resolve conflicts after stash pop

components/Layout/Header/Notification.vue

@@ -184,6 +184,8 @@ const update = async () => {
  * @param notification
  */
 const getMessage = (notification: Notification) => {
+  console.log(notification)
+  console.log(notification.message)
   switch (notification.type){
     case NOTIFICATION_TYPE.FILE :
       return `${i18n.t('your_file')} ${notification.message?.fileName} ${i18n.t('is_ready_to_be_downloaded')}`

components/Layout/Parameters/OrganizationPageTab.vue

@@ -1,5 +1,5 @@
 <template>
-  <p>Organization page</p>
+
 </template>
 
 <script setup lang="ts">

components/Layout/Parameters/PreferencesTab.vue

@@ -1,9 +1,42 @@
 <template>
-  <p>Preferences form</p>
+
+  <v-container>
+    <v-row>
+      <span>{{ $t('start_date_of_financial_season')}}</span>
+      <UiDatePicker v-model="financialSeasonStartDate"></UiDatePicker>
+    </v-row>
+    <v-row>
+      <span>{{ $t('start_date_of_activity_season')}}</span>
+      <UiDatePicker v-model="activitySeasonStartDate"></UiDatePicker>
+    </v-row>
+    <v-row>
+      <span>{{ $t('start_date_of_courses')}}</span>
+      <UiDatePicker v-model="coursesStartDate"></UiDatePicker>
+    </v-row>
+    <v-row>
+      <span>{{ $t('end_date_of_courses')}}</span>
+      <UiDatePicker v-model="coursesEndDate"></UiDatePicker>
+    </v-row>
+    <v-row>
+      <v-checkbox :label="$t('show_adherents_list_and_their_coordinates') + ' *'"></v-checkbox>
+    </v-row>
+    <v-row>
+      <v-checkbox :label="$t('students_are_also_association_members') + ' *'"></v-checkbox>
+    </v-row>
+
+  </v-container>
+
+
 </template>
 
 <script setup lang="ts">
 
+
+  const financialSeasonStartDate: Date = new Date()
+  const activitySeasonStartDate: Date = new Date()
+  const coursesStartDate: Date = new Date()
+  const coursesEndDate: Date = new Date()
+
 </script>
 
 <style scoped lang="scss">

composables/data/useEntityFetch.ts

@@ -24,7 +24,11 @@ export const useEntityFetch = (lazy: boolean = false): useEntityFetchReturnType
 
     const fetchCollection = (model: typeof ApiResource, parent: ApiResource | null = null, query: Ref<AssociativeArray> = ref([])) => useAsyncData(
         model.entity + '_many',
-        () => em.fetchCollection(model, parent, query.value),
+        async () => {
+            const data = await em.fetchCollection(model, parent, query.value)
+            // console.log(data)
+            return data
+        },
         { lazy }
     )
 

lang/fr.json

@@ -589,4 +589,10 @@
   "please_note_that_this_reservation_start_on_date_anterior_to_now": "Veuillez noter que cette réservation débute à une date antérieure à aujourd'hui",
   "validate": "Valider",
   "which_date_and_which_hour": "A quelle date et quelle heure ?"
+  "start_date_of_financial_season": "Début de la saison financière",
+  "start_date_of_activity_season": "Début de saison d'activité",
+  "start_date_of_courses": "Date de début des cours",
+  "end_date_of_courses": "Date de fin des cours",
+  "show_adherents_list_and_their_coordinates": "Afficher la liste des adhérents et leurs coordonnées",
+  "students_are_also_association_members": "Les élèves sont adhérents également de l'association"
 }