From a4d0a0ff3c9a31ee63a5c99f4ae15dd60481a046 Mon Sep 17 00:00:00 2001
From: Matheus Lins <msl@cin.ufpe.br>
Date: Fri, 4 Nov 2016 01:13:29 -0300
Subject: [PATCH] improviment detail course #214

---
 courses/static/js/course.js               | 48 +++++++++++++++++++++++++++++++-----------------
 courses/static/js/modal_subject.js        | 31 +++++++++++++++++++++++++++++++
 courses/templates/category/delete.html    | 48 ++++++++++++++++++++++++++++++------------------
 courses/templates/course/course_card.html |  5 +++--
 courses/templates/course/delete.html      |  2 +-
 courses/templates/course/view.html        | 25 +++----------------------
 courses/templates/subject/delete.html     | 46 ++++++++++++++++++++++++++++++++--------------
 courses/views.py                          |  2 +-
 8 files changed, 132 insertions(+), 75 deletions(-)
 create mode 100644 courses/static/js/modal_subject.js

diff --git a/courses/static/js/course.js b/courses/static/js/course.js
index daa8bd1..8fec0a4 100644
--- a/courses/static/js/course.js
+++ b/courses/static/js/course.js
@@ -49,27 +49,41 @@ function subscribe(elem, url, id, confirm_message) {
 
 /*
 *
-* Function to delete a course
+* Function to delete a course 
 *
 */
-function delete_course(url, course, message, return_url) {
-    alertify.confirm(message, function(){
-        var csrftoken = getCookie('csrftoken');
 
-        $.ajax({
-            method: 'post',
-            beforeSend: function (request) {
-                request.setRequestHeader('X-CSRFToken', csrftoken);
-            },
-            url: url,
-            success: function(data) {
-                alertify.alert('Remove Course', 'Course removed successfully!', function(){
-                    window.location.href = return_url;
-                });
-            }
-        });
-    });
+var RemoveCourse = {
+  remove: function(url,dados,id_li_link){
+    $('#course').modal('hide');
+      $.post(url,dados, function(data){
+        $(id_li_link).remove();
+        $("#modal_course").empty();
+        $("#accordion").remove();
+        $(".modal-backdrop.in").remove();
+        alertify.success("Course removed successfully!");
+        setTimeout(function () { location.reload(1); }, 2000);
+      }).fail(function(){
+        $("#modal_course").empty();
+        $("#modal_course").append(data);
+        $('#course').modal('show');
+      });
+  }
 }
+
+var delete_course = {
+  get: function (url, id_modal, id_div_modal){
+    $.get(url, function(data){
+      if($(id_modal).length){
+        $(id_div_modal).empty();
+        $(id_div_modal).append(data);
+      } else {
+        $(id_div_modal).append(data);
+      }
+      $(id_modal).modal('show');
+    });
+  }
+};
 /* 
 *
 * Function to load create course's form
diff --git a/courses/static/js/modal_subject.js b/courses/static/js/modal_subject.js
new file mode 100644
index 0000000..3b04765
--- /dev/null
+++ b/courses/static/js/modal_subject.js
@@ -0,0 +1,31 @@
+var RemoveSubject = {
+  remove: function(url,dados,id_li_link){
+    $('#subject').modal('hide');
+      $.post(url,dados, function(data){
+        $(id_li_link).remove();
+        $("#modal_subject").empty();
+        $("#accordion").remove();
+        $(".modal-backdrop.in").remove();
+        alertify.success("Subject removed successfully!");
+        setTimeout(function () { location.reload(1); }, 2000);
+      }).fail(function(){
+        $("#modal_subject").empty();
+        $("#modal_subject").append(data);
+        $('#subject').modal('show');
+      });
+  }
+}
+
+var delete_subject = {
+  get: function (url, id_modal, id_div_modal){
+    $.get(url, function(data){
+      if($(id_modal).length){
+        $(id_div_modal).empty();
+        $(id_div_modal).append(data);
+      } else {
+        $(id_div_modal).append(data);
+      }
+      $(id_modal).modal('show');
+    });
+  }
+};
\ No newline at end of file
diff --git a/courses/templates/category/delete.html b/courses/templates/category/delete.html
index 3620481..f7e4ed8 100644
--- a/courses/templates/category/delete.html
+++ b/courses/templates/category/delete.html
@@ -1,24 +1,36 @@
+{% load static i18n permission_tags %}
 
-{% extends 'course/view.html' %}
+<!-- Modal (remember to change the ids!!!) -->
+<div class="modal fade" id="course" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
+  <div class="modal-dialog" role="document">
+    <div class="modal-content">
+      <!-- Modal Header -->
+      <div class="modal-header">
 
-{% load static i18n %}
-
-{% block breadcrumbs %}
-  <ol class="breadcrumb">
-      <li><a href="{% url 'app:index' %}">{% trans 'Home' %}</a></li>
-      <li><a href="{% url 'course:view' course.slug %}">{{ course }}</a></li>
-  </ol>
-{% endblock %}
-
-{% block content %}
-<div class="panel panel-default">
-  <div class="panel-body">
-    <form action="" method="post">
+        <h4 class="modal-title" id="myModalLabel">{% trans "Delete Category" %}</h4>
+      </div>
+      <!-- Modal Body -->
+      <div class="modal-body">
+        <!-- Put ONLY your content here!!!  -->
+    <form id="delete_form" action="" method="post">
       {% csrf_token %}
-        <h2>{% trans 'Are you sure you want to delete the course' %} "{{course}}"?</h2>
-        <input type="submit" class="btn btn-raised btn-success btn-lg" value="{% trans 'Yes' %}" />
-        <a href="{% url 'course:view' course.slug%}" class="btn btn-raised btn-danger btn-lg">{% trans 'No' %}</a>
+        <p>{% trans 'Are you sure you want to delete the category' %} "{{category.name}}"?</p>
     </form>
+      </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>
+        <button type="submit" id="button" form="delete_form" class="btn btn-primary btn-raised">{% trans "Delete" %}</button>
+    <script>
+      $("#delete_form").submit(function(event) {
+        Subimite.remove("{% url 'course:delete_cat' category.slug %}",$(this).serialize(),"#category_{{category.slug}}");
+        event.preventDefault();
+      });
+    </script>
+      </div>
+    </div>
   </div>
 </div>
-{% endblock %}
\ No newline at end of file
+<script src="https://code.jquery.com/ui/1.12.1/jquery-ui.js"></script>
+<script src="{% static 'js/modal_category.js' %}"></script>
diff --git a/courses/templates/course/course_card.html b/courses/templates/course/course_card.html
index 44038fd..59ce272 100644
--- a/courses/templates/course/course_card.html
+++ b/courses/templates/course/course_card.html
@@ -20,7 +20,7 @@
                    </button>
                   <ul class="dropdown-menu pull-right" aria-labelledby="moreActions">
                     <li><a href="{% url 'course:replicate_course' course.slug %}"><i class="fa fa-files-o fa-fw" aria-hidden="true"></i>{% trans 'Replicate' %}</a></li>
-                    <li><a href="javascript:delete_course('{% url 'course:delete' course.slug %}', '{{ course.slug }}', '{% trans "Are you sure you want to delete this course?" %}', '{% url 'course:manage' %}')"><i class="fa fa-trash fa-fw" aria-hidden="true"></i>&nbsp;{% trans 'Remove' %}</a></li>
+                    <li><a href="javascript:delete_course.get('{% url 'course:delete' course.slug %}','#course','#modal_course')"><i class="fa fa-trash fa-fw" aria-hidden="true"></i>&nbsp;{% trans 'Remove' %}</a></li>
                   </ul>
                 </div>
             </div>
@@ -63,4 +63,5 @@
             </div>
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>
+ <script type="text/javascript" src="{% static 'js/course.js' %}"></script>
\ No newline at end of file
diff --git a/courses/templates/course/delete.html b/courses/templates/course/delete.html
index 5dc25cc..f9e4c3b 100644
--- a/courses/templates/course/delete.html
+++ b/courses/templates/course/delete.html
@@ -24,7 +24,7 @@
         <button type="submit" id="button" form="delete_form" class="btn btn-primary btn-raised">{% trans "Delete" %}</button>
 		<script>
 		  $("#delete_form").submit(function(event) {
-		    RemoverCurso.remove("{% url 'course:delete' course.slug %}",$(this).serialize(),"#course_{{course.slug}}");
+		    RemoveCourse.remove("{% url 'course:delete' course.slug %}",$(this).serialize(),"#course_{{course.slug}}");
 		    event.preventDefault();
 		  });
 		</script>
diff --git a/courses/templates/course/view.html b/courses/templates/course/view.html
index d94295f..879c426 100644
--- a/courses/templates/course/view.html
+++ b/courses/templates/course/view.html
@@ -9,6 +9,7 @@
 
 {% block javascript %}
   <script type="text/javascript" src="{% static 'js/course.js' %}"></script>
+  <script type="text/javascript" src="{% static 'js/modal_subject.js' %}"></script>
 {% endblock %}
 
 {% block breadcrumbs %}
@@ -128,27 +129,6 @@
 
   <div class="panel panel-info">
 </div>
-
-
-<!-- MODAL REMOVE -->
-<div class="modal" id="removeSubject">
-  <div class="modal-dialog">
-    <div class="modal-content">
-      <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">X</button>
-        <h4 class="modal-title"></h4>
-      </div>
-      <div class="modal-body">
-        <p>{% trans "Are you sure you want to remove this subject?" %}</p>
-      </div>
-      <div class="modal-footer">
-
-        <a href="http://127.0.0.1:8080/html/screens/users/teacher/home_course_teacher.html" target="_self"><button type="button" class="btn btn-primary">{% trans "Confirm" %}</button></a>
-
-      </div>
-    </div>
-  </div>
-</div>
 </div>
 <div class="cards-detail">
     {% for subject in subjects %}
@@ -171,7 +151,7 @@
                       </button>
                       <ul class="dropdown-menu pull-right" aria-labelledby="moreActions">
                         <li><a href="javascript:void(0)" data-toggle="modal" data-target="#myModal3"><i class="fa fa-pencil fa-fw" aria-hidden="true"></i>&nbsp; {% trans 'Replicate' %}</a></li>
-                        <li><a href="javascript:subject.get('{% url 'course:delete_subject' subject.slug %}','#subject','#modal_subject');" data-toggle="modal" data-target="#removeSubject"><i class="fa fa-trash fa-fw" aria-hidden="true"></i>&nbsp; {% trans 'Remove' %}</a></li>
+                        <li><a href="javascript:delete_subject.get('{% url 'course:delete_subject' subject.slug %}','#subject','#modal_subject')" data-toggle="modal" data-target="#removeSubject"><i class="fa fa-trash fa-fw" aria-hidden="true"></i>&nbsp; {% trans 'Remove' %}</a></li>
                       </ul>
                     </div>
                   </div>
@@ -221,5 +201,6 @@
 </div>
 </div>
 </div>
+<div class="row" id="modal_subject">
 
 {% endblock %}
diff --git a/courses/templates/subject/delete.html b/courses/templates/subject/delete.html
index 043b06c..ea16fb7 100644
--- a/courses/templates/subject/delete.html
+++ b/courses/templates/subject/delete.html
@@ -1,18 +1,36 @@
-{% extends 'subject/index.html' %}
+{% load static i18n permission_tags %}
 
-{% load static i18n permission_tags widget_tweaks %}
+<!-- Modal (remember to change the ids!!!) -->
+<div class="modal fade" id="subject" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
+  <div class="modal-dialog" role="document">
+    <div class="modal-content">
+      <!-- Modal Header -->
+      <div class="modal-header">
 
-{% block content %}
-
-<div class="panel panel-default">
-  <div class="panel-body">
-    <form action="" method="post">
-      {% csrf_token %}
-        <h2>{% trans 'Are you sure you want to delete the subject' %} "{{subject}}"?</h2>
-        <input type="submit" class="btn btn-raised btn-success btn-lg" value="{% trans 'Yes' %}" />
-        <a href="{% url 'course:view_subject' subject.slug%}" class="btn btn-raised btn-danger btn-lg">{% trans 'No' %}</a>
-    </form>
+        <h4 class="modal-title" id="myModalLabel">{% trans "Delete Course" %}</h4>
+      </div>
+      <!-- Modal Body -->
+      <div class="modal-body">
+        <!-- Put ONLY your content here!!!  -->
+		<form id="delete_form" action="" method="post">
+		  {% csrf_token %}
+		    <p>{% trans 'Are you sure you want to delete the subject' %} "{{subject.name}}"?</p>
+		</form>
+      </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>
+        <button type="submit" id="button" form="delete_form" class="btn btn-primary btn-raised">{% trans "Delete" %}</button>
+		<script>
+		  $("#delete_form").submit(function(event) {
+		    RemoveCourse.remove("{% url 'course:delete_subject' subject.slug %}",$(this).serialize(),"#subject_{{subject.slug}}");
+		    event.preventDefault();
+		  });
+		</script>
+      </div>
+    </div>
   </div>
 </div>
-
-{% endblock content %}
+<script src="https://code.jquery.com/ui/1.12.1/jquery-ui.js"></script>
+<script src="{% static 'js/modal_subject.js' %}"></script>
diff --git a/courses/views.py b/courses/views.py
index bfcac3d..42a4349 100644
--- a/courses/views.py
+++ b/courses/views.py
@@ -308,7 +308,7 @@ class DeleteCourseView(LoginRequiredMixin, HasRoleMixin, LogMixin, generic.Delet
 		if has_role(self.request.user,'system_admin'):
 			courses = Course.objects.all()
 		elif has_role(self.request.user,'professor'):
-			courses = self.request.user.courses.all()
+			courses = self.request.user.courses_professors.all()
 		context['courses'] = courses
 		context['title'] = course.name
 
--
libgit2 0.21.2