| @@ -2,6 +2,8 from django.conf.urls import url | |||
|
|
2 | 2 | |
|
|
3 | 3 | urlpatterns = ( |
|
|
4 | 4 | #url(r'^configuration/$', 'apps.cgs.views.configurate_frequencies', name='new_device'), |
|
|
5 | url(r'^(?P<id>-?\d+)/$', 'apps.cgs.views.configurate_frequencies', name='new_device'), | |
|
|
5 | # url(r'^(?P<id>-?\d+)/$', 'apps.cgs.views.configurate_frequencies', name='new_device'), | |
|
|
6 | url(r'^(?P<id_conf>-?\d+)/$', 'apps.main.views.dev_conf', name='url_cgs_conf'), | |
|
|
7 | url(r'^(?P<id_conf>-?\d+)/edit/$', 'apps.main.views.edit_dev_conf', name='url_edit_cgs_conf'), | |
|
|
6 | 8 | ) |
|
|
7 | 9 | |
| @@ -2,16 +2,17 | |||
|
|
2 | 2 | |
|
|
3 | 3 | from django.shortcuts import redirect, render |
|
|
4 | 4 | |
|
|
5 | from apps.main.models import Experiment, Configuration | |
|
|
5 | 6 | from .models import DDSConfiguration |
|
|
6 | 7 | from .forms import DDSConfigurationForm |
|
|
7 | 8 | # Create your views here. |
|
|
8 | 9 | |
|
|
9 | 10 | def dds_conf(request, id_conf): |
|
|
10 | 11 | |
|
|
11 |
|
|
|
|
12 | conf = DDSConfiguration.objects.get(pk=id_conf) | |
|
|
12 | 13 | |
|
|
13 | 14 | kwargs = {} |
|
|
14 |
kwargs['dev_conf'] = |
|
|
|
15 | kwargs['dev_conf'] = conf | |
|
|
15 | 16 | kwargs['dev_conf_keys'] = ['experiment', 'device', |
|
|
16 | 17 | 'clock', 'multiplier', |
|
|
17 | 18 | 'freq_reg', 'phase_reg', |
| @@ -24,17 +25,30 def dds_conf(request, id_conf): | |||
|
|
24 | 25 | |
|
|
25 | 26 | kwargs['button'] = 'Edit Configuration' |
|
|
26 | 27 | |
|
|
28 | ###### SIDEBAR ###### | |
|
|
29 | experiments = Experiment.objects.filter(campaign=conf.experiment.campaign) | |
|
|
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 | ||
|
|
27 | 41 | return render(request, 'dds_conf.html', kwargs) |
|
|
28 | 42 | |
|
|
29 | 43 | def edit_dds_conf(request, id_conf): |
|
|
30 | 44 | |
|
|
31 |
|
|
|
|
45 | conf = DDSConfiguration.objects.get(pk=id_conf) | |
|
|
32 | 46 | |
|
|
33 | 47 | if request.method=='GET': |
|
|
34 |
form = DDSConfigurationForm(instance= |
|
|
|
48 | form = DDSConfigurationForm(instance=conf) | |
|
|
35 | 49 | |
|
|
36 | 50 | if request.method=='POST': |
|
|
37 |
form = DDSConfigurationForm(request.POST, instance= |
|
|
|
51 | form = DDSConfigurationForm(request.POST, instance=conf) | |
|
|
38 | 52 | |
|
|
39 | 53 | if form.is_valid(): |
|
|
40 | 54 | form.save() |
| @@ -1,5 +1,7 | |||
|
|
1 | 1 | from django.conf.urls import url |
|
|
2 | 2 | |
|
|
3 | 3 | urlpatterns = ( |
|
|
4 | url(r'^(?P<id>-?\d+)/$', 'apps.jars.views.jars_config', name='jars'), | |
|
|
4 | # url(r'^(?P<id>-?\d+)/$', 'apps.jars.views.jars_config', name='jars'), | |
|
|
5 | url(r'^(?P<id_conf>-?\d+)/$', 'apps.main.views.dev_conf', name='url_jars_conf'), | |
|
|
6 | url(r'^(?P<id_conf>-?\d+)/edit/$', 'apps.main.views.edit_dev_conf', name='url_edit_jars_conf'), | |
|
|
5 | 7 | ) |
| @@ -1,22 +1,50 | |||
|
|
1 |
{% if |
|
|
|
1 | {% if campaign %} | |
|
|
2 | 2 | <div class="panel panel-default"> |
|
|
3 | 3 | <div class="panel-heading"> |
|
|
4 | 4 | <h4>Campaign</h4> |
|
|
5 | 5 | </div> |
|
|
6 | 6 | <div class="list-group"> |
|
|
7 |
<a href="{% url 'url_campaign' |
|
|
|
7 | <a href="{% url 'url_campaign' campaign.id %}" class="list-group-item active" >{{ campaign.name }}</a> | |
|
|
8 | 8 | </div> |
|
|
9 | 9 | </div> |
|
|
10 | 10 | |
|
|
11 | {% if experiments %} | |
|
|
12 | <div class="panel panel-default"> | |
|
|
13 | <div class="panel-heading"> | |
|
|
14 | <h4>Experiments</h4> | |
|
|
15 | </div> | |
|
|
16 | <div class="list-group"> | |
|
|
17 | {% for item in experiments %} | |
|
|
18 | <a href="{% url 'url_experiment' item.id %}" class="list-group-item {{item.active}}">{{item.name}}</a> | |
|
|
19 | {% endfor %} | |
|
|
20 | </div> | |
|
|
21 | </div> | |
|
|
22 | {% endif %} | |
|
|
23 | {% endif %} | |
|
|
24 | ||
|
|
25 | {% if experiment %} | |
|
|
11 | 26 | <div class="panel panel-default"> |
|
|
12 | 27 | <div class="panel-heading"> |
|
|
13 |
<h4> |
|
|
|
28 | <h4>Campaign</h4> | |
|
|
14 | 29 | </div> |
|
|
15 | 30 | <div class="list-group"> |
|
|
16 |
<a href="{% url 'url_ |
|
|
|
31 | <a href="{% url 'url_campaign' experiment.campaign.id %}" class="list-group-item active" >{{ experiment.campaign.name }}</a> | |
|
|
17 | 32 | </div> |
|
|
18 | 33 | </div> |
|
|
19 | 34 | |
|
|
35 | {% if experiments %} | |
|
|
36 | <div class="panel panel-default"> | |
|
|
37 | <div class="panel-heading"> | |
|
|
38 | <h4>Experiments</h4> | |
|
|
39 | </div> | |
|
|
40 | <div class="list-group"> | |
|
|
41 | {% for item in experiments %} | |
|
|
42 | <a href="{% url 'url_experiment' item.id %}" class="list-group-item {%if item.id == experiment.id%}active{%endif%}">{{item.name}}</a> | |
|
|
43 | {% endfor %} | |
|
|
44 | </div> | |
|
|
45 | </div> | |
|
|
46 | {% endif %} | |
|
|
47 | ||
|
|
20 | 48 | {% if configurations %} |
|
|
21 | 49 | <div class="panel panel-default"> |
|
|
22 | 50 | <div class="panel-heading"> |
| @@ -29,6 +57,7 | |||
|
|
29 | 57 | </div> |
|
|
30 | 58 | </div> |
|
|
31 | 59 | {% endif %} |
|
|
60 | ||
|
|
32 | 61 | {% endif %} |
|
|
33 | 62 | |
|
|
34 | 63 | {% if dev_conf %} |
| @@ -41,22 +70,31 | |||
|
|
41 | 70 | </div> |
|
|
42 | 71 | </div> |
|
|
43 | 72 | |
|
|
44 | <div class="panel panel-default"> | |
|
|
45 |
|
|
|
|
46 | <h4>Experiment</h4> | |
|
|
47 | </div> | |
|
|
48 | <div class="list-group"> | |
|
|
49 | <a href="{% url 'url_experiment' dev_conf.experiment.id %}" class="list-group-item active" >{{ dev_conf.experiment.name }}</a> | |
|
|
50 | </div> | |
|
|
51 | </div> | |
|
|
73 | {% if experiments %} | |
|
|
74 | <div class="panel panel-default"> | |
|
|
75 | <div class="panel-heading"> | |
|
|
76 | <h4>Experiments</h4> | |
|
|
77 | </div> | |
|
|
78 | <div class="list-group"> | |
|
|
79 | {% for item in experiments %} | |
|
|
80 | <a href="{% url 'url_experiment' item.id %}" class="list-group-item {%if item.id == dev_conf.experiment.id%}active{%endif%}">{{item.name}}</a> | |
|
|
81 | {% endfor %} | |
|
|
82 | </div> | |
|
|
83 | </div> | |
|
|
84 | {% endif %} | |
|
|
85 | ||
|
|
86 | {% if configurations %} | |
|
|
87 | <div class="panel panel-default"> | |
|
|
88 | <div class="panel-heading"> | |
|
|
89 | <h4>Device Configurations</h4> | |
|
|
90 | </div> | |
|
|
91 | <div class="list-group"> | |
|
|
92 | {% for item in configurations %} | |
|
|
93 | <a href="/{{item.device__device_type__name}}/{{item.id}}" class="list-group-item {%if item.id == dev_conf.id%}active{%endif%}">{{item.device__name}}</a> | |
|
|
94 | {% endfor %} | |
|
|
95 | </div> | |
|
|
96 | </div> | |
|
|
97 | {% endif %} | |
|
|
52 | 98 | |
|
|
53 | <div class="panel panel-default"> | |
|
|
54 | <div class="panel-heading"> | |
|
|
55 | <h4>Device</h4> | |
|
|
56 | </div> | |
|
|
57 | <div class="list-group"> | |
|
|
58 | <a href="{% url 'url_device' dev_conf.device.id %}" class="list-group-item active" >{{ dev_conf.device.name }}</a> | |
|
|
59 | </div> | |
|
|
60 | </div> | |
|
|
61 | 99 | |
|
|
62 | 100 | {% endif %} |
| @@ -217,23 +217,23 def experiments(request): | |||
|
|
217 | 217 | def experiment(request, id_exp): |
|
|
218 | 218 | |
|
|
219 | 219 | experiment = Experiment.objects.get(pk=id_exp) |
|
|
220 | # campaign = Campaign.objects.get(pk = experiment.campaign.id) | |
|
|
221 | configurations = Configuration.objects.filter(experiment=experiment) | |
|
|
222 | 220 | |
|
|
223 | # form = ExperimentForm(instance=experiment) | |
|
|
221 | experiments = Experiment.objects.filter(campaign=experiment.campaign) | |
|
|
222 | configurations = Configuration.objects.filter(experiment=experiment) | |
|
|
224 | 223 | |
|
|
225 | 224 | kwargs = {} |
|
|
226 | 225 | |
|
|
227 | # kwargs['campaign_keys'] = ['name', 'start_date', 'end_date', 'tags', 'description'] | |
|
|
228 | # kwargs['campaign'] = campaign | |
|
|
226 | exp_keys = ['id', 'campaign', 'name', 'start_time', 'end_time'] | |
|
|
227 | conf_keys = ['id', 'device__name', 'device__device_type__name', 'device__ip_address'] | |
|
|
228 | ||
|
|
229 | 229 | |
|
|
230 | kwargs['experiment_keys'] = ['campaign', 'name', 'start_time', 'end_time'] | |
|
|
230 | kwargs['experiment_keys'] = exp_keys[1:] | |
|
|
231 | 231 | kwargs['experiment'] = experiment |
|
|
232 | 232 | |
|
|
233 | keys = ['id', 'device__name', 'device__device_type__name', 'device__ip_address'] | |
|
|
233 | kwargs['experiments'] = experiments.values(*exp_keys) | |
|
|
234 | 234 | |
|
|
235 | kwargs['configuration_keys'] = keys[1:] | |
|
|
236 | kwargs['configurations'] = configurations.values(*keys) | |
|
|
235 | kwargs['configuration_keys'] = conf_keys[1:] | |
|
|
236 | kwargs['configurations'] = configurations.values(*conf_keys) | |
|
|
237 | 237 | |
|
|
238 | 238 | kwargs['title'] = 'Experiment' |
|
|
239 | 239 | kwargs['suptitle'] = 'Details' |
| @@ -318,6 +318,19 def dev_conf(request, id_conf): | |||
|
|
318 | 318 | |
|
|
319 | 319 | kwargs['button'] = 'Edit Configuration' |
|
|
320 | 320 | |
|
|
321 | ###### SIDEBAR ###### | |
|
|
322 | experiments = Experiment.objects.filter(campaign=conf.experiment.campaign) | |
|
|
323 | configurations = Configuration.objects.filter(experiment=conf.experiment) | |
|
|
324 | ||
|
|
325 | exp_keys = ['id', 'campaign', 'name', 'start_time', 'end_time'] | |
|
|
326 | conf_keys = ['id', 'device__name', 'device__device_type__name', 'device__ip_address'] | |
|
|
327 | ||
|
|
328 | kwargs['experiment_keys'] = exp_keys[1:] | |
|
|
329 | kwargs['experiments'] = experiments.values(*exp_keys) | |
|
|
330 | ||
|
|
331 | kwargs['configuration_keys'] = conf_keys[1:] | |
|
|
332 | kwargs['configurations'] = configurations.values(*conf_keys) | |
|
|
333 | ||
|
|
321 | 334 | return render(request, 'dev_conf.html', kwargs) |
|
|
322 | 335 | |
|
|
323 | 336 | def add_dev_conf(request, id_exp=0): |
General Comments 0
You need to be logged in to leave comments.
Login now