- Adaptation à la branche ITEM-342-back-modifier-dto-et-requete

- Correction relatives au champ de recherche
abes-esr · Nov 12, 2024 · 172fdf9 · 172fdf9
1 parent cf16423
commit 172fdf9
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 14 deletions.
diff --git a/src/service/ItemService.js b/src/service/ItemService.js
@@ -24,7 +24,7 @@ export class ItemService {
 
   login(login, password) {
     const url = import.meta.env.VITE_API_URL + `signin`;
-    console.info('appel:' + url);
+    //console.info('appel:' + url);
 
     return this.client.post(`signin`, {username: login, password: password})
       .then((response) => {
@@ -56,27 +56,26 @@ export class ItemService {
   }
 
   fetchDemandes(type, archive, extensionIln) {
-    console.info('appel: ' + import.meta.env.VITE_API_URL + `demandes/${type}?archive=${archive}&extension=${extensionIln}`)
+    //console.info('appel: ' + import.meta.env.VITE_API_URL + `demandes/${type}?archive=${archive}&extension=${extensionIln}`)
     return this.client.get(`demandes/${type}?archive=${archive}&extension=${extensionIln}`)
   }
   archiverDemande(type, numDemande) {
     const url = `archiverDemande/${type}/${numDemande}`;
-    console.info('appel: ' + import.meta.env.VITE_API_URL + url);
+    //console.info('appel: ' + import.meta.env.VITE_API_URL + url);
     return this.client.get(url);
   }
 
   checkToken(){
     const url = `checkToken`;
-    console.info('appel: ' + import.meta.env.VITE_API_URL + url);
+    //console.info('appel: ' + import.meta.env.VITE_API_URL + url);
     return this.client.get(url)
   }
 
-  //TODO MAJ STORE
   modifierEmail(id, email){
     const config = { headers: {'Content-Type': 'text/plain'} };
     return this.client.patch(`utilisateurs/${id}`, email, config);
   }
-  //TODO MAJ STORE
+
   creerEmail(id, email){
     const config = { headers: {'Content-Type': 'text/plain'} };
     return this.client.post(`utilisateurs/${id}`, email, config);
@@ -165,7 +164,6 @@ export class ItemService {
 
   async getHealthOfServices(){
     return this.client.get('applicationStatutServices').then(response => {
-      console.log(response.data)
       return response.data
     })
   }

diff --git a/src/views/Exemplarisation/ExempTable.vue b/src/views/Exemplarisation/ExempTable.vue
@@ -38,6 +38,10 @@
           <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>
@@ -83,6 +87,7 @@
           </v-btn>
         </td>
         <td @click="onRowClick(item)" class="text-center">{{ item.id }}</td>
+        <td @click="onRowClick(item)" class="text-center">{{ item.nbExemplaires }}</td>
         <td @click="onRowClick(item)" class="text-center">{{ item.dateCreation }}</td>
         <td @click="onRowClick(item)" class="text-center">{{ item.dateModification }}</td>
         <td @click="onRowClick(item)" class="text-center">{{ item.iln }}</td>
@@ -157,7 +162,7 @@ const headingsDemandes = [
   },
   {
     title: 'Nb d\'exemplaires',
-    key: 'nbex',
+    key: 'nbExemplaires',
     align: 'center',
     display: true,
   },
@@ -325,7 +330,6 @@ async function loadItems(type, archive) {
       ...item,
       expanded: false
     }));
-
     isDataLoaded.value = true;
     emit('backendSuccess');
   } catch (error) {
@@ -338,7 +342,7 @@ function filterItems() {
   contentsDemandesFrontFiltered.value = contentsDemandesFromServer.value.filter(demande => {
     const matchesNumDemande = numDemandeSearchField.value === '' || demande.id.toString()
       .includes(numDemandeSearchField.value);
-    const matchesNbExemplaires = nbExemplairesSearchField.value === '' || demande.nbex.toString()
+    const matchesNbExemplaires = nbExemplairesSearchField.value === '' || demande.nbExemplaires.toString()
       .includes(nbExemplairesSearchField.value);
     const matchesDateCreation = dateCreationSearchField.value === '' || demande.dateCreation.toString()
       .includes(dateCreationSearchField.value);

diff --git a/src/views/Modification/ModifTable.vue b/src/views/Modification/ModifTable.vue
@@ -37,6 +37,10 @@
           <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>
@@ -83,6 +87,7 @@
           </v-btn>
         </td>
         <td @click="onRowClick(item)" class="text-center">{{ item.id }}</td>
+        <td @click="onRowClick(item)" class="text-center">{{ item.nbExemplaires }}</td>
         <td @click="onRowClick(item)" class="text-center">{{ item.dateCreation }}</td>
         <td @click="onRowClick(item)" class="text-center">{{ item.dateModification }}</td>
         <td @click="onRowClick(item)" class="text-center">{{ item.iln }}</td>
@@ -155,7 +160,7 @@ const headingsDemandes = [
   },
   {
     title: 'Nb d\'exemplaires',
-    key: 'nbex',
+    key: 'nbExemplaires',
     align: 'center',
     display: true,
   },
@@ -337,7 +342,7 @@ function filterItems() {
   contentsDemandesFrontFiltered.value = contentsDemandesFromServer.value.filter(demande => {
     const matchesNumDemande = numDemandeSearchField.value === '' || demande.id.toString()
       .includes(numDemandeSearchField.value);
-    const matchesNbExemplaires = nbExemplairesSearchField.value === '' || demande.nbex.toString()
+    const matchesNbExemplaires = nbExemplairesSearchField.value === '' || demande.nbExemplaires.toString()
       .includes(nbExemplairesSearchField.value);
     const matchesDateCreation = dateCreationSearchField.value === '' || demande.dateCreation.toString()
       .includes(dateCreationSearchField.value);

diff --git a/src/views/Suppression/SuppTable.vue b/src/views/Suppression/SuppTable.vue
@@ -37,6 +37,10 @@
           <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>
@@ -70,6 +74,7 @@
           </v-btn>
         </td>
         <td @click="onRowClick(item)" class="text-center">{{ item.id }}</td>
+        <td @click="onRowClick(item)" class="text-center">{{ item.nbExemplaires }}</td>
         <td @click="onRowClick(item)" class="text-center">{{ item.dateCreation }}</td>
         <td @click="onRowClick(item)" class="text-center">{{ item.dateModification }}</td>
         <td @click="onRowClick(item)" class="text-center">{{ item.iln }}</td>
@@ -142,7 +147,7 @@ const headingsDemandes = [
   },
   {
     title: 'Nb d\'exemplaires',
-    key: 'nbex',
+    key: 'nbExemplaires',
     align: 'center',
     display: true,
   },
@@ -311,7 +316,7 @@ function filterItems() {
   contentsDemandesFrontFiltered.value = contentsDemandesFromServer.value.filter(demande => {
     const matchesNumDemande = numDemandeSearchField.value === '' || demande.id.toString()
       .includes(numDemandeSearchField.value);
-    const matchesNbExemplaires = nbExemplairesSearchField.value === '' || demande.nbex.toString()
+    const matchesNbExemplaires = nbExemplairesSearchField.value === '' || demande.nbExemplaires.toString()
       .includes(nbExemplairesSearchField.value);
     const matchesDateCreation = dateCreationSearchField.value === '' || demande.dateCreation.toString()
       .includes(dateCreationSearchField.value);