Skip to content
Snippets Groups Projects
Commit e5323243 authored by Hugo NOUTS's avatar Hugo NOUTS
Browse files

quick fix ?

parent c665bd73
No related branches found
No related tags found
1 merge request!791Resolve "[Gaz] Manque la donnée du dernier jour du mois"
......@@ -111,24 +111,33 @@ export default class QueryRunner {
timePeriod: TimePeriod,
timeStep: TimeStep
) {
// increase timeperiod range because the last data for a day is actually stored the next day at 00:00
if (timeStep === TimeStep.HALF_AN_HOUR) {
timePeriod.startDate = timePeriod.startDate.plus({ minutes: 30 })
timePeriod.endDate = timePeriod.endDate.plus({ minutes: 30 })
}
const filteredResult = data.data.filter((entry: any) =>
this.withinDateBoundaries(
const filterData = (
entry: any,
timeStep: TimeStep,
timePeriod: TimePeriod
) => {
const hour = timeStep === TimeStep.HALF_AN_HOUR ? entry.hour : 0
const min = timeStep === TimeStep.HALF_AN_HOUR ? entry.minute : 0
if (timeStep === TimeStep.HALF_AN_HOUR) {
// increase timeperiod range because the last data for a day is actually stored the next day at 00:00
timePeriod.startDate = timePeriod.startDate.plus({ minutes: 30 })
timePeriod.endDate = timePeriod.endDate.plus({ minutes: 30 })
}
return this.withinDateBoundaries(
DateTime.local(
entry.year,
entry.month || 1,
entry.day || 1,
entry.hour,
entry.minute
hour,
min
).setZone('utc', {
keepLocalTime: true,
}),
timePeriod
)
}
const filteredResult = data.data.filter((entry: any) =>
filterData(entry, timeStep, timePeriod)
)
return filteredResult
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment