diff --git a/src/services/ecogesture.service.ts b/src/services/ecogesture.service.ts index d5f3c4e9a9c104b30024a15cfd17697cae3ed777..f979140aa8ead2e7d63c3b631a3256081e90ccb4 100644 --- a/src/services/ecogesture.service.ts +++ b/src/services/ecogesture.service.ts @@ -20,6 +20,8 @@ export default class EcogestureService { query = query .where({ season: { $ne: seasonFilter } }) .sortBy([{ season: 'desc' }]) + } else { + query = query.where({}).sortBy([{ season: 'desc' }]) } const { diff --git a/src/utils/utils.ts b/src/utils/utils.ts index 4ba865e14186c6453a796094700ef42f0a77eb54..16890bb2bb7e94a17d2e46dacea3438846c57679 100644 --- a/src/utils/utils.ts +++ b/src/utils/utils.ts @@ -129,7 +129,7 @@ export const getMonthName = (date: DateTime) => { * @returns Season */ export const getSeason = (): Season => { - const currentDate: DateTime = DateTime.local(2021, 12, 1).setZone('utc', { + const currentDate: DateTime = DateTime.local().setZone('utc', { keepLocalTime: true, }) const currentYear: number = currentDate.year