radarsys Commit - r26:33c77d9a34df · Jicamarca Repository

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

Miguel Urco -

r26:33c77d9a34df

parent child

Context file:

r26:33c77d9a34df

Collapse all files

apps/dds/forms.py +22 -8

             from django import forms
             from apps.main.models import Device
             from .models import DDSConfiguration
-            from django.core.validators import MinValueValidator, MaxValueValidator
+            # from django.core.validators import MinValueValidator, MaxValueValidator
             class DDSConfigurationForm(forms.ModelForm):
-                frequency = forms.FloatField(label='Frequency (MHz)', validators=[MinValueValidator(0), MaxValueValidator(150)])
+            #     frequency_bin = forms.IntegerField(label='Frequency (Binary)', required=False)
-                phase = forms.FloatField(label='Phase (Degrees)', validators=[MinValueValidator(0), MaxValueValidator(360)])
+            #     phase_bin = forms.IntegerField(label='Phase (Binary)', required=False)
-                frequency_mod = forms.FloatField(label='Frequency (MHz)', validators=[MinValueValidator(0), MaxValueValidator(150)], required=False)
+            #     frequency_mod_bin = forms.IntegerField(label='Frequency Mod (Binary)', required=False)
-                phase_mod = forms.FloatField(label='Phase (Degrees)', validators=[MinValueValidator(0), MaxValueValidator(360)], required=False)
+            #     phase_mod_bin = forms.IntegerField(label='Phase Mod (Binary)', required=False)
+                field_order = ['experiment', 'device',
+                               'clock', 'multiplier',
+                               'frequency',
+                               'frequency_bin',
+                               'phase',
+                               'phase_bin',
+                               'amplitude_chA', 'amplitude_chB',
+                               'modulation',
+                               'frequency_mod',
+                               'frequency_mod_bin',
+                               'phase_mod',
+                               'phase_mod_bin']
                 def __init__(self, *args, **kwargs):
                     #request = kwargs.pop('request')
                     super(DDSConfigurationForm, self).__init__(*args, **kwargs)
                     instance = getattr(self, 'instance', None)
                     if instance and instance.pk:
                         devices = Device.objects.filter(device_type__name='dds')
-                        items = devices.values('id', 'name', 'device_type__name', 'ip_address')
                         self.fields['experiment'].widget.attrs['readonly'] = True
-                        self.fields['device'].widget.choices = [(item['id'], '[%s]: %s | %s' % (item['device_type__name'], item['name'], item['ip_address'])) for item in items]
+                        self.fields['experiment'].widget.choices = [(instance.experiment.id, instance.experiment)]
+                        self.fields['device'].widget.choices = [(device.id, device) for device in devices]
                 def clean(self):
                     # Custom validation to force an integer when type of unit = "Unit"
                     return
                 class Meta:
                     model = DDSConfiguration
-                    fields = ('experiment', 'device', 'clock', 'multiplier', 'modulation')
+                    exclude = ('type','parameters')

apps/dds/models.py +57 -11

@@ -1,31 +1,77
1	from django.db import models	1	from django.db import models
2	from apps.main.models import Configuration	2	from apps.main.models import Configuration
3	# Create your models here.	3	# Create your models here.
4		4
5	from django.core.validators import MinValueValidator, MaxValueValidator	5	from django.core.validators import MinValueValidator, MaxValueValidator
		6	from django.core.exceptions import ValidationError
6		7
7	MOD_TYPES = (	8	MOD_TYPES = (
8	(None, 'Select a modulation type'),	9	(None, 'Select a modulation type'),
9	(0, '~~No modulation~~'),	10	(0, 'Single Tone'),
10	(1, 'ASK'),	11	(1, 'FSK'),
11	(2, 'FSK'),	12	(2, 'Ramped FSK'),
12	(3, '~~PSK~~'),	13	(3, 'Chirp'),
		14	(4, 'BPSK'),
13	)	15	)
14		16
15	class DDSConfiguration(Configuration):	17	class DDSConfiguration(Configuration):
16		18
17	clock = models.FloatField(verbose_name='Clock Master (MHz)',validators=[MinValueValidator(5), MaxValueValidator(50)], blank=True, null=True)	19	DDS_NBITS = 48
		20
		21	clock = models.FloatField(verbose_name='Clock Master (MHz)',validators=[MinValueValidator(5), MaxValueValidator(75)])
