@@ -1,5 +1,5 | |||||
1 | from django.contrib import admin |
|
1 | from django.contrib import admin | |
2 | from .models import Device, DeviceType, Experiment, Campaign, Location |
|
2 | from .models import Device, DeviceType, Experiment, Campaign, Location#, RunningExperiment | |
3 |
|
3 | |||
4 | # Register your models here. |
|
4 | # Register your models here. | |
5 | admin.site.register(Campaign) |
|
5 | admin.site.register(Campaign) | |
@@ -7,3 +7,4 admin.site.register(Experiment) | |||||
7 | admin.site.register(Device) |
|
7 | admin.site.register(Device) | |
8 | admin.site.register(DeviceType) |
|
8 | admin.site.register(DeviceType) | |
9 | admin.site.register(Location) |
|
9 | admin.site.register(Location) | |
|
10 | #admin.site.register(RunningExperiment) No newline at end of file |
@@ -6,7 +6,15 from django.core.urlresolvers import reverse | |||||
6 | CONF_STATES = ( |
|
6 | CONF_STATES = ( | |
7 | (0, 'Disconnected'), |
|
7 | (0, 'Disconnected'), | |
8 | (1, 'Connected'), |
|
8 | (1, 'Connected'), | |
9 |
( |
|
9 | (2, 'Running'), | |
|
10 | ) | |||
|
11 | ||||
|
12 | EXP_STATES = ( | |||
|
13 | (0,'Error'), #RED | |||
|
14 | (1,'Configurated'), #BLUE | |||
|
15 | (2,'Running'), #GREEN | |||
|
16 | (3,'Waiting'), #YELLOW | |||
|
17 | (4,'Nothing'), #WHITE | |||
10 | ) |
|
18 | ) | |
11 |
|
19 | |||
12 | CONF_TYPES = ( |
|
20 | CONF_TYPES = ( | |
@@ -123,6 +131,11 class Campaign(models.Model): | |||||
123 | # def __unicode__(self): |
|
131 | # def __unicode__(self): | |
124 | # return u'%s' % self.location |
|
132 | # return u'%s' % self.location | |
125 |
|
133 | |||
|
134 | #class RunningExperiment(models.Model): | |||
|
135 | # radar = models.OneToOneField('Location', on_delete=models.CASCADE) | |||
|
136 | # running_experiment = models.OneToOneField('Experiment', on_delete=models.CASCADE) | |||
|
137 | # status = models.PositiveSmallIntegerField(default=0, choices=RADAR_STATES) | |||
|
138 | ||||
126 |
|
139 | |||
127 | class Experiment(models.Model): |
|
140 | class Experiment(models.Model): | |
128 |
|
141 |
General Comments 0
You need to be logged in to leave comments.
Login now