radarsys Commit - r41:4fd88f104093 · Jicamarca Repository

Location model added to RadarSys...

Miguel Urco -

r41:4fd88f104093

parent child

Context file:

r41:4fd88f104093

Collapse all files

apps/main/templates/location.html created 644 +34 0

@@ -0,0 +1,34
	1	{% extends "base.html" %}
	2	{% load bootstrap3 %}
	3	{% load static %}
	4	{% load main_tags %}
	5
	6	{% block loc-active %}active{% endblock %}
	7
	8	{% block content-title %}{{title}}{% endblock %}
	9	{% block content-suptitle %}{{suptitle}}{% endblock %}
	10
	11	{% block content %}
	12	<table class="table table-bordered">
	13	{% for key in location_keys %}
	14	<tr><th>{{key\|title}}</th><td>{{location\|attr:key}}</td></tr>
	15	{% endfor %}
	16	</table>
	17	<button class="btn btn-primary pull-right" style="margin-left: 10px" id="bt_edit">Edit</button>
	18	<br></br>
	19	<br></br>
	20	{% endblock %}
	21
	22	{% block sidebar%}
	23	{% include "sidebar_devices.html" %}
	24	{% endblock %}
	25
	26	{% block extra-js%}
	27	<script type="text/javascript">
	28
	29	$("#bt_edit").click(function() {
	30	document.location = "{% url 'url_edit_location' location.id%}";
	31	});
	32
	33	</script>
	34	{% endblock %} No newline at end of file

apps/main/templates/location_edit.html created 644 +29 0

@@ -0,0 +1,29
	1	{% extends "base.html" %}
	2	{% load bootstrap3 %}
	3	{% load static %}
	4	{% load main_tags %}
	5	{% block extra-head %}
	6	<link href="{% static 'css/bootstrap-datetimepicker.min.css' %}" media="screen" rel="stylesheet">
	7	{% endblock %}
	8
	9	{% block loc-active %}active{% endblock %}
	10
	11	{% block content-title %}{{title}}{% endblock %}
	12	{% block content-suptitle %}{{suptitle}}{% endblock %}
	13
	14	{% block content %}
	15	<form class="form" method="post" action="">
	16	{% csrf_token %}
	17	{% bootstrap_form form layout='horizontal' size='medium' %}
	18	<div style="clear: both;"></div>
	19	<br>
	20	<button type="submit" class="btn btn-primary pull-right">{{button}}</button>
	21	</form>
	22	{% endblock %}
	23
	24	{% block sidebar%}
	25	{% include "sidebar_devices.html" %}
	26	{% endblock %}
	27
	28	{% block extra-js%}
	29	{% endblock %} No newline at end of file

apps/main/templates/locations.html created 644 +47 0

@@ -0,0 +1,47
	1	{% extends "base.html" %}
	2	{% load bootstrap3 %}
	3	{% load static %}
	4	{% load main_tags %}
	5
	6	{% block loc-active %}active{% endblock %}
	7
	8	{% block content-title %}{{title}}{% endblock %}
	9	{% block content-suptitle %}{{suptitle}}{% endblock %}
	10
	11	{% block content %}
	12	<table class="table table-hover">
	13	<tr>
	14	<th>#</th>
	15	{% for key in location_keys %}
	16	<th>{{ key\|title }}</th>
	17	{% endfor%}
	18	</tr>
	19	{% for location in locations %}
	20	<tr class="clickable-row" data-href="{% url 'url_location' location.id %}">
	21	<td>{{ forloop.counter }}</td>
	22	{% for key in location_keys %}
	23	<td>{{ location\|attr:key }}</td>
	24	{% endfor %}
	25	</tr>
	26	{% endfor %}
	27	</table>
	28	<button class="btn btn-primary pull-right" id="bt_add">{{button}}</button>
	29	{% endblock %}
	30
	31	{% block sidebar%}
	32	{% include "sidebar_devices.html" %}
	33	{% endblock %}
	34
	35	{% block extra-js%}
	36	<script type="text/javascript">
	37
	38	$("#bt_add").click(function() {
	39	document.location = "{% url 'url_add_location' %}";
	40	});
	41
	42	$(".clickable-row").click(function() {
	43	document.location = $(this).data("href");
	44	});
	45
	46	</script>
	47	{% endblock %} No newline at end of file

