From 8422c9780c6d63b78fd8db1e5f0d74d680c4d664 Mon Sep 17 00:00:00 2001
From: Mario Raciti <mario.raciti@inaf.it>
Date: Thu, 22 Jul 2021 16:27:31 +0200
Subject: [PATCH] TMSS-770: Add target name info for the project reporting
---
SAS/TMSS/backend/src/tmss/tmssapp/adapters/reports.py | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/adapters/reports.py b/SAS/TMSS/backend/src/tmss/tmssapp/adapters/reports.py
index dd03169d75e..e93c4b44454 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/adapters/reports.py
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/adapters/reports.py
@@ -1,6 +1,7 @@
from django.db.models import F, Sum
from lofar.sas.tmss.tmss.tmssapp import models
from lofar.sas.tmss.tmss.tmssapp import serializers
+from lofar.sas.tmss.services.scheduling.constraints.template_constraints_v1 import get_target_observation_task_name_from_requirements_doc
from rest_framework.request import Request
from datetime import timedelta
@@ -343,6 +344,11 @@ def _get_subs_and_durations_from_project(project_pk: int) -> ({}, {}):
sub_observed_duration = sub.observed_duration.total_seconds() if sub.observed_duration else 0
sub_info = {'id': sub.pk, 'name': sub.name, 'status': sub.status, 'start': sub.start_time.isoformat(),
'stop': sub.stop_time.isoformat(), 'duration': sub_duration, 'observed_duration': sub_observed_duration}
+ try:
+ sub_info['target'] = get_target_observation_task_name_from_requirements_doc(sub)
+ except Exception as e:
+ sub_info['target'] = None
+
# Gather durations
durations['total'] += sub_duration # Total
if sub.status != 'cancelled': # Not cancelled SUBs
--
GitLab