radarsys Commit - r30:64b312519049 · Jicamarca Repository

Buttons "Import", "Export, "Read" and "Write" added to Configuration View...

Miguel Urco -

r30:64b312519049

parent child

Context file:

r30:64b312519049

Collapse all files

apps/dds/static/js/dds_conversion.js created 644 +13 0

@@ -0,0 +1,13
	1
	2	function freq2Binary(mclock, frequency) {
	3
	4	var freq_bin = parseInt(frequency * (Math.pow(2,48)/mclock));
	5	return freq_bin;
	6
	7	}
	8
	9	function binary2Freq(mclock, binary) {
	10
	11	var frequency = (1.0*binary) / (Math.pow(2,48)/mclock);
	12	return frequency;
	13	} No newline at end of file

apps/abs/urls.py +5 -1

             from django.conf.urls import url
             urlpatterns = (
                 url(r'^(?P<id_conf>-?\d+)/$', 'apps.main.views.dev_conf', name='url_abs_conf'),
                 url(r'^(?P<id_conf>-?\d+)/edit/$', 'apps.main.views.dev_conf_edit', name='url_edit_abs_conf'),
+                url(r'^(?P<id_conf>-?\d+)/write/$', 'apps.main.views.dev_conf_write', name='url_write_abs_conf'),
+                url(r'^(?P<id_conf>-?\d+)/read/$', 'apps.main.views.dev_conf_read', name='url_read_abs_conf'),
+                url(r'^(?P<id_conf>-?\d+)/import/$', 'apps.main.views.dev_conf_import', name='url_import_abs_conf'),
+                url(r'^(?P<id_conf>-?\d+)/export/$', 'apps.main.views.dev_conf_export', name='url_export_abs_conf'),
+            )
  No newline at end of file

apps/cgs/urls.py +4 0

             from django.conf.urls import url
             urlpatterns = (
                 #url(r'^configuration/$', 'apps.cgs.views.configurate_frequencies', name='new_device'),
             #     url(r'^(?P<id>-?\d+)/$', 'apps.cgs.views.configurate_frequencies', name='new_device'),
                 url(r'^(?P<id_conf>-?\d+)/$', 'apps.main.views.dev_conf', name='url_cgs_conf'),
                 url(r'^(?P<id_conf>-?\d+)/edit/$', 'apps.main.views.dev_conf_edit', name='url_edit_cgs_conf'),
+                url(r'^(?P<id_conf>-?\d+)/write/$', 'apps.main.views.dev_conf_write', name='url_write_cgs_conf'),
+                url(r'^(?P<id_conf>-?\d+)/read/$', 'apps.main.views.dev_conf_read', name='url_read_cgs_conf'),
+                url(r'^(?P<id_conf>-?\d+)/import/$', 'apps.main.views.dev_conf_import', name='url_import_cgs_conf'),
+                url(r'^(?P<id_conf>-?\d+)/export/$', 'apps.main.views.dev_conf_export', name='url_export_cgs_conf'),
             )

apps/dds/models.py +9 -10

             from django.db import models
             from apps.main.models import Configuration
             # Create your models here.
             from django.core.validators import MinValueValidator, MaxValueValidator
             from django.core.exceptions import ValidationError
             MOD_TYPES = (
-                (None, 'Select a modulation type'),
                 (0, 'Single Tone'),
                 (1, 'FSK'),
                 (2, 'Ramped FSK'),
                 (3, 'Chirp'),
                 (4, 'BPSK'),
             )
             class DDSConfiguration(Configuration):
                 DDS_NBITS = 48
-                clock = models.FloatField(verbose_name='Clock Master (MHz)',validators=[MinValueValidator(5), MaxValueValidator(75)])
+                clock = models.FloatField(verbose_name='Clock Master (MHz)',validators=[MinValueValidator(5), MaxValueValidator(75)], null=True)
                 multiplier = models.PositiveIntegerField(verbose_name='Multiplier',validators=[MinValueValidator(1), MaxValueValidator(20)], default=4)
-                frequency = models.DecimalField(verbose_name='Frequency (MHz)', validators=[MinValueValidator(0), MaxValueValidator(150)], max_digits=17, decimal_places=15)
+                frequency = models.DecimalField(verbose_name='Frequency (MHz)', validators=[MinValueValidator(0), MaxValueValidator(150)], max_digits=18, decimal_places=16)
                 frequency_bin = models.BigIntegerField(verbose_name='Frequency (Binary)',validators=[MinValueValidator(0), MaxValueValidator(2**DDS_NBITS-1)])
