radarsys Commit - r18:b1ece123c007 · Jicamarca Repository

delete interface added to views...

Miguel Urco -

r18:b1ece123c007

parent child

Context file:

r18:b1ece123c007

Collapse all files

apps/main/templates/item_delete.html created 644 +33 0

@@ -0,0 +1,33
	1	{% extends "base.html" %}
	2	{% load bootstrap3 %}
	3	{% load static %}
	4	{% load main_tags %}
	5
	6	{% block dev-active %}{{dev_active}}{% endblock %}
	7	{% block camp-active %}{{camp_active}}{% endblock %}
	8	{% block exp-active %}{{exp_active}}{% endblock %}
	9	{% block conf-active %}{{conf_active}}{% endblock %}
	10
	11	{% block content-title %}{{title}}{% endblock %}
	12	{% block content-suptitle %}{{suptitle}}{% endblock %}
	13
	14	{% block content %}
	15	<form action="" method="post">
	16	{% csrf_token %}
	17	<p>Are you sure you want to delete "{{ object }}"?</p>
	18	<button type="button" class="btn btn-primary pull-right" style="margin-left: 10px" id="bt_cancel">Cancel</button>
	19	<button type=submit class="btn btn-primary pull-right" style="margin-left: 10px" id="bt_ok">Confirm</button>
	20	</form>
	21	{% endblock %}
	22
	23	{% block sidebar%}
	24	{% include "sidebar_devices.html" %}
	25	{% endblock %}
	26
	27	{% block extra-js%}
	28	<script type="text/javascript">
	29	$("#bt_cancel").click(function() {
	30	document.location = "{%if url_cancel%} {% url url_cancel id_item %} {%endif%}";
	31	});
	32	</script>
	33	{% endblock %} No newline at end of file

apps/main/models.py +3 -1

             from itertools import chain
             from django.db import models
             from polymorphic import PolymorphicModel
             CONF_STATES = (
                       (0, 'Active'),
                       (1, 'Historial'),
                      )
             DEV_STATES = (
                       (0, 'No connected'),
                       (1, 'Connected'),
                       (2, 'Configured'),
                       (3, 'Running'),
                      )
             DEV_TYPES = (
                 ('', 'Select a device type'),
                 ('rc', 'Radar Controller'),
                 ('dds', 'Direct Digital Synthesizer'),
                 ('jars', 'Jicamarca Radar System'),
                 ('usrp', 'Universal Software Radio Peripheral'),
                 ('cgs', 'Clock Generator System'),
                 ('abs', 'Automatic Beam Switching'),
             )
             # Create your models here.
             class DeviceType(models.Model):
                 name = models.CharField(max_length = 10, choices = DEV_TYPES, default = 'rc')
                 description = models.TextField(blank=True, null=True)
             #     info = models.TextField(blank=True, null=True)
             #     status = models.PositiveSmallIntegerField(default=1, choices=STATES)
                 class Meta:
                     db_table = 'db_device_types'
                 def __unicode__(self):
                     return u'%s' % self.name
             class Device(models.Model):
                 device_type = models.ForeignKey(DeviceType)
                 name = models.CharField(max_length=40, default='')
                 ip_address = models.GenericIPAddressField(protocol='IPv4', default='0.0.0.0')
                 port_address = models.PositiveSmallIntegerField(default=2000)
                 description = models.TextField(blank=True, null=True)
                 status = models.PositiveSmallIntegerField(default=0, choices=DEV_STATES)
             #     serial_number = models.CharField(max_length=40, default='')
             #     mac_address = models.CharField(max_length = 20, null=True, blank=True)
                 class Meta:
                     db_table = 'db_devices'
                 def __unicode__(self):
                     return u'[%s]: %s | %s' % (self.device_type.name, self.name, self.ip_address)
             class Campaign(models.Model):
                 name = models.CharField(max_length=40, unique=True)
                 start_date = models.DateTimeField(blank=True, null=True)
                 end_date = models.DateTimeField(blank=True, null=True)
                 tags = models.CharField(max_length=40)
                 description = models.TextField(blank=True, null=True)
                 template = models.BooleanField(default=False)
                 class Meta:
                     db_table = 'db_campaigns'
                 def __unicode__(self):
                     return u'%s: %s - %s' % (self.name, self.start_date.date(), self.end_date.date())
             class Experiment(models.Model):
                 campaign = models.ForeignKey(Campaign)
                 name = models.CharField(max_length=40, default='')
                 start_time = models.TimeField(default='00:00:00')
                 end_time = models.TimeField(default='23:59:59')
                 class Meta:
                     db_table = 'db_experiments'
                 def __unicode__(self):
                     return u'[%s]: %s: %s - %s' % (self.campaign.name, self.name, self.start_time, self.end_time)
             class Configuration(PolymorphicModel):
                 experiment = models.ForeignKey(Experiment)
                 device = models.ForeignKey(Device)
                 status = models.PositiveSmallIntegerField(default=0, choices=CONF_STATES)
                 date = models.DateTimeField(auto_now=True, blank=True)
             #     parameters = models.TextField(default='{}')
                 class Meta:
                     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

