From 4a363e475ddbe9c3fe65ab6dedd5038f669ebd1b Mon Sep 17 00:00:00 2001 From: "george.robertson1" <50412379+georgeRobertson@users.noreply.github.com> Date: Tue, 31 Mar 2026 14:44:25 +0100 Subject: [PATCH 1/3] refactor: add time to rp end date in summary items --- src/dve/reporting/excel_report.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/dve/reporting/excel_report.py b/src/dve/reporting/excel_report.py index ce7c76a..aa0c7f6 100644 --- a/src/dve/reporting/excel_report.py +++ b/src/dve/reporting/excel_report.py @@ -3,6 +3,7 @@ from collections.abc import Iterable from dataclasses import dataclass, field +from datetime import datetime, timedelta from io import BytesIO from itertools import chain from typing import Any, Optional, Union @@ -136,7 +137,18 @@ def _add_submission_info(self, status: str, summary: Worksheet): summary.append(["", "Status", status]) for key, value in self.summary_dict.items(): +<<<<<<< Updated upstream summary.append(["", key, str(value)]) +======= + if key == "Reporting Period End": + _rp_end_value = datetime.strptime(value, "%Y-%m-%d %H:%M:%S") + value = ( + _rp_end_value + if _rp_end_value.hour != 0 \ + else _rp_end_value + timedelta(hours=23, minutes=59, seconds=59) + ) + summary.append(["", _key_renames.get(key, key), str(value)]) +>>>>>>> Stashed changes summary.append(["", ""]) From 0ee7dd5f4fcbcb99cb4087f037b1c8c5c2cf172c Mon Sep 17 00:00:00 2001 From: "george.robertson1" <50412379+georgeRobertson@users.noreply.github.com> Date: Tue, 31 Mar 2026 14:50:09 +0100 Subject: [PATCH 2/3] fix: issue with stash --- src/dve/reporting/excel_report.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/dve/reporting/excel_report.py b/src/dve/reporting/excel_report.py index aa0c7f6..8109053 100644 --- a/src/dve/reporting/excel_report.py +++ b/src/dve/reporting/excel_report.py @@ -137,9 +137,7 @@ def _add_submission_info(self, status: str, summary: Worksheet): summary.append(["", "Status", status]) for key, value in self.summary_dict.items(): -<<<<<<< Updated upstream summary.append(["", key, str(value)]) -======= if key == "Reporting Period End": _rp_end_value = datetime.strptime(value, "%Y-%m-%d %H:%M:%S") value = ( @@ -148,7 +146,6 @@ def _add_submission_info(self, status: str, summary: Worksheet): else _rp_end_value + timedelta(hours=23, minutes=59, seconds=59) ) summary.append(["", _key_renames.get(key, key), str(value)]) ->>>>>>> Stashed changes summary.append(["", ""]) From 491a2c92335c35c70b1f95e0f2b28f028987fe00 Mon Sep 17 00:00:00 2001 From: "george.robertson1" <50412379+georgeRobertson@users.noreply.github.com> Date: Tue, 31 Mar 2026 14:58:57 +0100 Subject: [PATCH 3/3] fix: rm further lingering changes from other commit --- src/dve/reporting/excel_report.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/dve/reporting/excel_report.py b/src/dve/reporting/excel_report.py index 8109053..e020b00 100644 --- a/src/dve/reporting/excel_report.py +++ b/src/dve/reporting/excel_report.py @@ -137,7 +137,6 @@ def _add_submission_info(self, status: str, summary: Worksheet): summary.append(["", "Status", status]) for key, value in self.summary_dict.items(): - summary.append(["", key, str(value)]) if key == "Reporting Period End": _rp_end_value = datetime.strptime(value, "%Y-%m-%d %H:%M:%S") value = ( @@ -145,7 +144,7 @@ def _add_submission_info(self, status: str, summary: Worksheet): if _rp_end_value.hour != 0 \ else _rp_end_value + timedelta(hours=23, minutes=59, seconds=59) ) - summary.append(["", _key_renames.get(key, key), str(value)]) + summary.append(["", key, str(value)]) summary.append(["", ""])