##// END OF EJS Templates
radarsys
RSS
Task # 487: Operation View: radar_play...
Fiorella Quino -
r92:1505d6a731c0
parent child
Show More
Show file before | Show file after | Hide comments
@@ -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#, RunningExperiment
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,4 +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
10 admin.site.register(RunningExperiment) No newline at end of file
Show file before | Show file after | Hide comments
@@ -133,7 +133,7 class Campaign(models.Model):
133
133
134 class RunningExperiment(models.Model):
134 class RunningExperiment(models.Model):
135 radar = models.OneToOneField('Location', on_delete=models.CASCADE)
135 radar = models.OneToOneField('Location', on_delete=models.CASCADE)
136 running_experiment = models.ManyToManyField('Experiment')
136 running_experiment = models.ManyToManyField('Experiment', blank = True)
137 status = models.PositiveSmallIntegerField(default=0, choices=RADAR_STATES)
137 status = models.PositiveSmallIntegerField(default=0, choices=RADAR_STATES)
138
138
139
139
Show file before | Show file after | Hide comments
@@ -1013,10 +1013,11 def radar_play(request, id_camp, id_radar):
1013 else:
1013 else:
1014 running_experiment = RunningExperiment(
1014 running_experiment = RunningExperiment(
1015 radar = radar,
1015 radar = radar,
1016 running_experiment = exp,
1017 status = 3,
1016 status = 3,
1018 )
1017 )
1019 running_experiment.save()
1018 running_experiment.save()
1019 running_experiment.running_experiment.add(exp)
1020 running_experiment.save()
1020
1021
1021 if answer:
1022 if answer:
1022 messages.success(request, conf.message)
1023 messages.success(request, conf.message)
General Comments 0
You need to be logged in to leave comments. Login now