From a6a5a7ef0f674c6151769259366afdba8fabe754 Mon Sep 17 00:00:00 2001
From: Hugo SUBTIL <ext.sopra.husubtil@grandlyon.com>
Date: Wed, 20 Oct 2021 17:33:15 +0200
Subject: [PATCH] fix(ecogesture): ecogestures with no season are now on top
when season is fall or spring
---
src/services/ecogesture.service.ts | 2 ++
src/utils/utils.ts | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/services/ecogesture.service.ts b/src/services/ecogesture.service.ts
index d5f3c4e9a..f979140aa 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 4ba865e14..16890bb2b 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
--
GitLab