apps/main/forms.py +6 -2

             from django import forms
             from django.utils.safestring import mark_safe
-            from .models import DeviceType, Device, Experiment, Campaign, Configuration
+            from .models import DeviceType, Device, Experiment, Campaign, Configuration, Location
             def add_empty_choice(choices, pos=0, label='-----'):
                 if len(choices)>0:
                     choices = list(choices)
                     choices.insert(0, (0, label))
                     return choices
                 else:
                     return [(0, label)]
             class DatepickerWidget(forms.widgets.TextInput):
                 def render(self, name, value, attrs=None):
                     input_html = super(DatepickerWidget, self).render(name, value, attrs)
                     html = '<div class="input-group date">'+input_html+'<span class="input-group-addon"><i class="glyphicon glyphicon-calendar"></i></span></div>'
                     return mark_safe(html)
             class TimepickerWidget(forms.widgets.TextInput):
                 def render(self, name, value, attrs=None):
                     input_html = super(TimepickerWidget, self).render(name, value, attrs)
                     html = '<div class="input-group time">'+input_html+'<span class="input-group-addon"><i class="glyphicon glyphicon-time"></i></span></div>'
                     return mark_safe(html)
             class CampaignForm(forms.ModelForm):
                 def __init__(self, *args, **kwargs):
                     super(CampaignForm, self).__init__(*args, **kwargs)
                     self.fields['start_date'].widget = DatepickerWidget(self.fields['start_date'].widget.attrs)
                     self.fields['end_date'].widget = DatepickerWidget(self.fields['end_date'].widget.attrs)
                 class Meta:
                     model = Campaign
                     fields = ['name', 'start_date', 'end_date', 'tags', 'description', 'template']
             class ExperimentForm(forms.ModelForm):
                 def __init__(self, *args, **kwargs):
                     super(ExperimentForm, self).__init__(*args, **kwargs)
                     self.fields['start_time'].widget = TimepickerWidget(self.fields['start_time'].widget.attrs)
                     self.fields['end_time'].widget = TimepickerWidget(self.fields['end_time'].widget.attrs)
                     self.fields['campaign'].widget.attrs['readonly'] = True
                 class Meta:
                     model = Experiment
                     fields = ['campaign', 'name', 'start_time', 'end_time']
+            class LocationForm(forms.ModelForm):
+                class Meta:
+                    model = Location
+                    exclude = ['']
             class DeviceForm(forms.ModelForm):
                 class Meta:
                     model = Device
                     exclude = ['status']
             class ConfigurationForm(forms.ModelForm):
                 class Meta:
                     model = Configuration
                     fields = ['experiment', 'device']
             class DeviceTypeForm(forms.Form):
                 device_type = forms.ChoiceField(choices=add_empty_choice(DeviceType.objects.all().order_by('name').values_list('id', 'name')))

apps/main/models.py +23 -9

-            from itertools import chain
             from django.db import models
             from polymorphic import PolymorphicModel
             from django.core.urlresolvers import reverse
+            CONF_STATES = (
+                      (0, 'Disconnected'),
+                      (1, 'Connected'),
+                      (1, 'Running'),
+                     )
             CONF_TYPES = (
                       (0, 'Active'),
                       (1, 'Historical'),
                      )
             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 Acquisition System'),
                 ('usrp', 'Universal Software Radio Peripheral'),
                 ('cgs', 'Clock Generator System'),
                 ('abs', 'Automatic Beam Switching'),
             )
             # Create your models here.
+            class Location(models.Model):
+                name = models.CharField(max_length = 30)
+                description = models.TextField(blank=True, null=True)
+                class Meta:
+                    db_table = 'db_location'
+                def __unicode__(self):
+                    return u'%s' % self.name
             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.get_name_display()
             class Device(models.Model):
                 device_type = models.ForeignKey(DeviceType)
