From 59ce4e6a16bb5a347e985f53da5307796dab38eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marl=C3=A8ne=20SIMONDANT?= <msimondant@grandlyon.com>
Date: Mon, 26 Sep 2022 13:39:33 +0000
Subject: [PATCH] fix(export-data) : bypass TimePeriodLength validation to be
able to export more than 12 months of data
---
src/components/Export/exportLoadingModal.tsx | 3 ++-
src/services/consumption.service.ts | 7 +++++--
src/services/consumptionValidator.service.ts | 6 ++++--
3 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/src/components/Export/exportLoadingModal.tsx b/src/components/Export/exportLoadingModal.tsx
index 5c0d71217..79379ca7a 100644
--- a/src/components/Export/exportLoadingModal.tsx
+++ b/src/components/Export/exportLoadingModal.tsx
@@ -76,7 +76,8 @@ const ExportLoadingModal: React.FC<ExportLoadingModalProps> = ({
[fluidType],
undefined,
undefined,
- false
+ false,
+ true
)
if (dataLoad && dataLoad.actualData) {
const exportDataFluid: any = {}
diff --git a/src/services/consumption.service.ts b/src/services/consumption.service.ts
index a3e19edf3..d43d3533e 100644
--- a/src/services/consumption.service.ts
+++ b/src/services/consumption.service.ts
@@ -46,6 +46,7 @@ export default class ConsumptionDataManager {
* @param fluidStatus FluidStatus[]
* @param compareTimePeriod - Optional TimePeriod
* @param isHome - Optional boolean
+ * @param isExport - Optional boolean
* @returns DataChart | null
*/
public async getGraphData(
@@ -54,14 +55,16 @@ export default class ConsumptionDataManager {
fluidTypes: FluidType[],
fluidStatus?: FluidStatus[],
compareTimePeriod?: TimePeriod,
- isHome?: boolean
+ isHome?: boolean,
+ isExport?: boolean
): Promise<Datachart | null> {
const InputisValid: boolean =
this._consumptionValidatorService.ValidateGetGraphData(
timePeriod,
timeStep,
fluidTypes,
- compareTimePeriod
+ compareTimePeriod,
+ isExport
)
if (!InputisValid) return null
if (fluidTypes.length === 1 && !isHome) {
diff --git a/src/services/consumptionValidator.service.ts b/src/services/consumptionValidator.service.ts
index 675baa4f1..6da879afd 100644
--- a/src/services/consumptionValidator.service.ts
+++ b/src/services/consumptionValidator.service.ts
@@ -8,7 +8,8 @@ export default class ConsumptionValidatorService {
timePeriod: TimePeriod,
timeStep: TimeStep,
fluidTypes: FluidType[],
- compareTimePeriod?: TimePeriod
+ compareTimePeriod?: TimePeriod,
+ isExport?: Boolean
): boolean {
if (fluidTypes.length === 0) return false
if (!this.ValidateTimePeriod(timePeriod)) return false
@@ -21,7 +22,8 @@ export default class ConsumptionValidatorService {
return false
}
- if (!this.ValidateTimePeriodLength(timePeriod, timeStep)) return false
+ if (!isExport && !this.ValidateTimePeriodLength(timePeriod, timeStep))
+ return false
if (compareTimePeriod) {
if (!this.ValidateTimePeriod(compareTimePeriod)) return false
--
GitLab