-                phase = models.FloatField(verbose_name='Phase (Degrees)', validators=[MinValueValidator(0), MaxValueValidator(360)])
+                phase = models.FloatField(verbose_name='Phase (Degrees)', validators=[MinValueValidator(0), MaxValueValidator(360)], default=0)
             #     phase_binary = models.PositiveIntegerField(verbose_name='Phase (Binary)',validators=[MinValueValidator(0), MaxValueValidator(2**14-1)])
-                amplitude_ch_A = models.PositiveIntegerField(verbose_name='Amplitude CHA',validators=[MinValueValidator(0), MaxValueValidator(2**10-1)], blank=True, null=True)
+                amplitude_ch_A = models.PositiveIntegerField(verbose_name='Amplitude CH A',validators=[MinValueValidator(0), MaxValueValidator(2**10-1)], blank=True, null=True)
-                amplitude_ch_B = models.PositiveIntegerField(verbose_name='Amplitude CHB',validators=[MinValueValidator(0), MaxValueValidator(2**10-1)], blank=True, null=True)
+                amplitude_ch_B = models.PositiveIntegerField(verbose_name='Amplitude CH B',validators=[MinValueValidator(0), MaxValueValidator(2**10-1)], blank=True, null=True)
-                modulation = models.PositiveIntegerField(choices = MOD_TYPES, default = 0)
+                modulation = models.PositiveIntegerField(verbose_name='Modulation Type', choices = MOD_TYPES, default = 0)
-                frequency_mod = models.DecimalField(verbose_name='Frequency Mod. (MHz)', validators=[MinValueValidator(0), MaxValueValidator(150)], max_digits=17, decimal_places=15, blank=True, null=True)
+                frequency_mod = models.DecimalField(verbose_name='Mod: Frequency (MHz)', validators=[MinValueValidator(0), MaxValueValidator(150)], max_digits=18, decimal_places=16, blank=True, null=True)
-                frequency_mod_bin = models.BigIntegerField(verbose_name='Frequency Mod. (Binary)',validators=[MinValueValidator(0), MaxValueValidator(2**DDS_NBITS-1)], blank=True, null=True)
+                frequency_mod_bin = models.BigIntegerField(verbose_name='Mod: Frequency (Binary)',validators=[MinValueValidator(0), MaxValueValidator(2**DDS_NBITS-1)], blank=True, null=True)
-                phase_mod = models.FloatField(verbose_name='Phase Mod. (Degrees)', validators=[MinValueValidator(0), MaxValueValidator(360)], blank=True, null=True)
+                phase_mod = models.FloatField(verbose_name='Mod: Phase (Degrees)', validators=[MinValueValidator(0), MaxValueValidator(360)], blank=True, null=True)
             #     phase_binary_mod = models.PositiveIntegerField(verbose_name='Phase Mod (Binary)',validators=[MinValueValidator(0), MaxValueValidator(2**14-1)], blank=True, null=True)
                 def get_nbits(self):
                     return self.DDS_NBITS
                 def clean(self):
                     if self.modulation in [1,2,3]:
                         if self.frequency_mod is None or self.frequency_mod_bin is None:
                             raise ValidationError({
                                 'frequency_mod': 'Frequency modulation has to be defined when FSK or Chirp modulation is selected'
                             })
                     if self.modulation in [4,]:
                         if self.phase_mod is None:
                             raise ValidationError({
                                 'phase_mod': 'Phase modulation has to be defined when BPSK modulation is selected'
                             })
                 def verify_frequencies(self):
                     return True
                 def freq2binary(self, freq, mclock):
                     binary = (float(freq)/mclock)*(2**self.DDS_NBITS)
                     return binary
                 def binary2freq(self, binary, mclock):
                     freq = (float(binary)/(2**self.DDS_NBITS))*mclock
                     return freq
                 class Meta:
                     db_table = 'dds_configurations'
   No newline at end of file

apps/dds/templates/dds_conf.html +1 -68

