From 604de34dcac460007964017742ded43b4009d052 Mon Sep 17 00:00:00 2001
From: Jailson Dias <jcd2@cin.ufpe.br>
Date: Fri, 7 Oct 2016 15:03:21 -0300
Subject: [PATCH] Template de ver enquete #146

---
 poll/templates/poll/view.html | 112 +++++++++++++++++++---------------------------------------------------------------------------------------------
 poll/urls.py                  |   3 +--
 poll/views.py                 | 121 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------
 3 files changed, 74 insertions(+), 162 deletions(-)

diff --git a/poll/templates/poll/view.html b/poll/templates/poll/view.html
index b035fa8..6dce08c 100644
--- a/poll/templates/poll/view.html
+++ b/poll/templates/poll/view.html
@@ -1,99 +1,25 @@
-{% extends "topic/index.html" %}
+{% extends "poll/create.html" %}
 
-{% load i18n widget_tweaks dict_access static%}
-{% block content %}
-<!-- Modal (remember to change the ids!!!) -->
-<div class="modal fade" id="poll" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
-  <div class="modal-dialog" role="document">
-    <div class="modal-content">
+{% load i18n dict_access static%}
 
-      <!-- Modal Header -->
-      <div class="modal-header">
+{% block style %}
+{% endblock %}
 
-        <!-- Put your title here!!!  -->
-        <h4 class="modal-title" id="myModalLabel">{{form.question}}</h4>
+{% block title_poll %}
+<!-- Put your title here!!!  -->
+<h4 class="modal-title" id="myModalLabel">{{poll}}</h4>
+{% endblock title_poll %}
 
-      </div>
-      <!-- Modal Body -->
-      <div class="modal-body">
-
-        <!-- Put ONLY your content here!!!  -->
-          <div class="conteiner">
-                </div>
-                  <form id="form" method="post">
-                    {% csrf_token %}
-                    {% for key in keys %}
-                    <div class="row form-group">
-                      <div class="col-md-1">
-                        </br>
-                        <label><span class="glyphicon glyphicon-move"></span></label>
-                      </div>
-                      <div class="col-md-10">
-                        <div class="has-success is-empty">
-                          <input type="text" name="{{key}}" class="form-control" placeholder='{% trans "Answer" %}' value="{{ answers|value:key }}">
-                          <span class="help-block">{% trans "Possible answer for the question" %}</span>
-                        </div>
-                      </div>
-                      <div class="col-md-1">
-                        </br>
-                        <label><span class="glyphicon glyphicon-remove" onclick="this.parentNode.parentNode.parentNode.parentNode.removeChild(this.parentNode.parentNode.parentNode);"></span></label>
-                      </div>
-                    </div>
-                    {% empty %}
-                    <div class="row form-group">
-                      <div class="col-md-1">
-                        </br>
-                        <label><span class="glyphicon glyphicon-move"></span></label>
-                      </div>
-                      <div class="col-md-10">
-                        <div class="has-success is-empty">
-                          <input type="text" name="1" class="form-control" placeholder='{% trans "Answer" %}'>
-                          <span class="help-block">{% trans "Possible answer for the question" %}</span>
-                        </div>
-                      </div>
-                      <div class="col-md-1">
-                        </br>
-                        <label><span class="glyphicon glyphicon-remove" onclick="this.parentNode.parentNode.parentNode.parentNode.removeChild(this.parentNode.parentNode.parentNode);"></span></label>
-                      </div>
-                    </div>
-                    {% endfor %}
-                  </form>
-                  </br>
-                </div>
-              <button type="button" id="add" class="btn btn-primary btn-block btn-sm">add</button>
-        <div class="row form-group">
-          <input form="form" class="form-control" type="date" name="{{form.limit_date.name}}" {% if form.limit_date.value != None %}value="{% if form.limit_date.value.year %}{{form.limit_date.value|date:'Y-m-d'}}{% else %}{{form.limit_date.value}}{% endif %}"{% endif %}>
-          {% if form.limit_date.errors %}
-          <div class="not_submited">
-          </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 form.limit_date.errors %}
-                    <li>{{ error }}</li>
-                  {% endfor %}
-                </ul>
-              </div>
-          </div>
-          {% endif %}
-        </div>
-
-      </div>
-
-      <!-- Modal Footer -->
-      <div class="modal-footer">
-
-        <!-- Don't remove that!!!  -->
-        <button type="button" class="btn btn-danger btn-raised" data-dismiss="modal">{% trans "Close" %}</button>
-
-        <!-- Put curtom buttons here!!!  -->
-        <button type="submite" id="button" form="form" class="btn btn-primary btn-raised">{% trans "Create" %}</button>
-      </div>
-
-    </div>
+{% block content_poll %}
+<!-- Put ONLY your content here!!!  -->
+<div class="row">
+  <div class="col-md-10 col-md-offset-1">
+    <h3>{% trans "Limit date:" %} {{poll.limit_date|date:'d/m/y'}}</h3>
   </div>
 </div>
-<a href="" data-toggle="modal" data-target="#poll">modal</a>
-{% endblock content %}
+{% endblock content_poll %}
+
+{% block button_save %}
+<!-- Put curtom buttons here!!!  -->
+<button type="submite" id="button" form="form" class="btn btn-primary btn-raised">{% trans "Answer" %}</button>
+{% endblock button_save %}
diff --git a/poll/urls.py b/poll/urls.py
index 6364763..6b504f4 100644
--- a/poll/urls.py
+++ b/poll/urls.py
@@ -3,10 +3,9 @@ from django.conf.urls import url
 from . import views
 
 urlpatterns = [
+	url(r'^view/(?P<slug>[\w\-_]+)/$', views.ViewPoll.as_view(), name='view_poll'), # poll slug
 	url(r'^create/(?P<slug>[\w\-_]+)/$', views.CreatePoll.as_view(), name='create_poll'), # topic slug
 	url(r'^update/(?P<slug>[\w\-_]+)/$', views.UpdatePoll.as_view(), name='update_poll'), # poll slug
-	url(r'^teste/(?P<slug>[\w\-_]+)/$', views.CreatePollModal.as_view(), name='teste'), # poll
-	url(r'^mymodal/', views.MyModal.as_view(), name='mymodal'),
 	url(r'^delete/(?P<slug>[\w\-_]+)/$', views.DeletePoll.as_view(), name='delete_poll'), # poll
 
 ]
