From b1ece123c0073bcd00fac2a4d847d32858ed23d6 2016-01-04 20:57:06
From: Miguel Urco <miguel.urco@jro.igp.gob.pe>
Date: 2016-01-04 20:57:06
Subject: [PATCH] delete interface added to views

git-svn-id: http://jro-dev.igp.gob.pe/svn/jro_hard/radarsys/trunk/webapp@32 aa17d016-51d5-4e8b-934c-7b2bbb1bbe71

---

diff --git a/apps/main/models.py b/apps/main/models.py
index 6f9e285..2b1267d 100644
--- a/apps/main/models.py
+++ b/apps/main/models.py
@@ -100,5 +100,7 @@ class Configuration(PolymorphicModel):
         db_table = 'db_configurations'
     
     def __unicode__(self):
-        return u'%s [%s]' % (self.experiment.name, self.device.name) 
+        return u'[%s - %s]: %s' % (self.experiment.campaign.name,
+                                self.experiment.name,
+                                self.device.name) 
     
\ No newline at end of file
diff --git a/apps/main/templates/base.html b/apps/main/templates/base.html
index a3ad338..4101a9a 100644
--- a/apps/main/templates/base.html
+++ b/apps/main/templates/base.html
@@ -37,12 +37,12 @@
       </div>
       <div class="collapse navbar-collapse" id="navigationbar">
         <ul class="nav navbar-nav"> 
+          <li class=" dropdown {% block dev-active %}{% endblock %}"><a href="{% url 'url_devices'%}">Devices</a>
+          </li>
           <li class=" dropdown {% block camp-active %}{% endblock %}"><a href="{% url 'url_campaigns'%}">Campaigns</a>
           </li>
           <li class=" dropdown {% block exp-active %}{% endblock %}"><a href="{% url 'url_experiments'%}">Experiments</a>
           </li>
-          <li class=" dropdown {% block dev-active %}{% endblock %}"><a href="{% url 'url_devices'%}">Devices</a>
-          </li>
           <li class=" dropdown {% block conf-active %}{% endblock %}"><a href="{% url 'url_dev_confs'%}">Device Configurations</a>
           </li>
         </ul>
diff --git a/apps/main/templates/campaign.html b/apps/main/templates/campaign.html
index 48a0cbf..3c5ef2b 100644
--- a/apps/main/templates/campaign.html
+++ b/apps/main/templates/campaign.html
@@ -65,8 +65,6 @@
 {% endblock %}
 
 {% block extra-js%}
-<script src="{% static 'js/moment.min.js' %}"></script>
-<script src="{% static 'js/bootstrap-datetimepicker.min.js' %}"></script>
 <script type="text/javascript">
   $('.input-group.date').datetimepicker({"format": "YYYY-MM-DD HH:mm"});
   
diff --git a/apps/main/templates/campaign_edit.html b/apps/main/templates/campaign_edit.html
index a1ceaab..93d30b9 100644
--- a/apps/main/templates/campaign_edit.html
+++ b/apps/main/templates/campaign_edit.html
@@ -26,7 +26,6 @@
 {% endblock %}
 
 {% block extra-js%}
-<script src="{% static 'js/moment.min.js' %}"></script>
 <script src="{% static 'js/bootstrap-datetimepicker.min.js' %}"></script>
 <script type="text/javascript">
   $('.input-group.date').datetimepicker({"format": "YYYY-MM-DD HH:mm"});
diff --git a/apps/main/templates/campaigns.html b/apps/main/templates/campaigns.html
index dcff800..8d80f6b 100644
--- a/apps/main/templates/campaigns.html
+++ b/apps/main/templates/campaigns.html
@@ -36,11 +36,7 @@
 {% endblock %}
 
 {% block extra-js%}
-<script src="{% static 'js/moment.min.js' %}"></script>
-<script src="{% static 'js/bootstrap-datetimepicker.min.js' %}"></script>
 <script type="text/javascript">