@@ -1,68 +1,1
1	{% extends "~~base~~.html" %}	1	{% extends "dev_conf.html" %} No newline at end of file
2	{% load bootstrap3 %}
3	{% load static %}
4	{% load main_tags %}
5
6	{% block conf-active %}active{% endblock %}
7
8	{% block content-title %}{{title}}{% endblock %}
9	{% block content-suptitle %}{{suptitle}}{% endblock %}
10
11	{% block content %}
12
13	<table class="table table-bordered">
14	<tr><th>Status</th><td>{%if connected == True %} ☘ Connected {% else %} ⛔ Disconnected {% endif %}</td></tr>
15	{% for item in dev_conf_keys %}
16	<tr><th>{{item\|title}}</th><td>{{dev_conf\|attr:item}}</td></tr>
17	{% endfor %}
18
19	<tr><th>{{form.modulation.label}}</th><td>{{form.modulation}}</td></tr>
20
21	{% if form.modulation.value == 0 %}
22	{% endif %}
23
24	{% if form.modulation.value == 1 %}
25	<tr><th>{{form.frequency_mod.label}}</th><td>{{form.frequency_mod.value}}</td></tr>
26	{% endif %}
27
28	{% if form.modulation.value == 2 %}
29	<tr><th>{{form.frequency_mod.label}}</th><td>{{form.frequency_mod.value}}</td></tr>
30	{% endif %}
31
32	{% if form.modulation.value == 3 %}
33	<tr><th>{{form.frequency_mod.label}}</th><td>{{form.frequency_mod.value}}</td></tr>
34	{% endif %}
35
36	{% if form.modulation.value == 4 %}
37	<tr><th>{{form.phase_mod.label}}</th><td>{{form.phase_mod.value}}</td></tr>
38	{% endif %}
39	</table>
40
41	<button class="btn btn-primary pull-right" style="margin-left: 10px" id="bt_read">Read</button>
42	<button class="btn btn-primary pull-right" style="margin-left: 10px" id="bt_write">Write</button>
43	<button class="btn btn-primary pull-left" style="margin-left: 10px" id="bt_export">Export</button>
44	<button class="btn btn-primary pull-left" style="margin-left: 10px" id="bt_edit">Edit</button>
45	<br></br>
46	{% endblock %}
47
48	{% block sidebar%}
49	{% include "sidebar_devices.html" %}
50	{% endblock %}
51
52	{% block extra-js%}
53	<script type="text/javascript">
54
55	$("#bt_edit").click(function() {
56	document.location = "{% url 'url_edit_dds_conf' dev_conf.id%}";
57	});
58
59	$("#bt_write").click(function() {
60	document.location = "{% url 'url_dds_conf_write' dev_conf.id%}";
61	});
62
63	$("#bt_read").click(function() {
64	document.location = "{% url 'url_dds_conf_read' dev_conf.id%}";
65	});
66
67	</script>
68	{% endblock %} No newline at end of file

apps/dds/templates/dds_conf_edit.html +8 -15

             {% extends "dev_conf_edit.html" %}
             {% load bootstrap3 %}
             {% load static %}
             {% load main_tags %}
             {% block extra-js%}
