From 0aa01fa47b5c1c2678f2b211a4d91f0e9ebfb49f Mon Sep 17 00:00:00 2001
From: Jailson Dias <jcd2@cin.ufpe.br>
Date: Tue, 8 Nov 2016 19:34:04 -0300
Subject: [PATCH] ajustando para quando criar uma enquete não precisar atualizar a página para ela aparecer #261

---
 courses/templates/subject/poll_item_actions_teacher.html | 10 ++++++++++
 poll/models.py                                           |  2 +-
 poll/static/js/modal_poll.js                             | 61 +++++++++++++++++++++++++++++++++++++++++++++++++------------
 poll/templates/poll/create.html                          |  9 +--------
 poll/templates/poll/poll_edit.html                       |  4 ++++
 poll/templates/poll/poll_view.html                       |  1 +
 poll/templates/poll/remove.html                          |  6 +++---
 poll/templates/poll/update.html                          |  2 +-
 poll/urls.py                                             |  2 ++
 poll/views.py                                            | 32 +++++++++++++++++++++++++++-----
 10 files changed, 99 insertions(+), 30 deletions(-)
 create mode 100644 courses/templates/subject/poll_item_actions_teacher.html
 create mode 100644 poll/templates/poll/poll_edit.html
 create mode 100644 poll/templates/poll/poll_view.html

diff --git a/courses/templates/subject/poll_item_actions_teacher.html b/courses/templates/subject/poll_item_actions_teacher.html
new file mode 100644
index 0000000..4c3caf0
--- /dev/null
+++ b/courses/templates/subject/poll_item_actions_teacher.html
@@ -0,0 +1,10 @@
+{% load static i18n permission_tags professor_access %}
+
+<div id="list-topic-{{ topic.slug }}-poll-edit">
+  {% for poll in polls %}
+    <div id="poll_{{poll.slug}}_div">
+      <li class="icon_edit_remove" ><a href="javascript:modal.get('{% url 'course:poll:update_poll' poll.slug %}','#poll','#requisicoes_ajax');"><i class="fa fa-pencil fa-lg" aria-hidden="true"></i></a>  <a href="javascript:modal.get('{% url 'course:poll:delete_poll' poll.slug %}','#poll','#requisicoes_ajax');"><i class="fa fa-trash fa-lg" aria-hidden="true"></i></a></li>
+      <li><i class="fa fa-bar-chart"></i> <a href="javascript:modal.get('{% url 'course:poll:view_poll' poll.slug %}','#poll','#requisicoes_ajax');">{{poll}}</a></li>
+    </div>
+  {% endfor %}
+</div>
diff --git a/poll/models.py b/poll/models.py
index 68eac05..13bf8bc 100644
--- a/poll/models.py
+++ b/poll/models.py
@@ -12,7 +12,7 @@ class Poll(Activity):
         verbose_name_plural = _('Polls')
 
     def __str__(self):
-        return str(self.name) + str("/") + str(self.topic)
+        return str(self.name)
 
 class Answer(models.Model):
     answer = models.CharField(_("Answer"), max_length = 200)
