diff --git a/apps/main/admin.py b/apps/main/admin.py index a4b2ee9..6d41690 100644 --- a/apps/main/admin.py +++ b/apps/main/admin.py @@ -1,5 +1,5 @@ from django.contrib import admin -from .models import Device, DeviceType, Experiment, Campaign, Location#, RunningExperiment +from .models import Device, DeviceType, Experiment, Campaign, Location, RunningExperiment # Register your models here. admin.site.register(Campaign) @@ -7,4 +7,4 @@ admin.site.register(Experiment) admin.site.register(Device) admin.site.register(DeviceType) admin.site.register(Location) -#admin.site.register(RunningExperiment) \ No newline at end of file +admin.site.register(RunningExperiment) \ No newline at end of file diff --git a/apps/main/models.py b/apps/main/models.py index 2baddb3..eaaf822 100644 --- a/apps/main/models.py +++ b/apps/main/models.py @@ -133,7 +133,7 @@ class Campaign(models.Model): class RunningExperiment(models.Model): radar = models.OneToOneField('Location', on_delete=models.CASCADE) - running_experiment = models.ManyToManyField('Experiment') + running_experiment = models.ManyToManyField('Experiment', blank = True) status = models.PositiveSmallIntegerField(default=0, choices=RADAR_STATES) diff --git a/apps/main/views.py b/apps/main/views.py index 36e2311..e499ad3 100644 --- a/apps/main/views.py +++ b/apps/main/views.py @@ -1013,10 +1013,11 @@ def radar_play(request, id_camp, id_radar): else: running_experiment = RunningExperiment( radar = radar, - running_experiment = exp, status = 3, ) running_experiment.save() + running_experiment.running_experiment.add(exp) + running_experiment.save() if answer: messages.success(request, conf.message)