diff --git a/apps/main/models.py b/apps/main/models.py index 1a718ac..ed5deeb 100644 --- a/apps/main/models.py +++ b/apps/main/models.py @@ -15,7 +15,7 @@ CONF_STATES = ( EXP_STATES = ( (0,'Error'), #RED - (1,'Configurated'), #BLUE + (1,'Configured'), #BLUE (2,'Running'), #GREEN (3,'Waiting'), #YELLOW (4,'Not Configured'), #WHITE @@ -109,6 +109,20 @@ class Device(models.Model): def get_status(self): return self.status + @property + def status_color(self): + color = 'muted' + if self.status == 0: + color = "danger" + elif self.status == 1: + color = "warning" + elif self.status == 2: + color = "info" + elif self.status == 3: + color = "success" + + return color + def get_absolute_url(self): return reverse('url_device', args=[str(self.id)]) diff --git a/apps/main/templates/experiment.html b/apps/main/templates/experiment.html index c9ace97..a4048ff 100644 --- a/apps/main/templates/experiment.html +++ b/apps/main/templates/experiment.html @@ -62,7 +62,11 @@ {{ forloop.counter }} {% for key in configuration_keys %} - {{ item|value:key }} + {% if key == 'device__status' %} + {{ item|value:key }} + {% else %} + {{ item|value:key }} + {% endif %} {% endfor %} {% endfor %} diff --git a/apps/main/views.py b/apps/main/views.py index 31f2d94..8c6e1ea 100644 --- a/apps/main/views.py +++ b/apps/main/views.py @@ -495,7 +495,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'] + kwargs['configuration_keys'] = ['name', 'device__device_type', 'device__ip_address', 'device__port_address', 'device__status'] kwargs['configurations'] = configurations kwargs['title'] = 'Experiment'