diff --git a/poll/static/js/modal_poll.js b/poll/static/js/modal_poll.js
index 21d953f..87de7f5 100644
--- a/poll/static/js/modal_poll.js
+++ b/poll/static/js/modal_poll.js
@@ -1,9 +1,11 @@
-//controles do modal
-$(window).ready(function() { // utilizado para abrir o modal quando tiver tido algum erro no preenchimento do formulario
-  if($('.not_submited').length){
-      $('#poll').modal('show');
-  }
-});
+// 
+// //controles do modal
+// $(window).ready(function() { // utilizado para abrir o modal quando tiver tido algum erro no preenchimento do formulario
+//   if($('.not_submited').length){
+//       $('#poll').modal('show');
+//   }
+// });
+
 var Answer = {
     init: function(url) { // utilizado para adicionar um novo campo de resposta
       $.get(url, function(data){
@@ -17,24 +19,59 @@ var Answer = {
 };
 
 var Submite = {
-  post: function(url,dados){
+  create: function(url,dados, slug){
+    $('#poll').modal('hide');
+    var poll = null;
+      $.post(url,dados, function(data){
+        $.ajax({
+          method: "get",
+          url: data["view"],
+          success: function(view){
+            $('#list-topic-'+ slug +'-poll').append(view);
+          }
+        });
+        $.ajax({
+          method: "get",
+          url: data["edit"],
+          success: function(edit){
+            $('#list-topic-'+ slug +'-poll-edit').append(edit);
+          }
+        });
+        $("#requisicoes_ajax").empty();
+        alertify.alert('Link successfully created!');
+      }).fail(function(data){
+        $("div.modal-backdrop.fade.in").remove();
+        $("#requisicoes_ajax").empty();
+        $("#requisicoes_ajax").append(data.responseText);
+        $('#poll').modal('show');
+      });
+  },
+  update: function(url,dados, slug_poll, slug_topic){
     $('#poll').modal('hide');
       $.post(url,dados, function(data){
+        $('#list-topic-'+ slug_topic +'-poll #'+slug_poll).remove();
+        $('#list-topic-'+ slug_topic +'-poll #'+slug_poll).remove();
+        $('#list-topic-'+ slug_topic +'-poll').append(data);
+        $('#list-topic-'+ slug_topic +'-poll-edit').append(data);
+        $("#requisicoes_ajax").empty();
+        alertify.alert('Link successfully updated!')
       }).fail(function(data){
         $("div.modal-backdrop.fade.in").remove();
-        $("#modal_poll").empty();
-        $("#modal_poll").append(data.responseText);
+        $("#requisicoes_ajax").empty();
+        $("#requisicoes_ajax").append(data.responseText);
+        $('#poll').modal('show');
       });
   },
   remove: function(url,dados, id_li_link){
     $('#poll').modal('hide');
       $.post(url,dados, function(data){
         $(id_li_link).remove();
-        $("#modal_poll").empty();
+        $(id_li_link+"_div").remove();
+        $("#requisicoes_ajax").empty();
         $("div.modal-backdrop.fade.in").remove();
       }).fail(function(){
-        $("#modal_poll").empty();
-        $("#modal_poll").append(data);
+        $("#requisicoes_ajax").empty();
+        $("#requisicoes_ajax").append(data);
         $('#poll').modal('show');
       });
   }
diff --git a/poll/templates/poll/create.html b/poll/templates/poll/create.html
index ee216fd..fd05942 100644
--- a/poll/templates/poll/create.html
+++ b/poll/templates/poll/create.html
@@ -2,13 +2,6 @@
 
 {% load i18n widget_tweaks dict_access static%}
 
-{# {% block style %} #}
-  <script src="https://code.jquery.com/ui/1.12.1/jquery-ui.js"></script>
-  <script src="{% static 'js/modal_poll.js' %}"></script>
-
-{# {% endblock %} #}
-
-{# {% 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">
@@ -178,7 +171,7 @@
   });
 
   $("#form").submit(function(event) {
-    Submite.post("{% url 'course:poll:create_poll' topic.slug %}",$(this).serialize());
+    Submite.create("{% url 'course:poll:create_poll' topic.slug %}",$(this).serialize(), "{{topic.slug}}");
     event.preventDefault();
   });
 </script>
diff --git a/poll/templates/poll/poll_edit.html b/poll/templates/poll/poll_edit.html
new file mode 100644
index 0000000..b44d97a
--- /dev/null
+++ b/poll/templates/poll/poll_edit.html
@@ -0,0 +1,4 @@
+<div id="poll_{{poll.slug}}_div">
+  <li class="icon_edit_remove" ><a href="javascript:modal.get('{% url 'course:poll:update_poll' poll.slug %}','#poll','#requisicoes_ajax');"><i class="fa fa-pencil fa-lg" aria-hidden="true"></i></a>  <a href="javascript:modal.get('{% url 'course:poll:delete_poll' poll.slug %}','#poll','#requisicoes_ajax');"><i class="fa fa-trash fa-lg" aria-hidden="true"></i></a></li>
+  <li><i class="fa fa-bar-chart"></i> <a href="javascript:modal.get('{% url 'course:poll:view_poll' poll.slug %}','#poll','#requisicoes_ajax');">{{poll}}</a></li>
+</div>
diff --git a/poll/templates/poll/poll_view.html b/poll/templates/poll/poll_view.html
new file mode 100644
index 0000000..5554ddd
--- /dev/null
+++ b/poll/templates/poll/poll_view.html
@@ -0,0 +1 @@
+<li id="poll_{{poll.slug}}"><i class="fa fa-bar-chart"></i> <a href="javascript:modal.get('{% url 'course:poll:view_poll' poll.slug %}','#poll','#requisicoes_ajax');">{{ poll }}</a></li>
diff --git a/poll/templates/poll/remove.html b/poll/templates/poll/remove.html
index 01ee64e..92c6f91 100644
--- a/poll/templates/poll/remove.html
+++ b/poll/templates/poll/remove.html
@@ -10,15 +10,15 @@
 {% block content_poll %}
 <script src="{% static 'js/modal_poll.js' %}"></script>
 <!-- Put ONLY your content here!!!  -->
-<form id="delete_form" action="" method="post">
+<form id="delete_poll" action="" method="post">
   {% csrf_token %}
     <p>{% trans 'Are you sure you want to delete the subject' %} "{{poll.name}}"?</p>
 </form>
 {% endblock content_poll %}
 {% block button_save %}
-<button type="submite" id="button" form="delete_form" class="btn btn-primary btn-raised">{% trans "Delete" %}</button>
+<button type="submite" id="button" form="delete_poll" class="btn btn-primary btn-raised">{% trans "Delete" %}</button>
 <script>
-  $("#delete_form").submit(function(event) {
+  $("#delete_poll").submit(function(event) {
     Submite.remove("{% url 'course:poll:delete_poll' poll.slug %}",$(this).serialize(),"#poll_{{poll.slug}}");
     event.preventDefault();
   });
diff --git a/poll/templates/poll/update.html b/poll/templates/poll/update.html
index 80ce56c..d4f318f 100644
--- a/poll/templates/poll/update.html
+++ b/poll/templates/poll/update.html
@@ -25,7 +25,7 @@
   });
 
   $("#form").submit(function(event) {
-    Submite.post("{% url 'course:poll:update_poll' poll.slug %}",$(this).serialize());
+    Submite.update("{% url 'course:poll:update_poll' poll.slug %}",$(this).serialize(), "{{poll.slug}}");
     event.preventDefault();
   });
 </script>
diff --git a/poll/urls.py b/poll/urls.py
index b5ec9e4..fc81a52 100644
--- a/poll/urls.py
+++ b/poll/urls.py
@@ -9,4 +9,6 @@ urlpatterns = [
 	url(r'^delete/(?P<slug>[\w\-_]+)/$', views.DeletePoll.as_view(), name='delete_poll'), # poll
 	url(r'^answer/$', views.AnswerPoll.as_view(), name='answer_poll'), # poll
 	url(r'^answer-poll/(?P<slug>[\w\-_]+)/$', views.AnswerStudentPoll.as_view(), name='answer_student_poll'), # poll slug
+	url(r'^poll-view/(?P<slug>[\w\-_]+)/$', views.render_poll_view, name='render_poll_view'), # poll slug
+	url(r'^poll-edit/(?P<slug>[\w\-_]+)/$', views.render_poll_edit, name='render_poll_edit'), # poll slug
 ]
diff --git a/poll/views.py b/poll/views.py
index ef439ec..efb936d 100644
--- a/poll/views.py
+++ b/poll/views.py
@@ -20,6 +20,8 @@ from courses.models import Course, Topic
 
 import datetime
 
+from django.http import JsonResponse
+
 class ViewPoll(LoginRequiredMixin, LogMixin, generic.DetailView):
 	log_component = "poll"
 	log_resource = "poll"
@@ -96,7 +98,6 @@ class CreatePoll(LoginRequiredMixin,HasRoleMixin, LogMixin, NotificationMixin,ge
 		context.context_data['keys'] = keys
 		context.context_data['form'] = form
 		context.status_code = 400
-		s
 		return context
 
 	def form_valid(self, form):
@@ -107,7 +108,7 @@ class CreatePoll(LoginRequiredMixin,HasRoleMixin, LogMixin, NotificationMixin,ge
 		self.object.save()
 
 		super(CreatePoll, self).createNotification(message="created a Poll at "+ self.object.topic.name, actor=self.request.user,
-			resource_name=self.object.name, resource_link= reverse('course:view_topic', args=[self.object.topic.slug]), 
+			resource_name=self.object.name, resource_link= reverse('course:view_topic', args=[self.object.topic.slug]),
 			users=self.object.topic.subject.students.all())
 		for key in self.request.POST:
 			if(key != 'csrfmiddlewaretoken' and key != 'name' and key != 'limit_date' and key != 'all_students' and key != 'students'):
@@ -130,7 +131,14 @@ class CreatePoll(LoginRequiredMixin,HasRoleMixin, LogMixin, NotificationMixin,ge
 
 		super(CreatePoll, self).createLog(self.request.user, self.log_component, self.log_action, self.log_resource, self.log_context)
 
-		return self.render_to_response(self.get_context_data(form = form), status = 200)
+		return JsonResponse({"view":reverse_lazy('course:poll:render_poll_view', kwargs={'slug' : self.object.slug}),
+							"edit":reverse_lazy('course:poll:render_poll_edit', kwargs={'slug' : self.object.slug}),
+							})
+
+
+    # def get_success_url(self):
+    #     self.success_url = redirect('course:poll:render_poll', slug = self.object.slug)
+    #     return self.success_url
 
 	def get_context_data(self, **kwargs):
 		context = super(CreatePoll, self).get_context_data(**kwargs)
@@ -141,6 +149,20 @@ class CreatePoll(LoginRequiredMixin,HasRoleMixin, LogMixin, NotificationMixin,ge
 		context['subjects'] = topic.subject.course.subjects.all()
 		return context
 
+def render_poll_view(request, slug):
+	template_name = 'poll/poll_view.html'
+	context = {
+		'poll': get_object_or_404(Poll, slug = slug)
+	}
+	return render(request, template_name, context)
+
+def render_poll_edit(request, slug):
+	template_name = 'poll/poll_edit.html'
+	context = {
+		'poll': get_object_or_404(Poll, slug = slug)
+	}
+	return render(request, template_name, context)
+
 class UpdatePoll(LoginRequiredMixin, HasRoleMixin, LogMixin, generic.UpdateView):
 	log_component = "poll"
 	log_resource = "poll"
@@ -325,9 +347,9 @@ class AnswerStudentPoll(LoginRequiredMixin, LogMixin, generic.CreateView):
 
 		date_time_click = datetime.datetime.strptime(self.request.session.get('time_spent'), "%Y-%m-%d %H:%M:%S.%f")
 		_now = datetime.datetime.now()
-		
+
 		time_spent = _now - date_time_click
-		
+
 		secs = time_spent.total_seconds()
 		hours = int(secs / 3600)
 		minutes = int(secs / 60) % 60
--
libgit2 0.21.2