apps/main/templates/base.html +2 -2

             <!DOCTYPE html>
             {% load static %}
             <html lang="en">
             <head>
                 <meta charset="utf-8">
                 <title>{% block title %}Jicamarca Integrated Radar System:::::{% endblock %}</title>
                 <meta name="description" content="">
                 <meta name="author" content="">
                 <meta name="viewport" content="width=device-width, initial-scale=1">
                 {# bootstrap_css #}
                 <link href="{% static 'css/bootstrap-flatly.min.css' %}" media="screen" rel="stylesheet">
                 <style type="text/css">
                   body {padding-top: 60px}
                   .logo {padding-top: 5px; height: 50px}
                   .clickable-row {cursor: pointer;}
                 </style>
                 <!--[if lt IE 9]>
             	<script src="//html5shim.googlecode.com/svn/trunk/html5.js"></script>
             	<![endif]-->
                 {% block extra-head %}
                 {% endblock %}
             </head>
             <body>
             {% block main_menu %}
             <nav class="navbar navbar-default navbar-fixed-top" role="banner">
                 <div class="container-fluid">
                   <div class="navbar-header">
                     <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navigationbar">
                       <span class="sr-only">Toggle navigation</span>
                       <span class="icon-bar"></span>
                       <span class="icon-bar"></span>
                       <span class="icon-bar"></span>
                     </button>
                     <a class="navbar-brand" href="{% url 'index' %}" style="padding-top:1px"><img class="logo" alt="JRO" src="{% static "images/logo-jro-white-trans.png" %}"></a>
                   </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>
                     <ul class="nav navbar-nav navbar-right">
                       <li class="nav-divider"></li>
                       {% if user.is_authenticated %}
                       <li class="dropdown">
                         <a href="#" class="dropdown-toggle" data-toggle="dropdown">Hi {{ user.username }}<span class="caret"></span></a>
                          <ul class="dropdown-menu" role="menu">
                             <li><a href="#">Control Panel</a></li>
                             <li><a href="{% url 'django.contrib.auth.views.logout' %}">Logout</a></li>
                          </ul>
                       </li>
                       {% else %}
                       <li><a href="{% url 'django.contrib.auth.views.login' %}?next={{request.get_full_path}}">Login</a></li>
                       {% endif %}
                     </ul>
                   </div>
                 </div>
             </nav>
             <div style="clear: both;"></div>
             {% endblock %}
             <div class="container">
                 <div id="page" class="row" style="min-height:600px">
             	   <div class="col-md-3 hidden-xs hidden-sm" role="complementary">
             	   <br><br>
             	       <div id="sidebar">
             	       {% block sidebar%}
                        {% endblock %}
             	       </div>
             	   </div>
             	   <div class="col-md-9 col-xs-12" role="main">
             	   <div class="page-header">
                     <h1>{% block content-title %}{% endblock %} <small>{% block content-suptitle %}{% endblock %}</small></h1>
                    <hr>
                    </div>
             	   {% block content %}
             	   {% endblock %}
             	   <br>
             	   {% block messages %}
             	   {% endblock %}
             	   </div>
             	</div><!--/row-->
             </div> <!-- container -->
             <div id="debug">{{debug}}</div>
             {% block footer %}
             <footer class="footer">
               <div class="container">
               <p><hr></p>
               <p>
               &copy; <a href="http://jro.igp.gob.pe">Jicamarca Radio Observatory</a> - {% now "Y" %}
               </p>
               </div>
             </footer>
             {% endblock %}
             {# bootstrap_javascript jquery=True #}
             <script src="{% static 'js/jquery.min.js' %}"></script>
             <script src="{% static 'js/bootstrap.min.js' %}"></script>
             {% block extra-js %}
             {% endblock%}
             </body>
             </html>

apps/main/templates/campaign.html 0 -2

             {% extends "base.html" %}
             {% load bootstrap3 %}
             {% load static %}
             {% load main_tags %}
             {% block extra-head %}
             <link href="{% static 'css/bootstrap-datetimepicker.min.css' %}" media="screen" rel="stylesheet">
             {% endblock %}
             {% block camp-active %}active{% endblock %}
             {% block content-title %}{{title}}{% endblock %}
             {% block content-suptitle %}{{suptitle}}{% endblock %}
             {% block content %}
             	<table class="table table-bordered">
             	{% for key in campaign_keys %}
             		<tr><th>{{key|title}}</th><td>{{campaign|attr:key}}</td></tr>
             	{% endfor %}
             	</table>
             	<button class="btn btn-primary pull-right" style="margin-left: 10px" id="bt_export">Export</button>
             	<button class="btn btn-primary pull-right" style="margin-left: 10px" id="bt_edit">Edit</button>
             	<br></br>
             	<br></br>
             	<div class="panel-group" id="accordion" role="tablist" aria-multiselectable="true">
             	  <div class="panel panel-default">
             	    <div class="panel-heading" role="tab" id="headingTwo">
             	      <h4 class="panel-title">
             	        <a class="collapsed" role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseTwo" aria-expanded="false" aria-controls="collapseTwo">
             	          Experiment List
             	        </a>
             	      </h4>
             	    </div>
             	    <div id="collapseTwo" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="headingTwo">
             	      <div class="panel-body">
             	      <table class="table table-hover">
             			<tr>
             			  <th>#</th>
             			  {% for header in experiment_keys %}
             			  <th>{{ header|title }}</th>
             			  {% endfor%}
             			</tr>
             			{% for item in experiments %}
             			<tr class="clickable-row" data-href="{% url 'url_experiment' item.id %}">
             			  <td>{{ forloop.counter }}</td>
             			  {% for key in experiment_keys %}
             			  <td>{{ item|attr:key }}</td>
             			  {% endfor %}
             			</tr>
             			{% endfor %}
             		  </table>
             		  <button class="btn btn-primary pull-right" id="bt_add">{{button}}</button>
             	      </div>
             	    </div>
             	  </div>
             	</div>
             {% endblock %}
             {% block sidebar%}
                {% include "sidebar_devices.html" %}
             {% 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");
             	  });
               $("#bt_edit").click(function() {
             	    document.location = "{% url 'url_edit_campaign' campaign.id%}";
             	  });
               $("#bt_add").click(function() {
                 document.location = "{% url 'url_add_experiment' campaign.id%}";
               });
             </script>
             {% endblock %}

apps/main/templates/campaign_edit.html 0 -1

             {% extends "base.html" %}
             {% load bootstrap3 %}
             {% load static %}
             {% load main_tags %}
             {% block extra-head %}
             <link href="{% static 'css/bootstrap-datetimepicker.min.css' %}" media="screen" rel="stylesheet">
             {% endblock %}
             {% block camp-active %}active{% endblock %}
             {% block content-title %}{{title}}{% endblock %}
             {% block content-suptitle %}{{suptitle}}{% endblock %}
             {% block content %}
             <form class="form" method="post" action="">
               {% csrf_token %}
               {% bootstrap_form form layout='horizontal' size='medium' %}
               <div style="clear: both;"></div>
               <br>
               <button type="submit" class="btn btn-primary pull-right">{{button}}</button>
             </form>
             {% endblock %}
             {% block sidebar%}
                {% include "sidebar_devices.html" %}
             {% 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"});
             </script>
             {% endblock %}

apps/main/templates/campaigns.html 0 -4

             {% extends "base.html" %}
             {% load bootstrap3 %}
             {% load static %}
             {% load main_tags %}
             {% block extra-head %}
             <link href="{% static 'css/bootstrap-datetimepicker.min.css' %}" media="screen" rel="stylesheet">
             {% endblock %}
             {% block camp-active %}active{% endblock %}
             {% block content-title %}{{title}}{% endblock %}
             {% block content-suptitle %}{{suptitle}}{% endblock %}
             {% block content %}
             <table class="table table-hover">
               <tr>
             	<th>#</th>
             	{% for key in campaign_keys %}
             	<th>{{ key|title }}</th>
             	{% endfor%}
               </tr>
               {% for campaign in campaigns %}
             	<tr class="clickable-row" data-href="{% url 'url_campaign' campaign.id %}">
             	  <td>{{ forloop.counter }}</td>
             	  {% for key in campaign_keys %}
             	  <td>{{ campaign|attr:key }}</td>
             	  {% endfor %}
             	</tr>
               {% endfor %}
             </table>
             <button class="btn btn-primary pull-right" id="bt_add">{{button}}</button>
             {% endblock %}
             {% block sidebar%}
                {% include "sidebar_devices.html" %}
             {% 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' %}";
               });
               $(".clickable-row").click(function() {
             	    document.location = $(this).data("href");
             	  });
             </script>
             {% endblock %}

apps/main/templates/dev_confs.html +1 -5

             {% extends "base.html" %}
             {% load bootstrap3 %}
             {% load static %}
             {% load main_tags %}
             {% block extra-head %}
             <link href="{% static 'css/bootstrap-datetimepicker.min.css' %}" media="screen" rel="stylesheet">
             {% endblock %}
             {% block conf-active %}active{% endblock %}
             {% block content-title %}{{title}}{% endblock %}
             {% block content-suptitle %}{{suptitle}}{% endblock %}
             {% block content %}
             <table class="table table-hover">
               <tr>
             	<th>#</th>
             	{% for key in configuration_keys %}
             	<th>{{ key|title }}</th>
             	{% endfor%}
               </tr>
               {% for item in configurations %}
             	<tr class="clickable-row" data-href="/{{item.device__device_type__name}}/{{item.id}}/">
             	  <td>{{ forloop.counter }}</td>
             	  {% for key in configuration_keys %}
             	  <td>{{ item|attr:key }}</td>
             	  {% endfor %}
             	</tr>
               {% endfor %}
             </table>
             <button class="btn btn-primary pull-right" id="bt_add">{{button}}</button>
             {% endblock %}
             {% block sidebar%}
                {% include "sidebar_devices.html" %}
             {% 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%}";
               });
               $(".clickable-row").click(function() {
             	    document.location = $(this).data("href");
             	  });
             </script>
             {% endblock %}

