From f89a35b28c768cdae6448bcb8ca827f62fef2c2d Mon Sep 17 00:00:00 2001
From: Zambom <erikzambom@hotmail.com>
Date: Wed, 28 Sep 2016 22:31:36 -0300
Subject: [PATCH] Add post creation [Issue: #74]

---
 courses/templates/subject/form_view_teacher.html   | 10 ----------
 forum/forms.py                                     | 15 ++++++++++++++-
 forum/static/js/forum.js                           | 18 ++++++++++++++++++
 forum/templates/forum/forum_list.html              | 41 ++++++++++++++++++++++++++++++++++++++++-
 forum/templates/post/post_render.html              | 30 ++++++++++++++++++++++++++++++
 forum/templates/post_answers/post_answer_form.html |  2 +-
 forum/urls.py                                      |  2 ++
 forum/views.py                                     | 37 +++++++++++++++++++++++++++++++++++--
 requirements.txt                                   |  1 -
 9 files changed, 140 insertions(+), 16 deletions(-)
 create mode 100644 forum/templates/post/post_render.html

diff --git a/courses/templates/subject/form_view_teacher.html b/courses/templates/subject/form_view_teacher.html
index 0528bef..f36f650 100644
--- a/courses/templates/subject/form_view_teacher.html
+++ b/courses/templates/subject/form_view_teacher.html
@@ -32,16 +32,6 @@
             <div class="modal-body">
                 <section>
                     <div class="forum_topics"></div>
-                    <div class="form-group">
-                        <div class="input-group">
-                            <textarea type="text" id="addon3a" class="form-control" placeholder="{% trans 'Post a comment...' %}"></textarea>
-                            <span class="input-group-btn">
-                                <button type="button" class="btn btn-fab btn-fab-mini">
-                                    <i class="material-icons">send</i>
-                                </button>
-                            </span>
-                        </div>
-                    </div>
                 </section>
             </div>
             <div class="modal-footer">
diff --git a/forum/forms.py b/forum/forms.py
index 5f8ff51..2304cce 100644
--- a/forum/forms.py
+++ b/forum/forms.py
@@ -1,6 +1,6 @@
 from django import forms
 from django.utils.translation import ugettext_lazy as _
-from .models import Forum, PostAnswer
+from .models import Forum, Post, PostAnswer
 
 class ForumForm(forms.ModelForm):
 
@@ -19,6 +19,19 @@ class ForumForm(forms.ModelForm):
 			'description': forms.Textarea(attrs={'cols': 80, 'rows': 5}),
 		}
 
+class PostForm(forms.ModelForm):
+	
+	class Meta:
+		model = Post
+		fields = ('message', 'forum', )
+		labels = {
+			'message': _('Message')
+		}
+		widgets = {
+			'message': forms.Textarea(attrs={'cols': 80, 'rows': 3}),
+			'forum': forms.HiddenInput(),
+		}
+
 class PostAnswerForm(forms.ModelForm):
 
 	class Meta:
diff --git a/forum/static/js/forum.js b/forum/static/js/forum.js
index 7577e1e..5fa5148 100644
--- a/forum/static/js/forum.js
+++ b/forum/static/js/forum.js
@@ -9,6 +9,24 @@ function showForum(url, forum_id) {
         data: {'forum_id': forum_id},
         success: function(data) {
             $(".forum_topics").html(data);
+
+            var frm = $('#form_post');
+            frm.submit(function () {
+                $.ajax({
+                    type: frm.attr('method'),
+                    url: frm.attr('action'),
+                    data: frm.serialize(),
+                    success: function (data) {
+                        $("#posts_list").append(data);
+                        frm[0].reset();
+                    },
+                    error: function(data) {
+                        console.log(frm.serialize());
+                        console.log('Error');
+                    }
+                });
+                return false;
+            });
         }
     });
 
diff --git a/forum/templates/forum/forum_list.html b/forum/templates/forum/forum_list.html
index f2e4b0b..059182f 100644
--- a/forum/templates/forum/forum_list.html
+++ b/forum/templates/forum/forum_list.html
@@ -1,4 +1,5 @@
 {% load i18n permission_tags list_post %}
+{% load widget_tweaks %}
 
 <div class="comments-list">
     <div class="section-heading">
@@ -8,7 +9,45 @@
     </div>
 </div>
 
-{% list_posts request forum %}
+<div id="posts_list">
+    {% list_posts request forum %}
+</div>
+
+<form id="form_post" method="post" action="{% url 'forum:create_post' %}" enctype="multipart/form-data">
+    {% csrf_token %}
+    {% for field in form %}
+        {% if field.field.widget.input_type == 'hidden' %}
+            {% render_field field class='form-control' value=forum.id %}
+        {% else %}
+            <div class="form-group {% if form.has_error %} has-error {% endif %} is-fileinput">
+                <div class="input-group">
+                    {% render_field field class='form-control' placeholder="Post a message" %}
+                    <span class="help-block">{{ field.help_text }}</span>
+                    {% if field.errors %}
+                        <div class="row">
+                            <br />
+                            <div class="alert alert-danger alert-dismissible" role="alert">
+                                <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+                                    <span aria-hidden="true">&times;</span>
+                                </button>
+                                <ul>
+                                    {% for error in field.errors %}
+                                        <li>{{ error }}</li>
+                                    {% endfor %}
+                                </ul>
+                            </div>
+                        </div>
+                    {% endif %}
+                    <span class="input-group-btn">
+                        <button type="submit" class="btn btn-fab btn-fab-mini">
+                            <i class="material-icons">send</i>
+                        </button>
+                    </span>
+                </div>
+            </div>
+        {% endif %}
+    {% endfor %}
+</form>
 
 <!--{% if foruns|length > 0 %}
     {% for forum in foruns %}
