Fix initialization of date filter

Club-Alpin-Annecy · Dec 3, 2024 · 74b09f3 · 74b09f3
1 parent 2043a39
commit 74b09f3
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/collectives/static/js/api.js b/collectives/static/js/api.js
@@ -37,11 +37,9 @@ function filtersToQuery(filters) {
     filterPayload.push({ field: 'title', type: 'like', value: filters.title })
   }
 
-  if (filters.date) {
-    filterPayload.push({ field: 'end', type: 'like', value: 
-      filters.date
-    })
-  }
+  filterPayload.push({ field: 'end', type: 'like', value: 
+    filters.date || getServerLocalTime()
+  })
 
   if (filters.leader) {
     filterPayload.push({ field: 'leaders', type: 'like', value: 

diff --git a/collectives/static/js/event/eventlist-filters.component.js b/collectives/static/js/event/eventlist-filters.component.js
@@ -146,6 +146,7 @@ export default {
           <p-datepicker 
             dateFormat="dd/mm/yy"
             v-model="filters.date"
+            placeholder="Aujourd'hui"
           ></p-datepicker>
         </label>
       </div>

diff --git a/collectives/static/js/event/eventlist.component.js b/collectives/static/js/event/eventlist.component.js
@@ -29,7 +29,7 @@ export default {
             activities: localStorage.getItem('eventlist-filters') ? JSON.parse(localStorage.getItem('eventlist-filters')).activities || [] : [],
             eventTypes: localStorage.getItem('eventlist-filters') ? JSON.parse(localStorage.getItem('eventlist-filters')).eventTypes || [] : [],
             eventTags: localStorage.getItem('eventlist-filters') ? JSON.parse(localStorage.getItem('eventlist-filters')).eventTags || [] : [],
-            date: moment().format("DD/MM/YYYY"),
+            date: null,
             title: null,
             leader: null,
             displayCancelled: localStorage.getItem('eventlist-filters') ? JSON.parse(localStorage.getItem('eventlist-filters')).displayCancelled : false