diff --git a/src/components/ConsumptionVisualizer/DataloadConsumptionVisualizer.tsx b/src/components/ConsumptionVisualizer/DataloadConsumptionVisualizer.tsx index 4b896430a01879f122450f08bcedef3d2c0bffef..6ef84a788ca6c43d757ee0e325c5ce7055c56ab8 100644 --- a/src/components/ConsumptionVisualizer/DataloadConsumptionVisualizer.tsx +++ b/src/components/ConsumptionVisualizer/DataloadConsumptionVisualizer.tsx @@ -43,7 +43,7 @@ const DataloadConsumptionVisualizer = ({ const [openEstimationModal, setOpenEstimationModal] = useState<boolean>(false) const converterService = new ConverterService() const dateChartService = new DateChartService() - const { currentDatachart, currentDatachartIndex } = useSelector( + const { currentDatachart } = useSelector( (state: AppStore) => state.ecolyo.chart ) @@ -56,12 +56,10 @@ const DataloadConsumptionVisualizer = ({ }, [client] ) - const toggleEstimationModal = useCallback(() => { setOpenEstimationModal(prev => !prev) }, []) - console.log('currentDatachart', currentDatachart) return ( <div className="dataloadvisualizer-root"> {!loading && dataload && dataload.value > -1 ? ( diff --git a/src/constants/config.json b/src/constants/config.json index cd05ed80b6662101ac18062cf75b81e18f570c3a..c99457ffe3edd331e608d0d2257966f3956c28e7 100644 --- a/src/constants/config.json +++ b/src/constants/config.json @@ -30,7 +30,7 @@ "fluidTypeId": 2, "name": "grdf", "coefficient": 0.0793, - "dataDelayOffset": 2, + "dataDelayOffset": 3, "konnectorConfig": { "name": "GRDF", "oauth": true, diff --git a/src/services/dateChart.service.spec.ts b/src/services/dateChart.service.spec.ts index 4c9f7c9155008021beb66f82928c59572055dec0..f0383d29bb20fd25f0973249e0b7eec343e986d0 100644 --- a/src/services/dateChart.service.spec.ts +++ b/src/services/dateChart.service.spec.ts @@ -1335,9 +1335,9 @@ describe('dateChart service', () => { expect(result).toBe(true) }) - it('should return false for gaz fluidType and dataLoad with date >= today-2', () => { + it('should return false for gaz fluidType and dataLoad with date >= today-3', () => { const dataLoad: Dataload = { - date: today.plus({ day: -2 }), + date: today.plus({ day: -3 }), value: 0, valueDetail: null, } diff --git a/src/services/dateChart.service.ts b/src/services/dateChart.service.ts index 38a7c3492ddd1764f01405e9ad911e5f4db24458..dcb6781263f4eb17744e5e2464d902fca983bbab 100644 --- a/src/services/dateChart.service.ts +++ b/src/services/dateChart.service.ts @@ -297,6 +297,9 @@ export default class DateChartService { } public isDataToCome(dataload: Dataload, fluidType: FluidType) { + const configService = new ConfigService() + const fluidConfig = configService.getFluidConfig() + const inter = dataload && Interval.fromDateTimes( @@ -305,13 +308,22 @@ export default class DateChartService { keepLocalTime: true, }) ).count('days') - if (fluidType === FluidType.ELECTRICITY && inter < 2) { + if ( + fluidType === FluidType.ELECTRICITY && + inter < fluidConfig[0].dataDelayOffset + 1 + ) { return true } - if (fluidType === FluidType.WATER && inter < 4) { + if ( + fluidType === FluidType.WATER && + inter < fluidConfig[1].dataDelayOffset + 1 + ) { return true } - if (fluidType === FluidType.GAS && inter < 3) { + if ( + fluidType === FluidType.GAS && + inter < fluidConfig[2].dataDelayOffset + 1 + ) { return true } else { return false @@ -335,8 +347,6 @@ export default class DateChartService { }) const inter = Interval.fromDateTimes(date, today).count('days') const limitDate = fluidConfig[fluidType].dataDelayOffset + 1 - console.log('inter', inter) - console.log('limitDate', limitDate) if (inter > limitDate) { return inter - limitDate } else return null diff --git a/src/services/timePeriod.service.spec.ts b/src/services/timePeriod.service.spec.ts index 431e8008aab13a811b742fa44c699394f00c28b3..87ce15dafcd6a63b5c219ee03cdc98f18380c1f7 100644 --- a/src/services/timePeriod.service.spec.ts +++ b/src/services/timePeriod.service.spec.ts @@ -119,7 +119,7 @@ describe('timePeriod service', () => { fluidTypes = [2] result = timePeriodService.calculateFluidTypesOffset(fluidTypes) - expect(result).toBe(2) + expect(result).toBe(3) }) }) describe('applyOffsetToDate method', () => {