diff --git a/forum/templates/post/post_render.html b/forum/templates/post/post_render.html
new file mode 100644
index 0000000..3163aac
--- /dev/null
+++ b/forum/templates/post/post_render.html
@@ -0,0 +1,30 @@
+{% load i18n permission_tags %}
+
+<div  class="row">
+    <div id="post_{{ post.id }}" class="col-sm-12 col-xs-12">
+        <h3 class="user-name">
+            {{ post.user }}
+            <div class="pull-right">
+                <a href="javascript:answer('{{ post.id }}', '{% url 'forum:reply_post' %}');">
+                    <i class="material-icons">reply</i>
+                </a>
+                {% if request.user|has_role:'system_admin' or request.user|has_role:'professor' and request.user == post.user %}
+                    <div class="btn-group icon-more-horiz">
+                        <a class="btn btn-default btn-xs dropdown-toggle" type="button" id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                            <i class="material-icons">more_horiz</i>
+                        </a>
+                        <ul class="dropdown-menu" aria-labelledby="dropdownMenu1">
+                            <li><a href="javascript:void(0)"><i class="material-icons">create</i> {% trans 'Edit' %}</a></li>
+                            <li><a href="javascript:void(0)"><i class="material-icons">delete_sweep</i> {% trans 'Remove' %}</a></li>
+                        </ul>
+                    </div>
+                {% endif %}
+            </div>
+        </h3>
+        <div class="card-data">
+            <p class="comment-date"><i class="fa fa-clock-o"></i> {{ post.post_date }}</p>
+        </div>
+        <p class="comment-text">{{ post.message|linebreaks }}</p>
+        <div class="answer_post"></div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/forum/templates/post_answers/post_answer_form.html b/forum/templates/post_answers/post_answer_form.html
index 47b6f46..d2032bc 100644
--- a/forum/templates/post_answers/post_answer_form.html
+++ b/forum/templates/post_answers/post_answer_form.html
@@ -25,7 +25,7 @@
 					</div>
 				{% endif %}
 				<span class="input-group-btn">
-			        <button type="button" class="btn btn-fab btn-fab-mini">
+			        <button type="submit" class="btn btn-fab btn-fab-mini">
 			            <i class="material-icons">send</i>
 			        </button>
 			    </span>
diff --git a/forum/urls.py b/forum/urls.py
index ac97be9..3d68afa 100644
--- a/forum/urls.py
+++ b/forum/urls.py
@@ -7,6 +7,8 @@ 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'^create_post$', views.CreatePostView.as_view(), name='create_post'),
+	url(r'^render+post/([\w_-]+)/$', views.render_post, name='render_post'),
 	url(r'^post_answers$', views.PostAnswerIndex.as_view(), name='post_answers'),
 	url(r'^reply_post$', views.CreatePostAnswerView.as_view(), name='reply_post'),
 ]
diff --git a/forum/views.py b/forum/views.py
index 5adec4f..a67b771 100644
--- a/forum/views.py
+++ b/forum/views.py
@@ -1,5 +1,5 @@
 from django.shortcuts import render, get_object_or_404
-from django.core.urlresolvers import reverse_lazy
+from django.core.urlresolvers import reverse, reverse_lazy
 from django.utils.translation import ugettext_lazy as _
 from django.views import generic
 from django.contrib.auth.mixins import LoginRequiredMixin
@@ -7,7 +7,7 @@ from django.contrib.auth.mixins import LoginRequiredMixin
 from .models import Forum, Post, PostAnswer
 from courses.models import Topic
 
-from .forms import ForumForm, PostAnswerForm
+from .forms import ForumForm, PostForm, PostAnswerForm
 
 class ForumIndex(LoginRequiredMixin, generic.ListView):
 	login_url = reverse_lazy("core:home")	
@@ -20,6 +20,12 @@ class ForumIndex(LoginRequiredMixin, generic.ListView):
 		forum_id = self.request.GET.get('forum_id', 0)
 
 		context = Forum.objects.get(id = forum_id)
+		
+		return context
+
+	def get_context_data(self, **kwargs):
+		context = super(ForumIndex, self).get_context_data(**kwargs)
+		context['form'] = PostForm()
 
 		return context
 
@@ -43,6 +49,33 @@ class PostIndex(LoginRequiredMixin, generic.ListView):
 
 		return context
 
+class CreatePostView(LoginRequiredMixin, generic.edit.CreateView):
+	login_url = reverse_lazy("core:home")	
+	redirect_field_name = 'next'
+
+	form_class = PostForm
+
+	def form_valid(self, form):
+		self.object = form.save(commit = False)
+		self.object.user = self.request.user
+
+		self.object.save()
+
+		return super(CreatePostView, self).form_valid(form)
+
+	def get_success_url(self):
+		self.success_url = reverse('forum:render_post', args = (self.object.id, ))
+		
+		return self.success_url
+
+def render_post(request, post):
+	last_post = get_object_or_404(Post, id = post)
+
+	context = {}
+	context['post'] = last_post
+
+	return render(request, "post/post_render.html", context)
+
 class PostAnswerIndex(LoginRequiredMixin, generic.ListView):
 	login_url = reverse_lazy("core:home")	
 	redirect_field_name = 'next'
diff --git a/requirements.txt b/requirements.txt
index cbf4ba6..e94ae52 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -10,7 +10,6 @@ itsdangerous==0.24
 Jinja2==2.8
 MarkupSafe==0.23
 Pillow==3.3.1
-pkg-resources==0.0.0
 pycpfcnpj==1.0.2
 six==1.10.0
 slugify==0.0.1
--
libgit2 0.21.2