From 5d617c8cd56b2ec39232c73f94c9dfa04d61b4e3 2015-12-31 16:21:37
From: Miguel Urco <miguel.urco@jro.igp.gob.pe>
Date: 2015-12-31 16:21:37
Subject: [PATCH] sidebar_devices updated

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

---

diff --git a/apps/cgs/views.py b/apps/cgs/views.py
index 197e963..a7e1c06 100644
--- a/apps/cgs/views.py
+++ b/apps/cgs/views.py
@@ -27,8 +27,6 @@ def configurate_frequencies(request, id=0):
         'device': device,
         'devices':devices,
         'title': ('YAP'),
-        'experiment': conf.experiment,
-        
     }
     
     data['dev_conf'] = conf
diff --git a/apps/jars/views.py b/apps/jars/views.py
index 4e2a889..3d7daba 100644
--- a/apps/jars/views.py
+++ b/apps/jars/views.py
@@ -22,6 +22,7 @@ def jars_config(request, id):
     kwargs = {
         'form': form,
         'devices':devices,
+        'dev_conf': conf
     }
 
     return render_to_response('jars.html', kwargs, context_instance=RequestContext(request))
diff --git a/apps/main/templates/campaign.html b/apps/main/templates/campaign.html
index 73b98ef..c793044 100644
--- a/apps/main/templates/campaign.html
+++ b/apps/main/templates/campaign.html
@@ -17,29 +17,12 @@
 <tr><th>{{key|title}}</th><td>{{campaign|attr:key}}</td></tr>
 {% endfor %}
 </table>
-<hr>
+<button class="btn btn-primary pull-right" id="bt_edit_campaign">Edit Campaign</button>
+<br></br>
+<br></br>
 
 <div class="panel-group" id="accordion" role="tablist" aria-multiselectable="true">
-  <div class="panel panel-default">
-    <div class="panel-heading" role="tab" id="headingOne">
-      <h4 class="panel-title">
-        <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseOne" aria-expanded="true" aria-controls="collapseOne">
-          Edit Campaign Details
-        </a>
-      </h4>
-    </div>
-    <div id="collapseOne" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingOne">
-      <div class="panel-body">
-        <form class="form" method="post" action="{% url 'url_edit_campaign' campaign.id %}">
-  		{% csrf_token %}
-  		{% bootstrap_form form layout='horizontal' size='medium' %}
-  		<div style="clear: both;"></div>
-		<br>
-		<button type="submit" class="btn btn-primary pull-right" id="bt_update">Update</button>
-		</form>		
-      </div>
-    </div>
-  </div>
+  
   <div class="panel panel-default">
     <div class="panel-heading" role="tab" id="headingTwo">
       <h4 class="panel-title">
@@ -84,13 +67,17 @@
 <script type="text/javascript">
   $('.input-group.date').datetimepicker({"format": "YYYY-MM-DD HH:mm"});
   
-  $("#bt_add").click(function() {
-    document.location = "{% url 'url_add_experiment' campaign.id%}";
-  });
-  
   $(".clickable-row").click(function() {
 	    document.location = $(this).data("href");
 	  });
+
+  $("#bt_edit_campaign").click(function() {
+	    document.location = "{% url 'url_edit_campaign' campaign.id%}";
+	  });
+  
+  $("#bt_add").click(function() {
+    document.location = "{% url 'url_add_experiment' campaign.id%}";
+  });
   
 </script>
 {% endblock %}
\ No newline at end of file
diff --git a/apps/main/templates/devices.html b/apps/main/templates/devices.html
index b4c9f8e..8c96d22 100644
--- a/apps/main/templates/devices.html
+++ b/apps/main/templates/devices.html
@@ -2,9 +2,6 @@
 {% 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 %}
 
@@ -39,8 +36,6 @@
 <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' %}";
diff --git a/apps/main/templates/experiment.html b/apps/main/templates/experiment.html
index 94716c9..d85f595 100644
--- a/apps/main/templates/experiment.html
+++ b/apps/main/templates/experiment.html
@@ -27,7 +27,7 @@
     <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>
