diff --git a/apps/main/admin.py b/apps/main/admin.py index 28e3f16..a4b2ee9 100644 --- a/apps/main/admin.py +++ b/apps/main/admin.py @@ -1,9 +1,10 @@ from django.contrib import admin -from .models import Device, DeviceType, Experiment, Campaign, Location +from .models import Device, DeviceType, Experiment, Campaign, Location#, RunningExperiment # Register your models here. admin.site.register(Campaign) admin.site.register(Experiment) admin.site.register(Device) admin.site.register(DeviceType) -admin.site.register(Location) \ No newline at end of file +admin.site.register(Location) +#admin.site.register(RunningExperiment) \ No newline at end of file diff --git a/apps/main/models.py b/apps/main/models.py index eb6bd0d..de79a0e 100644 --- a/apps/main/models.py +++ b/apps/main/models.py @@ -6,7 +6,15 @@ from django.core.urlresolvers import reverse CONF_STATES = ( (0, 'Disconnected'), (1, 'Connected'), - (1, 'Running'), + (2, 'Running'), + ) + +EXP_STATES = ( + (0,'Error'), #RED + (1,'Configurated'), #BLUE + (2,'Running'), #GREEN + (3,'Waiting'), #YELLOW + (4,'Nothing'), #WHITE ) CONF_TYPES = ( @@ -122,6 +130,11 @@ class Campaign(models.Model): # # def __unicode__(self): # return u'%s' % self.location + +#class RunningExperiment(models.Model): +# radar = models.OneToOneField('Location', on_delete=models.CASCADE) +# running_experiment = models.OneToOneField('Experiment', on_delete=models.CASCADE) +# status = models.PositiveSmallIntegerField(default=0, choices=RADAR_STATES) class Experiment(models.Model):