Ver Fonte

correction après mr

Vincent há 11 meses atrás
pai
commit
1fe5835e79

+ 1 - 1
lang/fr.json

@@ -1,6 +1,6 @@
 {
   "my_settings_page": "Mes paramètres",
-  "allow_report_message": "Je souhaite recevoir les rapports d'envoie des emails que j'envoie",
+  "allow_report_message": "Je souhaite recevoir les rapports d'envoi des emails que j'envoie",
   "my-settings_breadcrumbs": "Mes paramètres",
   "message_settings": "Paramètres des messages",
   "rewards_list": "Configuration des distinctions",

+ 1 - 1
models/Access/MyProfile.ts

@@ -61,5 +61,5 @@ export default class MyProfile extends ApiResource {
   declare originalAccess: Access | null
 
   @Num(null)
-  declare accessPreferenceId: number
+  declare preferencesId: number
 }

+ 4 - 4
models/Access/AccessPreferences.ts → models/Access/Preferences.ts

@@ -2,12 +2,12 @@ import { Uid, Bool } from 'pinia-orm/dist/decorators'
 import ApiModel from '~/models/ApiModel'
 
 /**
- * Ap2i Model : AccessPreference
+ * Ap2i Model : Preferences
  *
- * @see https://gitlab.2iopenservice.com/opentalent/ap2i/-/blob/develop/src/Entity/Access/AccessPreference.php
+ * @see https://gitlab.2iopenservice.com/opentalent/ap2i/-/blob/develop/src/Entity/Access/Preferences.php
  */
-export default class AccessPreferences extends ApiModel {
-  static entity = 'access_preferences'
+export default class Preferences extends ApiModel {
+  static entity = 'preferences'
 
   @Uid()
   declare id: number | string | null

+ 7 - 7
pages/my-settings.vue

@@ -8,10 +8,10 @@ Page 'Mes préférences'
         <UiExpansionPanel title="message_settings" icon="fas fa-inbox">
           <v-container fluid class="container">
             <v-row>
-              <UiLoadingPanel v-if="preferencesPending" />
+              <UiLoadingPanel v-if="pending" />
               <UiForm
                 v-else
-                :model="AccessPreferences"
+                :model="Preferences"
                 :entity="preferences"
                 action-position="bottom"
               >
@@ -36,7 +36,7 @@ Page 'Mes préférences'
 <script setup lang="ts">
 import type { Ref } from 'vue'
 import { useEntityFetch } from '~/composables/data/useEntityFetch'
-import AccessPreferences from '~/models/Access/AccessPreferences'
+import Preferences from '~/models/Access/Preferences'
 import { useAccessProfileStore } from '~/stores/accessProfile'
 
 definePageMeta({
@@ -44,15 +44,15 @@ definePageMeta({
 })
 
 const accessProfileStore = useAccessProfileStore()
-if (accessProfileStore.accessPreferenceId === null) {
+if (accessProfileStore.preferencesId === null) {
   throw new Error("Missing access preference's id")
 }
 
 const { fetch } = useEntityFetch()
 const openedPanels: Ref<Array<number>> = ref([0])
-const { data: preferences, pending: preferencesPending } = await fetch(
-  AccessPreferences,
-  accessProfileStore.accessPreferenceId,
+const { data: preferences, pending } = await fetch(
+  Preferences,
+  accessProfileStore.preferencesId,
 )
 </script>
 

+ 3 - 3
stores/accessProfile.ts

@@ -46,7 +46,7 @@ export const useAccessProfileStore = defineStore('accessProfile', () => {
   const multiAccesses: Ref<Array<BaseOrganizationProfile>> = ref([])
   const familyAccesses: Ref<Array<BaseAccessProfile>> = ref([])
   const originalAccess: Ref<OrignalAccessProfile | null> = ref(null)
-  const accessPreferenceId: Ref<number | null> = ref(null)
+  const preferencesId: Ref<number | null> = ref(null)
 
   // Getters
   /**
@@ -135,7 +135,7 @@ export const useAccessProfileStore = defineStore('accessProfile', () => {
     isAdminAccess.value = profile.isAdminAccess
     isGuardian.value = profile.isGuardian
     isPayer.value = profile.isPayer
-    accessPreferenceId.value = profile.accessPreferenceId
+    preferencesId.value = profile.preferencesId
 
     // Add the original Access (switch User case)
     if (profile.originalAccess !== null) {
@@ -215,6 +215,6 @@ export const useAccessProfileStore = defineStore('accessProfile', () => {
     setProfile,
     setHistorical,
     setHistoricalRange,
-    accessPreferenceId,
+    preferencesId,
   }
 })

+ 1 - 1
types/interfaces.d.ts

@@ -113,7 +113,7 @@ interface AccessProfile extends BaseAccessProfile {
   originalAccess: OrignalAccessProfile | null
   hasRole: (role: string) => boolean
   isAdminAccount: boolean
-  accessPreferenceId: number | null
+  preferencesId: number | null
 }
 
 // TODO: y'a un problème entre l'interface AccessProfile et celle organizationState, les noms sont construits différemment,