+            <script src="{% static 'js/dds_conversion.js' %}"></script>
             <script type="text/javascript">
             	$("#bt_cancel").click(function() {
             	    document.location = "{% url 'url_dds_conf' id_dev%}";
             	  });
             	$("#bt_read").click(function() {
-            	    document.location = "{% url 'url_dds_conf_read' id_dev%}";
+            	    document.location = "{% url 'url_read_dds_conf' id_dev%}";
             	  });
                 $("#id_clock").on('change', function() {
                 	updateFrequencies();
                 });
                 $("#id_multiplier").on('change', function() {
                 	updateFrequencies();
                 });
                 $("#id_frequency").on('change', function() {
                 	updateBinaryFrequencies();
                 });
                 $("#id_frequency_bin").on('change', function() {
                 	updateFrequencies();
                 });
                 $("#id_frequency_mod").on('change', function() {
                 	updateBinaryFrequencies();
                 });
                 $("#id_frequency_mod_bin").on('change', function() {
                 	updateFrequencies();
                 });
                 function updateBinaryFrequencies() {
                 	var clock = $("#id_clock").val();
                 	var multiplier = $("#id_multiplier").val();
                 	var freq = $("#id_frequency").val();
                 	var freq_mod = $("#id_frequency_mod").val();
                 	var mclock = clock*multiplier;
-                	var k = Math.pow(2,48)/mclock;
-                	var freq_bin = parseInt(freq*k);
+                	var freq_bin = freq2Binary(mclock, freq);
-                	var freq_mod_bin = parseInt(freq_mod*k);
+                	var freq_mod_bin = freq2Binary(mclock, freq_mod);
                 	$("#id_frequency_bin").val(freq_bin);
                 	$("#id_frequency_mod_bin").val(freq_mod_bin);
-                	freq = freq_bin/k;
+                	freq = binary2Freq(mclock, freq_bin);
-                	freq_mod = freq_mod_bin/k;
+                	freq_mod = binary2Freq(mclock, freq_mod_bin);
                 	$("#id_frequency").val(freq);
                 	$("#id_frequency_mod").val(freq_mod);
                 }
                 function updateFrequencies() {
                 	var clock = $("#id_clock").val();
                 	var multiplier = $("#id_multiplier").val();
                 	var freq_bin = $("#id_frequency_bin").val();
                 	var freq_mod_bin = $("#id_frequency_mod_bin").val();
                 	var mclock = clock*multiplier;
-                	var k = Math.pow(2,48)/mclock;
-                	var freq = parseInt(freq_bin)/k;
+                	var freq = binary2Freq(mclock, freq_bin);
-                	var freq_mod = parseInt(freq_mod_bin)/k;
+                	var freq_mod = binary2Freq(mclock, freq_mod_bin);
                 	$("#id_frequency").val(freq);
                 	$("#id_frequency_mod").val(freq_mod);
-                	var freq_bin = parseInt(freq*k);
-                	var freq_mod_bin = parseInt(freq_mod*k);
-                	$("#id_frequency_bin").val(freq_bin);
-                	$("#id_frequency_mod_bin").val(freq_mod_bin);
                 }
             </script>
             {% endblock %}

apps/dds/urls.py +4 -2

             from django.conf.urls import url
             urlpatterns = (
                 url(r'^(?P<id_conf>-?\d+)/$', 'apps.dds.views.dds_conf', name='url_dds_conf'),
                 url(r'^(?P<id_conf>-?\d+)/(?P<message>-?\d+)/$', 'apps.dds.views.dds_conf', name='url_dds_conf'),
                 url(r'^(?P<id_conf>-?\d+)/edit/$', 'apps.dds.views.dds_conf_edit', name='url_edit_dds_conf'),
-                url(r'^(?P<id_conf>-?\d+)/write/$', 'apps.dds.views.dds_conf_write', name='url_dds_conf_write'),
+                url(r'^(?P<id_conf>-?\d+)/write/$', 'apps.dds.views.dds_conf_write', name='url_write_dds_conf'),
-                url(r'^(?P<id_conf>-?\d+)/read/$', 'apps.dds.views.dds_conf_read', name='url_dds_conf_read'),
+                url(r'^(?P<id_conf>-?\d+)/read/$', 'apps.dds.views.dds_conf_read', name='url_read_dds_conf'),
+                url(r'^(?P<id_conf>-?\d+)/import/$', 'apps.main.views.dev_conf_import', name='url_import_dds_conf'),
+                url(r'^(?P<id_conf>-?\d+)/export/$', 'apps.main.views.dev_conf_export', name='url_export_dds_conf'),
             )

apps/dds/views.py +38 -36

             # Create your views here.
             from django.contrib import messages
             from django.shortcuts import redirect, render, get_object_or_404
-            from apps.main.models import Experiment, Configuration
+            # from apps.main.models import Experiment, Configuration
             from apps.main.views import sidebar
             from .models import DDSConfiguration
             from .forms import DDSConfigurationForm
             # Create your views here.
-            from radarsys_api import jro_device, dds
+            from radarsys_api import dds
             def dds_conf(request, id_conf):
                 conf = get_object_or_404(DDSConfiguration, pk=id_conf)
-                if request.method=='GET':
-                    form = DDSConfigurationForm(instance=conf)
                 answer = dds.echo(ip=str(conf.device.ip_address), port=conf.device.port_address)
                 kwargs = {}
                 kwargs['connected'] = (answer[0] == "1")
