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

fix over iteration

parent e5323243
No related branches found
No related tags found
1 merge request!791Resolve "[Gaz] Manque la donnée du dernier jour du mois"
...@@ -111,18 +111,16 @@ export default class QueryRunner { ...@@ -111,18 +111,16 @@ export default class QueryRunner {
timePeriod: TimePeriod, timePeriod: TimePeriod,
timeStep: TimeStep timeStep: TimeStep
) { ) {
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) { 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 // 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.startDate = timePeriod.startDate.plus({ minutes: 30 })
timePeriod.endDate = timePeriod.endDate.plus({ minutes: 30 }) timePeriod.endDate = timePeriod.endDate.plus({ minutes: 30 })
} }
const filteredResult = data.data.filter((entry: any) => {
// add ternary expression to not send to the withinDate function an hour different than zero
const hour = timeStep === TimeStep.HALF_AN_HOUR ? entry.hour : 0
const min = timeStep === TimeStep.HALF_AN_HOUR ? entry.minute : 0
return this.withinDateBoundaries( return this.withinDateBoundaries(
DateTime.local( DateTime.local(
entry.year, entry.year,
...@@ -135,10 +133,7 @@ export default class QueryRunner { ...@@ -135,10 +133,7 @@ export default class QueryRunner {
}), }),
timePeriod timePeriod
) )
} })
const filteredResult = data.data.filter((entry: any) =>
filterData(entry, timeStep, timePeriod)
)
return filteredResult return filteredResult
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment