From b0e18756a7d5b02bd6f2896eec04430b72f74693 Mon Sep 17 00:00:00 2001
From: Zambom <erikzambom@hotmail.com>
Date: Thu, 22 Sep 2016 19:10:08 -0300
Subject: [PATCH] Adding post answers visualization [Issue: #73]

---
 core/static/css/base/amadeus.css                 |  3 +++
 courses/templates/subject/form_view_teacher.html | 19 +++++++++++++++++++
 forum/models.py                                  |  2 +-
 forum/templates/post_answer_list.html            | 34 ++++++++++++++++++++++++++++++++++
 forum/templates/post_list.html                   | 40 +++++++++++++++++++++++-----------------
 forum/urls.py                                    |  1 +
 forum/views.py                                   | 16 +++++++++++++++-
 7 files changed, 96 insertions(+), 19 deletions(-)

diff --git a/core/static/css/base/amadeus.css b/core/static/css/base/amadeus.css
index a5cf89e..d9408ad 100644
--- a/core/static/css/base/amadeus.css
+++ b/core/static/css/base/amadeus.css
@@ -287,6 +287,9 @@ a.alert_message:hover{color : grey}
     -webkit-padding-start: 0px !important;
     width: 100%;
 }
+.timeline.post a {
+    color: #000;
+}
 .timeline.post li {
     padding: 10px;
     border-bottom: 1px solid #fff;
diff --git a/courses/templates/subject/form_view_teacher.html b/courses/templates/subject/form_view_teacher.html
index 2bc067a..71c0666 100644
--- a/courses/templates/subject/form_view_teacher.html
+++ b/courses/templates/subject/form_view_teacher.html
@@ -46,6 +46,25 @@
                 $("#collapse" + forum).collapse('show');
             }
         }
+
+        var postsAnswerUrl = '{% url "forum:post_answers" %}';
+        var formPostsAnswersUrl = '';
+
+        function showPostsAnswers(post) {
+            if ($("#collapse" + post).hasClass('in')) {
+                $("#collapse" + post).collapse('hide');
+            } else {
+                $.ajax({
+                    url: postsAnswerUrl, 
+                    data: {'post': post},
+                    success: function(data) {
+                        $("#collapse" + post).find(".well").html(data);
+                    }
+                });
+
+                $("#collapse" + post).collapse('show');
+            }
+        }
     </script>
 {% endblock %}
 
diff --git a/forum/models.py b/forum/models.py
index 1d39781..e15678d 100644
--- a/forum/models.py
+++ b/forum/models.py
@@ -50,4 +50,4 @@ class PostAnswer(models.Model):
 		verbose_name_plural = _('Post Answers')
 
 	def __str__(self):
-		return ''.join([self.user.name, " / ", self.answer_date])	
\ No newline at end of file
+		return ''.join([self.user.name, " / ", str(self.answer_date)])	
\ No newline at end of file
diff --git a/forum/templates/post_answer_list.html b/forum/templates/post_answer_list.html
index e69de29..f8c79b7 100644
--- a/forum/templates/post_answer_list.html
+++ b/forum/templates/post_answer_list.html
@@ -0,0 +1,34 @@
+{% load i18n %}
+
+{% if answers|length > 0 %}
+    <ul class="timeline post">
+        {% for answer in answers %}
+            <li>
+                <div class="timeline-panel">
+                    <div class="row">
+                        <div class="col-xs-2 col-sm-2 col-md-2">
+                            <img class="img-responsive img-rounded" src="{{ answer.user.image_url }}" />
+                        </div>
+                        <div class="col-xs-10 col-sm-10 col-md-10">
+                            <div class="timeline-heading">
+                                <h3> {{ answer.user }}</h3>
+                            </div>
+                            <div class="timeline-body">
+                                <p><em>{{ answer.message|linebreaks }}</em></p>
+                            </div>
+                            <hr>
+                            <small class="text-muted">
+                                <span class="pull-right">
+                                    <i class="glyphicon glyphicon-time"></i> {{ answer.answer_date|timesince }} 
+                                    {% trans ' ago' %}
+                                </span>
+                            </small>
+                        </div>
+                    </div>
+                </div>
+            </li>
+        {% endfor %}
+    </ul>
+{% else %}
+    <p>{% trans 'Nobody answered this post yet.' %}</p>
+{% endif %}
\ No newline at end of file
diff --git a/forum/templates/post_list.html b/forum/templates/post_list.html
index e183a9a..28f8793 100644
--- a/forum/templates/post_list.html
+++ b/forum/templates/post_list.html
@@ -4,27 +4,33 @@
     <ul class="timeline post">
         {% for post in posts %}
             <li>
