From 0b1b57138dfb314142c7e0766ec9dad2f499fc62 Mon Sep 17 00:00:00 2001
From: Zambom <erikzambom@hotmail.com>
Date: Thu, 8 Dec 2016 19:16:40 -0300
Subject: [PATCH] Changing topic structure to accordion

---
 courses/static/js/topic.js           | 85 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----
 courses/templates/subject/index.html |  8 +++++---
 courses/templates/topic/index.html   |  4 ++--
 courses/templates/topic/view.html    |  5 +++++
 courses/views.py                     | 24 ++++++++++++++----------
 5 files changed, 106 insertions(+), 20 deletions(-)

diff --git a/courses/static/js/topic.js b/courses/static/js/topic.js
index dcaee37..72c532a 100644
--- a/courses/static/js/topic.js
+++ b/courses/static/js/topic.js
@@ -1,10 +1,67 @@
 var topic = {
-  get: function (url, id_div, faz){
+  get: function (button, url, id_div, faz){
     if(!$(id_div + ' div').length || faz == 'true'){
-      $.get(url, function(data){
-        $(id_div).empty();
-        $(id_div).append(data);
-      });
+        var opened = $("#topics").find(".fa-angle-up");
+        
+        if (opened.length > 0) {
+            opened.removeClass("fa-angle-up");
+            opened.addClass("fa-angle-down");
+            var op_topic = opened.parent().parent().parent().parent().parent();
+
+            var log_id = op_topic.find(".log_id").val();
+            var log_url = op_topic.find(".log_url").val();
+
+            topicLog(log_url, log_id, 'close', id_div);
+
+            op_topic.find(".loaded").val("false");
+        }
+
+        //Changing button icon
+        button.find("i").removeClass('fa-angle-down');
+        button.find("i").addClass('fa-angle-up');
+        
+        $.get(url, function(data){
+            $(id_div).empty();
+            $(id_div).append(data);
+        });
+    } else {
+        var loaded = $(id_div).find(".loaded").val();
+
+        if (loaded == "true") {
+            var opened = $("#topics").find(".fa-angle-up");
+        
+            opened.removeClass("fa-angle-up");
+            opened.addClass("fa-angle-down");
+            var op_topic = opened.parent().parent().parent().parent().parent();
+
+            var log_id = op_topic.find(".log_id").val();
+            var log_url = op_topic.find(".log_url").val();
+
+            topicLog(log_url, log_id, 'close', id_div);
+
+            $(id_div).find(".loaded").val("false");
+        } else {
+            var opened = $("#topics").find(".fa-angle-up");
+        
+            opened.removeClass("fa-angle-up");
+            opened.addClass("fa-angle-down");
+            var op_topic = opened.parent().parent().parent().parent().parent();
+
+            var log_id = op_topic.find(".log_id").val();
+            var log_url = op_topic.find(".log_url").val();
+
+            topicLog(log_url, log_id, 'close', op_topic);
+
+            op_topic.find(".loaded").val("false");
+
+            var opened = $(id_div).parent().parent().find(".fa-angle-down");
+            opened.removeClass("fa-angle-down");
+            opened.addClass("fa-angle-up");
+            
+            var log_url = $(id_div).find(".log_url").val();
+
+            topicLog(log_url, 0, 'open', id_div);
+        }
     }
   },
   post: function(url,dados,id_div){
@@ -35,3 +92,21 @@ var delete_topic = {
     });
   }
 };
