From 9d6a4c6ee65d3da88c9be0b67f089c50e1f45841 Mon Sep 17 00:00:00 2001
From: Felipe Henrique de Almeida Bormann <fbormann@Felipes-MacBook-Air.local>
Date: Wed, 18 Jan 2017 13:21:09 -0300
Subject: [PATCH] subscription was made complete

---
 subjects/static/subjects/js/modal_subject.js  | 37 ++++++++++++++++++++++++++++++++++++-
 subjects/templates/subjects/subject_card.html | 10 ++++++----
 subjects/templates/subjects/subscribe.html    | 31 ++++++++++++++++++++++---------
 subjects/urls.py                              |  1 +
 subjects/views.py                             | 24 ++++++++++++++++++------
 5 files changed, 83 insertions(+), 20 deletions(-)

diff --git a/subjects/static/subjects/js/modal_subject.js b/subjects/static/subjects/js/modal_subject.js
index 413b938..27d7c9a 100644
--- a/subjects/static/subjects/js/modal_subject.js
+++ b/subjects/static/subjects/js/modal_subject.js
@@ -28,4 +28,39 @@ var delete_subject = {
       }
     });
   }
-};
\ No newline at end of file
+};
+
+
+var subscribe_subject = {
+  get: function(url, id_modal, id_div_modal){
+    $.get(url, function(data){
+      if($(id_modal).length){
+        $(id_div_modal).empty();
+      }
+      if (!data['error']){ //If there is no error in the removing process, no message is shown
+        $(id_div_modal).append(data);
+        $(id_modal).modal('show');
+      }else{
+        window.location.href = data['url']; // If there is a error, we redirect to another URL
+      }
+    });
+  }
+}
+
+
+var SubscribeSubject = {
+  subscribe: function(url,dados,id_li_link){
+    $("#subject").modal('toggle');
+      $.post(url,dados, function(data){
+        $(id_li_link).remove();
+        $('body').removeClass('modal-open');
+        $("#modal_course").empty();
+        $(".modal-backdrop.in").remove();
+        alertify.success("Subscription was succesfull!");
+      }).fail(function(){
+        $("#modal_course").empty();
+        $("#modal_course").append(data);
+        $('#subject').modal('show');
+      });
+  }
+}
\ No newline at end of file
diff --git a/subjects/templates/subjects/subject_card.html b/subjects/templates/subjects/subject_card.html
index a313de0..b6b1a19 100644
--- a/subjects/templates/subjects/subject_card.html
+++ b/subjects/templates/subjects/subject_card.html
@@ -47,14 +47,16 @@
                     <p><b>{% trans "End" %}:</b> {{subject.end_date}}</p>
                 </div>
             </div>
-
-            <p>{{subject.description_brief|safe}}</p>
+            {% if subject.description_brief %}
+                <p>{{subject.description_brief|safe}}</p>
+            {% endif %}
+            
             {% if show_buttons %}                 
                                         
                 {% if request.user in subject.students.all or request.user in subject.professor.all or request.user.is_staff or request.user in subject.category.coordinators.all %}
                     <a href="{% url 'subjects:view' subject.slug %}" class="btn btn-success btn-raised"> {% trans "Access Subject" %}</a>
                 {% else %}
-                    <a href="#" class="subscribe-subject btn btn-primary btn-raised"> {% trans "Subscribe to Subject" %}</a>
+                    <a href="javascript:subscribe_subject.get('{% url 'subjects:subscribe' subject.slug %}?view=index','#subject-subscribe','#modal_subject')" class="subscribe-subject btn btn-primary btn-raised"> {% trans "Subscribe to Subject" %}</a>
                 {% endif %}
 
             {% endif %}
@@ -115,7 +117,7 @@
                 {% if request.user in subject.students.all or request.user in subject.professor.all or request.user.is_staff or request.user in subject.category.coordinators.all %}
                     <a href="{% url 'subjects:view' subject.slug %}" class="btn btn-success btn-raised"> {% trans "Access Subject" %}</a>
                 {% else %}
-                    <a href="#" class="subscribe-subject btn btn-primary btn-raised"> {% trans "Subscribe to Subject" %}</a>
+                    <a href="{% url 'subjects:subscribe' subject.slug %}?view=index','#subject','#subject')" class="subscribe-subject btn btn-primary btn-raised"> {% trans "Subscribe to Subject" %}</a>
                 {% endif %}
 
             {% endif %}