diff --git a/poll/views.py b/poll/views.py
index 269f9d7..04e36f5 100644
--- a/poll/views.py
+++ b/poll/views.py
@@ -17,6 +17,60 @@ from core.mixins import NotificationMixin
 from users.models import User
 from courses.models import Course, Topic
 
+class ViewPoll(LoginRequiredMixin,generic.DetailView):
+
+	model = Poll
+	context_object_name = 'poll'
+	template_name = 'poll/view.html'
+
+	def get_object(self, queryset=None):
+	    return get_object_or_404(Poll, slug = self.kwargs.get('slug'))
+
+	def form_invalid(self, form,**kwargs):
+		context = super(ViewPoll, self).form_invalid(form)
+		answers = {}
+		for key in self.request.POST:
+			if(key != 'csrfmiddlewaretoken' and key != 'name' and key != 'limit_date' and key != 'all_students' and key != 'students'):
+				answers[key] = self.request.POST[key]
+
+		keys = sorted(answers)
+		context.context_data['answers'] = answers
+		context.context_data['keys'] = keys
+		return context
+
+	def form_valid(self, form):
+		poll = self.object
+		poll = form.save(commit = False)
+		poll.answers.all().delete()
+		poll.save()
+
+
+		for key in self.request.POST:
+			if(key != 'csrfmiddlewaretoken' and key != 'name' and key != 'limit_date' and key != 'all_students' and key != 'students'):
+				answer = Answer(answer=self.request.POST[key],order=key,poll=poll)
+				answer.save()
+
+		return super(ViewPoll, self).form_valid(form)
+
+	def get_context_data(self, **kwargs):
+		context = super(ViewPoll, self).get_context_data(**kwargs)
+		poll = self.object
+		context['course'] = poll.topic.subject.course
+		context['subject'] = poll.topic.subject
+		context['subjects'] = poll.topic.subject.course.subjects.all()
+
+		answers = {}
+		for answer in poll.answers.all():
+			answers[answer.order] = answer.answer
+
+		keys = sorted(answers)
+		context['answers'] = answers
+		context['keys'] = keys
+
+		print (context)
+		return context
+
+
 class CreatePoll(LoginRequiredMixin,HasRoleMixin,generic.CreateView):
 
 	allowed_roles = ['professor', 'system_admin']
@@ -152,70 +206,3 @@ class DeletePoll(LoginRequiredMixin, HasRoleMixin, generic.DeleteView):
 
 	def get_success_url(self):
 		return reverse_lazy('course:view_topic', kwargs={'slug' : self.object.topic.slug})
-
-
-from django_modalview.generic.edit import ModalCreateView
-from django_modalview.generic.component import ModalResponse
-
-class CreatePollModal(LoginRequiredMixin,ModalCreateView):
-
-	login_url = reverse_lazy("core:home")
-	redirect_field_name = 'next'
-	model = Poll
-	form_class = PollForm
-	context_object_name = 'poll'
-	template_name = 'poll/create.html'
-	success_url = reverse_lazy('core:home')
-
-	def form_invalid(self, form,**kwargs):
-		context = super(CreatePollModal, self).form_invalid(form)
-		answers = {}
-		for key in self.request.POST:
-			if(key != 'csrfmiddlewaretoken' and key != 'name' and key != 'limit_date' and key != 'all_students' and key != 'students'):
-				answers[key] = self.request.POST[key]
-
-		keys = sorted(answers)
-		context.context_data['answers'] = answers
-		context.context_data['keys'] = keys
-		return context
-
-	def form_valid(self, form):
-		self.object = form.save(commit = False)
-		topic = get_object_or_404(Topic, slug = self.kwargs.get('slug'))
-		self.object.topic = topic
-		self.object.save()
-
-		for key in self.request.POST:
-			if(key != 'csrfmiddlewaretoken' and key != 'name' and key != 'limit_date' and key != 'all_students' and key != 'students'):
-				answer = Answer(answer=self.request.POST[key],order=key,poll=self.object)
-				answer.save()
-
-		return super(CreatePollModal, self).form_valid(form)
-
-	def get_context_data(self, **kwargs):
-		context = super(CreatePollModal, self).get_context_data(**kwargs)
-		topic = get_object_or_404(Topic, slug = self.kwargs.get('slug'))
-		context['course'] = topic.subject.course
-		context['subject'] = topic.subject
-		context['subjects'] = topic.subject.course.subjects.all()
-		return context
-
-
-from django_modalview.generic.base import ModalTemplateView
-
-class MyModal(ModalTemplateView):
-    '''
-         This modal inherit of ModalTemplateView, so it just display a text without logic.
-    '''
-    def __init__(self, *args, **kwargs):
-        '''
-            You have to call the init method of the parent, before to overide the values:
-                - title: The title display in the modal-header
-                - icon: The css class that define the modal's icon
-                - description: The content of the modal.
-                - close_button: A button object that has several attributes.(explain below)
-        '''
-        super(MyModal, self).__init__(*args, **kwargs)
-        self.title = "My modal"
-        self.description = "This is my description"
-        self.icon = "icon-mymodal"
--
libgit2 0.21.2