+
+function topicLog(url, topic_log_id, action, topic_div) {
+    $.ajax({
+        url: url,
+        data: {'action': action, 'log_id': topic_log_id},
+        dataType: 'json',
+        success: function (data) {
+            if (action == 'open') {
+                $(topic_div).find(".log_id").val(data.log_id);
+                $(topic_div).find(".loaded").val("true");
+            }
+        },
+        error: function(data) {
+            console.log('Error: ');
+            console.log(data);
+        }
+    })
+}
\ No newline at end of file
diff --git a/courses/templates/subject/index.html b/courses/templates/subject/index.html
index 421a206..e19176c 100644
--- a/courses/templates/subject/index.html
+++ b/courses/templates/subject/index.html
@@ -63,15 +63,17 @@
   </div>
 
   {# lista de tópicos #}
-  {% for topic in topics %}
-  {% include "topic/index.html" %}
+    <div class="panel-group" id="topics" role="tablist" aria-multiselectable="true">
+        {% for topic in topics %}
+            {% include "topic/index.html" %}
     {# {% professor_subject topic.subject user as topic_professor%}#}
     {# {% if topic_professor %}#}
       {# {% include "subject/form_view_teacher.html" %}#}
     {# {% else %}#}
       {# {% include "subject/form_view_student.html" %}#}
     {# {% endif %}#}
-  {% endfor %}
+        {% endfor %}
+    </div>
 
   {# botão create topic #}
   {% professor_subject subject user as professor_sub %}
diff --git a/courses/templates/topic/index.html b/courses/templates/topic/index.html
index 8cd20a0..983efa3 100644
--- a/courses/templates/topic/index.html
+++ b/courses/templates/topic/index.html
@@ -3,8 +3,8 @@
 <div class="panel panel-default cards-detail">
   <div class="panel-heading topic">
     <div class="row">
-      <div class="col-md-1 moreAccordion" data-toggle="collapse" data-parent="#accordion-{{topic.slug}}" href=".collapseTopic-{{topic.slug}}" aria-expanded="false" aria-controls="collapseTopic-{{topic.slug}}">
-        <button class="btn btn-default btn-sm caret-square" onclick="topic.get('{% url 'course:view_topic' topic.slug %}', '#content_topic_{{topic.slug}}', 'false');"><i class="fa fa-angle-down fa-2x" aria-hidden="true"></i></button>
+      <div class="col-md-1 moreAccordion" data-toggle="collapse" data-parent="#topics" href=".collapseTopic-{{topic.slug}}" aria-expanded="false" aria-controls="collapseTopic-{{topic.slug}}">
+        <button class="btn btn-default btn-sm caret-square" onclick="topic.get($(this), '{% url 'course:view_topic' topic.slug %}', '#content_topic_{{topic.slug}}', 'false');"><i class="fa fa-angle-down fa-2x" aria-hidden="true"></i></button>
       </div>
       <div class="col-xs-9 col-md-9 titleTopic Topic-detail">
         <a role="button">
diff --git a/courses/templates/topic/view.html b/courses/templates/topic/view.html
index 3082374..0581634 100644
--- a/courses/templates/topic/view.html
+++ b/courses/templates/topic/view.html
@@ -1,4 +1,9 @@
 {% load static i18n list_topic_foruns permission_tags widget_tweaks professor_access list_topic_exercises %}
+<!-- Block with Log info -->
+<input type="hidden" class="log_id" value="{{ topic_log_id }}" />
+<input type="hidden" class="log_url" value="{% url 'course:topic_log' topic.id %}" />
+<input type="hidden" class="loaded" value="true" />
+<!-- Endblock -->
 <p>
   <i>
     {{topic.description|safe}}
diff --git a/courses/views.py b/courses/views.py
index a3698df..5e4a116 100644
--- a/courses/views.py
+++ b/courses/views.py
@@ -650,6 +650,19 @@ class TopicsView(LoginRequiredMixin, LogMixin, generic.TemplateView):
         if(not has_object_permission('view_topic', self.request.user, topic)):
             return self.handle_no_permission()
 
+        return super(TopicsView, self).dispatch(*args, **kwargs)
+
+    def get_queryset(self):
+        return get_object_or_404(Topic, slug = self.kwargs.get('slug'))
+
+    def get_context_data(self, **kwargs):
+        topic = get_object_or_404(Topic, slug = self.kwargs.get('slug'))
+        context = super(TopicsView, self).get_context_data(**kwargs)
+        context['topic'] = topic
+
+        if(not has_object_permission('view_topic', self.request.user, topic)):
+            return self.handle_no_permission()
+
         self.log_context['topic_id'] = topic.id
         self.log_context['topic_name'] = topic.name
         self.log_context['topic_slug'] = topic.slug
@@ -665,17 +678,8 @@ class TopicsView(LoginRequiredMixin, LogMixin, generic.TemplateView):
 
         super(TopicsView, self).createLog(self.request.user, self.log_component, self.log_action, self.log_resource, self.log_context)
 
-        self.request.session['log_id'] = Log.objects.latest('id').id
-
-        return super(TopicsView, self).dispatch(*args, **kwargs)
+        context['topic_log_id'] = Log.objects.latest('id').id
 
-    def get_queryset(self):
-        return get_object_or_404(Topic, slug = self.kwargs.get('slug'))
-
-    def get_context_data(self, **kwargs):
-        topic = get_object_or_404(Topic, slug = self.kwargs.get('slug'))
-        context = super(TopicsView, self).get_context_data(**kwargs)
-        context['topic'] = topic
         return context
 
 
--
libgit2 0.21.2