From 08de53529b15729d153344a5cc84ec97d255588d 2016-01-05 18:20:20
From: Miguel Urco <miguel.urco@jro.igp.gob.pe>
Date: 2016-01-05 18:20:20
Subject: [PATCH] models are passed as instances to templates (dictionaries are not used anymore)

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

---

diff --git a/apps/main/models.py b/apps/main/models.py
index bf3d3c2..afd71db 100644
--- a/apps/main/models.py
+++ b/apps/main/models.py
@@ -18,7 +18,7 @@ DEV_TYPES = (
     ('', 'Select a device type'),
     ('rc', 'Radar Controller'),
     ('dds', 'Direct Digital Synthesizer'),
-    ('jars', 'Jicamarca Radar System'),
+    ('jars', 'Jicamarca Radar Acquisition System'),
     ('usrp', 'Universal Software Radio Peripheral'),
     ('cgs', 'Clock Generator System'),
     ('abs', 'Automatic Beam Switching'),
@@ -39,7 +39,7 @@ class DeviceType(models.Model):
         db_table = 'db_device_types'
     
     def __unicode__(self):
-        return u'%s' % self.name
+        return u'%s' % self.get_name_display()
     
 class Device(models.Model):
 
@@ -58,7 +58,7 @@ class Device(models.Model):
         db_table = 'db_devices'
         
     def __unicode__(self):
-        return u'[%s]: %s | %s' % (self.device_type.name, self.name, self.ip_address)
+        return u'%s | %s' % (self.name, self.ip_address)
 
 class Campaign(models.Model):
 
@@ -73,7 +73,7 @@ class Campaign(models.Model):
         db_table = 'db_campaigns'
     
     def __unicode__(self):
-        return u'%s: %s - %s' % (self.name, self.start_date.date(), self.end_date.date())
+        return u'%s' % (self.name)
     
 class Experiment(models.Model):
 
@@ -86,16 +86,19 @@ class Experiment(models.Model):
         db_table = 'db_experiments'
     
     def __unicode__(self):
-        return u'[%s]: %s: %s - %s' % (self.campaign.name, self.name, self.start_time, self.end_time)
+        return u'[%s]: %s' % (self.campaign.name, self.name)
     
 class Configuration(PolymorphicModel):
 
     experiment = models.ForeignKey(Experiment)
     device = models.ForeignKey(Device)
     type = models.PositiveSmallIntegerField(default=0, choices=CONF_TYPES)
-    created = models.DateTimeField(auto_now_add=True, blank=True)
     
-#     parameters = models.TextField(default='{}')
+    created_date = models.DateTimeField(auto_now_add=True)
+    programmed_date = models.DateTimeField(auto_now=True)
+    
+    parameters = models.TextField(default='{}')
+    
     class Meta:
         db_table = 'db_configurations'
     
diff --git a/apps/main/templates/campaign.html b/apps/main/templates/campaign.html
index 3c5ef2b..41490ad 100644
--- a/apps/main/templates/campaign.html
+++ b/apps/main/templates/campaign.html
@@ -66,8 +66,7 @@
 
 {% block extra-js%}
 <script type="text/javascript">
-  $('.input-group.date').datetimepicker({"format": "YYYY-MM-DD HH:mm"});
-  
+
   $(".clickable-row").click(function() {
 	    document.location = $(this).data("href");
 	  });
diff --git a/apps/main/templates/dev_confs.html b/apps/main/templates/dev_confs.html
index 08d3c0b..c826134 100644
--- a/apps/main/templates/dev_confs.html
+++ b/apps/main/templates/dev_confs.html
@@ -20,7 +20,7 @@
 	{% endfor%}
   </tr>
   {% for item in configurations %}
-	<tr class="clickable-row" data-href="/{{item.device__device_type__name}}/{{item.id}}/">
+	<tr class="clickable-row" data-href="/{{item.device.device_type.name}}/{{item.id}}/">
 	  <td>{{ forloop.counter }}</td>
 	  {% for key in configuration_keys %}
 	  <td>{{ item|attr:key }}</td>
diff --git a/apps/main/views.py b/apps/main/views.py
index 5c0808f..6fcd316 100644
--- a/apps/main/views.py
+++ b/apps/main/views.py
@@ -45,11 +45,12 @@ def devices(request):
     
     devices = Device.objects.all().order_by('device_type__name')
     
-    keys = ['id', 'device_type__name', 'name', 'ip_address']
+#     keys = ['id', 'device_type__name', 'name', 'ip_address']
+    keys = ['id', 'name', 'ip_address', 'device_type']
     
     kwargs = {}
     kwargs['device_keys'] = keys[1:]
-    kwargs['devices'] = devices.values(*keys)
+    kwargs['devices'] = devices#.values(*keys)
     kwargs['title'] = 'Device'
     kwargs['suptitle'] = 'List'
     kwargs['button'] = 'New Device'
@@ -138,7 +139,7 @@ def campaigns(request):
     
     kwargs = {}
     kwargs['campaign_keys'] = keys[1:]
-    kwargs['campaigns'] = campaigns.values(*keys)
+    kwargs['campaigns'] = campaigns#.values(*keys)
     kwargs['title'] = 'Campaign'
     kwargs['suptitle'] = 'List'
     kwargs['button'] = 'New Campaign'
@@ -229,14 +230,14 @@ def campaign_delete(request, id_camp):
 
 def experiments(request):
     
-    campaigns = Experiment.objects.all().order_by('start_time')
+    experiment_list = Experiment.objects.all().order_by('campaign')
     
-    keys = ['id', 'campaign__name', 'name', 'start_time', 'end_time']
+    keys = ['id', 'name', 'start_time', 'end_time', 'campaign']
     
     kwargs = {}
     
     kwargs['experiment_keys'] = keys[1:]
-    kwargs['experiments'] = campaigns.values(*keys)
+    kwargs['experiments'] = experiment_list#.values(*keys)
     
     kwargs['title'] = 'Experiment'
     kwargs['suptitle'] = 'List'
@@ -333,14 +334,16 @@ def experiment_delete(request, id_exp):
 
 def dev_confs(request):
     
-    configurations = Configuration.objects.all().order_by('device__device_type')
+    configurations = Configuration.objects.all().order_by('experiment')
     
-    keys = ['id', 'device__device_type__name', 'device__name', 'experiment__campaign__name', 'experiment__name']
+#     keys = ['id', 'device__device_type__name', 'device__name', 'experiment__campaign__name', 'experiment__name']
     
+    keys = ['id', 'device', 'experiment']
+
     kwargs = {}
     
     kwargs['configuration_keys'] = keys[1:]
-    kwargs['configurations'] = configurations.values(*keys)
+    kwargs['configurations'] = configurations#.values(*keys)
     
     kwargs['title'] = 'Configuration'
     kwargs['suptitle'] = 'List'