Merge pull request #191 from abes-esr/develop

Merge dev dans test

src/components/Simulation.vue

@@ -10,14 +10,16 @@
 
   <recap-demande :demande="demande"></recap-demande>
   <!-- CONTENU SIMULATION -->
-  <v-alert icon="mdi-alert" type="error" v-if="alertMessageError" class="my-3" border="left">Simulation impossible : {{ alertMessageError }}</v-alert>
+  <v-alert icon="mdi-alert" type="error" v-if="alertMessageError" class="my-3" border="left">Simulation impossible :
+    {{ alertMessageError }}
+  </v-alert>
   <v-card flat class="pb-2">
     <v-card-title class="d-flex justify-space-between custom-card-title">
       <span>Ecran de simulation</span>
       <v-btn depressed variant="text" @click="deleted()" prepend-icon="mdi-delete">Supprimer</v-btn>
     </v-card-title>
     <!--TEMPLATE DE SIMULATION-->
-    <v-alert type="warning"  class="my-3 pa-2" dense prominent border="left">
+    <v-alert type="warning" class="my-3 pa-2" dense prominent border="left">
       Cet écran est une <strong>prévisualisation</strong> du traitement.<br>
       Il s'agit de la <strong>dernière étape</strong> avant de lancer le traitement en <strong>base de
       production</strong>. Merci de <strong>vérifier vos données</strong>.
@@ -36,7 +38,7 @@
         </v-card>
       </v-col>
       <v-col cols="12" sm="12" md="2" class="pb-10">
-        <navigate-notice v-model="nbNotice" @clicked="refresh()"></navigate-notice>
+        <navigate-notice v-model="nbNotice" @clicked="refresh(nbNotice.nbNoticeEnCours)"></navigate-notice>
       </v-col>
       <v-col cols="12" sm="12" md="5"> <!--Exemplaire à créer-->
         <v-card class="pa-1 mr-1" outlined tile>
@@ -54,7 +56,7 @@
 
 import RecapDemande from '@/components/RecapDemande.vue';
 import NavigateNotice from '@/components/NavigateNotice.vue';
-import { onMounted, ref } from 'vue';
+import { onMounted, ref, watchEffect } from 'vue';
 import itemService from '@/service/ItemService';
 
 const props = defineProps({
@@ -71,48 +73,44 @@ const props = defineProps({
     default: 'Après'
   }
 });
-const emits = defineEmits(['deleted'])
+const emits = defineEmits(['deleted']);
 
 const nbNotice = ref({
   nbNoticeEnCours: 0,
   nbTotalNotice: 0
 });
 const numeroPPNNotice = ref();
-const noticeAvant = ref("");
-const noticeApres = ref("");
+const noticeAvant = ref('');
+const noticeApres = ref('');
 const isLoading = ref(true);
 const alertMessageError = ref();
 
 onMounted(() => {
-  itemService.getNbLigneFichier(props.demande.id, props.demande.type)
-    .then(response => {
-      nbNotice.value.nbTotalNotice = response.data;
-    });
-  itemService.simulerLigne(props.demande.id, 0, props.demande.type)
-    .then(response => {
-      numeroPPNNotice.value = response.data[0];
-      noticeAvant.value = response.data[1];
-      noticeApres.value = response.data[2];
-    })
-    .catch(err => {
-      alertMessageError.value = err.response.data.message
-    })
-    .finally(() => {
-      isLoading.value = false;
-    });
+  refresh(0);
+});
+
+watchEffect(() => {
+  if (props.demande.etatDemande === 'En simulation') {
+    refresh(0);
+  }
 });
 
-function refresh() {
+//nbNotice.value.nbNoticeEnCours
+function refresh(nbNoticeEnCours) {
   isLoading.value = true;
   alertMessageError.value = null;
-  itemService.simulerLigne(props.demande.id, nbNotice.value.nbNoticeEnCours, props.demande.type)
+  itemService.getNbLigneFichier(props.demande.id, props.demande.type)
+    .then(response => {
+      nbNotice.value.nbTotalNotice = response.data;
+    });
+  itemService.simulerLigne(props.demande.id, nbNoticeEnCours, props.demande.type)
     .then(response => {
       numeroPPNNotice.value = response.data[0];
       noticeAvant.value = response.data[1];
       noticeApres.value = response.data[2];
     })
     .catch(err => {
-      alertMessageError.value = err.response.data.message
+      alertMessageError.value = err.response.data.message;
     })
     .finally(() => {
       isLoading.value = false;
@@ -134,6 +132,7 @@ h4 {
   font-size: x-large;
   font-weight: normal;
 }
+
 h5 {
   font-size: x-large;
   font-weight: normal;

src/components/Supp/BtnStop.vue

@@ -1,25 +1,28 @@
 <template>
-  <v-btn icon="mdi-stop"  variant="plain" @click="click">
+  <v-btn icon="mdi-stop" variant="plain" @click="click">
   </v-btn>
-  <dialog-confirmation-stop v-model="dialog" :id="id" @stop="emits('stop')">
+  <dialog-confirmation-stop v-model="dialog" :id="id" @stop="emits('stop')" @on-error="throwError">
   </dialog-confirmation-stop>
 </template>
 <script setup>
-import DialogConfirmationStop from "@/components/Supp/DialogConfirmationStop.vue";
-import {ref} from "vue";
+import DialogConfirmationStop from '@/components/Supp/DialogConfirmationStop.vue';
+import { ref } from 'vue';
 
-const emits = defineEmits(['stop'])
+const emits = defineEmits(['stop', 'onError']);
 const props = defineProps({
-  id:{
-    required:true,
-    type:Number
+  id: {
+    required: true,
+    type: Number
   }
-})
+});
 const dialog = ref(false);
 
 function click() {
-  dialog.value = true
+  dialog.value = true;
 }
 
+function throwError(err) {
+  emits('onError', err);
+}
 
 </script>

src/components/Supp/DialogConfirmationStop.vue

@@ -3,7 +3,7 @@
     <v-card>
       <v-card-title>Confirmation</v-card-title>
       <v-card-text>
-        Voulez vous vraiment stopper le traitement sur la demande N°{{id}} ?
+        Voulez vous vraiment stopper le traitement sur la demande N°{{ id }} ?
       </v-card-text>
       <v-card-actions>
         <v-btn @click="dialog=false">Refuser</v-btn>
@@ -13,21 +13,25 @@
   </v-dialog>
 </template>
 <script setup>
-import itemService from "@/service/ItemService";
+import itemService from '@/service/ItemService';
 
-const emits = defineEmits(['stop'])
+const emits = defineEmits(['stop', 'onError']);
 const dialog = defineModel();
 const props = defineProps({
-  id:{
-    required:true,
-    type:Number
+  id: {
+    required: true,
+    type: Number
   }
-})
+});
 
-function stopDemande(){
-  itemService.stopDemande(props.id).finally(() => {
-    dialog.value = false;
-    emits('stop');
-  });
+function stopDemande() {
+  itemService.stopDemande(props.id)
+    .catch(err => {
+      emits('onError', err);
+    })
+    .finally(() => {
+      dialog.value = false;
+      emits('stop');
+    });
 }
 </script>

src/service/ItemService.js

@@ -170,6 +170,10 @@ export class ItemService {
   stopDemande(id) {
     return this.client.patch('stopDemandeSupp/' + id);
   }
+
+  restaurerDemande(id, typeDemande) {
+    return this.client.patch('restaurerDemande/' + typeDemande + '/' + id )
+  }
 }
 
 export default new ItemService()