radarsys Commit - r14:5d617c8cd56b · Jicamarca Repository

sidebar_devices updated...

Miguel Urco -

r14:5d617c8cd56b

parent child

Context file:

r14:5d617c8cd56b

Collapse all files

apps/cgs/views.py 0 -2

                     'device': device,
                     'devices':devices,
                     'title': ('YAP'),
-                    'experiment': conf.experiment,
                 }
                 data['dev_conf'] = conf

apps/jars/views.py +1 0

                 kwargs = {
                     'form': form,
                     'devices':devices,
+                    'dev_conf': conf
                 }
                 return render_to_response('jars.html', kwargs, context_instance=RequestContext(request))

apps/main/templates/campaign.html +12 -25

@@ -17,29 +17,12
17	<tr><th>{{key\|title}}</th><td>{{campaign\|attr:key}}</td></tr>	17	<tr><th>{{key\|title}}</th><td>{{campaign\|attr:key}}</td></tr>
18	{% endfor %}	18	{% endfor %}
19	</table>	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	<div class="panel-group" id="accordion" role="tablist" aria-multiselectable="true">	24	<div class="panel-group" id="accordion" role="tablist" aria-multiselectable="true">
23	<div class="panel panel-default">	25
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>
43	<div class="panel panel-default">	26	<div class="panel panel-default">
44	<div class="panel-heading" role="tab" id="headingTwo">	27	<div class="panel-heading" role="tab" id="headingTwo">
45	<h4 class="panel-title">	28	<h4 class="panel-title">
@@ -84,13 +67,17
84	<script type="text/javascript">	67	<script type="text/javascript">
85	$('.input-group.date').datetimepicker({"format": "YYYY-MM-DD HH:mm"});	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	$(".clickable-row").click(function() {	70	$(".clickable-row").click(function() {
92	document.location = $(this).data("href");	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	</script>	82	</script>
96	{% endblock %} No newline at end of file	83	{% endblock %}

apps/main/templates/devices.html 0 -5

             {% load bootstrap3 %}
             {% load static %}
             {% load main_tags %}
-            {% block extra-head %}
-            <link href="{% static 'css/bootstrap-datetimepicker.min.css' %}" media="screen" rel="stylesheet">
-            {% endblock %}
             {% block dev-active %}active{% endblock %}
             <script src="{% static 'js/moment.min.js' %}"></script>
             <script src="{% static 'js/bootstrap-datetimepicker.min.js' %}"></script>
             <script type="text/javascript">
-              $('.input-group.date').datetimepicker({"format": "YYYY-MM-DD HH:mm"});
-              $('.input-group.time').datetimepicker({"format": "HH:mm"});
               $("#bt_add").click(function() {
                 document.location = "{% url 'url_add_device' %}";

apps/main/templates/experiment.html +1 -1

                 <div class="panel-heading" role="tab" id="headingTwo">
                   <h4 class="panel-title">
                     <a class="collapsed" role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseTwo" aria-expanded="false" aria-controls="collapseThree">
-                      Experiment's Devices
+                      Device Configurations
                     </a>
                   </h4>
                 </div>

apps/main/templates/sidebar_devices.html +59 -20

@@ -1,23 +1,62
1	{% if experiment %}	1	{% if experiment %}
2	<div class="panel panel-default">	2	<div class="panel panel-default">
3	<div class="panel-heading">	3	<div class="panel-heading">
4	<h3>~~Experiment~~</h3>	4	<h4>Campaign</h4>
5	</div>	5	</div>
6	<div class="list-group">	6	<div class="list-group">
7	<a href="{% url 'url_~~experiment~~' experiment.id %}" class="list-group-item active" >{{ experiment.name }}</a>	7	<a href="{% url 'url_campaign' experiment.campaign.id %}" class="list-group-item active" >{{ experiment.campaign.name }}</a>
8	</div>	8	</div>
9	</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	{% endif %}	32	{% endif %}
11		33
12	{% if dev~~ices~~ %}	34	{% if dev_conf %}
13	<div class="panel panel-default">	35	<div class="panel panel-default">
14	<div class="panel-heading">	36	<div class="panel-heading">
15	<h3>Devices</h3>	37	<h4>Campaign</h4>
16	</div>	38	</div>
17	<div class="list-group">	39	<div class="list-group">
18	{% for item in devices %}	40	<a href="{% url 'url_campaign' dev_conf.experiment.campaign.id %}" class="list-group-item active" >{{ dev_conf.experiment.campaign.name }}</a>
19	<a href="/{{item.device_type__name}}/{{item.configuration__id}}/" class="list-group-item {{item.active}}">{{item.device_type__alias}}</a>	41	</div>
20	{% endfor %}	42	</div>
21	</div>	43
22	</div>	44	<div class="panel panel-default">
23	{% endif %} No newline at end of file	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 %}

apps/main/views.py +4 -4

             def experiment(request, id_exp):
                 experiment = Experiment.objects.get(pk=id_exp)
-                campaign = Campaign.objects.get(pk = experiment.campaign.id)
+            #     campaign = Campaign.objects.get(pk = experiment.campaign.id)
                 configurations = Configuration.objects.filter(experiment=experiment)
             #     form = ExperimentForm(instance=experiment)
                 kwargs = {}
-                kwargs['campaign_keys'] = ['name', 'start_date', 'end_date', 'tags', 'description']
+            #     kwargs['campaign_keys'] = ['name', 'start_date', 'end_date', 'tags', 'description']
-                kwargs['campaign'] = campaign
+            #     kwargs['campaign'] = campaign
                 kwargs['experiment_keys'] = ['campaign', 'name', 'start_time', 'end_time']
                 kwargs['experiment'] = experiment
                 kwargs['configuration_keys'] = keys[1:]
                 kwargs['configurations'] = configurations.values(*keys)
-                kwargs['title'] = 'Configurations'
+                kwargs['title'] = 'Configuration'
                 kwargs['suptitle'] = 'List'
                 kwargs['button'] = 'New Configuration'

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