diff --git a/src/views/Exemplarisation/ExempTable.vue b/src/views/Exemplarisation/ExempTable.vue index d713c2e..0067d9c 100644 --- a/src/views/Exemplarisation/ExempTable.vue +++ b/src/views/Exemplarisation/ExempTable.vue @@ -155,12 +155,6 @@ const headingsDemandes = [ align: 'center', display: true, }, - { - title: 'Nb d\'exemplaires', - key: 'nbex', - align: 'center', - display: true, - }, { title: 'Crée le', key: 'dateCreation', @@ -270,7 +264,6 @@ const sortBy = ref([{ const isDataLoaded = ref(false); //Search fields columns const numDemandeSearchField = ref(''); -const nbExemplairesSearchField = ref(''); const dateCreationSearchField = ref(''); const dateModificationSearchField = ref(''); const ilnSearchField = ref(''); @@ -338,8 +331,6 @@ 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() - .includes(nbExemplairesSearchField.value); const matchesDateCreation = dateCreationSearchField.value === '' || demande.dateCreation.toString() .includes(dateCreationSearchField.value); const matchesDateModification = dateModificationSearchField.value === '' || demande.dateModification.toString() @@ -352,7 +343,7 @@ function filterItems() { const matchesIndexSearch = indexRechercheSearchField.value === '' || demande.indexRecherche && demande.indexRecherche.includes(indexRechercheSearchField.value); const matchesEtatDemande = statutSearchField.value === undefined || statutSearchField.value === null || statutSearchField.value === '' || demande.etatDemande.toString() .includes(statutSearchField.value) || ((statutSearchField.value === 'En saisie') && (demande.etatDemande === 'En simulation' || demande.etatDemande === 'En préparation' || demande.etatDemande === 'A compléter')); - return matchesNumDemande && matchesNbExemplaires && matchesDateCreation && matchesDateModification && matchesRCR && matchesILN && matchesTypeExemp && matchesIndexSearch && matchesEtatDemande; + return matchesNumDemande && matchesDateCreation && matchesDateModification && matchesRCR && matchesILN && matchesTypeExemp && matchesIndexSearch && matchesEtatDemande; }); } diff --git a/src/views/Modification/ModifTable.vue b/src/views/Modification/ModifTable.vue index f133128..61359a9 100644 --- a/src/views/Modification/ModifTable.vue +++ b/src/views/Modification/ModifTable.vue @@ -152,13 +152,7 @@ const headingsDemandes = [ key: 'id', align: 'center', display: true, - }, - { - title: 'Nb d\'exemplaires', - key: 'nbex', - align: 'center', - display: true, - }, + },z { title: 'Crée le', key: 'dateCreation', @@ -268,7 +262,6 @@ const isDataLoaded = ref(false); //Search fields columns const numDemandeSearchField = ref(''); -const nbExemplairesSearchField = ref(''); const dateCreationSearchField = ref(''); const dateModificationSearchField = ref(''); const ilnSearchField = ref(''); @@ -337,8 +330,6 @@ 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() - .includes(nbExemplairesSearchField.value); const matchesDateCreation = dateCreationSearchField.value === '' || demande.dateCreation.toString() .includes(dateCreationSearchField.value); const matchesDateModification = dateModificationSearchField.value === '' || demande.dateModification.toString() @@ -351,7 +342,7 @@ function filterItems() { const matchesTraitement = traitementSearchField.value === undefined || traitementSearchField.value === null || traitementSearchField.value === '' || (demande.traitement && demande.traitement.includes(traitementSearchField.value)) || (!demande.traitement && traitementSearchField.value === 'Non défini'); const matchesEtatDemande = statutSearchField.value === undefined || statutSearchField.value === null || statutSearchField.value === '' || demande.etatDemande.toString() .includes(statutSearchField.value) || ((statutSearchField.value === 'En saisie') && (demande.etatDemande === 'En simulation' || demande.etatDemande === 'En préparation' || demande.etatDemande === 'Préparée' || demande.etatDemande === 'A compléter')); - return matchesNumDemande && matchesNbExemplaires && matchesDateCreation && matchesDateModification && matchesRCR && matchesILN && matchesZone && matchesTraitement && matchesEtatDemande; + return matchesNumDemande && matchesDateCreation && matchesDateModification && matchesRCR && matchesILN && matchesZone && matchesTraitement && matchesEtatDemande; }); } diff --git a/src/views/Suppression/SuppTable.vue b/src/views/Suppression/SuppTable.vue index c6c82ae..ade3541 100644 --- a/src/views/Suppression/SuppTable.vue +++ b/src/views/Suppression/SuppTable.vue @@ -140,12 +140,6 @@ const headingsDemandes = [ align: 'center', display: true, }, - { - title: 'Nb d\'exemplaires', - key: 'nbex', - align: 'center', - display: true, - }, { title: 'Crée le', key: 'dateCreation', @@ -243,7 +237,6 @@ const isDataLoaded = ref(false); //Search fields columns const numDemandeSearchField = ref(''); -const nbExemplairesSearchField = ref(''); const dateCreationSearchField = ref(''); const dateModificationSearchField = ref(''); const ilnSearchField = ref(''); @@ -297,6 +290,7 @@ async function loadItems(type, archive) { contentsDemandesFrontFiltered.value = response.data.map((item) => ({ ...item, expanded: false, + })); isDataLoaded.value = true; @@ -311,8 +305,6 @@ 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() - .includes(nbExemplairesSearchField.value); const matchesDateCreation = dateCreationSearchField.value === '' || demande.dateCreation.toString() .includes(dateCreationSearchField.value); const matchesDateModification = dateModificationSearchField.value === '' || demande.dateModification.toString() @@ -325,7 +317,7 @@ function filterItems() { const matchesTraitement = traitementSearchField.value === undefined || traitementSearchField.value === null || traitementSearchField.value === '' || (demande.traitement && demande.traitement.includes(traitementSearchField.value)) || (!demande.traitement && traitementSearchField.value === 'Non défini'); const matchesEtatDemande = statutSearchField.value === undefined || statutSearchField.value === null || statutSearchField.value === '' || demande.etatDemande.toString() .includes(statutSearchField.value) || ((statutSearchField.value === 'En saisie') && (demande.etatDemande === 'En simulation' || demande.etatDemande === 'En préparation' || demande.etatDemande === 'Préparée' || demande.etatDemande === 'A compléter')); - return matchesNumDemande && matchesNbExemplaires && matchesDateCreation && matchesDateModification && matchesRCR && matchesILN && matchesZone && matchesTraitement && matchesEtatDemande; + return matchesNumDemande && matchesDateCreation && matchesDateModification && matchesRCR && matchesILN && matchesZone && matchesTraitement && matchesEtatDemande; }); } @@ -397,7 +389,6 @@ function colorProgressBar(item) {