From de6c3c8510d2f1d6e6add8a20dfe291e14d81088 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: Wed, 30 Aug 2023 11:09:47 +0200
Subject: [PATCH] TMSS-2626: rename misleading report element
---
.../src/tmss/tmssapp/adapters/reports.py | 4 +--
SAS/TMSS/backend/test/t_reports.py | 34 +++++++++----------
.../cycle/report.category.observations.js | 14 ++++----
.../src/routes/Report/cycle/report.main.js | 2 +-
4 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/adapters/reports.py b/SAS/TMSS/backend/src/tmss/tmssapp/adapters/reports.py
index c4f4327261d..444a0051f6a 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/adapters/reports.py
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/adapters/reports.py
@@ -128,7 +128,7 @@ class CycleReport():
return result
- def _get_observation_hours_per_category(self) -> {}:
+ def _get_observation_durations_per_category(self) -> {}:
"""
Help method to retrieve observation hours per category info.
"""
@@ -355,7 +355,7 @@ class CycleReport():
'telescope_time_distribution': self._get_telescope_time_distribution(),
'average_efficiency': self._get_average_efficiency(),
'completion_level': self._get_completion_level(),
- 'observation_hours_per_category': self._get_observation_hours_per_category(),
+ 'observation_durations_per_category': self._get_observation_durations_per_category(),
'weekly_efficiency': self._get_weekly_efficiency(),
'data_ingested_per_site_and_category': self._get_data_ingested_per_site_and_category(),
'projects_summary': self._get_projects_summary(),
diff --git a/SAS/TMSS/backend/test/t_reports.py b/SAS/TMSS/backend/test/t_reports.py
index d50d0e3e326..bd324885df1 100755
--- a/SAS/TMSS/backend/test/t_reports.py
+++ b/SAS/TMSS/backend/test/t_reports.py
@@ -423,24 +423,24 @@ class ReportTest(unittest.TestCase):
self.assertEqual(completion_level['succeeded_perc'], 0.66)
self.assertEqual(completion_level['prognosis'], 0.0) # Two 'unschedulable' Subtasks (one in 'regular' and one in 'commissioning')
- # Assert observation_hours_per_category
- observation_hours_per_category = result['observation_hours_per_category']
- self.assertAlmostEqual(observation_hours_per_category['total_duration'], 262980, places=4) # 262980 = 600 'unassigned' + 1200 'regular' + 1200 'commissioning' + 86400*3+600 'test' + 3*60 'filler'
- self.assertAlmostEqual(observation_hours_per_category['total_duration_successful'], 174000, places=4) # 174000 = 600 'regular' + 600 'commissioning' + 86400*2 'test'
- self.assertAlmostEqual(observation_hours_per_category['total_duration_successful_A'], 174000, places=4)
- self.assertAlmostEqual(observation_hours_per_category['total_duration_successful_B'], 0, places=4)
- self.assertAlmostEqual(observation_hours_per_category['total_duration_failed'], 88200, places=4) # 88200 = 600 'regular' + 600 'commissioning' + 86400+600 'test
- self.assertAlmostEqual(observation_hours_per_category['total_duration_idle'], 780, places=4) # 'unassigned'
- self.assertAlmostEqual(observation_hours_per_category['DDT Com Rep'], 1260, places=4) # = 0 + 1200 + 0 + 60 (DDT + Com + Rep + filler)
- self.assertAlmostEqual(observation_hours_per_category['TMSS Com'], 1200, places=4)
- self.assertAlmostEqual(observation_hours_per_category['System Unavailability'], 2100, places=4) # = 300 + 600 + 1200 (maintanance + software rollout + TMSS Com)
+ # Assert observation_durations_per_category
+ observation_durations_per_category = result['observation_durations_per_category']
+ self.assertAlmostEqual(observation_durations_per_category['total_duration'], 262980, places=4) # 262980 = 600 'unassigned' + 1200 'regular' + 1200 'commissioning' + 86400*3+600 'test' + 3*60 'filler'
+ self.assertAlmostEqual(observation_durations_per_category['total_duration_successful'], 174000, places=4) # 174000 = 600 'regular' + 600 'commissioning' + 86400*2 'test'
+ self.assertAlmostEqual(observation_durations_per_category['total_duration_successful_A'], 174000, places=4)
+ self.assertAlmostEqual(observation_durations_per_category['total_duration_successful_B'], 0, places=4)
+ self.assertAlmostEqual(observation_durations_per_category['total_duration_failed'], 88200, places=4) # 88200 = 600 'regular' + 600 'commissioning' + 86400+600 'test
+ self.assertAlmostEqual(observation_durations_per_category['total_duration_idle'], 780, places=4) # 'unassigned'
+ self.assertAlmostEqual(observation_durations_per_category['DDT Com Rep'], 1260, places=4) # = 0 + 1200 + 0 + 60 (DDT + Com + Rep + filler)
+ self.assertAlmostEqual(observation_durations_per_category['TMSS Com'], 1200, places=4)
+ self.assertAlmostEqual(observation_durations_per_category['System Unavailability'], 2100, places=4) # = 300 + 600 + 1200 (maintanance + software rollout + TMSS Com)
# Assert percentages
- self.assertEqual(observation_hours_per_category['successful_perc'], 0.66)
- self.assertEqual(observation_hours_per_category['idle_perc'], 0)
- self.assertEqual(observation_hours_per_category['failed_perc'], 0.34)
- self.assertEqual(observation_hours_per_category['ddt_com_rep_perc'], 0)
- self.assertEqual(observation_hours_per_category['tmss_com_perc'], 0)
- self.assertEqual(observation_hours_per_category['system_unavailability_perc'], 0.01)
+ self.assertEqual(observation_durations_per_category['successful_perc'], 0.66)
+ self.assertEqual(observation_durations_per_category['idle_perc'], 0)
+ self.assertEqual(observation_durations_per_category['failed_perc'], 0.34)
+ self.assertEqual(observation_durations_per_category['ddt_com_rep_perc'], 0)
+ self.assertEqual(observation_durations_per_category['tmss_com_perc'], 0)
+ self.assertEqual(observation_durations_per_category['system_unavailability_perc'], 0.01)
# Assert weekly_efficiency
weekly_efficiency = result['weekly_efficiency']
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Report/cycle/report.category.observations.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Report/cycle/report.category.observations.js
index aabd47cc90b..61f179dd676 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Report/cycle/report.category.observations.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Report/cycle/report.category.observations.js
@@ -101,13 +101,13 @@ class CycleCategoryObservations extends Component{
this.props.data.map(repData => {
let cycleData = {}
cycleData['cycle'] = repData.cycle;
- cycleData['prio_A'] = repData.observation_hours_per_category.total_duration_successful_A;
- cycleData['prio_B'] = repData.observation_hours_per_category.total_duration_successful_B;
- cycleData['ddt_com_rep'] = repData.observation_hours_per_category["DDT Com Rep"];
- cycleData['unavailable'] = repData.observation_hours_per_category["System Unavailability"];
- cycleData['tmss_com'] = repData.observation_hours_per_category["TMSS Com"];
- cycleData['failed'] = repData.observation_hours_per_category.total_duration_failed;
- cycleData['idle'] = repData.observation_hours_per_category.total_duration_idle;
+ cycleData['prio_A'] = repData.observation_durations_per_category.total_duration_successful_A;
+ cycleData['prio_B'] = repData.observation_durations_per_category.total_duration_successful_B;
+ cycleData['ddt_com_rep'] = repData.observation_durations_per_category["DDT Com Rep"];
+ cycleData['unavailable'] = repData.observation_durations_per_category["System Unavailability"];
+ cycleData['tmss_com'] = repData.observation_durations_per_category["TMSS Com"];
+ cycleData['failed'] = repData.observation_durations_per_category.total_duration_failed;
+ cycleData['idle'] = repData.observation_durations_per_category.total_duration_idle;
reportData.push(cycleData);
});
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Report/cycle/report.main.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Report/cycle/report.main.js
index c353904648f..ccf5b3b3d4b 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Report/cycle/report.main.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Report/cycle/report.main.js
@@ -35,7 +35,7 @@ const REPORT_VARIABLE_MAP = {"Intro" : "report_intro",
"TelescopeTime" : "telescope_time_distribution",
"AverageEfficiency": "average_efficiency",
"CompletionLevel": "completion_level",
- "CategoryObservation": "observation_hours_per_category",
+ "CategoryObservation": "observation_durations_per_category",
"WeeklyEfficiency": "weekly_efficiency",
"DataIngestedPerSite": "data_ingested_per_site_and_category",
"DataIngestedPerCategory": "data_ingested_per_site_and_category",
--
GitLab