diff --git a/src/service/ItemService.js b/src/service/ItemService.js
index 50343e9..511018d 100644
--- 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
index 0067d9c..cb6273d 100644
--- a/src/views/Exemplarisation/ExempTable.vue
+++ b/src/views/Exemplarisation/ExempTable.vue
@@ -38,6 +38,10 @@
+
+
+ |
@@ -83,6 +87,7 @@
|
{{ item.id }} |
+ {{ item.nbExemplaires }} |
{{ item.dateCreation }} |
{{ item.dateModification }} |
{{ item.iln }} |
@@ -155,6 +160,12 @@ const headingsDemandes = [
align: 'center',
display: true,
},
+ {
+ title: 'Nb d\'exemplaires',
+ key: 'nbExemplaires',
+ align: 'center',
+ display: true,
+ },
{
title: 'Crée le',
key: 'dateCreation',
@@ -264,6 +275,7 @@ 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('');
@@ -318,7 +330,6 @@ async function loadItems(type, archive) {
...item,
expanded: false
}));
-
isDataLoaded.value = true;
emit('backendSuccess');
} catch (error) {
@@ -331,6 +342,8 @@ function filterItems() {
contentsDemandesFrontFiltered.value = contentsDemandesFromServer.value.filter(demande => {
const matchesNumDemande = numDemandeSearchField.value === '' || demande.id.toString()
.includes(numDemandeSearchField.value);
+ const matchesNbExemplaires = nbExemplairesSearchField.value === '' || demande.nbExemplaires.toString()
+ .includes(nbExemplairesSearchField.value);
const matchesDateCreation = dateCreationSearchField.value === '' || demande.dateCreation.toString()
.includes(dateCreationSearchField.value);
const matchesDateModification = dateModificationSearchField.value === '' || demande.dateModification.toString()
@@ -343,7 +356,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 && matchesDateCreation && matchesDateModification && matchesRCR && matchesILN && matchesTypeExemp && matchesIndexSearch && matchesEtatDemande;
+ return matchesNumDemande && matchesNbExemplaires && matchesDateCreation && matchesDateModification && matchesRCR && matchesILN && matchesTypeExemp && matchesIndexSearch && matchesEtatDemande;
});
}
diff --git a/src/views/Modification/ModifTable.vue b/src/views/Modification/ModifTable.vue
index e074df6..cdda509 100644
--- a/src/views/Modification/ModifTable.vue
+++ b/src/views/Modification/ModifTable.vue
@@ -37,6 +37,10 @@
+
+
+ |
@@ -83,6 +87,7 @@
|
{{ item.id }} |
+ {{ item.nbExemplaires }} |
{{ item.dateCreation }} |
{{ item.dateModification }} |
{{ item.iln }} |
@@ -153,6 +158,12 @@ const headingsDemandes = [
align: 'center',
display: true,
},
+ {
+ title: 'Nb d\'exemplaires',
+ key: 'nbExemplaires',
+ align: 'center',
+ display: true,
+ },
{
title: 'Crée le',
key: 'dateCreation',
@@ -262,6 +273,7 @@ const isDataLoaded = ref(false);
//Search fields columns
const numDemandeSearchField = ref('');
+const nbExemplairesSearchField = ref('');
const dateCreationSearchField = ref('');
const dateModificationSearchField = ref('');
const ilnSearchField = ref('');
@@ -330,6 +342,8 @@ function filterItems() {
contentsDemandesFrontFiltered.value = contentsDemandesFromServer.value.filter(demande => {
const matchesNumDemande = numDemandeSearchField.value === '' || demande.id.toString()
.includes(numDemandeSearchField.value);
+ const matchesNbExemplaires = nbExemplairesSearchField.value === '' || demande.nbExemplaires.toString()
+ .includes(nbExemplairesSearchField.value);
const matchesDateCreation = dateCreationSearchField.value === '' || demande.dateCreation.toString()
.includes(dateCreationSearchField.value);
const matchesDateModification = dateModificationSearchField.value === '' || demande.dateModification.toString()
@@ -342,7 +356,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 && matchesDateCreation && matchesDateModification && matchesRCR && matchesILN && matchesZone && matchesTraitement && matchesEtatDemande;
+ return matchesNumDemande && matchesNbExemplaires && matchesDateCreation && matchesDateModification && matchesRCR && matchesILN && matchesZone && matchesTraitement && matchesEtatDemande;
});
}
diff --git a/src/views/Suppression/SuppTable.vue b/src/views/Suppression/SuppTable.vue
index ade3541..7389051 100644
--- a/src/views/Suppression/SuppTable.vue
+++ b/src/views/Suppression/SuppTable.vue
@@ -37,6 +37,10 @@
+
+
+ |
@@ -70,6 +74,7 @@
|
{{ item.id }} |
+ {{ item.nbExemplaires }} |
{{ item.dateCreation }} |
{{ item.dateModification }} |
{{ item.iln }} |
@@ -140,6 +145,12 @@ const headingsDemandes = [
align: 'center',
display: true,
},
+ {
+ title: 'Nb d\'exemplaires',
+ key: 'nbExemplaires',
+ align: 'center',
+ display: true,
+ },
{
title: 'Crée le',
key: 'dateCreation',
@@ -237,6 +248,7 @@ const isDataLoaded = ref(false);
//Search fields columns
const numDemandeSearchField = ref('');
+const nbExemplairesSearchField = ref('');
const dateCreationSearchField = ref('');
const dateModificationSearchField = ref('');
const ilnSearchField = ref('');
@@ -290,7 +302,6 @@ async function loadItems(type, archive) {
contentsDemandesFrontFiltered.value = response.data.map((item) => ({
...item,
expanded: false,
-
}));
isDataLoaded.value = true;
@@ -305,6 +316,8 @@ function filterItems() {
contentsDemandesFrontFiltered.value = contentsDemandesFromServer.value.filter(demande => {
const matchesNumDemande = numDemandeSearchField.value === '' || demande.id.toString()
.includes(numDemandeSearchField.value);
+ const matchesNbExemplaires = nbExemplairesSearchField.value === '' || demande.nbExemplaires.toString()
+ .includes(nbExemplairesSearchField.value);
const matchesDateCreation = dateCreationSearchField.value === '' || demande.dateCreation.toString()
.includes(dateCreationSearchField.value);
const matchesDateModification = dateModificationSearchField.value === '' || demande.dateModification.toString()
@@ -317,7 +330,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 && matchesDateCreation && matchesDateModification && matchesRCR && matchesILN && matchesZone && matchesTraitement && matchesEtatDemande;
+ return matchesNumDemande && matchesNbExemplaires && matchesDateCreation && matchesDateModification && matchesRCR && matchesILN && matchesZone && matchesTraitement && matchesEtatDemande;
});
}
@@ -389,6 +402,7 @@ function colorProgressBar(item) {