+            #     location = models.ForeignKey(Location)
                 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' % (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' % (self.name)
             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' % (self.campaign.name, self.name)
             class Configuration(PolymorphicModel):
                 experiment = models.ForeignKey(Experiment)
                 device = models.ForeignKey(Device)
+                status = models.PositiveSmallIntegerField(default=0, choices=CONF_STATES)
                 type = models.PositiveSmallIntegerField(default=0, choices=CONF_TYPES)
+                name = models.CharField(max_length=40, default='')
                 created_date = models.DateTimeField(auto_now_add=True)
                 programmed_date = models.DateTimeField(auto_now=True)
                 parameters = models.TextField(default='{}')
                 class Meta:
                     db_table = 'db_configurations'
                 def __unicode__(self):
                     return u'[%s - %s]: %s' % (self.experiment.campaign.name,
                                             self.experiment.name,
                                             self.device.name)
                 def get_absolute_url(self):
                     return reverse('url_%s_conf' % self.device.device_type.name, args=[str(self.id)])
                 def get_absolute_url_edit(self):
                     return reverse('url_edit_%s_conf' % self.device.device_type.name, args=[str(self.id)])
                 def get_absolute_url_import(self):
                     return reverse('url_import_%s_conf' % self.device.device_type.name, args=[str(self.id)])
                 def get_absolute_url_export(self):
                     return reverse('url_export_%s_conf' % self.device.device_type.name, args=[str(self.id)])
                 def get_absolute_url_write(self):
                     return reverse('url_write_%s_conf' % self.device.device_type.name, args=[str(self.id)])
                 def get_absolute_url_read(self):
                     return reverse('url_read_%s_conf' % self.device.device_type.name, args=[str(self.id)])

apps/main/templates/base.html +5 -3

             <!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="all" 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 conf-active %}{% endblock %}"><a href="{% url 'url_dev_confs'%}">Device Configurations</a>
+                      <li class=" dropdown {% block conf-active %}{% endblock %}"><a href="{% url 'url_dev_confs'%}">Configurations</a>
+                      </li>
+                      <li class=" dropdown {% block dev-active %}{% endblock %}"><a href="{% url 'url_devices'%}">Devices</a>
+                      </li>
+                      <li class=" dropdown {% block loc-active %}{% endblock %}"><a href="{% url 'url_locations'%}">Locations</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 messages %}
             	       {% if messages %}
             	         {% for message in messages %}
             	         <div class="alert alert-{% if message.tags %}{% if 'error' in message.tags %}danger{% else %}{{ message.tags }}{% endif %}{% else %}info{% endif %} alert-dismissible" role="alert">
             	           <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
             	           <strong>{{message.tags|title}}!</strong> {{ message }}
             	         </div>
             	         {% endfor %}
             	       {% endif %}
                    {% endblock %}
             	   {% block content %}
             	   {% 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>
             <script src="{% static 'js/jquery-ui.min.js' %}"></script>
             {% block extra-js %}
             {% endblock%}
             </body>
             </html>

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

             {% extends "base.html" %}
             {% load bootstrap3 %}
             {% load static %}
             {% load main_tags %}
             {% block conf-active %}active{% endblock %}
             {% block content-title %}{{title}}{% endblock %}
             {% block content-suptitle %}{{suptitle}}{% endblock %}
             {% block content %}
             {% if form.is_multipart %}
-                <form class="form" enctype="multipart/form-data" method="post" action="">
+                <form class="form" enctype="multipart/form-data" method="post" action="{{action}}">
             {% else %}
-                <form class="form" method="post" action="">
+                <form class="form" method="post" action="{{action}}">
             {% endif %}
               {% csrf_token %}
               {% bootstrap_form form layout='horizontal' size='medium' %}
               <div style="clear: both;"></div>
               <br>
               <div class="pull-right">
               <button type="button" class="btn btn-primary" onclick="{% if previous %}window.location.replace('{{ previous }}');{% else %}history.go(-1);{% endif %}">Cancel</button>
               <button type="submit" class="btn btn-primary">{{button}}</button>
               </div>
             </form>
             {% endblock %}
             {% block sidebar%}
             {% include "sidebar_devices.html" %}
             {% endblock %}
             {% block extra-js%}
             {% endblock %}

apps/main/templates/experiment.html +3 -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 %}
+            		  {% for key in configuration_labels %}
             		  <th>{{ key|title }}</th>
             		  {% endfor%}
             		</tr>
             		{% for item in configurations %}
