##// END OF EJS Templates
radarsys
RSS
siderbar_devices.html updated...
Miguel Urco -
r17:853d2d2bd93a
parent child
Show More
Show file before | Show file after | Hide comments
@@ -2,6 +2,8 from django.conf.urls import url
2
2
3 urlpatterns = (
3 urlpatterns = (
4 #url(r'^configuration/$', 'apps.cgs.views.configurate_frequencies', name='new_device'),
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
Show file before | Show file after | Hide comments
@@ -2,16 +2,17
2
2
3 from django.shortcuts import redirect, render
3 from django.shortcuts import redirect, render
4
4
5 from apps.main.models import Experiment, Configuration
5 from .models import DDSConfiguration
6 from .models import DDSConfiguration
6 from .forms import DDSConfigurationForm
7 from .forms import DDSConfigurationForm
7 # Create your views here.
8 # Create your views here.
8
9
9 def dds_conf(request, id_conf):
10 def dds_conf(request, id_conf):
10
11
11 dev_conf = DDSConfiguration.objects.get(pk=id_conf)
12 conf = DDSConfiguration.objects.get(pk=id_conf)
12
13
13 kwargs = {}
14 kwargs = {}
14 kwargs['dev_conf'] = dev_conf
15 kwargs['dev_conf'] = conf
15 kwargs['dev_conf_keys'] = ['experiment', 'device',
16 kwargs['dev_conf_keys'] = ['experiment', 'device',
16 'clock', 'multiplier',
17 'clock', 'multiplier',
17 'freq_reg', 'phase_reg',
18 'freq_reg', 'phase_reg',
@@ -24,17 +25,30 def dds_conf(request, id_conf):
24
25
25 kwargs['button'] = 'Edit Configuration'
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 return render(request, 'dds_conf.html', kwargs)
41 return render(request, 'dds_conf.html', kwargs)
28
42
29 def edit_dds_conf(request, id_conf):
43 def edit_dds_conf(request, id_conf):
30
44
31 dev_conf = DDSConfiguration.objects.get(pk=id_conf)
45 conf = DDSConfiguration.objects.get(pk=id_conf)
32
46
33 if request.method=='GET':
47 if request.method=='GET':
34 form = DDSConfigurationForm(instance=dev_conf)
48 form = DDSConfigurationForm(instance=conf)
35
49
36 if request.method=='POST':
50 if request.method=='POST':
37 form = DDSConfigurationForm(request.POST, instance=dev_conf)
51 form = DDSConfigurationForm(request.POST, instance=conf)
38
52
39 if form.is_valid():
53 if form.is_valid():
40 form.save()
54 form.save()
Show file before | Show file after | Hide comments
@@ -1,5 +1,7
1 from django.conf.urls import url
1 from django.conf.urls import url
2
2
3 urlpatterns = (
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 )
Show file before | Show file after | Hide comments
@@ -1,22 +1,50
1 {% if experiment %}
1 {% if campaign %}
2 <div class="panel panel-default">
2 <div class="panel panel-default">
3 <div class="panel-heading">
3 <div class="panel-heading">
4 <h4>Campaign</h4>
4 <h4>Campaign</h4>
5 </div>
5 </div>
6 <div class="list-group">
6 <div class="list-group">
7 <a href="{% url 'url_campaign' experiment.campaign.id %}" class="list-group-item active" >{{ experiment.campaign.name }}</a>
7 <a href="{% url 'url_campaign' campaign.id %}" class="list-group-item active" >{{ campaign.name }}</a>
8 </div>
8 </div>
9 </div>
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 <div class="panel panel-default">
26 <div class="panel panel-default">
12 <div class="panel-heading">
27 <div class="panel-heading">
13 <h4>Experiment</h4>
28 <h4>Campaign</h4>
14 </div>
29 </div>
15 <div class="list-group">
30 <div class="list-group">
16 <a href="{% url 'url_experiment' experiment.id %}" class="list-group-item active" >{{ experiment.name }}</a>
31 <a href="{% url 'url_campaign' experiment.campaign.id %}" class="list-group-item active" >{{ experiment.campaign.name }}</a>
17 </div>
32 </div>
18 </div>
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 {% if configurations %}
48 {% if configurations %}
21 <div class="panel panel-default">
49 <div class="panel panel-default">
22 <div class="panel-heading">
50 <div class="panel-heading">
@@ -29,6 +57,7
29 </div>
57 </div>
30 </div>
58 </div>
31 {% endif %}
59 {% endif %}
60
32 {% endif %}
61 {% endif %}
33
62
34 {% if dev_conf %}
63 {% if dev_conf %}
@@ -41,22 +70,31
41 </div>
70 </div>
42 </div>
71 </div>
43
72
44 <div class="panel panel-default">
73 {% if experiments %}
45 <div class="panel-heading">
74 <div class="panel panel-default">
46 <h4>Experiment</h4>
75 <div class="panel-heading">
47 </div>
76 <h4>Experiments</h4>
48 <div class="list-group">
77 </div>
49 <a href="{% url 'url_experiment' dev_conf.experiment.id %}" class="list-group-item active" >{{ dev_conf.experiment.name }}</a>
78 <div class="list-group">
50 </div>
79 {% for item in experiments %}
51 </div>
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 {% endif %}
100 {% endif %}
Show file before | Show file after | Hide comments
@@ -217,23 +217,23 def experiments(request):
217 def experiment(request, id_exp):
217 def experiment(request, id_exp):
218
218
219 experiment = Experiment.objects.get(pk=id_exp)
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 kwargs = {}
224 kwargs = {}
226
225
227 # kwargs['campaign_keys'] = ['name', 'start_date', 'end_date', 'tags', 'description']
226 exp_keys = ['id', 'campaign', 'name', 'start_time', 'end_time']
228 # kwargs['campaign'] = campaign
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 kwargs['experiment'] = experiment
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:]
235 kwargs['configuration_keys'] = conf_keys[1:]
236 kwargs['configurations'] = configurations.values(*keys)
236 kwargs['configurations'] = configurations.values(*conf_keys)
237
237
238 kwargs['title'] = 'Experiment'
238 kwargs['title'] = 'Experiment'
239 kwargs['suptitle'] = 'Details'
239 kwargs['suptitle'] = 'Details'
@@ -318,6 +318,19 def dev_conf(request, id_conf):
318
318
319 kwargs['button'] = 'Edit Configuration'
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 return render(request, 'dev_conf.html', kwargs)
334 return render(request, 'dev_conf.html', kwargs)
322
335
323 def add_dev_conf(request, id_exp=0):
336 def add_dev_conf(request, id_exp=0):
General Comments 0
You need to be logged in to leave comments. Login now