| @@ -1,9 +1,10 | |||
|
|
1 | 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 | 4 | # Register your models here. |
|
|
5 | 5 | admin.site.register(Campaign) |
|
|
6 | 6 | admin.site.register(Experiment) |
|
|
7 | 7 | admin.site.register(Device) |
|
|
8 | 8 | admin.site.register(DeviceType) |
|
|
9 | admin.site.register(Location) No newline at end of file | |
|
|
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 | 6 | CONF_STATES = ( |
|
|
7 | 7 | (0, 'Disconnected'), |
|
|
8 | 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 | 20 | CONF_TYPES = ( |
| @@ -122,6 +130,11 class Campaign(models.Model): | |||
|
|
122 | 130 | # |
|
|
123 | 131 | # def __unicode__(self): |
|
|
124 | 132 | # return u'%s' % self.location |
|
|
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) | |
|
|
125 | 138 | |
|
|
126 | 139 | |
|
|
127 | 140 | class Experiment(models.Model): |
General Comments 0
You need to be logged in to leave comments.
Login now