Merge pull request #199 from abes-esr/ITEM-445-front-beaucoup-derreur…

…s-warning-sur-les-formulaire-a-lauthentification Item 445 front beaucoup derreurs warning sur les formulaire a lauthentification
abes-esr · Jan 9, 2025 · bc81d96 · bc81d96
2 parents dff078d + 9a00846
commit bc81d96
Show file tree

Hide file tree

Showing 16 changed files with 2,969 additions and 141 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/components/ButtonsActions/BtnArchive.vue b/src/components/ButtonsActions/BtnArchive.vue
@@ -1,4 +1,5 @@
 <template>
+  <div v-bind="$attrs">
   <v-tooltip v-if="canArchive(demande)" text="Archiver">
     <template v-slot:activator="{ props }">
       <v-btn v-bind="props"
@@ -9,6 +10,7 @@
              aria-label="Archiver"></v-btn>
     </template>
   </v-tooltip>
+  </div>
 </template>
 <script setup>
 import itemService from '@/service/ItemService';

diff --git a/src/components/ButtonsActions/BtnRestore.vue b/src/components/ButtonsActions/BtnRestore.vue
@@ -1,4 +1,5 @@
 <template>
+  <div v-bind="$attrs">
   <v-tooltip v-if="demande.etatDemande === 'Archivé'" text="Restaurer">
     <template v-slot:activator="{ props }">
       <v-btn v-bind="props"
@@ -8,10 +9,15 @@
              @click="restaurerDemande(demande)"></v-btn>
     </template>
   </v-tooltip>
+  </div>
 </template>
 <script setup>
 import itemService from '@/service/ItemService';
 