18	multiplier = models.PositiveIntegerField(verbose_name='Multiplier',validators=[MinValueValidator(1), MaxValueValidator(20)], default=4)	22	multiplier = models.PositiveIntegerField(verbose_name='Multiplier',validators=[MinValueValidator(1), MaxValueValidator(20)], default=4)
19	freq_reg = models.PositiveIntegerField(verbose_name='Frequency (Binary)',validators=[MinValueValidator(0), MaxValueValidator(2**32-1)], blank=True, null=True)	23
20	~~phase_reg~~ = models.~~PositiveInteger~~Field(verbose_name='~~Phase (Binary~~)',validators=[MinValueValidator(0), MaxValueValidator(2**14-1)], ~~blank~~=~~True~~, ~~null~~=~~True~~)	24	frequency = models.DecimalField(verbose_name='Frequency (MHz)', validators=[MinValueValidator(0), MaxValueValidator(150)], max_digits=17, decimal_places=15)
		25	frequency_bin = models.BigIntegerField(verbose_name='Frequency (Binary)',validators=[MinValueValidator(0), MaxValueValidator(2**DDS_NBITS-1)])
21		26
22	~~amplitude_chA~~ = models.~~PositiveInteger~~Field(verbose_name='~~Amplitude CHA~~',validators=[MinValueValidator(0), MaxValueValidator(2**10-1)], ~~blank~~=~~True~~, ~~null~~=~~True~~)	27	phase = models.FloatField(verbose_name='Phase (Degrees)', validators=[MinValueValidator(0), MaxValueValidator(360)])
23	~~amplitude_chB~~ = models.PositiveIntegerField(verbose_name='~~Amplitude CHB~~',validators=[MinValueValidator(0), MaxValueValidator(2**10-1~~)],~~ ~~blank~~=~~True~~, ~~null~~=~~True~~)	28	# phase_binary = models.PositiveIntegerField(verbose_name='Phase (Binary)',validators=[MinValueValidator(0), MaxValueValidator(2**14-1)])
		29
		30	amplitude_ch_A = models.PositiveIntegerField(verbose_name='Amplitude CHA',validators=[MinValueValidator(0), MaxValueValidator(2**10-1)], blank=True, null=True)
		31	amplitude_ch_B = models.PositiveIntegerField(verbose_name='Amplitude CHB',validators=[MinValueValidator(0), MaxValueValidator(2**10-1)], blank=True, null=True)
24		32
25	modulation = models.PositiveIntegerField(choices = MOD_TYPES, default = 0)	33	modulation = models.PositiveIntegerField(choices = MOD_TYPES, default = 0)
26	freq_reg_mod = models.PositiveIntegerField(verbose_name='Frequency Mod (Binary)',validators=[MinValueValidator(0), MaxValueValidator(2**32-1)], blank=True, null=True)	34
27	~~phase_reg~~_mod = models.~~PositiveInteger~~Field(verbose_name='~~Phase Mod (Binary~~)',validators=[MinValueValidator(0), MaxValueValidator(2**14-1)], blank=True, null=True)	35	frequency_mod = models.DecimalField(verbose_name='Frequency Mod. (MHz)', validators=[MinValueValidator(0), MaxValueValidator(150)], max_digits=17, decimal_places=15, blank=True, null=True)
		36	frequency_mod_bin = models.BigIntegerField(verbose_name='Frequency Mod. (Binary)',validators=[MinValueValidator(0), MaxValueValidator(2**DDS_NBITS-1)], blank=True, null=True)
		37
		38	phase_mod = models.FloatField(verbose_name='Phase Mod. (Degrees)', validators=[MinValueValidator(0), MaxValueValidator(360)], blank=True, null=True)
		39	# phase_binary_mod = models.PositiveIntegerField(verbose_name='Phase Mod (Binary)',validators=[MinValueValidator(0), MaxValueValidator(2**14-1)], blank=True, null=True)
		40
		41	def get_nbits(self):
		42
		43	return self.DDS_NBITS
		44
		45	def clean(self):
		46
		47	if self.modulation in [1,2,3]:
		48	if self.frequency_mod is None or self.frequency_mod_bin is None:
		49	raise ValidationError({
		50	'frequency_mod': 'Frequency modulation has to be defined when FSK or Chirp modulation is selected'
		51	})
		52
		53	if self.modulation in [4,]:
		54	if self.phase_mod is None:
		55	raise ValidationError({
		56	'phase_mod': 'Phase modulation has to be defined when BPSK modulation is selected'
		57	})
		58
		59	def verify_frequencies(self):
		60
		61	return True
		62
		63	def freq2binary(self, freq, mclock):
		64
		65	binary = (float(freq)/mclock)(2*self.DDS_NBITS)
		66
		67	return binary
		68
		69	def binary2freq(self, binary, mclock):
		70
		71	freq = (float(binary)/(2*self.DDS_NBITS))mclock
		72
		73	return freq