-                <div class="timeline-panel">
-                    <div class="row">
-                        <div class="col-xs-2 col-sm-2 col-md-2">
-                            <img class="img-responsive img-rounded" src="{{ post.user.image_url }}" />
-                        </div>
-                        <div class="col-xs-10 col-sm-10 col-md-10">
-                            <div class="timeline-heading">
-                                <h3> {{ post.user }}</h3>
+                <a class="post_collapse" role="button" href="javascript: showPostsAnswers('{{ post.id }}')" aria-expanded="false">
+                    <div class="timeline-panel">
+                        <div class="row">
+                            <div class="col-xs-2 col-sm-2 col-md-2">
+                                <img class="img-responsive img-rounded" src="{{ post.user.image_url }}" />
                             </div>
-                            <div class="timeline-body">
-                                <p><em>{{ post.message|linebreaks }}</em></p>
+                            <div class="col-xs-10 col-sm-10 col-md-10">
+                                <div class="timeline-heading">
+                                    <h3> {{ post.user }}</h3>
+                                </div>
+                                <div class="timeline-body">
+                                    <p><em>{{ post.message|linebreaks }}</em></p>
+                                </div>
+                                <hr>
+                                <small class="text-muted">
+                                    <span class="pull-right">
+                                        <i class="glyphicon glyphicon-time"></i> {{ post.post_date|timesince }} 
+                                        {% trans ' ago' %}
+                                    </span>
+                                </small>
                             </div>
-                            <hr>
-                            <small class="text-muted">
-                                <span class="pull-right">
-                                    <i class="glyphicon glyphicon-time"></i> {{ post.post_date|timesince }} 
-                                    {% trans ' ago' %}
-                                </span>
-                            </small>
                         </div>
                     </div>
+                </a>
+                <div class="collapse" id="collapse{{ post.id }}" style="margin-top:10px;">
+                    <div class="well">
+                    </div>
                 </div>
             </li>
         {% endfor %}
diff --git a/forum/urls.py b/forum/urls.py
index b54d4c5..d25e67e 100644
--- a/forum/urls.py
+++ b/forum/urls.py
@@ -7,4 +7,5 @@ urlpatterns = [
 	url(r'^$', views.ForumIndex.as_view(), name='index'),
 	url(r'^create$', views.CreateForumView.as_view(), name='create'),
 	url(r'^posts$', views.PostIndex.as_view(), name='posts'),
+	url(r'^post_answers$', views.PostAnswerIndex.as_view(), name='post_answers'),
 ]
diff --git a/forum/views.py b/forum/views.py
index 801cb93..93bdc4f 100644
--- a/forum/views.py
+++ b/forum/views.py
@@ -4,7 +4,7 @@ from django.utils.translation import ugettext_lazy as _
 from django.views import generic
 from django.contrib.auth.mixins import LoginRequiredMixin
 
-from .models import Forum, Post
+from .models import Forum, Post, PostAnswer
 from courses.models import Topic
 
 from .forms import ForumForm
@@ -41,4 +41,18 @@ class PostIndex(LoginRequiredMixin, generic.ListView):
 
 		context = Post.objects.filter(forum = forum)
 
+		return context
+
+class PostAnswerIndex(LoginRequiredMixin, generic.ListView):
+	login_url = reverse_lazy("core:home")	
+	redirect_field_name = 'next'
+
+	template_name = "post_answer_list.html"
+	context_object_name = 'answers'
+
+	def get_queryset(self):
+		post = get_object_or_404(Post, id = self.request.GET.get('post', ''))
+
+		context = PostAnswer.objects.filter(post = post)
+
 		return context
\ No newline at end of file
--
libgit2 0.21.2