Skip to content

Commit

Permalink
Merge pull request #142 from abes-esr/develop
Browse files Browse the repository at this point in the history
develop
  • Loading branch information
SamuelQuetin authored Oct 9, 2024
2 parents 667b13a + 675fd87 commit 85c808e
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 10 deletions.
16 changes: 8 additions & 8 deletions src/components/NavigateNotice.vue
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@
large
dark
@click="first"
aria-label="Première notice">
aria-label="Première ligne">
<v-icon>mdi-page-first</v-icon>
</v-btn>
</v-row>
<v-row class="d-flex justify-center">
<div style="width: 4em; text-align: center;">Première notice</div>
<span aria-label="Navigation à la première ligne">Première ligne</span>
</v-row>
<!--Conteneur bouton 2-->
<v-row class="d-flex justify-center">
Expand All @@ -23,12 +23,12 @@
large
dark
@click="prev"
aria-label="Notice précédente">
aria-label="Ligne précédente">
<v-icon>mdi-chevron-left</v-icon>
</v-btn>
</v-row>
<v-row class="d-flex justify-center">
<div style="width: 5em; text-align: center;">Notice précédente</div>
<span aria-label="Navigation à la ligne précédente">Ligne précédente</span>
</v-row>
<!--Conteneur bouton 3-->
<v-row class="d-flex justify-center">
Expand All @@ -38,12 +38,12 @@
large
dark
@click="next"
aria-label="Notice suivante">
aria-label="Ligne suivante">
<v-icon>mdi-chevron-right</v-icon>
</v-btn>
</v-row>
<v-row class="d-flex justify-center">
<div style="width: 4em; text-align: center;">Notice suivante</div>
<span aria-label="Navigation à la ligne suivante">Ligne suivante</span>
</v-row>
<!--Conteneur bouton 4-->
<v-row class="d-flex justify-center">
Expand All @@ -53,12 +53,12 @@
large
dark
@click="last"
aria-label="Dernière notice">
aria-label="Dernière ligne">
<v-icon>mdi-page-last</v-icon>
</v-btn>
</v-row>
<v-row class="d-flex justify-center">
<div style="width: 4em; text-align: center;">Dernière notice</div>
<span aria-label="Navigation à la dernière ligne">Dernière ligne</span>
</v-row>
</template>
<script setup>
Expand Down
1 change: 1 addition & 0 deletions src/views/Exemplarisation/ExempSteps.vue
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,7 @@ function createDemande() {
itemService.creerDemande(rcrSelected.value, 'EXEMP')
.then(response => {
demande.value = response.data;
router.replace(`/exemplarisation/${demande.value.id}`)
next();
}).catch(err => {
emits('backendError',err);
Expand Down
3 changes: 2 additions & 1 deletion src/views/Modification/ModifSteps.vue
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,7 @@ function createDemande() {
itemService.creerDemande(rcrSelected.value, 'MODIF')
.then(response => {
demande.value = response.data;
router.replace(`/modification/${demande.value.id}`)
next();
}).catch(err => {
emits('backendError', err);
Expand All @@ -259,12 +260,12 @@ function uploadFileInit() {
itemService.uploadDemande(demande.value.id, fileInitSelected.value, 'MODIF')
.then(() => {
alertMessage.value = "Fichier envoyé";
isLoaded.value = true;
itemService.getFile(demande.value.id, 'MODIF','fichier_prepare', '.csv')
.then(response => {
let blob = new Blob([response.data], {type: 'application/csv'});
fileLink.value = window.URL.createObjectURL(blob);
fileName.value = `fichier_demande_${demande.value.id}.csv`;
isLoaded.value = true;
})
})
.catch(err => {
Expand Down
1 change: 1 addition & 0 deletions src/views/Recouvrement/RecouvSteps.vue
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,7 @@ function createDemande() {
itemService.creerDemande(rcrSelected.value, 'RECOUV')
.then(response => {
demande.value = response.data;
router.replace(`/recouvrement/${demande.value.id}`)
next();
}).catch(err => {
emits('backendError',err);
Expand Down
3 changes: 2 additions & 1 deletion src/views/Suppression/SuppSteps.vue
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,7 @@ function createDemande() {
itemService.creerDemande(rcrSelected.value, 'SUPP')
.then(response => {
demande.value = response.data;
router.replace(`/suppression/${demande.value.id}`)
next();
}).catch(err => {
emits('backendError', err);
Expand All @@ -238,12 +239,12 @@ function uploadFile() {
itemService.uploadDemande(demande.value.id, fileSelected.value, 'SUPP')
.then(() => {
alertMessage.value = "Fichier envoyé";
isLoaded.value = true;
itemService.getFile(demande.value.id, 'SUPP','fichier_correspondance', '.csv')
.then(response => {
let blob = new Blob([response.data], {type: 'application/csv'});
fileLink.value = window.URL.createObjectURL(blob);
fileName.value = `fichier_demande_${demande.value.id}.csv`;
isLoaded.value = true;
})
})
.catch(err => {
Expand Down

0 comments on commit 85c808e

Please sign in to comment.