Date: 20/06/2016

By: Paul Carensac Version: 0.7.5 Durations are now printed in seconds, and saved in JD Issues (closed): https://projects.irap.omp.eu/issues/3835 Major current version (0.7): https://projects.irap.omp.eu/versions/117

Date: 20/06/2016
By: Paul Carensac Version: 0.7.5 Durations are now printed in seconds, and saved in JD Issues (closed): https://projects.irap.omp.eu/issues/3835 Major current version (0.7): https://projects.irap.omp.eu/versions/117
haribo
1 parent 3dbda6a0
Showing 3 changed files with 25 additions and 17 deletions Show diff stats
README.md
src/routine_manager/RequestSerializer.py
src/routine_manager/forms.py
@@ -60,12 +60,11 @@ PROJECT STRUCTURE:
 --------------------------------------------------------------------------------------------
 CURRENT VERSION
-Date: 17/06/2016
+Date: 20/06/2016
 By: Paul Carensac
-Version: 0.7.4
-Import XML + Changed deprecated reverse by dotting path in templates (links)
-Warning : DB updated
-Issues (closed): https://projects.irap.omp.eu/issues/3811
+Version: 0.7.5
+Durations are now printed in seconds, and saved in JD
+Issues (closed): https://projects.irap.omp.eu/issues/3835
 Major current version (0.7): https://projects.irap.omp.eu/versions/117
 ROADMAP: https://projects.irap.omp.eu/projects/pyros/roadmap
@@ -33,11 +33,13 @@ class RequestSerializer():
                              target_type=req.target_type)
         for seq in req.sequences.all():
             sequence = ET.SubElement(request, "sequence", name=seq.name, target_coords=seq.target_coords,
-                                     jd1=str(seq.jd1), jd2=str(seq.jd2), duration=str(seq.duration))
+                                     jd1=str(seq.jd1), jd2=str(seq.jd2))
+            sequence.set("duration", str(seq.duration * 86400))
             for alb in seq.albums.all():
                 album = ET.SubElement(sequence, "album", name=alb.name, detector=alb.detector.device.name)
                 for plan in alb.plans.all():
-                    ET.SubElement(album, "plan", name=plan.name, filter=plan.filter.device.name, duration=str(plan.duration), nb_images=str(plan.nb_images))
+                    pl = ET.SubElement(album, "plan", name=plan.name, filter=plan.filter.device.name, nb_images=str(plan.nb_images))
+                    pl.set("duration", str(plan.duration * 86400))
         with open(file_name, "w") as file:
             file.write(prettify(request))
@@ -126,7 +128,7 @@ class RequestSerializer():
             elif name == "jd2":
                 seq.jd2 = Decimal(value)
             elif name == "duration":
-                seq.duration = Decimal(value)
+                seq.duration = Decimal(value) / 86400
         # faire des checks ?? j'imagine
         album_list = []
@@ -186,7 +188,7 @@ class RequestSerializer():
             elif name == "name":
                 pl.name = value
             elif name == "duration":
-                pl.duration = Decimal(value)
+                pl.duration = Decimal(value) / 86400
             elif name == "nb_images":
                 pl.nb_images = int(value)
@@ -7,8 +7,6 @@ class RequestForm(forms.ModelForm):
         Form for Request edition
     """
-    time_start = forms.CharField(label="Time start", widget=forms.TextInput)
-
     class Meta:
         model = Request
         fields = ("name", "scientific_program", "target_type")
@@ -20,10 +18,6 @@ class RequestForm(forms.ModelForm):
                 field.widget.attrs['readonly'] = True
             field.widget.attrs['class'] = 'form-control'
             field.required = True
-        self.fields['time_start'].widget.attrs['readonly'] = True
-        self.fields['time_start'].required = False
-
-
 class SequenceForm(forms.ModelForm):
@@ -38,10 +32,11 @@ class SequenceForm(forms.ModelForm):
     )
     start_expo_pref = forms.ChoiceField(label="Start exposure prefered time", choices=START_EXPO_PREF)
+    duration = forms.IntegerField(label="duration")
     class Meta:
         model = Sequence
-        fields = ("name", "target_coords", "jd1", "jd2", "duration")
+        fields = ("name", "target_coords", "jd1", "jd2")
     def __init__(self, *args, readonly=False, **kwargs):
         super(SequenceForm, self).__init__(*args, **kwargs)
@@ -54,6 +49,10 @@ class SequenceForm(forms.ModelForm):
         self.fields['duration'].widget.attrs['readonly'] = True
         self.fields['duration'].required = False
+        seq = kwargs["instance"]
+        if seq.duration:
+            self.fields["duration"].initial = seq.duration * 86400
+
     def save(self):
         seq = super(SequenceForm, self).save()
         if self.cleaned_data["start_expo_pref"] == "IM":
@@ -62,6 +61,7 @@ class SequenceForm(forms.ModelForm):
             seq.t_prefered = -1;  #  TODO : calculer avec le programme de simulation ?
         elif self.cleaned_data["start_expo_pref"] == "MD":
             seq.t_prefered = (seq.jd1 + seq .jd2) / 2;
+        seq.duration = self.cleaned_data["duration"] / 86400
         seq.save()
         return seq
@@ -89,9 +89,11 @@ class PlanForm(forms.ModelForm):
         Form for Plan edition
     """
+    duration = forms.IntegerField(label="duration")
+
     class Meta:
         model = Plan
-        fields = ("name", "filter", "duration", "nb_images")
+        fields = ("name", "filter", "nb_images")
     def __init__(self, *args, readonly=False, **kwargs):
         super(PlanForm, self).__init__(*args, **kwargs)
@@ -101,6 +103,10 @@ class PlanForm(forms.ModelForm):
             field.widget.attrs['class'] = 'form-control'
             field.required = True
+        plan = kwargs["instance"]
+        if plan.duration:
+            self.fields["duration"].initial = plan.duration * 86400
+
     def clean_duration(self):
         '''
             Checks if duration is at least of 1s
@@ -124,6 +130,7 @@ class PlanForm(forms.ModelForm):
     def save(self):
         plan = super(PlanForm, self).save()
         plan.complete = True
+        plan.duration = self.cleaned_data["duration"] / 86400
         plan.save()
         check_album_validity(plan.album)
         return plan