From 525e272f8fc7702dc382776abcff4cbcde767e8b Mon Sep 17 00:00:00 2001
From: Zambom <erikzambom@hotmail.com>
Date: Wed, 21 Sep 2016 22:39:21 -0300
Subject: [PATCH] Adding form to create forum [Issue: #73]

---
 courses/templates/subject/form_view_teacher.html | 26 +++++++++++++++++++++-----
 forum/forms.py                                   | 20 ++++++++++++++++++++
 forum/templates/forum_form.html                  | 30 ++++++++++++++++++++++++++++++
 forum/templates/forum_list.html                  | 24 +++++++++++++++++-------
 forum/urls.py                                    |  1 +
 forum/views.py                                   | 14 +++++++++++---
 6 files changed, 100 insertions(+), 15 deletions(-)
 create mode 100644 forum/forms.py
 create mode 100644 forum/templates/forum_form.html

diff --git a/courses/templates/subject/form_view_teacher.html b/courses/templates/subject/form_view_teacher.html
index 9acd26c..11ee35a 100644
--- a/courses/templates/subject/form_view_teacher.html
+++ b/courses/templates/subject/form_view_teacher.html
@@ -2,20 +2,31 @@
 
 {% block javascript %}
     <script type="text/javascript">
-    var baseUrl = '{% url "forum:index" %}';
+        var baseUrl = '{% url "forum:index" %}';
+        var formUrl = '{% url "forum:create" %}';
 
         function showForum(topic) {
             $.ajax({
                 url: baseUrl, 
                 data: {'topic': topic},
                 success: function(data) {
-                    console.log(data);
-                    $(".modal-body").html(data);
+                    $(".forum_topics").html(data);
                 }
             });
 
             $('#forumModal').modal();
         }
+
+        function getForm() {
+            $.ajax({
+                url: formUrl, 
+                success: function(data) {
+                    $(".forum_form").html(data);
+                }
+            });
+
+            $(".forum_form").show();
+        }
     </script>
 {% endblock %}
 
@@ -43,10 +54,15 @@
         <div class="modal-content">
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                <h4 class="modal-title" id="myModalLabel"></h4>
+                <h4 class="modal-title" id="myModalLabel">
+                    <button type="button" class="btn btn-primary btn-sm" onclick="getForm();"><i class="fa fa-plus"></i> {% trans 'Create Forum' %}</button>
+                </h4>
             </div>
             <div class="modal-body">
-                
+                <div class="forum_form" style="display:none">
+                </div>
+                <div class="forum_topics">
+                </div>
             </div>
         </div>
     </div>
diff --git a/forum/forms.py b/forum/forms.py
new file mode 100644
index 0000000..945ea8a
--- /dev/null
+++ b/forum/forms.py
@@ -0,0 +1,20 @@
+from django import forms
+from django.utils.translation import ugettext_lazy as _
+from .models import Forum
+
+class ForumForm(forms.ModelForm):
+
+	class Meta:
+		model = Forum
+		fields = ('title', 'description')
+		labels = {
+			'title': _('Title'),
+			'description': _('Description')
+		}
+		help_texts = {
+			'title': _('Forum title'),
+			'description': _('What is this forum about?')
+		}
+		widgets = {
+			'description': forms.Textarea(attrs={'cols': 80, 'rows': 5}),
+		}
\ No newline at end of file
diff --git a/forum/templates/forum_form.html b/forum/templates/forum_form.html
new file mode 100644
index 0000000..06a4b8d
--- /dev/null
+++ b/forum/templates/forum_form.html
@@ -0,0 +1,30 @@
+{% load static i18n %}
+{% load widget_tweaks %}
+
+<form method="post" action="" enctype="multipart/form-data">
+	{% csrf_token %}
+	{% for field in form %}
+		<div class="form-group {% if form.has_error %} has-error {% endif %} is-fileinput">
+			<label for="{{ field.auto_id }}">{{ field.label }}</label>
+			{% render_field field class='form-control' %}
+			<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 %}
+		</div>
+	{% endfor %}
+
+	<input type="submit" value="{% trans 'Create' %}" class="btn btn-primary" />
+</form>
\ No newline at end of file
diff --git a/forum/templates/forum_list.html b/forum/templates/forum_list.html
index 0556598..873bbe3 100644
--- a/forum/templates/forum_list.html
+++ b/forum/templates/forum_list.html
@@ -1,9 +1,19 @@
-<div class="page-header">
-    <h1 id="timeline">Forum</h1>
-    <b>Descricao: </b>Learning Python<p>
-    <b>Abertura: </b>Sexta-feira, 10 Junho 2016
-</div>
-<ul class="timeline">
+{% load i18n %}
+
+{% if foruns|length > 0 %}
+    {% for forum in foruns %}
+        <div class="page-header">
+            <h1 id="timeline">{{ forum }}</h1>
+            <b>Descricao: </b>{{ forum.description }}<p>
+            <b>Abertura: </b>{{ forum.create_date }}
+        </div>
+    {% endfor %}
+{% else %}
+    <div class="page-header">
+        <p>{% trans 'No forum created yet.' %}</p>
+    </div>
+{% endif %}
+<!-- <ul class="timeline">
     <li>
         <div class="timeline-badge">
             <img id="logo" src="https://uxdesign-html-japm94.c9users.io/atividades-amadeus/uxdesign-html/img/topo-amadeus.png">
@@ -38,4 +48,4 @@
             <i class="fa fa-pencil-square-o fa-2x" aria-hidden="true"></i>
         </div>
     </li>
-</ul>
\ No newline at end of file
+</ul> -->
\ No newline at end of file
diff --git a/forum/urls.py b/forum/urls.py
index a546bcb..c3e9dfd 100644
--- a/forum/urls.py
+++ b/forum/urls.py
@@ -5,4 +5,5 @@ from . import views
 
 urlpatterns = [
 	url(r'^$', views.ForumIndex.as_view(), name='index'),
+	url(r'^create$', views.CreateForumView.as_view(), name='create'),
 ]
diff --git a/forum/views.py b/forum/views.py
index aee77a5..efe5055 100644
--- a/forum/views.py
+++ b/forum/views.py
@@ -1,18 +1,20 @@
 from django.shortcuts import render, get_object_or_404
 from django.core.urlresolvers import reverse_lazy
 from django.utils.translation import ugettext_lazy as _
-from django.views.generic import ListView
+from django.views import generic
 from django.contrib.auth.mixins import LoginRequiredMixin
 
 from .models import Forum
 from courses.models import Topic
 
-class ForumIndex(LoginRequiredMixin, ListView):
+from .forms import ForumForm
+
+class ForumIndex(LoginRequiredMixin, generic.ListView):
 	login_url = reverse_lazy("core:home")	
 	redirect_field_name = 'next'
 
 	template_name = "forum_list.html"
-	context_object_name = 'forum'
+	context_object_name = 'foruns'
 
 	def get_queryset(self):
 		topic = get_object_or_404(Topic, slug = self.request.GET.get('topic', ''))
@@ -20,3 +22,9 @@ class ForumIndex(LoginRequiredMixin, ListView):
 		context = Forum.objects.filter(topic = topic)
 
 		return context
+
+class CreateForumView(LoginRequiredMixin, generic.edit.CreateView):
+
+	template_name = 'forum_form.html'
+	form_class = ForumForm
+	success_url = reverse_lazy('forum:index')
\ No newline at end of file
--
libgit2 0.21.2