##// END OF EJS Templates
radarsys
RSS
models are passed as instances to templates (dictionaries are not used anymore)...
Miguel Urco -
r22:08de53529b15
parent child
Show More
Show file before | Show file after | Hide comments
@@ -18,7 +18,7 DEV_TYPES = (
18 18 ('', 'Select a device type'),
19 19 ('rc', 'Radar Controller'),
20 20 ('dds', 'Direct Digital Synthesizer'),
21 ('jars', 'Jicamarca Radar System'),
21 ('jars', 'Jicamarca Radar Acquisition System'),
22 22 ('usrp', 'Universal Software Radio Peripheral'),
23 23 ('cgs', 'Clock Generator System'),
24 24 ('abs', 'Automatic Beam Switching'),
@@ -39,7 +39,7 class DeviceType(models.Model):
39 39 db_table = 'db_device_types'
40 40
41 41 def __unicode__(self):
42 return u'%s' % self.name
42 return u'%s' % self.get_name_display()
43 43
44 44 class Device(models.Model):
45 45
@@ -58,7 +58,7 class Device(models.Model):
58 58 db_table = 'db_devices'
59 59
60 60 def __unicode__(self):
61 return u'[%s]: %s | %s' % (self.device_type.name, self.name, self.ip_address)
61 return u'%s | %s' % (self.name, self.ip_address)
62 62
63 63 class Campaign(models.Model):
64 64
@@ -73,7 +73,7 class Campaign(models.Model):
73 73 db_table = 'db_campaigns'
74 74
75 75 def __unicode__(self):
76 return u'%s: %s - %s' % (self.name, self.start_date.date(), self.end_date.date())
76 return u'%s' % (self.name)
77 77
78 78 class Experiment(models.Model):
79 79
@@ -86,16 +86,19 class Experiment(models.Model):
86 86 db_table = 'db_experiments'
87 87
88 88 def __unicode__(self):
89 return u'[%s]: %s: %s - %s' % (self.campaign.name, self.name, self.start_time, self.end_time)
89 return u'[%s]: %s' % (self.campaign.name, self.name)
90 90
91 91 class Configuration(PolymorphicModel):
92 92
93 93 experiment = models.ForeignKey(Experiment)
94 94 device = models.ForeignKey(Device)
95 95 type = models.PositiveSmallIntegerField(default=0, choices=CONF_TYPES)
96 created = models.DateTimeField(auto_now_add=True, blank=True)
97 96
98 # parameters = models.TextField(default='{}')
97 created_date = models.DateTimeField(auto_now_add=True)
98 programmed_date = models.DateTimeField(auto_now=True)
99
100 parameters = models.TextField(default='{}')
101
99 102 class Meta:
100 103 db_table = 'db_configurations'
101 104
Show file before | Show file after | Hide comments
@@ -66,8 +66,7
66 66
67 67 {% block extra-js%}
68 68 <script type="text/javascript">
69 $('.input-group.date').datetimepicker({"format": "YYYY-MM-DD HH:mm"});
70
69
71 70 $(".clickable-row").click(function() {
72 71 document.location = $(this).data("href");
73 72 });
Show file before | Show file after | Hide comments
@@ -20,7 +20,7
20 20 {% endfor%}
21 21 </tr>
22 22 {% for item in configurations %}
23 <tr class="clickable-row" data-href="/{{item.device__device_type__name}}/{{item.id}}/">
23 <tr class="clickable-row" data-href="/{{item.device.device_type.name}}/{{item.id}}/">
24 24 <td>{{ forloop.counter }}</td>
25 25 {% for key in configuration_keys %}
26 26 <td>{{ item|attr:key }}</td>
Show file before | Show file after | Hide comments
@@ -45,11 +45,12 def devices(request):
45 45
46 46 devices = Device.objects.all().order_by('device_type__name')
47 47
48 keys = ['id', 'device_type__name', 'name', 'ip_address']
48 # keys = ['id', 'device_type__name', 'name', 'ip_address']
49 keys = ['id', 'name', 'ip_address', 'device_type']
49 50
50 51 kwargs = {}
51 52 kwargs['device_keys'] = keys[1:]
52 kwargs['devices'] = devices.values(*keys)
53 kwargs['devices'] = devices#.values(*keys)
53 54 kwargs['title'] = 'Device'
54 55 kwargs['suptitle'] = 'List'
55 56 kwargs['button'] = 'New Device'
@@ -138,7 +139,7 def campaigns(request):
138 139
139 140 kwargs = {}
140 141 kwargs['campaign_keys'] = keys[1:]
141 kwargs['campaigns'] = campaigns.values(*keys)
142 kwargs['campaigns'] = campaigns#.values(*keys)
142 143 kwargs['title'] = 'Campaign'
143 144 kwargs['suptitle'] = 'List'
144 145 kwargs['button'] = 'New Campaign'
@@ -229,14 +230,14 def campaign_delete(request, id_camp):
229 230
230 231 def experiments(request):
231 232
232 campaigns = Experiment.objects.all().order_by('start_time')
233 experiment_list = Experiment.objects.all().order_by('campaign')
233 234
234 keys = ['id', 'campaign__name', 'name', 'start_time', 'end_time']
235 keys = ['id', 'name', 'start_time', 'end_time', 'campaign']
235 236
236 237 kwargs = {}
237 238
238 239 kwargs['experiment_keys'] = keys[1:]
239 kwargs['experiments'] = campaigns.values(*keys)
240 kwargs['experiments'] = experiment_list#.values(*keys)
240 241
241 242 kwargs['title'] = 'Experiment'
242 243 kwargs['suptitle'] = 'List'
@@ -333,14 +334,16 def experiment_delete(request, id_exp):
333 334
334 335 def dev_confs(request):
335 336
336 configurations = Configuration.objects.all().order_by('device__device_type')
337 configurations = Configuration.objects.all().order_by('experiment')
337 338
338 keys = ['id', 'device__device_type__name', 'device__name', 'experiment__campaign__name', 'experiment__name']
339 # keys = ['id', 'device__device_type__name', 'device__name', 'experiment__campaign__name', 'experiment__name']
339 340
341 keys = ['id', 'device', 'experiment']
342
340 343 kwargs = {}
341 344
342 345 kwargs['configuration_keys'] = keys[1:]
343 kwargs['configurations'] = configurations.values(*keys)
346 kwargs['configurations'] = configurations#.values(*keys)
344 347
345 348 kwargs['title'] = 'Configuration'
346 349 kwargs['suptitle'] = 'List'
General Comments 0
You need to be logged in to leave comments. Login now