From 8870947423fe5b72e23e3370d46b2cb6a86cb1a0 Mon Sep 17 00:00:00 2001
From: Jorrit Schaap <schaap@astron.nl>
Date: Mon, 28 Aug 2023 08:23:42 +0200
Subject: [PATCH] TMSS_992: sorted line for easy comparison
---
SAS/TMSS/backend/src/tmss/tmssapp/viewsets/scheduling.py | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/viewsets/scheduling.py b/SAS/TMSS/backend/src/tmss/tmssapp/viewsets/scheduling.py
index beaf5e192d5..6bd5f614cc0 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/viewsets/scheduling.py
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/viewsets/scheduling.py
@@ -189,7 +189,7 @@ class SubtaskViewSet(LOFARViewSet):
subtask = get_object_or_404(models.Subtask, pk=pk)
parset = convert_to_parset(subtask)
- header = "# THIS PARSET WAS GENERATED BY TMSS FROM THE SPECIFICATION OF SUBTASK ID=%d ON %s\n" % (subtask.pk, formatDatetime(datetime.utcnow().replace(microsecond=0)))
+ header = "# THIS PARSET WAS GENERATED BY TMSS FROM THE SPECIFICATION OF SUBTASK ID=%d ON %s\n" % (subtask.pk, formatDatetime(datetime.utcnow()))
parset_str = header + str(parset).replace('"','').replace("'","") # remove quotes
return HttpResponse(parset_str, content_type='text/plain')
@@ -421,9 +421,10 @@ class SubtaskViewSet(LOFARViewSet):
from lofar.sas.tmss.tmss.tmssapp.adapters.feedback import create_feedback_for_observation_subtask_from_specifications
subtask = get_object_or_404(models.Subtask, pk=pk)
feedback_parset = create_feedback_for_observation_subtask_from_specifications(subtask)
-
+ feedback_parset = str(feedback_parset).replace('"', '').replace("'", "")
+ feedback_parset = '\n'.join(sorted(feedback_parset.split('\n')))
header = "# THIS FEEDBACK PARSET WAS GENERATED BY TMSS FROM THE SPECIFICATION OF SUBTASK ID=%d ON %s\n" % (subtask.pk, formatDatetime(datetime.utcnow().replace(microsecond=0)))
- feedback_parset_str = header + str(feedback_parset).replace('"','').replace("'","") # remove quotes
+ feedback_parset_str = header + feedback_parset # remove quotes
return HttpResponse(feedback_parset_str, content_type='text/plain')
--
GitLab