-            		<tr class="clickable-row" data-href="/{{item.device__device_type__name}}/{{item.id}}/">
+            		<tr class="clickable-row" data-href="{{item.get_absolute_url}}">
             		  <td>{{ forloop.counter }}</td>
             		  {% for key in configuration_keys %}
-            		  <td>{{ item|attr:key }}</td>
+            		  <td>{{ item|value: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 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/sidebar_devices.html +2 -2

             {% if campaign %}
             	<div class="panel panel-default">
             	  <div class="panel-heading">
             	    <h4>Campaign</h4>
             	  </div>
             	  <div class="list-group">
             	  	<a href="{% url 'url_campaign' campaign.id %}" class="list-group-item active" >{{ campaign.name }}</a>
             	  </div>
             	</div>
             	{% if experiments %}
             		<div class="panel panel-default">
             		  <div class="panel-heading">
             		    <h4>Experiments</h4>
             		  </div>
             		  <div class="list-group">
             		  {% for item in experiments %}
             		    <a href="{% url 'url_experiment' item.id %}" class="list-group-item {{item.active}}">{{item.name}}</a>
             		  {% endfor %}
             		  </div>
             		</div>
             	{% endif %}
             {% endif %}
             {% if experiment %}
             	<div class="panel panel-default">
             	  <div class="panel-heading">
             	    <h4>Campaign</h4>
             	  </div>
             	  <div class="list-group">
             	  	<a href="{% url 'url_campaign' experiment.campaign.id %}" class="list-group-item active" >{{ experiment.campaign.name }}</a>
             	  </div>
             	</div>
             	{% if experiments %}
             		<div class="panel panel-default">
             		  <div class="panel-heading">
             		    <h4>Experiments</h4>
             		  </div>
             		  <div class="list-group">
             		  {% for item in experiments %}
             		    <a href="{% url 'url_experiment' item.id %}" class="list-group-item {%if item.id == experiment.id%}active{%endif%}">{{item.name}}</a>
             		  {% endfor %}
             		  </div>
             		</div>
             	{% endif %}
             	{% if configurations %}
             		<div class="panel panel-default">
             		  <div class="panel-heading">
             		    <h4>Device Configurations</h4>
             		  </div>
             		  <div class="list-group">
             		  {% for item in configurations %}
-            		    <a href="/{{item.device__device_type__name}}/{{item.id}}" class="list-group-item {{item.active}}">{{item.device__name}}</a>
+            		    <a href="{{item.get_absolute_url}}" class="list-group-item {{item.active}}">{{item.device.name}}</a>
             		  {% endfor %}
             		  </div>
             		</div>
             	{% endif %}
             {% endif %}
             {% if dev_conf %}
             	<div class="panel panel-default">
             	  <div class="panel-heading">
             	    <h4>Campaign</h4>
             	  </div>
             	  <div class="list-group">
             	  	<a href="{% url 'url_campaign' dev_conf.experiment.campaign.id %}" class="list-group-item active" >{{ dev_conf.experiment.campaign.name }}</a>
             	  </div>
             	</div>
             	{% if experiments %}
             		<div class="panel panel-default">
             		  <div class="panel-heading">
             		    <h4>Experiments</h4>
             		  </div>
             		  <div class="list-group">
             		  {% for item in experiments %}
             		    <a href="{% url 'url_experiment' item.id %}" class="list-group-item {%if item.id == dev_conf.experiment.id%}active{%endif%}">{{item.name}}</a>
             		  {% endfor %}
             		  </div>
             		</div>
             	{% endif %}
             	{% if configurations %}
             		<div class="panel panel-default">
             		  <div class="panel-heading">
             		    <h4>Device Configurations</h4>
             		  </div>
             		  <div class="list-group">
             		  {% for item in configurations %}
-            		    <a href="/{{item.device__device_type__name}}/{{item.id}}" class="list-group-item {%if item.id == dev_conf.id%}active{%endif%}">{{item.device__name}}</a>
+            		    <a href="{{item.get_absolute_url}}" class="list-group-item {%if item.id == dev_conf.id%}active{%endif%}">{{item.device.name}}</a>
             		  {% endfor %}
             		  </div>
             		</div>
             	{% endif %}
             {% endif %}

apps/main/templatetags/main_tags.py +11 0

             from django.template.defaulttags import register
             @register.filter
             def attr(instance, key):
                 display_key = "get_" + key + "_display"
                 if hasattr(instance, display_key):
                     return getattr(instance, display_key)()
                 if hasattr(instance, key):
                     return getattr(instance, key)
                 return instance.get(key)
             @register.filter
             def title(s):
                 return s.replace('_', ' ').title()
+            @register.filter
+            def value(instance, key):
+                item = instance
+                for my_key in key.split("__"):
+                    print "TP Value", item, my_key
+                    item = attr(item, my_key)
+                print item
+                return item
             @register.simple_tag
             def get_verbose_field_name(instance, field_name):
                 """
                 Returns verbose_name for a field.
                 """
                 return instance._meta.get_field(field_name).verbose_name.title()

apps/main/urls.py +7 0

             from django.conf.urls import url
             urlpatterns = (
+                url(r'^location/new/$', 'apps.main.views.location_new', name='url_add_location'),
+                url(r'^location/$', 'apps.main.views.locations', name='url_locations'),
+                url(r'^location/(?P<id_loc>-?\d+)/$', 'apps.main.views.location', name='url_location'),
+                url(r'^location/(?P<id_loc>-?\d+)/edit/$', 'apps.main.views.location_edit', name='url_edit_location'),
+                url(r'^location/(?P<id_loc>-?\d+)/delete/$', 'apps.main.views.location_delete', name='url_delete_location'),
                 url(r'^device/new/$', 'apps.main.views.device_new', 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.device_edit', name='url_edit_device'),
                 url(r'^device/(?P<id_dev>-?\d+)/delete/$', 'apps.main.views.device_delete', name='url_delete_device'),
                 url(r'^campaign/new/$', 'apps.main.views.campaign_new', 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.campaign_edit', name='url_edit_campaign'),
                 url(r'^campaign/(?P<id_camp>-?\d+)/delete/$', 'apps.main.views.campaign_delete', name='url_delete_campaign'),
                 url(r'^campaign/(?P<id_camp>-?\d+)/new_experiment/$', 'apps.main.views.experiment_new', 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.experiment_edit', name='url_edit_experiment'),
                 url(r'^experiment/(?P<id_exp>-?\d+)/delete/$', 'apps.main.views.experiment_delete', name='url_delete_experiment'),
                 url(r'^experiment/(?P<id_exp>-?\d+)/new_dev_conf/$', 'apps.main.views.dev_conf_new', 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.dev_conf_edit', name='url_edit_dev_conf'),
                 url(r'^dev_conf/(?P<id_conf>-?\d+)/delete/$', 'apps.main.views.dev_conf_delete', name='url_delete_dev_conf'),
             )

apps/main/views.py +100 -15

             from django.shortcuts import render, redirect, get_object_or_404, HttpResponse
             from django.contrib import messages
-            from .forms import CampaignForm, ExperimentForm, DeviceForm, ConfigurationForm
+            from .forms import CampaignForm, ExperimentForm, DeviceForm, ConfigurationForm, LocationForm
             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 .models import Campaign, Experiment, Device, Configuration, Location
             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 locations(request):
+                locations = Location.objects.all().order_by('name')
+                keys = ['id', 'name', 'description']
+                kwargs = {}
+                kwargs['location_keys'] = keys[1:]
+                kwargs['locations'] = locations
+                kwargs['title'] = 'Location'
+                kwargs['suptitle'] = 'List'
+                kwargs['button'] = 'New Location'
+                return render(request, 'locations.html', kwargs)
+            def location(request, id_loc):
+                location = get_object_or_404(Location, pk=id_loc)
+                kwargs = {}
+                kwargs['location'] = location
+                kwargs['location_keys'] = ['name', 'description']
+                kwargs['title'] = 'Location'
+                kwargs['suptitle'] = 'Details'
+                return render(request, 'location.html', kwargs)
+            def location_new(request):
+                if request.method == 'GET':
+                    form = LocationForm()
+                if request.method == 'POST':
+                    form = LocationForm(request.POST)
+                    if form.is_valid():
+                        form.save()
+                        return redirect('url_locations')
+                kwargs = {}
+                kwargs['form'] = form
+                kwargs['title'] = 'Location'
+                kwargs['suptitle'] = 'New'
+                kwargs['button'] = 'Create'
+                return render(request, 'location_edit.html', kwargs)
+            def location_edit(request, id_loc):
+                location = get_object_or_404(Location, pk=id_loc)
+                if request.method=='GET':
+                    form = LocationForm(instance=location)
+                if request.method=='POST':
+                    form = LocationForm(request.POST, instance=location)
+                    if form.is_valid():
+                        form.save()
+                        return redirect('url_locations')
+                kwargs = {}
+                kwargs['form'] = form
+                kwargs['title'] = 'Location'
+                kwargs['suptitle'] = 'Edit'
+                kwargs['button'] = 'Update'
+                return render(request, 'location_edit.html', kwargs)
+            def location_delete(request, id_loc):
+                location = get_object_or_404(Location, pk=id_loc)
+                if request.method=='POST':
+                    if request.user.is_staff:
+                        location.delete()
+                        return redirect('url_locations')
+                    return HttpResponse("Not enough permission to delete this object")
+                kwargs = {'object':location, 'loc_active':'active',
+                          'url_cancel':'url_location', 'id_item':id_loc}
+                return render(request, 'item_delete.html', kwargs)
             def devices(request):
                 devices = Device.objects.all().order_by('device_type__name')
             #     keys = ['id', 'device_type__name', 'name', 'ip_address']
-                keys = ['id', 'name', 'ip_address', 'device_type']
+                keys = ['id', 'name', 'ip_address', 'port_address', 'device_type']
                 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 = get_object_or_404(Device, pk=id_dev)
                 kwargs = {}
                 kwargs['device'] = device
                 kwargs['device_keys'] = ['device_type', 'name', 'ip_address', 'port_address', 'description']
                 kwargs['title'] = 'Device'
                 kwargs['suptitle'] = 'Details'
-                kwargs['button'] = 'Add Device'
                 return render(request, 'device.html', kwargs)
             def device_new(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 device_edit(request, id_dev):
                 device = get_object_or_404(Device, 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 device_delete(request, id_dev):
                 device = get_object_or_404(Device, 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 = get_object_or_404(Campaign, 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 campaign_new(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 campaign_edit(request, id_camp):
                 campaign = get_object_or_404(Campaign, 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 campaign_delete(request, id_camp):
                 campaign = get_object_or_404(Campaign, 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):
                 experiment_list = Experiment.objects.all().order_by('campaign')
                 keys = ['id', 'name', 'start_time', 'end_time', 'campaign']
                 kwargs = {}
                 kwargs['experiment_keys'] = keys[1:]
                 kwargs['experiments'] = experiment_list#.values(*keys)
                 kwargs['title'] = 'Experiment'
                 kwargs['suptitle'] = 'List'
                 kwargs['button'] = 'New Experiment'
                 return render(request, 'experiments.html', kwargs)
             def experiment(request, id_exp):
                 experiment = get_object_or_404(Experiment, pk=id_exp)
                 experiments = Experiment.objects.filter(campaign=experiment.campaign)
-                configurations = Configuration.objects.filter(experiment=experiment)
+                configurations = Configuration.objects.filter(experiment=experiment, type=0)
                 kwargs = {}
                 exp_keys = ['id', 'campaign', 'name', 'start_time', 'end_time']
-                conf_keys = ['id', 'device__name', 'device__device_type__name', 'device__ip_address']
+                conf_keys = ['id', 'device__name', 'device__device_type', 'device__ip_address', 'device__port_address']
+                conf_labels = ['id', 'device__name', 'device_type', 'ip_address', 'port_address']
                 kwargs['experiment_keys'] = exp_keys[1:]
                 kwargs['experiment'] = experiment
                 kwargs['experiments'] = experiments.values(*exp_keys)
+                kwargs['configuration_labels'] = conf_labels[1:]
                 kwargs['configuration_keys'] = conf_keys[1:]
-                kwargs['configurations'] = configurations.values(*conf_keys)
+                kwargs['configurations'] = configurations #.values(*conf_keys)
                 kwargs['title'] = 'Experiment'
                 kwargs['suptitle'] = 'Details'
                 kwargs['button'] = 'Add Device'
                 return render(request, 'experiment.html', kwargs)
             def experiment_new(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 experiment_edit(request, id_exp):
                 experiment = get_object_or_404(Experiment, 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 experiment_delete(request, id_exp):
                 experiment = get_object_or_404(Experiment, 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('experiment')
+                configurations = Configuration.objects.all().order_by('type', 'device__device_type', 'experiment')
             #     keys = ['id', 'device__device_type__name', 'device__name', 'experiment__campaign__name', 'experiment__name']
                 keys = ['id', 'device', 'experiment', 'type', 'programmed_date']
                 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 = get_object_or_404(Configuration, 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 ######
                 kwargs.update(sidebar(conf))
                 return render(request, 'dev_conf.html', kwargs)
             def dev_conf_new(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)
+                        exp_devices = Device.objects.filter(configuration__experiment=experiment,
+                                                            configuration__type=0)
                         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'
-                ###### SIDEBAR ######
-                kwargs.update(sidebar(conf))
                 return render(request, 'dev_conf_edit.html', kwargs)
             def dev_conf_edit(request, id_conf):
                 conf = get_object_or_404(Configuration, 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'
                 ###### SIDEBAR ######
                 kwargs.update(sidebar(conf))
                 return render(request, 'dev_conf_edit.html', kwargs)
             def dev_conf_read(request, id_conf):
                 conf = get_object_or_404(Configuration, pk=id_conf)
                 messages.error(request, "Read View not implemented yet")
                 return redirect('url_dev_conf', id_conf=conf.id)
             def dev_conf_write(request, id_conf):
                 conf = get_object_or_404(Configuration, pk=id_conf)
                 messages.error(request, "Write View not implemented yet")
                 return redirect('url_dev_conf', id_conf=conf.id)
             def dev_conf_import(request, id_conf):
                 conf = get_object_or_404(Configuration, pk=id_conf)
                 messages.error(request, "Import View not implemented yet")
                 return redirect('url_dev_conf', id_conf=conf.id)
             def dev_conf_export(request, id_conf):
                 conf = get_object_or_404(Configuration, pk=id_conf)
                 messages.error(request, "Export View not implemented yet")
                 return redirect('url_dev_conf', id_conf=conf.id)
             def dev_conf_delete(request, id_conf):
                 conf = get_object_or_404(Configuration, 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}
                 ###### SIDEBAR ######
                 kwargs.update(sidebar(conf))
                 return render(request, 'item_delete.html', kwargs)
             def sidebar(conf):
                 experiments = Experiment.objects.filter(campaign=conf.experiment.campaign)
                 configurations = Configuration.objects.filter(experiment=conf.experiment, type=0)
                 exp_keys = ['id', 'campaign', 'name', 'start_time', 'end_time']
-                conf_keys = ['id', 'device__name', 'device__device_type__name', 'device__ip_address']
+                conf_keys = ['id', 'device']
                 kwargs = {}
                 kwargs['dev_conf'] = conf
                 kwargs['experiment_keys'] = exp_keys[1:]
                 kwargs['experiments'] = experiments.values(*exp_keys)
                 kwargs['configuration_keys'] = conf_keys[1:]
-                kwargs['configurations'] = configurations.values(*conf_keys)
+                kwargs['configurations'] = configurations #.values(*conf_keys)
                 return kwargs

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