-                kwargs['form'] = form
                 kwargs['dev_conf'] = conf
                 kwargs['dev_conf_keys'] = ['experiment', 'device',
                                            'clock', 'multiplier',
                                            'frequency',
-            #                                 'frequency_bin',
+                                            'frequency_bin',
                                             'phase',
             #                                'phase_binary',
-                                           'amplitude_ch_A', 'amplitude_ch_B']
+                                           'amplitude_ch_A', 'amplitude_ch_B',
-            #                                'modulation',
+                                            'modulation',
-            #                                'frequency_mod',
+                                            'frequency_mod',
-            #                                 'frequency_mod_bin',
+                                            'frequency_mod_bin',
-            #                                'phase_mod']
+                                            'phase_mod']
             #                                'phase_binary_mod']
                 kwargs['title'] = 'DDS Configuration'
                 kwargs['suptitle'] = 'Details'
                 kwargs['button'] = 'Edit Configuration'
                 ###### SIDEBAR ######
                 kwargs.update(sidebar(conf))
                 return render(request, 'dds_conf.html', kwargs)
             def dds_conf_edit(request, id_conf):
                 conf = get_object_or_404(DDSConfiguration, pk=id_conf)
                 if request.method=='GET':
                     form = DDSConfigurationForm(instance=conf)
                 if request.method=='POST':
                     form = DDSConfigurationForm(request.POST, instance=conf)
                     if form.is_valid():
                         conf = form.save(commit=False)
                         if conf.verify_frequencies():
                             conf.save()
                             return redirect('url_dds_conf', id_conf=conf.id)
                         ##ERRORS
                 kwargs = {}
                 kwargs['id_dev'] = conf.id
                 kwargs['form'] = form
                 kwargs['title'] = 'Device Configuration'
                 kwargs['suptitle'] = 'Edit'
                 kwargs['button'] = 'Save'
-                kwargs['dds_nbits'] = conf.get_nbits()
                 ###### SIDEBAR ######
                 kwargs.update(sidebar(conf))
                 return render(request, 'dds_conf_edit.html', kwargs)
             def dds_conf_write(request, id_conf):
                 conf = get_object_or_404(DDSConfiguration, pk=id_conf)
                 answer = dds.write_config(ip=str(conf.device.ip_address),
                                          port=conf.device.port_address,
                                          clock=conf.clock,
                                          multiplier=conf.multiplier,
                                          freq_regA=conf.frequency_bin,
                                          freq_regB=conf.frequency_mod_bin,
                                          modulation=conf.modulation,
                                          phaseA=conf.phase,
                                          phaseB=conf.phase_mod,
                                          amplitude0=conf.amplitude_ch_A,
                                          amplitude1=conf.amplitude_ch_B)
                 if answer[0] == "1":
                     messages.success(request, answer[2:])
+                    conf.pk = None
+                    conf.id = None
+                    conf.type = 1
+                    conf.save()
                 else:
                     messages.error(request, answer)
                 return redirect('url_dds_conf', id_conf=conf.id)
             def dds_conf_read(request, id_conf):
                 conf = get_object_or_404(DDSConfiguration, pk=id_conf)
                 if request.method=='POST':
                     form = DDSConfigurationForm(request.POST, instance=conf)
                     if form.is_valid():
                         dds_model = form.save(commit=False)
                         if dds_model.verify_frequencies():
                             dds_model.save()
                             return redirect('url_dds_conf', id_conf=conf.id)
-                parms = None
+                    messages.error(request, "Parameters could not be saved. Invalid parameters")
+                    data = {}
                 if request.method=='GET':
                     #mult, freqA, freqB, modulation, phaseA, phaseB, amp0, amp1
                     parms = dds.read_config(ip=conf.device.ip_address,
                                       port=conf.device.port_address)
