##// END OF EJS Templates
radarsys
RSS
sidebar_devices updated...
Miguel Urco -
r14:5d617c8cd56b
parent child
Show More
Show file before | Show file after | Hide comments
@@ -27,8 +27,6 def configurate_frequencies(request, id=0):
27 27 'device': device,
28 28 'devices':devices,
29 29 'title': ('YAP'),
30 'experiment': conf.experiment,
31
32 30 }
33 31
34 32 data['dev_conf'] = conf
Show file before | Show file after | Hide comments
@@ -22,6 +22,7 def jars_config(request, id):
22 22 kwargs = {
23 23 'form': form,
24 24 'devices':devices,
25 'dev_conf': conf
25 26 }
26 27
27 28 return render_to_response('jars.html', kwargs, context_instance=RequestContext(request))
Show file before | Show file after | Hide comments
@@ -17,29 +17,12
17 17 <tr><th>{{key|title}}</th><td>{{campaign|attr:key}}</td></tr>
18 18 {% endfor %}
19 19 </table>
20 <hr>
20 <button class="btn btn-primary pull-right" id="bt_edit_campaign">Edit Campaign</button>
21 <br></br>
22 <br></br>
21 23
22 24 <div class="panel-group" id="accordion" role="tablist" aria-multiselectable="true">
23 <div class="panel panel-default">
24 <div class="panel-heading" role="tab" id="headingOne">
25 <h4 class="panel-title">
26 <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseOne" aria-expanded="true" aria-controls="collapseOne">
27 Edit Campaign Details
28 </a>
29 </h4>
30 </div>
31 <div id="collapseOne" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingOne">
32 <div class="panel-body">
33 <form class="form" method="post" action="{% url 'url_edit_campaign' campaign.id %}">
34 {% csrf_token %}
35 {% bootstrap_form form layout='horizontal' size='medium' %}
36 <div style="clear: both;"></div>
37 <br>
38 <button type="submit" class="btn btn-primary pull-right" id="bt_update">Update</button>
39 </form>
40 </div>
41 </div>
42 </div>
25
43 26 <div class="panel panel-default">
44 27 <div class="panel-heading" role="tab" id="headingTwo">
45 28 <h4 class="panel-title">
@@ -84,13 +67,17
84 67 <script type="text/javascript">
85 68 $('.input-group.date').datetimepicker({"format": "YYYY-MM-DD HH:mm"});
86 69
87 $("#bt_add").click(function() {
88 document.location = "{% url 'url_add_experiment' campaign.id%}";
89 });
90
91 70 $(".clickable-row").click(function() {
92 71 document.location = $(this).data("href");
93 72 });
73
74 $("#bt_edit_campaign").click(function() {
75 document.location = "{% url 'url_edit_campaign' campaign.id%}";
76 });
77
78 $("#bt_add").click(function() {
79 document.location = "{% url 'url_add_experiment' campaign.id%}";
80 });
94 81
95 82 </script>
96 83 {% endblock %} No newline at end of file
Show file before | Show file after | Hide comments
@@ -2,9 +2,6
2 2 {% load bootstrap3 %}
3 3 {% load static %}
4 4 {% load main_tags %}
5 {% block extra-head %}
6 <link href="{% static 'css/bootstrap-datetimepicker.min.css' %}" media="screen" rel="stylesheet">
7 {% endblock %}
8 5
9 6 {% block dev-active %}active{% endblock %}
10 7
@@ -39,8 +36,6
39 36 <script src="{% static 'js/moment.min.js' %}"></script>
40 37 <script src="{% static 'js/bootstrap-datetimepicker.min.js' %}"></script>
41 38 <script type="text/javascript">
42 $('.input-group.date').datetimepicker({"format": "YYYY-MM-DD HH:mm"});
43 $('.input-group.time').datetimepicker({"format": "HH:mm"});
44 39
45 40 $("#bt_add").click(function() {
46 41 document.location = "{% url 'url_add_device' %}";
Show file before | Show file after | Hide comments
@@ -27,7 +27,7
27 27 <div class="panel-heading" role="tab" id="headingTwo">
28 28 <h4 class="panel-title">
29 29 <a class="collapsed" role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseTwo" aria-expanded="false" aria-controls="collapseThree">
30 Experiment's Devices
30 Device Configurations
31 31 </a>
32 32 </h4>
33 33 </div>
Show file before | Show file after | Hide comments
@@ -1,23 +1,62
1 1 {% if experiment %}
2 <div class="panel panel-default">
3 <div class="panel-heading">
4 <h3>Experiment</h3>
5 </div>
6 <div class="list-group">
7 <a href="{% url 'url_experiment' experiment.id %}" class="list-group-item active" >{{ experiment.name }}</a>
8 </div>
9 </div>
2 <div class="panel panel-default">
3 <div class="panel-heading">
4 <h4>Campaign</h4>
5 </div>
6 <div class="list-group">
7 <a href="{% url 'url_campaign' experiment.campaign.id %}" class="list-group-item active" >{{ experiment.campaign.name }}</a>
8 </div>
9 </div>
10
11 <div class="panel panel-default">
12 <div class="panel-heading">
13 <h4>Experiment</h4>
14 </div>
15 <div class="list-group">
16 <a href="{% url 'url_experiment' experiment.id %}" class="list-group-item active" >{{ experiment.name }}</a>
17 </div>
18 </div>
19
20 {% if configurations %}
21 <div class="panel panel-default">
22 <div class="panel-heading">
23 <h4>Device Configurations</h4>
24 </div>
25 <div class="list-group">
26 {% for item in configurations %}
27 <a href="/{{item.device__device_type__name}}/{{item.id}}" class="list-group-item {{item.active}}">{{item.device__name}}</a>
28 {% endfor %}
29 </div>
30 </div>
31 {% endif %}
10 32 {% endif %}
11 33
12 {% if devices %}
13 <div class="panel panel-default">
14 <div class="panel-heading">
15 <h3>Devices</h3>
16 </div>
17 <div class="list-group">
18 {% for item in devices %}
19 <a href="/{{item.device_type__name}}/{{item.configuration__id}}/" class="list-group-item {{item.active}}">{{item.device_type__alias}}</a>
20 {% endfor %}
21 </div>
22 </div>
23 {% endif %} No newline at end of file
34 {% if dev_conf %}
35 <div class="panel panel-default">
36 <div class="panel-heading">
37 <h4>Campaign</h4>
38 </div>
39 <div class="list-group">
40 <a href="{% url 'url_campaign' dev_conf.experiment.campaign.id %}" class="list-group-item active" >{{ dev_conf.experiment.campaign.name }}</a>
41 </div>
42 </div>
43
44 <div class="panel panel-default">
45 <div class="panel-heading">
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>
52
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
62 {% endif %}
Show file before | Show file after | Hide comments
@@ -217,15 +217,15 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)
220 # campaign = Campaign.objects.get(pk = experiment.campaign.id)
221 221 configurations = Configuration.objects.filter(experiment=experiment)
222 222
223 223 # form = ExperimentForm(instance=experiment)
224 224
225 225 kwargs = {}
226 226
227 kwargs['campaign_keys'] = ['name', 'start_date', 'end_date', 'tags', 'description']
228 kwargs['campaign'] = campaign
227 # kwargs['campaign_keys'] = ['name', 'start_date', 'end_date', 'tags', 'description']
228 # kwargs['campaign'] = campaign
229 229
230 230 kwargs['experiment_keys'] = ['campaign', 'name', 'start_time', 'end_time']
231 231 kwargs['experiment'] = experiment
@@ -296,7 +296,7 def dev_confs(request):
296 296 kwargs['configuration_keys'] = keys[1:]
297 297 kwargs['configurations'] = configurations.values(*keys)
298 298
299 kwargs['title'] = 'Configurations'
299 kwargs['title'] = 'Configuration'
300 300 kwargs['suptitle'] = 'List'
301 301 kwargs['button'] = 'New Configuration'
302 302
General Comments 0
You need to be logged in to leave comments. Login now