From 3cd1b9c58c0267623854c57d33065d509175d31f 2016-05-04 15:30:25
From: Juan C. Espinoza <juan.espinoza@jro.igp.gob.pe>
Date: 2016-05-04 15:30:25
Subject: [PATCH] - Improve display name for Devices & Configurations

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

---

diff --git a/apps/main/models.py b/apps/main/models.py
index ed5deeb..e1ed73d 100644
--- a/apps/main/models.py
+++ b/apps/main/models.py
@@ -104,7 +104,8 @@ class Device(models.Model):
         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
@@ -303,7 +304,7 @@ class Experiment(models.Model):
         self.save()
         
     def status_color(self):
-        color = 'danger'
+        color = 'muted'
         if self.status == 0:
             color = "danger"
         elif self.status == 1:
@@ -312,8 +313,6 @@ class Experiment(models.Model):
             color = "success"
         elif self.status == 3:
             color = "warning"
-        else:
-            color = "muted"
         
         return color
     
@@ -452,7 +451,7 @@ class Configuration(PolymorphicModel):
     
     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):
         
diff --git a/apps/main/views.py b/apps/main/views.py
index 8c6e1ea..c8a7819 100644
--- a/apps/main/views.py
+++ b/apps/main/views.py
@@ -26,7 +26,6 @@ from apps.dds.models import DDSConfiguration
 
 CONF_FORMS = {
     'rc': RCConfigurationForm,
-    'rc_mix': RCMixConfigurationForm,
     'dds': DDSConfigurationForm,
     'jars': JARSConfigurationForm,
     'cgs': CGSConfigurationForm,
@@ -495,7 +494,7 @@ def experiment(request, id_exp):
     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'
@@ -835,12 +834,13 @@ def dev_conf_new(request, id_exp=0, id_dev=0):
             device = Device.objects.get(pk=id_dev)
             DevConfForm = CONF_FORMS[device.device_type.name]
             initial['name'] = request.GET['name']                                          
-            form = DevConfForm(initial=initial)
+            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'])
@@ -851,7 +851,7 @@ def dev_conf_new(request, id_exp=0, id_dev=0):
                                                 'template': False,
                                                 'experiment':id_exp})                
             elif 'blank' in request.GET:
-                kwargs['button'] = 'Create'             
+                kwargs['button'] = 'Create'                    
                 form = ConfigurationForm(initial=initial)
             else:
                 form = NewForm()                                                               
diff --git a/apps/rc/models.py b/apps/rc/models.py
index a250c1b..9715fd0 100644
--- a/apps/rc/models.py
+++ b/apps/rc/models.py
@@ -78,9 +78,9 @@ class RCConfiguration(Configuration):
     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)])
diff --git a/apps/rc/views.py b/apps/rc/views.py
index 84ba61c..b68b740 100644
--- a/apps/rc/views.py
+++ b/apps/rc/views.py
@@ -328,14 +328,13 @@ def import_file(request, conf_id):
     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:    
-            #    messages.error(request, 'Error parsing file: "%s" - %s' % (request.FILES['file_name'], e))
+            except Exception as e:    
+                messages.error(request, 'Error parsing file: "%s" - %s' % (request.FILES['file_name'], e))
         
     else:
         messages.warning(request, 'Your current configuration will be replaced')