28		74
29	class Meta:	75	class Meta:
30	db_table = 'dds_configurations'	76	db_table = 'dds_configurations'
31	No newline at end of file	77

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

@@ -1,11 +1,68
1	{% extends "~~dev_conf~~.html" %}	1	{% extends "base.html" %}
		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 %}
2		51
3	{% block extra-js%}	52	{% block extra-js%}
4	<script type="text/javascript">	53	<script type="text/javascript">
5		54
6	$("#bt_edit").click(function() {	55	$("#bt_edit").click(function() {
7	document.location = "{% url 'url_edit_dds_conf' dev_conf.id%}";	56	document.location = "{% url 'url_edit_dds_conf' dev_conf.id%}";
8	});	57	});
9		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
10	</script>	67	</script>
11	{% endblock %} No newline at end of file	68	{% endblock %}

apps/dds/templates/dds_conf_edit.html +90 -1

@@ -1,1 +1,90
1	{% extends "dev_conf_edit.html" %} No newline at end of file	1	{% extends "dev_conf_edit.html" %}
		2	{% load bootstrap3 %}
		3	{% load static %}
		4	{% load main_tags %}
		5
		6	{% block extra-js%}
		7	<script type="text/javascript">
		8
		9	$("#bt_cancel").click(function() {
		10	document.location = "{% url 'url_dds_conf' id_dev%}";
		11	});
		12
		13	$("#bt_read").click(function() {
		14	document.location = "{% url 'url_dds_conf_read' id_dev%}";
		15	});
		16
		17	$("#id_clock").on('change', function() {
		18	updateFrequencies();
		19	});
		20
		21	$("#id_multiplier").on('change', function() {
		22	updateFrequencies();
		23	});
		24
		25	$("#id_frequency").on('change', function() {
		26	updateBinaryFrequencies();
		27	});
		28
		29	$("#id_frequency_bin").on('change', function() {
		30	updateFrequencies();
		31	});
		32
		33	$("#id_frequency_mod").on('change', function() {
		34	updateBinaryFrequencies();
		35	});
		36
		37	$("#id_frequency_mod_bin").on('change', function() {
		38	updateFrequencies();
		39	});
		40
		41	function updateBinaryFrequencies() {
		42
		43	var clock = $("#id_clock").val();
		44	var multiplier = $("#id_multiplier").val();
		45	var freq = $("#id_frequency").val();
		46	var freq_mod = $("#id_frequency_mod").val();
		47
		48	var mclock = clock*multiplier;
		49	var k = Math.pow(2,48)/mclock;
		50
		51	var freq_bin = parseInt(freq*k);
		52	var freq_mod_bin = parseInt(freq_mod*k);
		53
		54	$("#id_frequency_bin").val(freq_bin);
		55	$("#id_frequency_mod_bin").val(freq_mod_bin);
		56
		57	freq = freq_bin/k;
		58	freq_mod = freq_mod_bin/k;
		59
		60	$("#id_frequency").val(freq);
		61	$("#id_frequency_mod").val(freq_mod);
		62
		63	}
		64
		65	function updateFrequencies() {
		66
		67	var clock = $("#id_clock").val();
		68	var multiplier = $("#id_multiplier").val();
		69	var freq_bin = $("#id_frequency_bin").val();
		70	var freq_mod_bin = $("#id_frequency_mod_bin").val();
		71
		72	var mclock = clock*multiplier;
		73	var k = Math.pow(2,48)/mclock;
		74
		75	var freq = parseInt(freq_bin)/k;
		76	var freq_mod = parseInt(freq_mod_bin)/k;
		77
		78	$("#id_frequency").val(freq);
		79	$("#id_frequency_mod").val(freq_mod);
		80
		81	var freq_bin = parseInt(freq*k);
		82	var freq_mod_bin = parseInt(freq_mod*k);
		83
		84	$("#id_frequency_bin").val(freq_bin);
		85	$("#id_frequency_mod_bin").val(freq_mod_bin);
		86
		87	}
		88
		89	</script>
		90	{% endblock %} No newline at end of file

