radarsys Commit - r121:3cd1b9c58c02 · Jicamarca Repository

- Improve display name for Devices & Configurations...

Juan C. Espinoza -

r121:3cd1b9c58c02

parent child

Context file:

r121:3cd1b9c58c02

Collapse all files

apps/main/models.py +4 -5

                     db_table = 'db_devices'
                 def __unicode__(self):
-                    return u'%s | %s' % (self.name, self.ip_address)
+                    return u'[{}]: {}'.format(self.device_type.name.upper(),
+                                                self.name)
                 def get_status(self):
                     return self.status
                     self.save()
                 def status_color(self):
-                    color = 'danger'
+                    color = 'muted'
                     if self.status == 0:
                         color = "danger"
                     elif self.status == 1:
                         color = "success"
                     elif self.status == 3:
                         color = "warning"
-                    else:
-                        color = "muted"
                     return color
                 def __unicode__(self):
-                    return u'[%s]: %s' % (self.device.name, self.name)
+                    return u'[{}]: {}'.format(self.device.device_type.name.upper(), self.name)
                 def clone(self, **kwargs):

apps/main/views.py +5 -5

             CONF_FORMS = {
                 'rc': RCConfigurationForm,
-                'rc_mix': RCMixConfigurationForm,
                 'dds': DDSConfigurationForm,
                 'jars': JARSConfigurationForm,
                 'cgs': CGSConfigurationForm,
                 kwargs['experiment_keys'] = ['template', 'radar', 'name', 'start_time', 'end_time']
                 kwargs['experiment'] = experiment
-                kwargs['configuration_keys'] = ['name', 'device__device_type', 'device__ip_address', 'device__port_address', 'device__status']
+                kwargs['configuration_keys'] = ['name', 'device__ip_address', 'device__port_address', 'device__status']
                 kwargs['configurations'] = configurations
                 kwargs['title'] = 'Experiment'
                         device = Device.objects.get(pk=id_dev)
                         DevConfForm = CONF_FORMS[device.device_type.name]
                         initial['name'] = request.GET['name']
                         form = DevConfForm(initial=initial)
                     else:
                         if 'template' in request.GET:
                             if request.GET['template']=='0':
+                                choices = [(conf.pk, '{}'.format(conf)) for conf in Configuration.objects.filter(template=True)]
                                 form = NewForm(initial={'create_from':2},
-                                               template_choices=Configuration.objects.filter(template=True).values_list('id', 'name'))
+                                               template_choices=choices)
                             else:
                                 kwargs['button'] = 'Create'
                                 conf = Configuration.objects.get(pk=request.GET['template'])
                                                             'template': False,
                                                             'experiment':id_exp})
                         elif 'blank' in request.GET:
                             kwargs['button'] = 'Create'
                             form = ConfigurationForm(initial=initial)
                         else:
                             form = NewForm()

apps/rc/models.py +2 -2

                 def __unicode__(self):
                     if self.mix:
-                        return u'[MIXED]: %s' % self.name
+                        return u'[RC MIXED]: {}'.format(self.name)
                     else:
-                        return u'[%s]: %s' % (self.device.name, self.name)
+                        return u'[RC]: {}'.format(self.name)
                 def get_absolute_url_plot(self):
                     return reverse('url_plot_rc_pulses', args=[str(self.id)])

apps/rc/views.py +3 -4

                 if request.method=='POST':
                     form = RCImportForm(request.POST, request.FILES)
                     if form.is_valid():
-                        if True:
+                        try:
-                        #try:
                             conf.update_from_file(request.FILES['file_name'])
                             messages.success(request, 'Configuration "%s" loaded succesfully' % request.FILES['file_name'])
                             return redirect(conf.get_absolute_url_edit())
-                        #except Exception as e:
+                        except Exception as e:
-                        #    messages.error(request, 'Error parsing file: "%s" - %s' % (request.FILES['file_name'], e))
+                            messages.error(request, 'Error parsing file: "%s" - %s' % (request.FILES['file_name'], e))
                 else:
                     messages.warning(request, 'Your current configuration will be replaced')

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