diff --git a/apps/main/templates/sidebar_devices.html b/apps/main/templates/sidebar_devices.html
index d72815b..a045a53 100644
--- a/apps/main/templates/sidebar_devices.html
+++ b/apps/main/templates/sidebar_devices.html
@@ -1,23 +1,62 @@
 {% if experiment %}
-<div class="panel panel-default">
-  <div class="panel-heading">
-    <h3>Experiment</h3>
-  </div>
-  <div class="list-group"> 
-  	<a href="{% url 'url_experiment' experiment.id %}" class="list-group-item active" >{{ experiment.name }}</a>
-  </div>
-</div>
+	<div class="panel panel-default">
+	  <div class="panel-heading">
+	    <h4>Campaign</h4>
+	  </div>
+	  <div class="list-group"> 
+	  	<a href="{% url 'url_campaign' experiment.campaign.id %}" class="list-group-item active" >{{ experiment.campaign.name }}</a>
+	  </div>
+	</div>
+	
+	<div class="panel panel-default">
+	  <div class="panel-heading">
+	    <h4>Experiment</h4>
+	  </div>
+	  <div class="list-group"> 
+	  	<a href="{% url 'url_experiment' experiment.id %}" class="list-group-item active" >{{ experiment.name }}</a>
+	  </div>
+	</div>
+	
+	{% if configurations %}
+		<div class="panel panel-default">
+		  <div class="panel-heading">
+		    <h4>Device Configurations</h4>
+		  </div>
+		  <div class="list-group"> 
+		  {% for item in configurations %}
+		    <a href="/{{item.device__device_type__name}}/{{item.id}}" class="list-group-item {{item.active}}">{{item.device__name}}</a>      
+		  {% endfor %}
+		  </div>
+		</div>
+	{% endif %}
 {% endif %}
 
-{% if devices %}
-<div class="panel panel-default">
-  <div class="panel-heading">
-    <h3>Devices</h3>
-  </div>
-  <div class="list-group">
-  {% for item in devices %}
-    <a href="/{{item.device_type__name}}/{{item.configuration__id}}/" class="list-group-item {{item.active}}">{{item.device_type__alias}}</a>      
-  {% endfor %}
-  </div>
-</div>
-{% endif %}
\ No newline at end of file
+{% if dev_conf %}
+	<div class="panel panel-default">
+	  <div class="panel-heading">
+	    <h4>Campaign</h4>
+	  </div>
+	  <div class="list-group"> 
+	  	<a href="{% url 'url_campaign' dev_conf.experiment.campaign.id %}" class="list-group-item active" >{{ dev_conf.experiment.campaign.name }}</a>
+	  </div>
+	</div>
+	
+	<div class="panel panel-default">
+	  <div class="panel-heading">
+	    <h4>Experiment</h4>
+	  </div>
+	  <div class="list-group"> 
+	  	<a href="{% url 'url_experiment' dev_conf.experiment.id %}" class="list-group-item active" >{{ dev_conf.experiment.name }}</a>
+	  </div>
+	</div>
+	
+	<div class="panel panel-default">
+	  <div class="panel-heading">
+	    <h4>Device</h4>
+	  </div>
+	  <div class="list-group"> 
+	  	<a href="{% url 'url_device' dev_conf.device.id %}" class="list-group-item active" >{{ dev_conf.device.name }}</a>
+	  </div>
+	</div>
+	
+{% endif %}
diff --git a/apps/main/views.py b/apps/main/views.py
index 8f6708b..57f99cf 100644
--- a/apps/main/views.py
+++ b/apps/main/views.py
@@ -217,15 +217,15 @@ def experiments(request):
 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'] = campaign
+#     kwargs['campaign_keys'] = ['name', 'start_date', 'end_date', 'tags', 'description']
+#     kwargs['campaign'] = campaign
     
     kwargs['experiment_keys'] = ['campaign', 'name', 'start_time', 'end_time']
     kwargs['experiment'] = experiment
@@ -296,7 +296,7 @@ def dev_confs(request):
     kwargs['configuration_keys'] = keys[1:]
     kwargs['configurations'] = configurations.values(*keys)
     
-    kwargs['title'] = 'Configurations'
+    kwargs['title'] = 'Configuration'
     kwargs['suptitle'] = 'List'
     kwargs['button'] = 'New Configuration'