apps/main/templates/device.html 0 -2

             {% extends "base.html" %}
             {% load bootstrap3 %}
             {% load static %}
             {% load main_tags %}
             {% block dev-active %}active{% endblock %}
             {% block content-title %}{{title}}{% endblock %}
             {% block content-suptitle %}{{suptitle}}{% endblock %}
             {% block content %}
             <table class="table table-bordered">
             {% for key in device_keys %}
             <tr><th>{{key|title}}</th><td>{{device|attr:key}}</td></tr>
             {% endfor %}
             </table>
             <button class="btn btn-primary pull-right" style="margin-left: 10px" id="bt_edit_device">Edit</button>
             <br></br>
             <br></br>
             {% endblock %}
             {% block sidebar%}
             {% include "sidebar_devices.html" %}
             {% 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() {
                 document.location = "{% url 'url_edit_device' device.id%}";
               });
             </script>
             {% endblock %}

apps/main/templates/devices.html 0 -2

             {% extends "base.html" %}
             {% load bootstrap3 %}
             {% load static %}
             {% load main_tags %}
             {% block dev-active %}active{% endblock %}
             {% block content-title %}{{title}}{% endblock %}
             {% block content-suptitle %}{{suptitle}}{% endblock %}
             {% block content %}
             <table class="table table-hover">
               <tr>
             	<th>#</th>
             	{% for key in device_keys %}
             	<th>{{ key|title }}</th>
             	{% endfor%}
               </tr>
               {% for device in devices %}
             	<tr class="clickable-row" data-href="{% url 'url_device' device.id %}">
             	  <td>{{ forloop.counter }}</td>
             	  {% for key in device_keys %}
             	  <td>{{ device|attr:key }}</td>
             	  {% endfor %}
             	</tr>
               {% endfor %}
             </table>
             <button class="btn btn-primary pull-right" id="bt_add">{{button}}</button>
             {% endblock %}
             {% block sidebar%}
                {% include "sidebar_devices.html" %}
             {% 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() {
                 document.location = "{% url 'url_add_device' %}";
               });
               $(".clickable-row").click(function() {
             	    document.location = $(this).data("href");
             	  });
             </script>
             {% endblock %}