apps/dds/urls.py +3 0

             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+)/read/$', 'apps.dds.views.dds_conf_read', name='url_dds_conf_read'),
             )

apps/dds/views.py +117 -19

@@ -1,63 +1,161
1	# Create your views here.	1	# Create your views here.
2		2	from django.contrib import messages
3	from django.shortcuts import redirect, render, get_object_or_404	3	from django.shortcuts import redirect, render, get_object_or_404
4		4
5	from apps.main.models import Experiment, Configuration	5	from apps.main.models import Experiment, Configuration
		6	from apps.main.views import sidebar
		7
6	from .models import DDSConfiguration	8	from .models import DDSConfiguration
7	from .forms import DDSConfigurationForm	9	from .forms import DDSConfigurationForm
8	# Create your views here.	10	# Create your views here.
9		11
		12	from radarsys_api import jro_device, dds
		13
10	def dds_conf(request, id_conf):	14	def dds_conf(request, id_conf):
11		15
12	conf = get_object_or_404(DDSConfiguration, pk=id_conf)	16	conf = get_object_or_404(DDSConfiguration, pk=id_conf)
13		17
		18	if request.method=='GET':
		19	form = DDSConfigurationForm(instance=conf)
		20
		21	answer = dds.echo(ip=str(conf.device.ip_address), port=conf.device.port_address)
		22
14	kwargs = {}	23	kwargs = {}
		24	kwargs['connected'] = (answer[0] == "1")
		25	kwargs['form'] = form
		26
15	kwargs['dev_conf'] = conf	27	kwargs['dev_conf'] = conf
16	kwargs['dev_conf_keys'] = ['experiment', 'device',	28	kwargs['dev_conf_keys'] = ['experiment', 'device',
17	'clock', 'multiplier',	29	'clock', 'multiplier',
18	'freq~~_reg'~~, ~~'phase_reg~~',	30	'frequency',
19	'~~amplitude_chA'~~, ~~'amplitude_chB~~',	31	# 'frequency_bin',
20	'~~modulation~~',	32	'phase',
21	'~~freq_reg_mod'~~, 'phase_~~reg_mod'~~]	33	# 'phase_binary',
		34	'amplitude_ch_A', 'amplitude_ch_B']
		35	# 'modulation',
		36	# 'frequency_mod',
		37	# 'frequency_mod_bin',
		38	# 'phase_mod']
		39	# 'phase_binary_mod']