-                if parms is None:
-                    return redirect('url_dds_conf', id_conf=conf.id)
-                data = {'experiment' : conf.experiment.id,
+                    if not parms:
-                        'device' : conf.device.id,
+                        messages.error(request, "Could not read parameters from Device")
-                        'clock' : conf.clock,
+                        return redirect('url_dds_conf', id_conf=conf.id)
-                        'multiplier' : parms[0],
-                        'frequency' : conf.binary2freq(parms[1], parms[0]*conf.clock),
+                    data = {'experiment' : conf.experiment.id,
-                        'frequency_bin' : parms[1],
+                            'device' : conf.device.id,
-                        'phase' : parms[4],
+                            'clock' : conf.clock,
-                        'amplitude_ch_A' : parms[6],
+                            'multiplier' : parms[0],
-                        'amplitude_ch_B' : parms[7],
+                            'frequency' : conf.binary2freq(parms[1], parms[0]*conf.clock),
-                        'modulation' : parms[3],
+                            'frequency_bin' : parms[1],
-                        'frequency_mod' : conf.binary2freq(parms[2], parms[0]*conf.clock),
+                            'phase' : parms[4],
-                        'frequency_mod_bin' : parms[2],
+                            'amplitude_ch_A' : parms[6],
-                        'phase_mod' : parms[5],
+                            'amplitude_ch_B' : parms[7],
+                            'modulation' : parms[3],
+                            'frequency_mod' : conf.binary2freq(parms[2], parms[0]*conf.clock),
+                            'frequency_mod_bin' : parms[2],
+                            'phase_mod' : parms[5],
+                            }
                 form = DDSConfigurationForm(data)
                 kwargs = {}
                 kwargs['id_dev'] = conf.id
                 kwargs['form'] = form
                 kwargs['title'] = 'Device Configuration'
                 kwargs['suptitle'] = 'Parameters read from device'
                 kwargs['button'] = 'Save'
-                kwargs['dds_nbits'] = conf.get_nbits()
                 ###### SIDEBAR ######
                 kwargs.update(sidebar(conf))
                 return render(request, 'dds_conf_edit.html', kwargs)

apps/jars/urls.py +4 0

             from django.conf.urls import url
             urlpatterns = (
             #     url(r'^(?P<id>-?\d+)/$', 'apps.jars.views.jars_config', name='jars'),
                 url(r'^(?P<id_conf>-?\d+)/$', 'apps.main.views.dev_conf', name='url_jars_conf'),
                 url(r'^(?P<id_conf>-?\d+)/edit/$', 'apps.main.views.dev_conf_edit', name='url_edit_jars_conf'),
+                url(r'^(?P<id_conf>-?\d+)/write/$', 'apps.main.views.dev_conf_write', name='url_write_jars_conf'),
+                url(r'^(?P<id_conf>-?\d+)/read/$', 'apps.main.views.dev_conf_read', name='url_read_jars_conf'),
+                url(r'^(?P<id_conf>-?\d+)/import/$', 'apps.main.views.dev_conf_import', name='url_import_jars_conf'),
+                url(r'^(?P<id_conf>-?\d+)/export/$', 'apps.main.views.dev_conf_export', name='url_export_jars_conf'),
             )

apps/jars/views.py +8 -5

             from django.shortcuts import render_to_response
             from django.template import RequestContext
             from apps.main.models import Device
+            from apps.main.views import sidebar
             from .models import JARSConfiguration
             from .forms import JARSConfigurationForm
             # Create your views here.
             def jars_config(request, id):
                 if id:
                     conf = JARSConfiguration.objects.get(pk=id)
                     devices = Device.objects.filter(configuration__experiment=conf.experiment)
                     devices = devices.values('configuration__id', 'device_type__name')
                     for device in devices:
                         if device['device_type__name']=='jars':
                             device['active'] = 'active'
-                    form = JARSConfigurationForm(instance=conf)
+            #         form = JARSConfigurationForm(instance=conf)
-                else:
+            #     else:
-                    form = JARSConfigurationForm()
+            #         form = JARSConfigurationForm()
                 kwargs = {
-                    'form': form,
-                    'devices':devices,
                     'dev_conf': conf
                 }
+                ###### SIDEBAR ######
+                kwargs.update(sidebar(conf))
                 return render_to_response('jars.html', kwargs, context_instance=RequestContext(request))

apps/main/models.py +20 -1

             from itertools import chain
             from django.db import models
             from polymorphic import PolymorphicModel
             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 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)
                 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)
                 type = models.PositiveSmallIntegerField(default=0, choices=CONF_TYPES)
                 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):
                     from django.core.urlresolvers import reverse
                     return reverse('url_%s_conf' % self.device.device_type.name, args=[str(self.id)])