apps/main/templates/experiment.html 0 -3

             {% extends "base.html" %}
             {% load bootstrap3 %}
             {% load static %}
             {% load main_tags %}
             {% block extra-head %}
             <link href="{% static 'css/bootstrap-datetimepicker.min.css' %}" media="screen" rel="stylesheet">
             {% endblock %}
             {% block exp-active %}active{% endblock %}
             {% block content-title %}{{title}}{% endblock %}
             {% block content-suptitle %}{{suptitle}}{% endblock %}
             {% block content %}
             <table class="table table-bordered">
             {% for key in experiment_keys %}
             <tr><th>{{key|title}}</th><td>{{experiment|attr:key}}</td></tr>
             {% endfor %}
             </table>
             <button class="btn btn-primary pull-right" style="margin-left: 10px" id="bt_export">Export</button>
             <button class="btn btn-primary pull-right" style="margin-left: 10px" id="bt_edit">Edit</button>
             <br></br>
             <br></br>
             <div class="panel-group" id="accordion" role="tablist" aria-multiselectable="true">
               <div class="panel panel-default">
                 <div class="panel-heading" role="tab" id="headingTwo">
                   <h4 class="panel-title">
                     <a class="collapsed" role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseTwo" aria-expanded="false" aria-controls="collapseThree">
                       Device Configurations
                     </a>
                   </h4>
                 </div>
                 <div id="collapseTwo" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="headingTwo">
                   <div class="panel-body">
                   <table class="table table-hover">
             		<tr>
             		  <th>#</th>
             		  {% for key in configuration_keys %}
             		  <th>{{ key|title }}</th>
             		  {% endfor%}
             		</tr>
             		{% for item in configurations %}
             		<tr class="clickable-row" data-href="/{{item.device__device_type__name}}/{{item.id}}/">
             		  <td>{{ forloop.counter }}</td>
             		  {% for key in configuration_keys %}
             		  <td>{{ item|attr:key }}</td>
             		  {% endfor %}
             		</tr>
             		{% endfor %}
             	  </table>
             	  <button class="btn btn-primary pull-right" id="bt_add_conf">{{button}}</button>
                   </div>
                 </div>
               </div>
             </div>
             {% endblock %}
             {% block sidebar%}
                {% include "sidebar_devices.html" %}
             {% 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() {
                 document.location = $(this).data("href");
               });
               $("#bt_edit").click(function() {
             	    document.location = "{% url 'url_edit_experiment' experiment.id%}";
             	  });
               $("#bt_add_conf").click(function() {
                 document.location = "{% url 'url_add_dev_conf' experiment.id%}";
               });
             </script>
             {% endblock %}