diff --git a/subjects/templates/subjects/subscribe.html b/subjects/templates/subjects/subscribe.html
index 8dadf28..bce69a3 100644
--- a/subjects/templates/subjects/subscribe.html
+++ b/subjects/templates/subjects/subscribe.html
@@ -1,22 +1,35 @@
 {% load static i18n permission_tags %}
 
 <!-- Modal (remember to change the ids!!!) -->
-<div class="modal fade" id="subscribe_modal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
+<div class="modal fade" id="subject-subscribe" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
   <div class="modal-dialog" role="document">
     <div class="modal-content">
-           <!-- Modal Body -->
+      <!-- Modal Header -->
+      <div class="modal-header">
+
+        <h4 class="modal-title" id="myModalLabel">{% trans "Delete Subject" %}</h4>
+      </div>
+      <!-- Modal Body -->
       <div class="modal-body">
         <!-- Put ONLY your content here!!!  -->
-        <form id="modal_form" action="{% url 'subjects:subscribe' subject.slug %}" method="post">
-          {% csrf_token %}
-          <p>{% trans 'Are you sure you want to subscribe to this subject' %} "{{subject.name}}"?</p>
-        </form>
+    <form id="subscribe" action="" method="post">
+      {% csrf_token %}
+        <p>{% trans 'Are you sure you want to subscribe to the subject' %} "{{subject.name}}"?</p>
+    </form>
       </div>
       <!-- Modal Footer -->
-      <div id="delete-category-footer"class="modal-footer">
+      <div class="modal-footer">
         <!-- Don't remove that!!!  -->
-        <button type="button" class="btn btn-default btn-raised" data-dismiss="modal">{% trans "Close" %}</button>
-        <button type="submit" id="button" form="delete_form" class="btn btn-primary btn-raised erase-button">{% trans "Subcribe" %}</button>
+        <button type="button" class="btn btn-raised btn-default" data-dismiss="modal">{% trans "Cancel" %}</button>
+        <button type="submit" id="button" form="subscribe" class="btn btn-success btn-raised">{% trans "Ok" %}</button>
+
+       
+        <script>
+          $("#subscribe").submit(function(event) {
+            SubscribeSubject.subscribe("{% url 'subjects:subscribe' subject.slug %}",$(this).serialize(),"#subject_{{subject.slug}}");
+            event.preventDefault();
+          });
+        </script>
         
       </div>
     </div>
diff --git a/subjects/urls.py b/subjects/urls.py
index 2abe7bb..de71e12 100644
--- a/subjects/urls.py
+++ b/subjects/urls.py
@@ -10,5 +10,6 @@ urlpatterns = [
 	url(r'^update/(?P<slug>[\w_-]+)/$', views.SubjectUpdateView.as_view(), name='update'),
 	url(r'^delete/(?P<slug>[\w_-]+)/$', views.SubjectDeleteView.as_view(), name='delete'),
 	url(r'^view/(?P<slug>[\w_-]+)/$', views.SubjectDetailView.as_view(), name='view'),
+	url(r'^subscribe/(?P<slug>[\w_-]+)/$', views.SubjectSubscribeView.as_view(), name='subscribe'),
 	#url(r'^modal/(?P<subject_slug>[\w_-]+)/$', views.subscribe_subject(), name='subscribe'),
 ]
\ No newline at end of file
diff --git a/subjects/views.py b/subjects/views.py
index d55bdf8..0bb885a 100644
--- a/subjects/views.py
+++ b/subjects/views.py
@@ -265,12 +265,24 @@ class SubjectDetailView(LoginRequiredMixin, DetailView):
 
         return context
 
-def subscribe_subject(request, subject_slug):
-    subject = get_object_or_404(Subject, slug= subject_slug)
-    subject.students.add(request.user)
-    subject.save()
 
-    messages.success(self.request, _('Subcribed "%s" was updated on "%s" successfully!')%(self.object.name, self.object.category.name ))
-    return reverse_lazy('subjects:index')
+class SubjectSubscribeView(LoginRequiredMixin, TemplateView):
+
+    template_name = 'subjects/subscribe.html'
+
+    def get_context_data(self, **kwargs):
+        context = super(SubjectSubscribeView, self).get_context_data(**kwargs)
+        context['subject'] = get_object_or_404(Subject, slug= kwargs.get('slug'))
+
+        return context
+
+    def post(self, request, *args, **kwargs):
+        subject = get_object_or_404(Subject, slug= kwargs.get('slug'))
+        print(subject)
+        subject.students.add(request.user)
+        subject.save()
+
+       
+        return HttpResponse('success')
 
 
--
libgit2 0.21.2