-  No newline at end of file
+                def get_absolute_url_edit(self):
+                    from django.core.urlresolvers import reverse
+                    return reverse('url_edit_%s_conf' % self.device.device_type.name, args=[str(self.id)])
+                def get_absolute_url_import(self):
+                    from django.core.urlresolvers import reverse
+                    return reverse('url_import_%s_conf' % self.device.device_type.name, args=[str(self.id)])
+                def get_absolute_url_export(self):
+                    from django.core.urlresolvers import reverse
+                    return reverse('url_export_%s_conf' % self.device.device_type.name, args=[str(self.id)])
+                def get_absolute_url_write(self):
+                    from django.core.urlresolvers import reverse
+                    return reverse('url_write_%s_conf' % self.device.device_type.name, args=[str(self.id)])
+                def get_absolute_url_read(self):
+                    from django.core.urlresolvers import reverse
+                    return reverse('url_read_%s_conf' % self.device.device_type.name, args=[str(self.id)])
  No newline at end of file

apps/main/templates/base.html +10 -9

             <!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>
                     </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 %}
+            	       {% if messages %}
-                     {% for message in 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">
+            	         <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>
+            	           <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                       <strong>{{message.tags|title}}!</strong> {{ message }}
+            	           <strong>{{message.tags|title}}!</strong> {{ message }}
-                     </div>
+            	         </div>
-                     {% endfor %}
+            	         {% endfor %}
-                   {% endif %}
+            	         <br>
+            	       {% endif %}
                    {% endblock %}
-            	   <br>
             	   {% block content %}
             	   {% endblock %}
             	   <br>
             	   </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.html +33 -7

             {% 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 %}
             <table class="table table-bordered">
-            <tr><th>Status</th><td>{%if connected == True %} &#9752; Connected  {% else %} &#9940; Disconnected {% endif %}</td></tr>
+            	<tr>
-            {% for key in dev_conf_keys %}
+            		<th>Status</th>
-            <tr><th>{{key|title}}</th><td>{{dev_conf|attr:key}}</td></tr>
+            		<td>{%if connected == True %} &#9752; Connected  {% else %} &#9940; Disconnected {% endif %}</td>
-            {% endfor %}
+            	</tr>
+            	{% for key in dev_conf_keys %}
+            	<tr>
+            		<th>{% get_verbose_field_name dev_conf key %}</th>
+            		<td>{{dev_conf|attr:key}}</td>
+            	</tr>
+            	{% endfor %}
             </table>
-            <button class="btn btn-primary pull-right" style="margin-left: 10px" id="bt_send">Send</button>
             <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_import">Import</button>
             <button class="btn btn-primary pull-right" style="margin-left: 10px" id="bt_edit">Edit</button>
-            <br></br>
+            <button class="btn btn-primary pull-left" style="margin-left: 10px" id="bt_read">Read</button>
+            <button class="btn btn-primary pull-left" style="margin-left: 10px" id="bt_write">Write</button>
             {% endblock %}
             {% block sidebar%}
             {% include "sidebar_devices.html" %}
             {% endblock %}
             {% block extra-js%}
             <script type="text/javascript">
               $("#bt_edit").click(function() {
-                document.location = "{% url 'url_edit_dev_conf' dev_conf.id%}";
+                document.location = "{{ dev_conf.get_absolute_url_edit }}";
+              });
+              $("#bt_read").click(function() {
+                document.location = "{{ dev_conf.get_absolute_url_read }}";
+              });
+              $("#bt_write").click(function() {
+                document.location = "{{ dev_conf.get_absolute_url_write }}";
+              });
+              $("#bt_import").click(function() {
+                document.location = "{{ dev_conf.get_absolute_url_import }}";
+              });
+              $("#bt_export").click(function() {
+                document.location = "{{ dev_conf.get_absolute_url_export }}";
               });
             </script>
             {% endblock %}

apps/main/templates/dev_confs.html +1 -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 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}}/">
+            	<tr class="clickable-row" data-href="{{item.get_absolute_url}}">
             	  <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 type="text/javascript">
               $("#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/templatetags/main_tags.py +19 -5

@@ -1,11 +1,25
1	from django.template.defaulttags import register	1	from django.template.defaulttags import register
2		2
3	@register.filter	3	@register.filter
4	def attr(~~object~~, key):	4	def attr(instance, key):
5	if hasattr(object, key):	5
6	return getattr(object, key)	6	display_key = "get_" + key + "_display"
7	return object.get(key)	7
		8	if hasattr(instance, display_key):
		9	return getattr(instance, display_key)()
		10
		11	if hasattr(instance, key):
		12	return getattr(instance, key)
		13
		14	return instance.get(key)
8		15
9	@register.filter	16	@register.filter
10	def title(s):	17	def title(s):
11	return s.replace('_', ' ').title() No newline at end of file	18	return s.replace('_', ' ').title()
		19
		20	@register.simple_tag
		21	def get_verbose_field_name(instance, field_name):
		22	"""
		23	Returns verbose_name for a field.
		24	"""
		25	return instance._meta.get_field(field_name).verbose_name.title() No newline at end of file

apps/main/views.py +105 -13

             from django.shortcuts import render, redirect, get_object_or_404, HttpResponse
+            from django.contrib import messages
             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']
                 keys = ['id', 'name', 'ip_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)
                 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['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')
             #     keys = ['id', 'device__device_type__name', 'device__name', 'experiment__campaign__name', 'experiment__name']
-                keys = ['id', 'device', 'experiment']
+                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 ######
-                experiments = Experiment.objects.filter(campaign=conf.experiment.campaign)
+                kwargs.update(sidebar(conf))
-                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 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)
                         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)