apps/main/templates/experiment_edit.html 0 -2

             {% extends "base.html" %}
             {% load bootstrap3 %}
             {% load static %}
             {% load main_tags %}
             {% block extra-head %}
             <link href="{% static 'css/bootstrap-datetimepicker.min.css' %}" media="screen" rel="stylesheet">
             {% endblock %}
             {% block exp-active %}active{% endblock %}
             {% block content-title %}{{title}}{% endblock %}
             {% block content-suptitle %}{{suptitle}}{% endblock %}
             {% block content %}
             <form class="form" method="post" action="">
               {% csrf_token %}
               {% bootstrap_form form layout='horizontal' size='medium' %}
               <div style="clear: both;"></div>
               <br>
               <button type="submit" class="btn btn-primary pull-right">{{button}}</button>
             </form>
             {% endblock %}
             {% block sidebar%}
                {% include "sidebar_devices.html" %}
             {% 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"});
             </script>
             {% endblock %}

apps/main/templates/experiments.html +1 -5

             {% extends "base.html" %}
             {% load bootstrap3 %}
             {% load static %}
             {% load main_tags %}
             {% block extra-head %}
             <link href="{% static 'css/bootstrap-datetimepicker.min.css' %}" media="screen" rel="stylesheet">
             {% endblock %}
             {% block exp-active %}active{% endblock %}
             {% block content-title %}{{title}}{% endblock %}
             {% block content-suptitle %}{{suptitle}}{% endblock %}
             {% block content %}
             <table class="table table-hover">
               <tr>
             	<th>#</th>
             	{% for key in experiment_keys %}
             	<th>{{ key|title }}</th>
             	{% endfor%}
               </tr>
               {% for experiment in experiments %}
             	<tr class="clickable-row" data-href="{% url 'url_experiment' experiment.id %}">
             	  <td>{{ forloop.counter }}</td>
             	  {% for key in experiment_keys %}
             	  <td>{{ experiment|attr:key }}</td>
             	  {% endfor %}
             	</tr>
               {% endfor %}
             </table>
             <button class="btn btn-primary pull-right" id="bt_add">{{button}}</button>
             {% endblock %}
             {% block sidebar%}
                {% include "sidebar_devices.html" %}
             {% 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");
               });
               $("#bt_add").click(function() {
                 document.location = "{% url 'url_add_experiment' 0 %}";
               });
             </script>
             {% endblock %}

apps/main/urls.py +5 -3

             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'),
             )

apps/main/views.py +67 -5

-            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
             from apps.jars.forms import JARSConfigurationForm
             from apps.usrp.forms import USRPConfigurationForm
             from apps.abs.forms import ABSConfigurationForm
             from apps.rc.forms import RCConfigurationForm
             from apps.dds.forms import DDSConfigurationForm
             from .models import Campaign, Experiment, Device, Configuration
             from apps.cgs.models import CGSConfiguration
             from apps.jars.models import JARSConfiguration
             from apps.usrp.models import USRPConfiguration
             from apps.abs.models import ABSConfiguration
             from apps.rc.models import RCConfiguration
             from apps.dds.models import DDSConfiguration
             # Create your views here.
             CONF_FORMS = {
                 'rc': RCConfigurationForm,
                 'dds': DDSConfigurationForm,
                 'jars': JARSConfigurationForm,
                 'cgs': CGSConfigurationForm,
                 'abs': ABSConfigurationForm,
                 'usrp': USRPConfigurationForm,
             }
             CONF_MODELS = {
                 'rc': RCConfiguration,
                 'dds': DDSConfiguration,
                 'jars': JARSConfiguration,
                 'cgs': CGSConfiguration,
                 'abs': ABSConfiguration,
                 'usrp': USRPConfiguration,
             }
             def index(request):
                 kwargs = {}
                 return render(request, 'index.html', kwargs)
             def devices(request):
                 devices = Device.objects.all().order_by('device_type__name')
                 keys = ['id', 'device_type__name', 'name', 'ip_address']
                 kwargs = {}
                 kwargs['device_keys'] = keys[1:]
                 kwargs['devices'] = devices.values(*keys)
                 kwargs['title'] = 'Device'
                 kwargs['suptitle'] = 'List'
                 kwargs['button'] = 'New Device'
                 return render(request, 'devices.html', kwargs)
             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']
                 kwargs['title'] = 'Device'
                 kwargs['suptitle'] = 'Details'
