From 71e2c40f62c69e348517061234554f23b660fe4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn=20K=C3=BCnsem=C3=B6ller?=
<jkuensem@physik.uni-bielefeld.de>
Date: Mon, 29 Jan 2024 12:31:43 +0000
Subject: [PATCH] TMSS-2903: add additonal percentages to failure report
---
SAS/TMSS/backend/src/tmss/tmssapp/adapters/reports.py | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/adapters/reports.py b/SAS/TMSS/backend/src/tmss/tmssapp/adapters/reports.py
index 378717b21ce..9db6732d774 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/adapters/reports.py
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/adapters/reports.py
@@ -673,7 +673,6 @@ class FailureReport():
.annotate(count=Count(f'{field_name}__value'),
duration_lost_event=Sum(Coalesce(F('stop'), datetime.utcnow()) - F('start'))))
-
for d in group_aggregates:
# determine total duration of affected scheduling units
system_events = self.system_events.filter(**{f'{field_name}__value': d[f'{field_name}__value']})
@@ -687,7 +686,17 @@ class FailureReport():
'percent_of_wall_time_lost_event': 100 * d['duration_lost_event'].total_seconds() / wall_time,
'percent_of_wall_time_lost_on_sky': total_on_sky_duration_lost.total_seconds() / wall_time if total_on_sky_duration_lost else 0})
+ total_failure_event_time = sum([d['duration_lost_event'] for d in group_aggregates])
+ total_failure_on_sky_time = sum([d['duration_lost_on_sky'] for d in group_aggregates])
+ total_failure_count = sum(d['count'] for d in group_aggregates)
+
+ for d in group_aggregates:
+ d.update({'percent_of_total_failure_time_lost_event': 100 * d['duration_lost_event'] / total_failure_event_time if total_failure_event_time else 0,
+ 'percent_of_total_failure_time_lost_on_sky': 100 * d['duration_lost_on_sky'] / total_failure_on_sky_time if total_failure_on_sky_time else 0,
+ 'percent_of_total_failure_count': 100 * d['count'] / total_failure_count if total_failure_count else 0})
+
aggregates[f'by_{field_name}'] = group_aggregates
+
return aggregates
def _get_lost_observing_time_histogram(self, ignore_time_range=True) -> {}:
--
GitLab