22		40
23	kwargs['title'] = 'DDS Configuration'	41	kwargs['title'] = 'DDS Configuration'
24	kwargs['suptitle'] = 'Details'	42	kwargs['suptitle'] = 'Details'
25		43
26	kwargs['button'] = 'Edit Configuration'	44	kwargs['button'] = 'Edit Configuration'
27		45
28	###### SIDEBAR ######	46	###### SIDEBAR ######
29	experiments = Experiment.objects.filter(campaign=conf.experiment.campaign)	47	kwargs.update(sidebar(conf))
30	configurations = Configuration.objects.filter(experiment=conf.experiment)
31
32	exp_keys = ['id', 'campaign', 'name', 'start_time', 'end_time']
33	conf_keys = ['id', 'device__name', 'device__device_type__name', 'device__ip_address']
34
35	kwargs['experiment_keys'] = exp_keys[1:]
36	kwargs['experiments'] = experiments.values(*exp_keys)
37
38	kwargs['configuration_keys'] = conf_keys[1:]
39	kwargs['configurations'] = configurations.values(*conf_keys)
40		48
41	return render(request, 'dds_conf.html', kwargs)	49	return render(request, 'dds_conf.html', kwargs)
42		50
43	def dds_conf_edit(request, id_conf):	51	def dds_conf_edit(request, id_conf):
44		52
45	conf = get_object_or_404(DDSConfiguration, pk=id_conf)	53	conf = get_object_or_404(DDSConfiguration, pk=id_conf)
46		54
47	if request.method=='GET':	55	if request.method=='GET':
48	form = DDSConfigurationForm(instance=conf)	56	form = DDSConfigurationForm(instance=conf)
49		57
50	if request.method=='POST':	58	if request.method=='POST':
51	form = DDSConfigurationForm(request.POST, instance=conf)	59	form = DDSConfigurationForm(request.POST, instance=conf)
52		60
53	if form.is_valid():	61	if form.is_valid():
54	form.save()	62	conf = form.save(commit=False)
55	return redirect('url_dds_conf', id_conf=id_conf)	63
		64	if conf.verify_frequencies():
		65
		66	conf.save()
		67	return redirect('url_dds_conf', id_conf=conf.id)
		68
		69	##ERRORS
56		70
57	kwargs = {}	71	kwargs = {}
		72	kwargs['id_dev'] = conf.id
58	kwargs['form'] = form	73	kwargs['form'] = form
59	kwargs['title'] = 'Device Configuration'	74	kwargs['title'] = 'Device Configuration'
60	kwargs['suptitle'] = 'Edit'	75	kwargs['suptitle'] = 'Edit'
61	kwargs['button'] = '~~Updat~~e'	76	kwargs['button'] = 'Save'
		77	kwargs['dds_nbits'] = conf.get_nbits()
		78
		79	###### SIDEBAR ######
		80	kwargs.update(sidebar(conf))
		81
		82	return render(request, 'dds_conf_edit.html', kwargs)
		83
		84	def dds_conf_write(request, id_conf):
		85
		86	conf = get_object_or_404(DDSConfiguration, pk=id_conf)
		87
		88	answer = dds.write_config(ip=str(conf.device.ip_address),
		89	port=conf.device.port_address,
		90	clock=conf.clock,
		91	multiplier=conf.multiplier,
		92	freq_regA=conf.frequency_bin,
		93	freq_regB=conf.frequency_mod_bin,
		94	modulation=conf.modulation,
		95	phaseA=conf.phase,
		96	phaseB=conf.phase_mod,
		97	amplitude0=conf.amplitude_ch_A,
		98	amplitude1=conf.amplitude_ch_B)
		99
		100	if answer[0] == "1":
		101	messages.success(request, answer[2:])
		102	else:
		103	messages.error(request, answer)
		104
		105	return redirect('url_dds_conf', id_conf=conf.id)
		106
		107	def dds_conf_read(request, id_conf):
		108
		109	conf = get_object_or_404(DDSConfiguration, pk=id_conf)
		110
		111	if request.method=='POST':
		112	form = DDSConfigurationForm(request.POST, instance=conf)
		113
		114	if form.is_valid():
		115	dds_model = form.save(commit=False)
		116
		117	if dds_model.verify_frequencies():
		118
		119	dds_model.save()
		120	return redirect('url_dds_conf', id_conf=conf.id)
		121
		122	parms = None
		123
		124	if request.method=='GET':
		125
		126	#mult, freqA, freqB, modulation, phaseA, phaseB, amp0, amp1
		127	parms = dds.read_config(ip=conf.device.ip_address,
		128	port=conf.device.port_address)
		129
		130	if parms is None:
		131	return redirect('url_dds_conf', id_conf=conf.id)
		132
		133	data = {'experiment' : conf.experiment.id,
		134	'device' : conf.device.id,
		135	'clock' : conf.clock,
		136	'multiplier' : parms[0],
		137	'frequency' : conf.binary2freq(parms[1], parms[0]*conf.clock),
		138	'frequency_bin' : parms[1],
		139	'phase' : parms[4],
		140	'amplitude_ch_A' : parms[6],
		141	'amplitude_ch_B' : parms[7],
		142	'modulation' : parms[3],
		143	'frequency_mod' : conf.binary2freq(parms[2], parms[0]*conf.clock),
		144	'frequency_mod_bin' : parms[2],
		145	'phase_mod' : parms[5],
		146	}
		147
		148	form = DDSConfigurationForm(data)
		149
		150	kwargs = {}
		151	kwargs['id_dev'] = conf.id
		152	kwargs['form'] = form
		153	kwargs['title'] = 'Device Configuration'
		154	kwargs['suptitle'] = 'Parameters read from device'
		155	kwargs['button'] = 'Save'
		156	kwargs['dds_nbits'] = conf.get_nbits()
		157
		158	###### SIDEBAR ######
		159	kwargs.update(sidebar(conf))