-            #     kwargs['form'] = form
                 kwargs['button'] = 'Add Device'
                 return render(request, 'device.html', kwargs)
             def add_device(request):
                 if request.method == 'GET':
                     form = DeviceForm()
                 if request.method == 'POST':
                     form = DeviceForm(request.POST)
                     if form.is_valid():
                         form.save()
                         return redirect('url_devices')
                 kwargs = {}
                 kwargs['form'] = form
                 kwargs['title'] = 'Device'
                 kwargs['suptitle'] = 'New'
                 kwargs['button'] = 'Create'
                 return render(request, 'device_edit.html', kwargs)
             def edit_device(request, id_dev):
                 device = Device.objects.get(pk=id_dev)
                 if request.method=='GET':
                     form = DeviceForm(instance=device)
                 if request.method=='POST':
                     form = DeviceForm(request.POST, instance=device)
                     if form.is_valid():
                         form.save()
                         return redirect('url_devices')
                 kwargs = {}
                 kwargs['form'] = form
                 kwargs['title'] = 'Device'
                 kwargs['suptitle'] = 'Edit'
                 kwargs['button'] = 'Update'
                 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')
                 keys = ['id', 'name', 'start_date', 'end_date']
                 kwargs = {}
                 kwargs['campaign_keys'] = keys[1:]
                 kwargs['campaigns'] = campaigns.values(*keys)
                 kwargs['title'] = 'Campaign'
                 kwargs['suptitle'] = 'List'
                 kwargs['button'] = 'New Campaign'
                 return render(request, 'campaigns.html', kwargs)
             def campaign(request, id_camp):
                 campaign = Campaign.objects.get(pk=id_camp)
                 experiments = Experiment.objects.filter(campaign=campaign)
                 form = CampaignForm(instance=campaign)
                 kwargs = {}
                 kwargs['campaign'] = campaign
                 kwargs['campaign_keys'] = ['name', 'start_date', 'end_date', 'tags', 'description']
                 keys = ['id', 'name', 'start_time', 'end_time']
                 kwargs['experiment_keys'] = keys[1:]
                 kwargs['experiments'] = experiments.values(*keys)
                 kwargs['title'] = 'Campaign'
                 kwargs['suptitle'] = 'Details'
                 kwargs['form'] = form
                 kwargs['button'] = 'Add Experiment'
                 return render(request, 'campaign.html', kwargs)
             def add_campaign(request):
                 if request.method == 'GET':
                     form = CampaignForm()
                 if request.method == 'POST':
                     form = CampaignForm(request.POST)
                     if form.is_valid():
                         campaign = form.save()
                         return redirect('url_campaign', id_camp=campaign.id)
                 kwargs = {}
                 kwargs['form'] = form
                 kwargs['title'] = 'Campaign'
                 kwargs['suptitle'] = 'New'
                 kwargs['button'] = 'Create'
                 return render(request, 'campaign_edit.html', kwargs)
             def edit_campaign(request, id_camp):
                 campaign = Campaign.objects.get(pk=id_camp)
                 if request.method=='GET':
                     form = CampaignForm(instance=campaign)
                 if request.method=='POST':
                     form = CampaignForm(request.POST, instance=campaign)
                     if form.is_valid():
                         form.save()
                         return redirect('url_campaign', id_camp=id_camp)
                 kwargs = {}
                 kwargs['form'] = form
                 kwargs['title'] = 'Campaign'
                 kwargs['suptitle'] = 'Edit'
                 kwargs['button'] = 'Update'
                 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')
                 keys = ['id', 'campaign__name', 'name', 'start_time', 'end_time']
                 kwargs = {}
                 kwargs['experiment_keys'] = keys[1:]
                 kwargs['experiments'] = campaigns.values(*keys)
                 kwargs['title'] = 'Experiment'
                 kwargs['suptitle'] = 'List'
                 kwargs['button'] = 'New Experiment'
                 return render(request, 'experiments.html', kwargs)
             def experiment(request, id_exp):
                 experiment = Experiment.objects.get(pk=id_exp)
                 experiments = Experiment.objects.filter(campaign=experiment.campaign)
                 configurations = Configuration.objects.filter(experiment=experiment)
                 kwargs = {}
                 exp_keys = ['id', 'campaign', 'name', 'start_time', 'end_time']
                 conf_keys = ['id', 'device__name', 'device__device_type__name', 'device__ip_address']
                 kwargs['experiment_keys'] = exp_keys[1:]
                 kwargs['experiment'] = experiment
                 kwargs['experiments'] = experiments.values(*exp_keys)
                 kwargs['configuration_keys'] = conf_keys[1:]
                 kwargs['configurations'] = configurations.values(*conf_keys)
                 kwargs['title'] = 'Experiment'
                 kwargs['suptitle'] = 'Details'