+                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))
+                messages.error(request, "Read View not implemented yet for this configuration")
+                return render(request, 'dev_conf.html', kwargs)
+            def dev_conf_write(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))
+                messages.error(request, "Write View not implemented yet for this configuration")
+                return render(request, 'dev_conf.html', kwargs)
+            def dev_conf_import(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))
+                messages.error(request, "Import View not implemented yet for this configuration")
+                return render(request, 'dev_conf.html', kwargs)
+            def dev_conf_export(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))
+                messages.error(request, "Export View not implemented yet for this configuration")
+                return render(request, 'dev_conf.html', kwargs)
             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)
+                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']
                 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)
                 return kwargs

apps/rc/urls.py +5 0

             from django.conf.urls import url
             urlpatterns = (
                 url(r'^(?P<id>-?\d+)/$', 'apps.rc.views.conf', name='url_rc_conf'),
                 url(r'^(?P<id>-?\d+)/edit/$', 'apps.rc.views.conf_edit', name='url_edit_rc_conf'),
+                url(r'^(?P<id_conf>-?\d+)/write/$', 'apps.main.views.dev_conf_write', name='url_write_rc_conf'),
+                url(r'^(?P<id_conf>-?\d+)/read/$', 'apps.main.views.dev_conf_read', name='url_read_rc_conf'),
+                url(r'^(?P<id_conf>-?\d+)/import/$', 'apps.main.views.dev_conf_import', name='url_import_rc_conf'),
+                url(r'^(?P<id_conf>-?\d+)/export/$', 'apps.main.views.dev_conf_export', name='url_export_rc_conf'),
                 url(r'^(?P<conf_id>-?\d+)/add_line/$', 'apps.rc.views.add_line', name='url_add_rc_line'),
                 url(r'^(?P<conf_id>-?\d+)/update_lines/$', 'apps.rc.views.update_lines', name='url_update_rc_lines'),
                 url(r'^(?P<conf_id>-?\d+)/edit_lines/$', 'apps.rc.views.edit_lines', name='url_edit_rc_lines'),
                 url(r'^(?P<conf_id>-?\d+)/add_line/(?P<line_type_id>-?\d+)/$', 'apps.rc.views.add_line', name='url_add_rc_line'),
                 url(r'^(?P<conf_id>-?\d+)/line/(?P<line_id>-?\d+)/delete/$', 'apps.rc.views.remove_line', name='url_remove_rc_line'),
             )

apps/usrp/urls.py +4 0

             from django.conf.urls import url
             urlpatterns = (
                 url(r'^(?P<id_conf>-?\d+)/$', 'apps.main.views.dev_conf', name='url_usrp_conf'),
                 url(r'^(?P<id_conf>-?\d+)/edit/$', 'apps.main.views.dev_conf_edit', name='url_edit_usrp_conf'),
+                url(r'^(?P<id_conf>-?\d+)/write/$', 'apps.main.views.dev_conf_write', name='url_write_usrp_conf'),
+                url(r'^(?P<id_conf>-?\d+)/read/$', 'apps.main.views.dev_conf_read', name='url_read_usrp_conf'),
+                url(r'^(?P<id_conf>-?\d+)/import/$', 'apps.main.views.dev_conf_import', name='url_import_usrp_conf'),
+                url(r'^(?P<id_conf>-?\d+)/export/$', 'apps.main.views.dev_conf_export', name='url_export_usrp_conf'),
             )

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