62		160
63	return render(request, 'dds_conf_edit.html', kwargs) No newline at end of file	161	return render(request, 'dds_conf_edit.html', kwargs)

apps/jars/forms.py +8 -3

             from django import forms
             from apps.main.models import Device
             from .models import JARSConfiguration
             class JARSConfigurationForm(forms.ModelForm):
                 def __init__(self, *args, **kwargs):
                     super(JARSConfigurationForm, self).__init__(*args, **kwargs)
                     instance = getattr(self, 'instance', None)
                     if instance and instance.pk:
-                        self.fields['experiment'].widget.attrs['disabled'] = True
+                        devices = Device.objects.filter(device_type__name='jars')
-                        self.fields['device'].widget.choices = [(item['id'], '%s | %s' % (item['device_type__name'], item['ip_address'])) for item in Device.objects.filter(device_type__name='jars').values('id', 'device_type__name', 'ip_address')]
+                        self.fields['experiment'].widget.attrs['readonly'] = True
+                        self.fields['experiment'].widget.choices = [(instance.experiment.id, instance.experiment)]
+                        self.fields['device'].widget.choices = [(device.id, device) for device in devices]
                 class Meta:
                     model = JARSConfiguration
                     exclude = ('parameters', 'status')

apps/main/templates/dev_conf.html +3 -1

             {% 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>
             {% for key in dev_conf_keys %}
             <tr><th>{{key|title}}</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_edit">Edit</button>
             <br></br>
-            <br></br>
             {% 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%}";
               });
             </script>
             {% endblock %}

apps/main/views.py +3 0

             from django.shortcuts import render, redirect, get_object_or_404, HttpResponse
             from .forms import CampaignForm, ExperimentForm, DeviceForm, ConfigurationForm
             from apps.cgs.forms import CGSConfigurationForm
             from apps.jars.forms import JARSConfigurationForm
             from apps.usrp.forms import USRPConfigurationForm
             from apps.abs.forms import ABSConfigurationForm
             from apps.rc.forms import RCConfigurationForm
             from apps.dds.forms import DDSConfigurationForm
             from .models import Campaign, Experiment, Device, Configuration
             from apps.cgs.models import CGSConfiguration
             from apps.jars.models import JARSConfiguration
             from apps.usrp.models import USRPConfiguration
             from apps.abs.models import ABSConfiguration
             from apps.rc.models import RCConfiguration
             from apps.dds.models import DDSConfiguration
             # Create your views here.
             CONF_FORMS = {
                 'rc': RCConfigurationForm,
                 'dds': DDSConfigurationForm,
                 'jars': JARSConfigurationForm,
                 'cgs': CGSConfigurationForm,
                 'abs': ABSConfigurationForm,
                 'usrp': USRPConfigurationForm,
             }
             CONF_MODELS = {
                 'rc': RCConfiguration,
                 'dds': DDSConfiguration,
                 'jars': JARSConfiguration,
                 'cgs': CGSConfiguration,
                 'abs': ABSConfiguration,
                 'usrp': USRPConfiguration,
             }
             def index(request):
                 kwargs = {}
                 return render(request, 'index.html', kwargs)
             def devices(request):
                 devices = Device.objects.all().order_by('device_type__name')
             #     keys = ['id', 'device_type__name', 'name', 'ip_address']
                 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']
                 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)
                 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'
                 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'
                 return render(request, 'dev_conf_edit.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}
                 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)
                 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

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