-  $('.input-group.date').datetimepicker({"format": "YYYY-MM-DD HH:mm"});
-  $('.input-group.time').datetimepicker({"format": "HH:mm"});
   
   $("#bt_add").click(function() {
     document.location = "{% url 'url_add_campaign' %}";
diff --git a/apps/main/templates/dev_confs.html b/apps/main/templates/dev_confs.html
index e0d966b..08d3c0b 100644
--- a/apps/main/templates/dev_confs.html
+++ b/apps/main/templates/dev_confs.html
@@ -36,12 +36,8 @@
 {% endblock %}
 
 {% block extra-js%}
-<script src="{% static 'js/moment.min.js' %}"></script>
-<script src="{% static 'js/bootstrap-datetimepicker.min.js' %}"></script>
 <script type="text/javascript">
-  $('.input-group.date').datetimepicker({"format": "YYYY-MM-DD HH:mm"});
-  $('.input-group.time').datetimepicker({"format": "HH:mm"});
-  
+
   $("#bt_add").click(function() {
     document.location = "{% url 'url_add_dev_conf' 0%}";
   });
diff --git a/apps/main/templates/device.html b/apps/main/templates/device.html
index 93c3dae..7780e33 100644
--- a/apps/main/templates/device.html
+++ b/apps/main/templates/device.html
@@ -24,8 +24,6 @@
 {% endblock %}
 
 {% block extra-js%}
-<script src="{% static 'js/moment.min.js' %}"></script>
-<script src="{% static 'js/bootstrap-datetimepicker.min.js' %}"></script>
 <script type="text/javascript">
   
   $("#bt_edit_device").click(function() {
diff --git a/apps/main/templates/devices.html b/apps/main/templates/devices.html
index 8c96d22..22b4244 100644
--- a/apps/main/templates/devices.html
+++ b/apps/main/templates/devices.html
@@ -33,8 +33,6 @@
 {% endblock %}
 
 {% block extra-js%}
-<script src="{% static 'js/moment.min.js' %}"></script>
-<script src="{% static 'js/bootstrap-datetimepicker.min.js' %}"></script>
 <script type="text/javascript">
   
   $("#bt_add").click(function() {
diff --git a/apps/main/templates/experiment.html b/apps/main/templates/experiment.html
index bc0d815..ed2e353 100644
--- a/apps/main/templates/experiment.html
+++ b/apps/main/templates/experiment.html
@@ -62,9 +62,6 @@
 {% endblock %}
 
 {% block extra-js%}
-
-<script src="{% static 'js/moment.min.js' %}"></script>
-<script src="{% static 'js/bootstrap-datetimepicker.min.js' %}"></script>
 <script type="text/javascript">
   
   $(".clickable-row").click(function() {
diff --git a/apps/main/templates/experiment_edit.html b/apps/main/templates/experiment_edit.html
index 55001dd..a7bee7e 100644
--- a/apps/main/templates/experiment_edit.html
+++ b/apps/main/templates/experiment_edit.html
@@ -26,8 +26,6 @@
 {% endblock %}
 
 {% block extra-js%}
-
-<script src="{% static 'js/moment.min.js' %}"></script>
 <script src="{% static 'js/bootstrap-datetimepicker.min.js' %}"></script>
 <script type="text/javascript">
   $('.input-group.date').datetimepicker({"format": "YYYY-MM-DD HH:mm"});
diff --git a/apps/main/templates/experiments.html b/apps/main/templates/experiments.html
index ff12806..7aabec7 100644
--- a/apps/main/templates/experiments.html
+++ b/apps/main/templates/experiments.html
@@ -36,12 +36,8 @@
 {% endblock %}
 
 {% block extra-js%}
-
-<script src="{% static 'js/moment.min.js' %}"></script>
-<script src="{% static 'js/bootstrap-datetimepicker.min.js' %}"></script>
 <script type="text/javascript">
-  $('.input-group.date').datetimepicker({"format": "YYYY-MM-DD HH:mm"});
-  
+
   $(".clickable-row").click(function() {
     document.location = $(this).data("href");
   });
diff --git a/apps/main/templates/item_delete.html b/apps/main/templates/item_delete.html
new file mode 100644
index 0000000..0357f68
--- /dev/null
+++ b/apps/main/templates/item_delete.html
@@ -0,0 +1,33 @@
+{% extends "base.html" %}
+{% load bootstrap3 %}
+{% load static %}
+{% load main_tags %}
+
+{% block dev-active %}{{dev_active}}{% endblock %}
+{% block camp-active %}{{camp_active}}{% endblock %}
+{% block exp-active %}{{exp_active}}{% endblock %}
+{% block conf-active %}{{conf_active}}{% endblock %}
+
+{% block content-title %}{{title}}{% endblock %}
+{% block content-suptitle %}{{suptitle}}{% endblock %}
+
+{% block content %}
+<form action="" method="post">
+	{% csrf_token %}
+    <p>Are you sure you want to delete "{{ object }}"?</p>
+    <button type="button" class="btn btn-primary pull-right" style="margin-left: 10px" id="bt_cancel">Cancel</button>
+    <button type=submit class="btn btn-primary pull-right" style="margin-left: 10px" id="bt_ok">Confirm</button>
+</form>
+{% endblock %}
+
+{% block sidebar%}
+{% include "sidebar_devices.html" %}
+{% endblock %}
+
+{% block extra-js%}
+<script type="text/javascript">
+  $("#bt_cancel").click(function() {
+    document.location = "{%if url_cancel%} {% url url_cancel id_item %} {%endif%}";
+  });
+</script>
+{% endblock %}
\ No newline at end of file
diff --git a/apps/main/urls.py b/apps/main/urls.py
index 6515747..5bd4514 100644
--- a/apps/main/urls.py
+++ b/apps/main/urls.py
@@ -1,25 +1,27 @@
 from django.conf.urls import url
 
 urlpatterns = (
-    
     url(r'^device/add/$', 'apps.main.views.add_device', name='url_add_device'),
     url(r'^device/$', 'apps.main.views.devices', name='url_devices'),
     url(r'^device/(?P<id_dev>-?\d+)/$', 'apps.main.views.device', name='url_device'),
     url(r'^device/(?P<id_dev>-?\d+)/edit/$', 'apps.main.views.edit_device', name='url_edit_device'),
+    url(r'^device/(?P<id_dev>-?\d+)/delete/$', 'apps.main.views.delete_device', name='url_delete_device'),
     
     url(r'^campaign/add/$', 'apps.main.views.add_campaign', name='url_add_campaign'),
     url(r'^campaign/$', 'apps.main.views.campaigns', name='url_campaigns'),
     url(r'^campaign/(?P<id_camp>-?\d+)/$', 'apps.main.views.campaign', name='url_campaign'),
     url(r'^campaign/(?P<id_camp>-?\d+)/edit/$', 'apps.main.views.edit_campaign', name='url_edit_campaign'),
+    url(r'^campaign/(?P<id_camp>-?\d+)/delete/$', 'apps.main.views.delete_campaign', name='url_delete_campaign'),
     
     url(r'^campaign/(?P<id_camp>-?\d+)/add_experiment/$', 'apps.main.views.add_experiment', name='url_add_experiment'),
     url(r'^experiment/$', 'apps.main.views.experiments', name='url_experiments'),
     url(r'^experiment/(?P<id_exp>-?\d+)/$', 'apps.main.views.experiment', name='url_experiment'),
     url(r'^experiment/(?P<id_exp>-?\d+)/edit/$', 'apps.main.views.edit_experiment', name='url_edit_experiment'),
-
+    url(r'^experiment/(?P<id_exp>-?\d+)/delete/$', 'apps.main.views.delete_experiment', name='url_delete_experiment'),
+    
     url(r'^experiment/(?P<id_exp>-?\d+)/add_dev_conf/$', 'apps.main.views.add_dev_conf', name='url_add_dev_conf'),
     url(r'^dev_conf/$', 'apps.main.views.dev_confs', name='url_dev_confs'),
     url(r'^dev_conf/(?P<id_conf>-?\d+)/$', 'apps.main.views.dev_conf', name='url_dev_conf'),
     url(r'^dev_conf/(?P<id_conf>-?\d+)/edit/$', 'apps.main.views.edit_dev_conf', name='url_edit_dev_conf'),
-      
+    url(r'^dev_conf/(?P<id_conf>-?\d+)/delete/$', 'apps.main.views.delete_dev_conf', name='url_delete_dev_conf'),
 )
diff --git a/apps/main/views.py b/apps/main/views.py
index d9f486c..50ce0ac 100644
--- a/apps/main/views.py
+++ b/apps/main/views.py
@@ -1,4 +1,4 @@
-from django.shortcuts import render, redirect
+from django.shortcuts import render, redirect, HttpResponse
 
 from .forms import CampaignForm, ExperimentForm, DeviceForm, ConfigurationForm
 from apps.cgs.forms import CGSConfigurationForm
@@ -60,8 +60,6 @@ def device(request, id_dev):
     
     device = Device.objects.get(pk=id_dev)
     
-#     form = DeviceForm(instance=device)
-    
     kwargs = {}
     kwargs['device'] = device
     kwargs['device_keys'] = ['device_type', 'name', 'ip_address', 'port_address', 'description']
@@ -69,7 +67,6 @@ def device(request, id_dev):
     kwargs['title'] = 'Device'
     kwargs['suptitle'] = 'Details'
     
-#     kwargs['form'] = form
     kwargs['button'] = 'Add Device'
     
     return render(request, 'device.html', kwargs)
@@ -116,6 +113,23 @@ def edit_device(request, id_dev):
     
     return render(request, 'device_edit.html', kwargs)
 
+def delete_device(request, id_dev):
+    
+    device = Device.objects.get(pk=id_dev)
+    
+    if request.method=='POST':
+        
+        if request.user.is_staff:
+            device.delete()
+            return redirect('url_devices')
+        
+        return HttpResponse("Not enough permission to delete this object")
+    
+    kwargs = {'object':device, 'dev_active':'active',
+              'url_cancel':'url_device', 'id_item':id_dev}
+    
+    return render(request, 'item_delete.html', kwargs)
+    
 def campaigns(request):
     
     campaigns = Campaign.objects.all().order_by('start_date')
@@ -197,6 +211,22 @@ def edit_campaign(request, id_camp):
     
     return render(request, 'campaign_edit.html', kwargs)
 
+def delete_campaign(request, id_camp):
+     
+    campaign = Campaign.objects.get(pk=id_camp)
+    
+    if request.method=='POST':
+        if request.user.is_staff:
+            campaign.delete()
+            return redirect('url_campaigns')
+        
+        return HttpResponse("Not enough permission to delete this object")
+    
+    kwargs = {'object':campaign, 'camp_active':'active',
+              'url_cancel':'url_campaign', 'id_item':id_camp}
+    
+    return render(request, 'item_delete.html', kwargs)
+
 def experiments(request):
     
     campaigns = Experiment.objects.all().order_by('start_time')
@@ -238,7 +268,6 @@ def experiment(request, id_exp):
     kwargs['title'] = 'Experiment'
     kwargs['suptitle'] = 'Details'
     
-#     kwargs['form'] = form
     kwargs['button'] = 'Add Device'
     
     return render(request, 'experiment.html', kwargs)
@@ -285,6 +314,23 @@ def edit_experiment(request, id_exp):
         
     return render(request, 'experiment_edit.html', kwargs)
 
+def delete_experiment(request, id_exp):
+     
+    experiment = Experiment.objects.get(pk=id_exp)
+    
+    if request.method=='POST':
+        if request.user.is_staff:
+            id_camp = experiment.campaign.id
+            experiment.delete()
+            return redirect('url_campaign', id_camp=id_camp)
+        
+        return HttpResponse("Not enough permission to delete this object")
+    
+    kwargs = {'object':experiment, 'exp_active':'active',
+              'url_cancel':'url_experiment', 'id_item':id_exp}
+    
+    return render(request, 'item_delete.html', kwargs)
+
 def dev_confs(request):
     
     configurations = Configuration.objects.all().order_by('device__device_type')
@@ -390,6 +436,22 @@ def edit_dev_conf(request, id_conf):
     
     return render(request, 'dev_conf_edit.html', kwargs)
 
+def delete_dev_conf(request, id_conf):
+     
+    conf = Configuration.objects.get(pk=id_conf)
+    
+    if request.method=='POST':
+        if request.user.is_staff:
+            id_exp = conf.experiment.id
+            conf.delete()
+            return redirect('url_experiment', id_exp=id_exp)
+        
+        return HttpResponse("Not enough permission to delete this object")
+    
+    kwargs = {'object':conf, 'conf_active':'active',
+          'url_cancel':'url_dev_conf', 'id_item':id_conf}
+    
+    return render(request, 'item_delete.html', kwargs)
 
 # def experiment(request, id_exp=0, id_dev_type=0):
 #     kwargs = {}