From 1ba0c493f0295f1053710fdbca812357ae6ef761 Mon Sep 17 00:00:00 2001
From: hnouts <hnouts@grandlyon.com>
Date: Tue, 6 Dec 2022 15:27:43 +0100
Subject: [PATCH] fixed
---
src/components/DateNavigator/DateNavigatorFormat.tsx | 8 ++++----
src/services/consumptionFormatter.service.ts | 11 +++++++----
src/services/dateChart.service.ts | 2 +-
src/services/queryRunner.service.ts | 5 +----
4 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/src/components/DateNavigator/DateNavigatorFormat.tsx b/src/components/DateNavigator/DateNavigatorFormat.tsx
index 2edec1571..7b2066154 100644
--- a/src/components/DateNavigator/DateNavigatorFormat.tsx
+++ b/src/components/DateNavigator/DateNavigatorFormat.tsx
@@ -1,6 +1,6 @@
-import React from 'react'
-import { DateTime } from 'luxon'
import { TimeStep } from 'enum/timeStep.enum'
+import { DateTime } from 'luxon'
+import React from 'react'
import './datenavigatorformat.scss'
interface DateNavigatorFormatProps {
@@ -50,11 +50,11 @@ const DateNavigatorFormat: React.FC<DateNavigatorFormatProps> = ({
* Day 0X Month
*/
return [
- `${date.minus({ minutes: 30 }).toLocaleString({
+ `${date.toLocaleString({
hour: 'numeric',
minute: 'numeric',
})} -
- ${date.toLocaleString({
+ ${date.plus({ minutes: 30 }).toLocaleString({
hour: 'numeric',
minute: 'numeric',
})}`,
diff --git a/src/services/consumptionFormatter.service.ts b/src/services/consumptionFormatter.service.ts
index 885e52728..66030e7ce 100644
--- a/src/services/consumptionFormatter.service.ts
+++ b/src/services/consumptionFormatter.service.ts
@@ -17,13 +17,17 @@ export default class ConsumptionFormatterService {
): Dataload[] {
// Sort data
data.sort((dataA, dataB) => compareDates(dataA.date, dataB.date))
-
// Set status of data and complete missing/empty data
const filledData = []
let parsingDate = timePeriod.startDate
-
+ let endDate = timePeriod.endDate
+ if (timeStep === 10) {
+ parsingDate = parsingDate.minus({ minutes: 30 })
+ endDate = endDate.minus({ minutes: 30 })
+ }
const dateChartService = new DateChartService()
- while (parsingDate <= timePeriod.endDate) {
+ // TODO KO
+ while (parsingDate <= endDate) {
const filtereddata = data.filter(dt =>
dateChartService.compareStepDate(timeStep, dt.date, parsingDate)
)
@@ -43,7 +47,6 @@ export default class ConsumptionFormatterService {
filledData.push({ ...newElement })
parsingDate = parsingDate.plus(this.getTimeFromStepTime(timeStep))
}
-
return filledData
}
diff --git a/src/services/dateChart.service.ts b/src/services/dateChart.service.ts
index 7f7ecc150..8e97757b0 100644
--- a/src/services/dateChart.service.ts
+++ b/src/services/dateChart.service.ts
@@ -151,7 +151,7 @@ export default class DateChartService {
date1.month === date2.month &&
date1.day === date2.day &&
date1.hour === date2.hour &&
- Math.abs(date1.minute - date2.minute) < 30
+ Math.abs(date1.minute - date2.minute) === 0
)
default:
throw new Error('TimeStep unknown')
diff --git a/src/services/queryRunner.service.ts b/src/services/queryRunner.service.ts
index 3637f35a0..73f96fd08 100644
--- a/src/services/queryRunner.service.ts
+++ b/src/services/queryRunner.service.ts
@@ -156,7 +156,7 @@ export default class QueryRunner {
.setZone('utc', {
keepLocalTime: true,
})
- .minus({ minutes: 180 }),
+ .minus({ minutes: 30 }),
value: entry.load,
state: DataloadState.VALID,
price: entry.price,
@@ -361,14 +361,11 @@ export default class QueryRunner {
fluidType,
this._max_limit
)
- console.log('FETCH FLUID DATA, QUERY : ', query)
const result = await this.fetchData(query)
if (result?.data) {
const filteredResult = this.filterDataList(result, timePeriod)
- // console.log('filteredRes ', filteredResult)
const mappedResult: Dataload[] = this.mapDataList(filteredResult)
- // console.log('mappedResult ', mappedResult)
return mappedResult
}
return null
--
GitLab