-            #     kwargs['form'] = form
                 kwargs['button'] = 'Add Device'
                 return render(request, 'experiment.html', kwargs)
             def add_experiment(request, id_camp=0):
                 if request.method == 'GET':
                     form = ExperimentForm(initial={'campaign':id_camp})
                 if request.method == 'POST':
                     form = ExperimentForm(request.POST, initial={'campaign':id_camp})
                     if form.is_valid():
                         experiment = form.save()
                         return redirect('url_experiment', id_exp=experiment.id)
                 kwargs = {}
                 kwargs['form'] = form
                 kwargs['title'] = 'Experiment'
                 kwargs['suptitle'] = 'New'
                 kwargs['button'] = 'Create'
                 return render(request, 'experiment_edit.html', kwargs)
             def edit_experiment(request, id_exp):
                 experiment = Experiment.objects.get(pk=id_exp)
                 if request.method == 'GET':
                     form = ExperimentForm(instance=experiment)
                 if request.method=='POST':
                     form = ExperimentForm(request.POST, instance=experiment)
                     if form.is_valid():
                         experiment = form.save()
                         return redirect('url_experiment', id_exp=experiment.id)
                 kwargs = {}
                 kwargs['form'] = form
                 kwargs['title'] = 'Experiment'
                 kwargs['suptitle'] = 'Edit'
                 kwargs['button'] = 'Update'
                 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')
                 keys = ['id', 'device__device_type__name', 'device__name', 'experiment__campaign__name', 'experiment__name']
                 kwargs = {}
                 kwargs['configuration_keys'] = keys[1:]
                 kwargs['configurations'] = configurations.values(*keys)
                 kwargs['title'] = 'Configuration'
                 kwargs['suptitle'] = 'List'
                 kwargs['button'] = 'New Configuration'
                 return render(request, 'dev_confs.html', kwargs)
             def dev_conf(request, id_conf):
                 conf = Configuration.objects.get(pk=id_conf)
                 DevConfModel = CONF_MODELS[conf.device.device_type.name]
                 dev_conf = DevConfModel.objects.get(pk=id_conf)
                 kwargs = {}
                 kwargs['dev_conf'] = dev_conf
                 kwargs['dev_conf_keys'] = ['experiment', 'device']
                 kwargs['title'] = 'Configuration'
                 kwargs['suptitle'] = 'Details'
                 kwargs['button'] = 'Edit Configuration'
                 ###### SIDEBAR ######
                 experiments = Experiment.objects.filter(campaign=conf.experiment.campaign)
                 configurations = Configuration.objects.filter(experiment=conf.experiment)
                 exp_keys = ['id', 'campaign', 'name', 'start_time', 'end_time']
                 conf_keys = ['id', 'device__name', 'device__device_type__name', 'device__ip_address']
                 kwargs['experiment_keys'] = exp_keys[1:]
                 kwargs['experiments'] = experiments.values(*exp_keys)
                 kwargs['configuration_keys'] = conf_keys[1:]
                 kwargs['configurations'] = configurations.values(*conf_keys)
                 return render(request, 'dev_conf.html', kwargs)
             def add_dev_conf(request, id_exp=0):
                 if request.method == 'GET':
                     form = ConfigurationForm(initial={'experiment':id_exp})
                 if request.method == 'POST':
                     form = ConfigurationForm(request.POST)
                     if form.is_valid():
                         experiment = Experiment.objects.get(pk=request.POST['experiment'])
                         device = Device.objects.get(pk=request.POST['device'])
                         exp_devices = Device.objects.filter(configuration__experiment=experiment)
                         if device.id not in exp_devices.values('id',):
                             DevConfModel = CONF_MODELS[device.device_type.name]
                             conf = DevConfModel(experiment=experiment, device=device)
                             conf.save()
                             return redirect('url_experiment', id_exp=experiment.id)
                 kwargs = {}
                 kwargs['form'] = form
                 kwargs['title'] = 'Configuration'
                 kwargs['suptitle'] = 'New'
                 kwargs['button'] = 'Create'
                 return render(request, 'dev_conf_edit.html', kwargs)
             def edit_dev_conf(request, id_conf):
                 conf = Configuration.objects.get(pk=id_conf)
                 DevConfModel = CONF_MODELS[conf.device.device_type.name]
                 DevConfForm = CONF_FORMS[conf.device.device_type.name]
                 dev_conf = DevConfModel.objects.get(pk=id_conf)
                 if request.method=='GET':
                     form = DevConfForm(instance=dev_conf)
                 if request.method=='POST':
                     form = DevConfForm(request.POST, instance=dev_conf)
                     if form.is_valid():
                         form.save()
                         return redirect('url_dev_conf', id_conf=id_conf)
                 kwargs = {}
                 kwargs['form'] = form
                 kwargs['title'] = 'Device Configuration'
                 kwargs['suptitle'] = 'Edit'
                 kwargs['button'] = 'Update'
                 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 = {}
             #     if id_exp:
             #         experiment = Experiment.objects.get(pk=id_exp)
             #         devices = Configuration.objects.filter(configuration__experiment=experiment)
             #         kwargs['experiment'] = experiment
             #         kwargs['experiment_keys'] = ['campaign', 'name', 'start_time', 'end_time']
             #
             #         form = ExperimentForm(instance=experiment)
             #
             #         if id_dev_type:
             #             subform = DeviceTypeForm(initial={'device_type':id_dev_type})
             #             kwargs['keys'] = ['ip_address']
             #             keys = ['id']+kwargs['keys']
             #             kwargs['items'] = Device.objects.filter(device_type=id_dev_type).values(*keys)
             #         else:
             #             subform = DeviceTypeForm()
             #
             #         kwargs['form'] = form
             #         kwargs['subform'] = subform
             #         kwargs['device_keys'] = ['device_type__name', 'ip_address']
             #         kwargs['devices'] = devices.values('device_type__name', 'ip_address', 'configuration__id')
             #         kwargs['suptitle'] = 'Detail'
             #     else:
             #         experiments = Experiment.objects.all().order_by('start_time')
             #         kwargs['keys'] = ['name', 'start_time', 'end_time']
             #         keys = ['id']+kwargs['keys']
             #         kwargs['items'] = experiments.values(*keys)
             #         kwargs['suptitle'] = 'List'
             #         kwargs['button'] = 'Add Experiment'
             #
             #     kwargs['id_dev_type'] = id_dev_type
             #     kwargs['id_exp'] = id_exp
             #     return render_to_response("experiment.html", kwargs, context_instance=RequestContext(request))
             # def edit_experiment(request, id_exp):
             #     if request.method=='POST':
             #         experiment = Experiment.objects.get(pk=id_exp)
             #         form = ExperimentForm(request.POST, instance=experiment)
             #         if form.is_valid():
             #             form.save()
             #     return redirect('experiment', id_exp=id_exp)
             # def experiment_add_device(request, id_exp):
             #     if request.method=='POST':
             #         experiment = Experiment.objects.get(pk=id_exp)
             #
             #         exp_devices = Device.objects.filter(configuration__experiment=experiment)
             #
             #         device = Device.objects.get(pk=request.POST['device'])
             #
             #         if device.id in exp_devices.values('id',):
             #             return redirect('experiment', id_exp=id_exp)
             #
             #         model = MODELS[device.device_type.alias]
             #         conf = model(experiment=experiment, device=device)
             #         conf.save()
             #     return redirect('experiment', id_exp=id_exp)
             # def add_experiment(request):
             #
             #     kwargs = {}
             #     if request.method == 'POST':
             #         form = ExperimentForm(request.POST)
             #         if form.is_valid():
             #             experiment = form.save()
             #             return redirect('experiment', id_exp=experiment.id)
             #     else:
             #         form = ExperimentForm()
             #     kwargs['form_new'] = form
             #     kwargs['title'] = 'Experiment'
             #     kwargs['suptitle'] = 'New'
             #     kwargs['id_exp'] = 0
             #     return render_to_response("experiment.html", kwargs, context_instance=RequestContext(request))
             # def device(request, id_dev=0):
             #     kwargs = {}
             #     if id_dev:
             #         device = Device.objects.get(pk=id_dev)
             #         kwargs['form'] = DeviceForm(instance=device)
             #         kwargs['action'] = 'edit/'
             #         kwargs['button'] = 'Update'
             #         kwargs['suptitle'] = 'Detail'
             #     else:
             #         devices = Device.objects.all()
             #         kwargs['keys'] = ['device_type__name', 'ip_address']
             #         keys = ['id']+kwargs['keys']
             #         kwargs['items'] = devices.values(*keys)
             #         kwargs['suptitle'] = 'List'
             #         kwargs['button'] = 'Add Device'
             #     return render_to_response("device.html", kwargs, context_instance=RequestContext(request))
             #
             # def edit_device(request, id_dev):
             #     if request.method=='POST':
             #         device = Device.objects.get(pk=id_dev)
             #         form = DeviceForm(request.POST, instance=device)
             #         if form.is_valid():
             #             form.save()
             #     return redirect('devices')
             #
             # def add_device(request):
             #     kwargs = {}
             #     if request.method == 'POST':
             #         form = DeviceForm(request.POST)
             #         if form.is_valid():
             #             form.save()
             #             return redirect('devices')
             #     else:
             #         form = DeviceForm()
             #     kwargs['form'] = form
             #     kwargs['button'] = 'Create'
             #     kwargs['suptitle'] = 'New'
             #     return render_to_response("device.html", kwargs, context_instance=RequestContext(request))

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages