From 9eb35814cc7f360a9fc632fa9f2bb83481a3f2af Mon Sep 17 00:00:00 2001
From: Felipe Henrique de Almeida Bormann <fbormann@Felipes-MacBook-Air.local>
Date: Mon, 26 Dec 2016 17:13:43 -0300
Subject: [PATCH] delete course is working but still has course inside it's name function, we have to replace most of them for naming purposes

---
 amadeus/static/js/course.js                 | 101 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 categories/templates/categories/delete.html |  36 ++++++++++++++++++++++++++++++++++++
 categories/templates/categories/list.html   |  17 +++++++++++------
 categories/urls.py                          |   2 +-
 categories/views.py                         |  17 ++++++++++++++++-
 5 files changed, 165 insertions(+), 8 deletions(-)
 create mode 100755 amadeus/static/js/course.js
 create mode 100644 categories/templates/categories/delete.html

diff --git a/amadeus/static/js/course.js b/amadeus/static/js/course.js
new file mode 100755
index 0000000..540053f
--- /dev/null
+++ b/amadeus/static/js/course.js
@@ -0,0 +1,101 @@
+var locale = navigator.language || navigator.userLanguage;
+
+$('.date-picker').datepicker({
+    language: locale,
+});
+
+/*
+*
+* Function to get a cookie stored on browser
+*
+*/
+function getCookie(name) {
+    var cookieValue = null;
+    if (document.cookie && document.cookie !== '') {
+        var cookies = document.cookie.split(';');
+        for (var i = 0; i < cookies.length; i++) {
+            var cookie = jQuery.trim(cookies[i]);
+            // Does this cookie string begin with the name we want?
+            if (cookie.substring(0, name.length + 1) === (name + '=')) {
+                cookieValue = decodeURIComponent(cookie.substring(name.length + 1));
+                break;
+            }
+        }
+    }
+    return cookieValue;
+}
+/*
+*
+* Function to subscribe (works for courses and subjects)
+*
+*/
+function subscribe(elem, url, id, confirm_message) {
+	alertify.confirm(confirm_message, function(){
+		$.ajax({
+			dataType: "json",
+			url: url,
+			success: function (data) {
+				if (data.status == "ok") {
+					elem.remove();
+					alertify.success(data.message);
+					$(".panel_"+id).find(".view_btn").show()
+				} else {
+					alertify.error(data.message);
+				}
+			}
+		});
+	});
+}
+
+/*
+*
+* Function to delete a course
+*
+*/
+
+var RemoveCourse = {
+  remove: function(url,dados,id_li_link){
+    $('#category').modal().hide();
+      $.post(url,dados, function(data){
+        $(id_li_link).remove();
+        // alert("certo");
+        $('body').removeClass('modal-open');
+        $("#modal_course").empty();
+        $(".modal-backdrop.in").remove();
+        alertify.success("Course removed successfully!");
+        // setTimeout(function () { location.reload(1); }, 1);
+      }).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
+*
+*/
+function replicate_course(url, course) {
+    $.ajax({
+        url: url,
+        data: {'form': course},
+        success: function(data) {
+            $(".course_replicate_form").html(data);
+        }
+    });
+}
diff --git a/categories/templates/categories/delete.html b/categories/templates/categories/delete.html
new file mode 100644
index 0000000..ad0f084
--- /dev/null
+++ b/categories/templates/categories/delete.html
@@ -0,0 +1,36 @@
+{% load static i18n permission_tags %}
+
+<!-- Modal (remember to change the ids!!!) -->
+<div class="modal fade" id="category" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
+  <div class="modal-dialog" role="document">
+    <div class="modal-content">
+      <!-- Modal Header -->
+      <div class="modal-header">
+
+        <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="{% url 'categories:delete' category.slug %}" method="post">
+          {% csrf_token %}
+          <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-default 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>
+        {% if index %}
+        <script>
+          $("#delete_form").submit(function(event) {
+            RemoveCourse.remove("{% url 'categories:delete' category.slug %}",$(this).serialize(),"#course_{{category.slug}}");
+            event.preventDefault();
+          });
+        </script>
+        {% endif %}
+      </div>
+    </div>
+  </div>
+</div>
\ No newline at end of file
diff --git a/categories/templates/categories/list.html b/categories/templates/categories/list.html
index 71eab69..eef74a4 100755
--- a/categories/templates/categories/list.html
+++ b/categories/templates/categories/list.html
@@ -37,16 +37,21 @@
               <a  class="category-course-link" data-toggle="collapse" href="#{{category.slug}}">{{category.name}}</a>
             </h4>
 
-            {% if user|has_role:'sys_admin' %}
-               <ul class="dropdown-menu pull-right" aria-labelledby="moreActions">
+            {% if user.is_staff %}
+               <div class="col-xs-6 col-md-6 divMoreActions" >
+                <div class="btn-group">
+                  <button class="btn btn-default btn-sm dropdown-toggle" type="button" id="moreActions" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                    <i class="fa fa-ellipsis-v fa-2x" aria-hidden="true"></i>
+                   </button>
+                  <ul class="dropdown-menu pull-right" aria-labelledby="moreActions">
                     <li><a href="#"><i class="fa fa-files-o fa-fw" aria-hidden="true"></i>{% trans 'Replicate' %}</a></li>
                     <li><a href="#"><i class="fa fa-pencil fa-fw" aria-hidden="true"></i>{% trans 'Edit' %}</a></li>
-                    <li><a href="#"><i class="fa fa-trash fa-fw" aria-hidden="true"></i>&nbsp;{% trans 'Remove' %}</a></li>
+                    <li><a href="javascript:delete_course.get('{% url 'categories:delete' category.slug %}?view=index','#category','#modal_course')"><i class="fa fa-trash fa-fw" aria-hidden="true"></i>&nbsp;{% trans 'Remove' %}</a></li>
                   </ul>
+                </div>
+            </div>
               
-            {% endif %}
-
-            {% if user|has_role:'student' %}
+            {% else %}
                <a href=""><i class="fa fa-list" aria-hidden="true"></i></a>
               <a href=""><i class="fa fa-envelope-o" aria-hidden="true"></i></a>
 
diff --git a/categories/urls.py b/categories/urls.py
index d7398e6..25b096a 100644
--- a/categories/urls.py
+++ b/categories/urls.py
@@ -4,5 +4,5 @@ from . import views
 urlpatterns = [
 	url(r'^$', views.IndexView.as_view(), name='index'),
 	url(r'^create/$', views.CreateCategory.as_view(), name='create'),
-	
+	url(r'^delete/(?P<slug>[\w_-]+)/$', views.DeleteCategory.as_view(), name='delete'),
 ]
\ No newline at end of file
diff --git a/categories/views.py b/categories/views.py
index 432f92f..2669165 100644
--- a/categories/views.py
+++ b/categories/views.py
@@ -1,5 +1,5 @@
 from django.shortcuts import render
-from django.views.generic import ListView, CreateView
+from django.views.generic import ListView, CreateView, DeleteView
 from .models import Category
 from django.core.urlresolvers import reverse_lazy
 from rolepermissions.verifications import has_role
@@ -74,3 +74,18 @@ class CreateCategory(HasRoleMixin, CreateView):
         self.object = form.save()
         #TODO: Implement log calls
         return super(CreateCategory, self).form_valid(form)
+
+
+class DeleteCategory(HasRoleMixin, DeleteView):
+
+    login_url = reverse_lazy("users:login")
+    redirect_field_name = 'next'
+    model = Category
+    template_name = 'categories/delete.html'
+
+    
+    def get_success_url(self):
+
+        return reverse_lazy('categories:index')
+
+
--
libgit2 0.21.2