+defineOptions({
+  inheritAttrs: false
+});
+
 const emits = defineEmits(['clicked', 'onError']);
 const props = defineProps({
   demande: {

diff --git a/src/components/ButtonsActions/BtnStop.vue b/src/components/ButtonsActions/BtnStop.vue
@@ -1,4 +1,5 @@
 <template>
+  <div v-bind="$attrs">
   <v-tooltip v-if="canStop(demande)" text="Annuler">
     <template v-slot:activator="{ props }">
       <v-btn v-bind="props"
@@ -11,11 +12,16 @@
   </v-tooltip>
   <dialog-confirmation-stop v-model="dialog" :id="demande.id" @clicked="emits('clicked')" @on-error="throwError">
   </dialog-confirmation-stop>
+  </div>
 </template>
 <script setup>
 import DialogConfirmationStop from '@/components/Dialog/DialogConfirmationStop.vue';
 import { ref } from 'vue';
 
+defineOptions({
+  inheritAttrs: false
+});
+
 const emits = defineEmits(['clicked', 'onError']);
 const props = defineProps({
   demande: {

diff --git a/src/components/ButtonsActions/BtnSuppression.vue b/src/components/ButtonsActions/BtnSuppression.vue
@@ -1,20 +1,32 @@
 <template>
-  <v-tooltip v-if="canCancel(demande)" text="Supprimer">
-    <template v-slot:activator="{ props }">
-      <v-btn v-bind="props"
-             icon="mdi-delete"
-             variant="text"
-             @click="dialog = true">
-      </v-btn>
-    </template>
-  </v-tooltip>
-  <dialog-suppression v-model="dialog" :demande="demande" @supp="emits('clicked')" @on-error="throwError">
-  </dialog-suppression>
+  <!-- Wrapper div pour recevoir les attributs -->
+  <div v-bind="$attrs">
+    <v-tooltip v-if="canCancel(demande)" text="Supprimer">
+      <template v-slot:activator="{ props }">
+        <v-btn v-bind="props"
+               icon="mdi-delete"
+               variant="text"
+               @click="dialog = true">
+        </v-btn>
+      </template>
+    </v-tooltip>
+    <dialog-suppression 
+      v-model="dialog" 
+      :demande="demande" 
+      @supp="emits('clicked')" 
+      @on-error="throwError">
+    </dialog-suppression>
+  </div>
 </template>
+
 <script setup>
 import { ref } from 'vue';
 import DialogSuppression from '@/components/Dialog/DialogSuppression.vue';
 
+defineOptions({
+  inheritAttrs: false
+});
+
 const emits = defineEmits(['clicked', 'onError']);
 const props = defineProps({
   demande: {

diff --git a/src/components/Home/BtnAccueil.vue b/src/components/Home/BtnAccueil.vue
@@ -25,6 +25,7 @@
 import router from '@/router';
 
 const props = defineProps({
+  id: { type: String, required: true },
   icon: { type: String, required: true },
   route: { type: String, required: true }
 })

diff --git a/src/components/Rcr.vue b/src/components/Rcr.vue
@@ -1,4 +1,4 @@
-A<template>
+<template>
   <v-card elevation="0">
     <v-card-title class="custom-card-title">
       <span>Sélection du RCR</span>

diff --git a/src/main.js b/src/main.js
@@ -17,5 +17,5 @@ const pinia = createPinia()
 
 registerPlugins(app)
 
-app.use(router).use(vuetify).use(pinia)
+app.use(router).use(pinia)
 app.mount('#app')
diff --git a/src/views/Exemplarisation/ExempSteps.vue b/src/views/Exemplarisation/ExempSteps.vue
@@ -125,9 +125,17 @@ import DialogSuppression from '@/components/Dialog/DialogSuppression.vue';
 import RecapDemande from '@/components/RecapDemande.vue';
 
 const emits = defineEmits(['backendError', 'backendSuccess', 'login-success']);
-const props = defineProps({ id: { type: String } });
+const props = defineProps({ 
+  id: { type: String }
+});
 
-const demande = ref();
+const demande = ref({
+  id: null,
+  rcr: '',
+  typeExemp: '',
+  etatDemande: '',
+  type: 'EXEMP'
+});
 const currentStep = ref(0);
 const typeDocumentSelected = ref();
 const rcrSelected = ref();
@@ -191,9 +199,12 @@ function cleanPath() {
 }
 
 function createDemande() {
-  if (demande.value && (rcrSelected.value === demande.value.rcr)) {
+  // Si la demande existe déjà et le RCR est le même
+  if (demande.value?.id && rcrSelected.value === demande.value.rcr) {
     next();
-  } else if (demande.value) {
+  } 
+  // Si la demande existe et le RCR est différent
+  else if (demande.value?.id) {
     isLoading.value = true;
     itemService.modifierRcrDemande(demande.value.id, rcrSelected.value, 'EXEMP')
       .then(response => {
@@ -206,7 +217,9 @@ function createDemande() {
       .finally(() => {
         isLoading.value = false;
       });
-  } else {
+  }
+  // Si c'est une nouvelle demande
+  else {
     isLoading.value = true;
     itemService.creerDemande(rcrSelected.value, 'EXEMP')
       .then(response => {

diff --git a/src/views/Exemplarisation/ExempTable.vue b/src/views/Exemplarisation/ExempTable.vue
@@ -31,52 +31,111 @@
                 :loading="!isDataLoaded" show-expand :sort-by="sortBy"
                 item-key="id"
   >
-    <template v-slot:body.prepend>
-      <tr>
-        <td></td>
-        <td>
-          <v-text-field v-model="numDemandeSearchField" hide-details @input="filterItems"
-                        variant="underlined" append-inner-icon="mdi-magnify"></v-text-field>
-        </td>
-        <td>
-          <v-text-field v-model="nbExemplairesSearchField" hide-details @input="filterItems"
-                        variant="underlined" append-inner-icon="mdi-magnify"></v-text-field>
-        </td>
-        <td>
-          <v-text-field v-model="dateCreationSearchField" hide-details @input="filterItems"
-                        variant="underlined" append-inner-icon="mdi-magnify"></v-text-field>
-        </td>
-        <td>
-          <v-text-field v-model="dateModificationSearchField" hide-details @input="filterItems"
-                        variant="underlined" append-inner-icon="mdi-magnify"></v-text-field>
-        </td>
-        <td>
-          <v-text-field v-model="ilnSearchField" hide-details @input="filterItems" variant="underlined"
-                        append-inner-icon="mdi-magnify"></v-text-field>
-        </td>
-        <td>
-          <v-text-field v-model="rcrSearchField" hide-details @input="filterItems" variant="underlined"
-                        append-inner-icon="mdi-magnify"></v-text-field>
-        </td>
-        <td>
-          <v-select
-            v-model="typeExempSearchField" hide-details variant="underlined" :items="listTypeExemp"
-            @update:menu="filterItems"
-            @click:clear="filterItems" clearable clear-icon="mdi-close" no-data-text="Aucun type d'exemplaire trouvé."
-            aria-label="Recherche par type d'exemplaire"
-          ></v-select>
-        </td>
-        <td>
-          <v-text-field v-model="indexRechercheSearchField" @input="filterItems" hide-details
-                        variant="underlined" append-inner-icon="mdi-magnify"></v-text-field>
-        </td>
-        <td>
-          <v-select :items="listStatut" variant="underlined" hide-details @update:menu="filterItems"
-                    @click:clear="filterItems" aria-label="Recherche par statut" clearable clear-icon="mdi-close"
-                    no-data-text="Aucun statut trouvé." v-model="statutSearchField"></v-select>
-        </td>
-      </tr>
-    </template>
+  <template v-slot:body.prepend>
+  <tr>
+    <td></td>
+    <td>
+      <v-text-field
+        v-model="numDemandeSearchField"
+        id="search-num-demande"
+        hide-details
+        @input="filterItems"
+        variant="underlined"
+        append-inner-icon="mdi-magnify"
+      ></v-text-field>
+    </td>
+    <td>
+      <v-text-field
+        v-model="nbExemplairesSearchField"
+        id="search-nb-exemplaires"
+        hide-details
+        @input="filterItems"
+        variant="underlined"
+        append-inner-icon="mdi-magnify"
+      ></v-text-field>
+    </td>
+    <td>
+      <v-text-field
+        v-model="dateCreationSearchField"
+        id="search-date-creation"
+        hide-details
+        @input="filterItems"
+        variant="underlined"
+        append-inner-icon="mdi-magnify"
+      ></v-text-field>
+    </td>
+    <td>
+      <v-text-field
+        v-model="dateModificationSearchField"
+        id="search-date-modification"
+        hide-details
+        @input="filterItems"
+        variant="underlined"
+        append-inner-icon="mdi-magnify"
+      ></v-text-field>
+    </td>
+    <td>
+      <v-text-field
+        v-model="ilnSearchField"
+        id="search-iln"
+        hide-details
+        @input="filterItems"
+        variant="underlined"
+        append-inner-icon="mdi-magnify"
+      ></v-text-field>
+    </td>
+    <td>
+      <v-text-field
+        v-model="rcrSearchField"
+        id="search-rcr"
+        hide-details
+        @input="filterItems"
+        variant="underlined"
+        append-inner-icon="mdi-magnify"
+      ></v-text-field>
+    </td>
+    <td>
+      <v-select
+        v-model="typeExempSearchField"
+        id="search-type-exemp"
+        hide-details
+        variant="underlined"
+        :items="listTypeExemp"
+        @update:menu="filterItems"
+        @click:clear="filterItems"
+        clearable
+        clear-icon="mdi-close"
+        no-data-text="Aucun type d'exemplaire trouvé."
+        aria-label="Recherche par type d'exemplaire"
+      ></v-select>
+    </td>
+    <td>
+      <v-text-field
+        v-model="indexRechercheSearchField"
+        id="search-index"
+        hide-details
+        @input="filterItems"
+        variant="underlined"
+        append-inner-icon="mdi-magnify"
+      ></v-text-field>
+    </td>
+    <td>
+      <v-select
+        v-model="statutSearchField"
+        id="search-statut"
+        :items="listStatut"
+        variant="underlined"
+        hide-details
+        @update:menu="filterItems"
+        @click:clear="filterItems"
+        clearable
+        clear-icon="mdi-close"
+        no-data-text="Aucun statut trouvé."
+        aria-label="Recherche par statut"
+      ></v-select>
+    </td>
+  </tr>
+</template>
 
     <template v-slot:item="{ item, expand }">
       <tr :class="{ 'highlighted-row': item.highlighted }" style="cursor: pointer;">
@@ -120,12 +179,14 @@
         </td>
         <td class="text-center">
           <!-- Colonne Action -->
-          <btn-archive :demande="item" @clicked="loadItems(item.type)"
+           <v-btn-group>
+          <btn-archive v-bind="$attrs" :demande="item" @clicked="loadItems(item.type)"
                        @on-error="throwError" aria-label="Archiver"></btn-archive>
-          <btn-suppression :demande="item" @clicked="loadItems(item.type)"
+          <btn-suppression v-bind="$attrs" :demande="item" @clicked="loadItems(item.type)"
                            @on-error="throwError" aria-label="Supprimer"></btn-suppression>
-          <btn-restore :demande="item" @clicked="loadItems(item.type)"
+          <btn-restore v-bind="$attrs" :demande="item" @clicked="loadItems(item.type)"
                        @on-error="throwError" aria-label="Restaurer"></btn-restore>
+          </v-btn-group>
         </td>
       </tr>
     </template>