From 71884dcb1a430e280786ae40aa4898627de44ad1 Mon Sep 17 00:00:00 2001
From: Alejandro MG <alejandro@amguillen.dev>
Date: Fri, 17 Jan 2025 16:50:41 +0100
Subject: [PATCH 01/15] UI modal structure

---
 frontend/src/utils/mappings.js                | 56 +++++++++++
 .../src/views/InstructionPage/DecisionTab.vue | 57 +----------
 .../VisaPage/DecisionModificationModal.vue    | 98 +++++++++++++++++++
 .../src/views/VisaPage/VisaValidationTab.vue  | 25 +++--
 4 files changed, 171 insertions(+), 65 deletions(-)
 create mode 100644 frontend/src/views/VisaPage/DecisionModificationModal.vue

diff --git a/frontend/src/utils/mappings.js b/frontend/src/utils/mappings.js
index 4d9ea11ac..f2c92e19b 100644
--- a/frontend/src/utils/mappings.js
+++ b/frontend/src/utils/mappings.js
@@ -275,3 +275,59 @@ export const populationCategoriesMapping = {
 export const getAuthorizationModeInFrench = (type) => {
   return authorizationModesMapping[type] || null
 }
+
+export const blockingReasons = [
+  {
+    title: "Le produit ne répond pas à la définition du complément alimentaire",
+    items: [
+      "Forme assimilable à un aliment courant",
+      "Recommandations d'emploi incompatibles",
+      "Composition (source concentrée, ...)",
+      "Autre raison pour laquelle le produit ne répond pas à la définition du complément alimentaire",
+    ],
+  },
+  {
+    title: "Le produit répond à la définition du médicament",
+    items: ["Médicament par fonction", "Médicament par présentation", "Sevrage tabagique"],
+  },
+  {
+    title: "Les procédures ne sont pas respectées",
+    items: [
+      "Présence d'un Novel Food",
+      "Présence d'une forme d'apport en nutriments non autorisée",
+      "Demande en article 17 attendue",
+      "Demande en article 18 attendue",
+    ],
+  },
+  {
+    title: "Le dossier n'est pas recevable",
+    items: [
+      "Incohérences entre le dossier et l'étiquetage",
+      "Informations manquantes",
+      "Absence de preuve de reconnaissance mutuelle",
+      "Absence ou non conformité de l'étiquetage",
+      "Autre motif d'irrecevabilité",
+    ],
+  },
+  {
+    title: "Le complément alimentaire n'est pas acceptable",
+    items: ["Existence d'un risque"],
+  },
+]
+
+export const decisionCategories = [
+  {
+    value: "approve",
+    title: "J’envoie l’attestation de déclaration",
+    icon: "ri-checkbox-circle-fill",
+    description: "La déclaration est conforme et peut être transmise.",
+    color: "green",
+  },
+  {
+    value: "modify",
+    title: "Des changements sont nécessaires",
+    icon: "ri-close-circle-fill",
+    description: "La déclaration ne peut pas être transmise en l'état.",
+    color: "red",
+  },
+]
diff --git a/frontend/src/views/InstructionPage/DecisionTab.vue b/frontend/src/views/InstructionPage/DecisionTab.vue
index e0923d40e..56709d008 100644
--- a/frontend/src/views/InstructionPage/DecisionTab.vue
+++ b/frontend/src/views/InstructionPage/DecisionTab.vue
@@ -105,6 +105,7 @@ import { headers } from "@/utils/data-fetching"
 import useToaster from "@/composables/use-toaster"
 import { handleError } from "@/utils/error-handling"
 import ArticleInfoRow from "@/components/DeclarationSummary/ArticleInfoRow"
+import { blockingReasons, decisionCategories } from "@/utils/mappings"
 
 const decisionCategory = ref(null)
 watch(decisionCategory, () => (proposal.value = decisionCategory.value === "approve" ? "autorisation" : null))
@@ -142,62 +143,6 @@ watch(proposal, (newProposal) => {
 
 const needsAnsesReferal = computed(() => declaration.value?.article === "ANSES_REFERAL")
 
-const decisionCategories = [
-  {
-    value: "approve",
-    title: "J’envoie l’attestation de déclaration",
-    icon: "ri-checkbox-circle-fill",
-    description: "La déclaration est conforme et peut être transmise.",
-    color: "green",
-  },
-  {
-    value: "modify",
-    title: "Des changements sont nécessaires",
-    icon: "ri-close-circle-fill",
-    description: "La déclaration ne peut pas être transmise en l'état.",
-    color: "red",
-  },
-]
-
-const blockingReasons = [
-  {
-    title: "Le produit ne répond pas à la définition du complément alimentaire",
-    items: [
-      "Forme assimilable à un aliment courant",
-      "Recommandations d'emploi incompatibles",
-      "Composition (source concentrée, ...)",
-      "Autre raison pour laquelle le produit ne répond pas à la définition du complément alimentaire",
-    ],
-  },
-  {
-    title: "Le produit répond à la définition du médicament",
-    items: ["Médicament par fonction", "Médicament par présentation", "Sevrage tabagique"],
-  },
-  {
-    title: "Les procédures ne sont pas respectées",
-    items: [
-      "Présence d'un Novel Food",
-      "Présence d'une forme d'apport en nutriments non autorisée",
-      "Demande en article 17 attendue",
-      "Demande en article 18 attendue",
-    ],
-  },
-  {
-    title: "Le dossier n'est pas recevable",
-    items: [
-      "Incohérences entre le dossier et l'étiquetage",
-      "Informations manquantes",
-      "Absence de preuve de reconnaissance mutuelle",
-      "Absence ou non conformité de l'étiquetage",
-      "Autre motif d'irrecevabilité",
-    ],
-  },
-  {
-    title: "Le complément alimentaire n'est pas acceptable",
-    items: ["Existence d'un risque"],
-  },
-]
-
 const proposalOptions = computed(() => {
   if (decisionCategory.value === "approve") return [{ text: "Autorisation", value: "autorisation" }]
 
diff --git a/frontend/src/views/VisaPage/DecisionModificationModal.vue b/frontend/src/views/VisaPage/DecisionModificationModal.vue
new file mode 100644
index 000000000..6a03ab780
--- /dev/null
+++ b/frontend/src/views/VisaPage/DecisionModificationModal.vue
@@ -0,0 +1,98 @@
+<template>
+  <div>
+    <div class="text-right">
+      <DsfrButton label="Modifier la décision" size="sm" secondary icon="ri-edit-fill" @click="open" />
+    </div>
+
+    <DsfrModal
+      :actions="actions"
+      ref="modal"
+      @close="close"
+      :opened="opened"
+      title="Modifier la décision de l'instruction"
+      size="xl"
+    >
+      <div class="grid grid-cols-2 gap-4">
+        <div class="col-span-2 sm:col-span-1">
+          <DsfrInputGroup>
+            <DsfrSelect
+              label="Nouvelle décision"
+              v-model="overridenDecision.proposal"
+              :options="proposalOptions"
+              class="max-w-96"
+            />
+          </DsfrInputGroup>
+        </div>
+        <div class="col-span-2 sm:col-span-1">
+          <DsfrInputGroup>
+            <DsfrInput
+              v-model="overridenDecision.delayDays"
+              label="Délai de réponse (jours)"
+              label-visible
+              class="max-w-96"
+            />
+          </DsfrInputGroup>
+        </div>
+      </div>
+      <DsfrInputGroup>
+        <DsfrInput
+          is-textarea
+          label="Message au déclarant·e"
+          v-model="overridenDecision.producerMessage"
+          label-visible
+        />
+      </DsfrInputGroup>
+      <div v-if="showReasons" class="border p-4">
+        <DsfrInputGroup>
+          <div class="mb-8" v-for="reason in blockingReasons" :key="reason.title">
+            <p class="font-bold">{{ reason.title }}</p>
+            <DsfrCheckboxSet
+              v-model="overridenDecision.reasons"
+              :options="reason.items.map((x) => ({ label: x, value: x }))"
+            />
+          </div>
+        </DsfrInputGroup>
+      </div>
+    </DsfrModal>
+  </div>
+</template>
+
+<script setup>
+import { ref, computed, onUpdated } from "vue"
+import { blockingReasons } from "@/utils/mappings"
+const emit = defineEmits(["override"])
+const props = defineProps({ originalOverridenDecision: { type: Object, default: () => {} } })
+
+const overridenDecision = ref(props.originalOverridenDecision || {})
+
+const opened = ref(false)
+
+const actions = [
+  {
+    label: "Modifier la décision",
+    onClick: () => emit("override", overridenDecision.value),
+    icon: { name: "ri-edit-fill" },
+  },
+  {
+    label: "Annuler",
+    onClick: () => close(),
+    secondary: true,
+  },
+]
+
+const close = () => (opened.value = false)
+const open = () => (opened.value = true)
+
+const proposalOptions = [
+  { text: "Autorisation", value: "autorisation" },
+  { text: "Observation", value: "observation" },
+  { text: "Objection", value: "objection" },
+  { text: "Refus", value: "rejection" },
+]
+
+const showReasons = computed(
+  () => overridenDecision.value.proposal && overridenDecision.value.proposal !== "autorisation"
+)
+
+onUpdated(() => (overridenDecision.value = props.originalOverridenDecision || {}))
+</script>
diff --git a/frontend/src/views/VisaPage/VisaValidationTab.vue b/frontend/src/views/VisaPage/VisaValidationTab.vue
index ea59848a9..fd54ea50d 100644
--- a/frontend/src/views/VisaPage/VisaValidationTab.vue
+++ b/frontend/src/views/VisaPage/VisaValidationTab.vue
@@ -5,6 +5,12 @@
       <div class="border p-2">
         <VisaInfoLine title="Instructeur·ice" :text="instructorName" icon="ri-account-circle-line" />
         <VisaInfoLine title="Décision" :text="postValidationStatus" icon="ri-focus-2-fill" />
+        <VisaInfoLine
+          v-if="declaration.blockingReasons?.length"
+          title="Raisons de la décision"
+          icon="ri-edit-line"
+          :text="declaration.blockingReasons.join(',\n') || '< non spécifié >'"
+        />
         <VisaInfoLine title="Message au déclarant·e" icon="ri-chat-3-line">
           <template v-slot:value>
             <DsfrInputGroup>
@@ -23,12 +29,9 @@
           icon="ri-time-fill"
           :text="declaration.postValidationExpirationDays || '< non spécifié >'"
         />
-        <VisaInfoLine
-          v-if="declaration.blockingReasons?.length"
-          title="Raisons de la décision"
-          icon="ri-edit-line"
-          :text="declaration.blockingReasons.join(',\n') || '< non spécifié >'"
-        />
+        <div class="px-4 py-2 border bg-gray-50">
+          <DecisionModificationModal :overridenDecision="overridenDecision" />
+        </div>
       </div>
     </div>
 
@@ -64,16 +67,20 @@ import { handleError } from "@/utils/error-handling"
 import useToaster from "@/composables/use-toaster"
 import VisaInfoLine from "./VisaInfoLine.vue"
 import ArticleInfoRow from "@/components/DeclarationSummary/ArticleInfoRow"
+import DecisionModificationModal from "./DecisionModificationModal"
 
 const $externalResults = ref({})
 const emit = defineEmits(["decision-done"])
 const declaration = defineModel()
 
+const overridenDecision = ref({})
+
 const producerMessage = ref(declaration.value.postValidationProducerMessage)
 
-const instructorName = computed(
-  () => `${declaration.value?.instructor?.firstName} ${declaration.value?.instructor?.lastName}`
-)
+const instructorName = computed(() => {
+  if (!declaration.value?.instructor) return "-"
+  return `${declaration.value.instructor.firstName || ""} ${declaration.value.instructor.lastName || ""}`
+})
 const showExpirationDays = computed(
   () =>
     declaration.value.postValidationStatus === "OBJECTION" || declaration.value.postValidationStatus === "OBSERVATION"

From b266b95a7907264278e3171d9ee7581847612ad5 Mon Sep 17 00:00:00 2001
From: Alejandro MG <alejandro@amguillen.dev>
Date: Fri, 17 Jan 2025 16:51:05 +0100
Subject: [PATCH 02/15] Backend decision override first approach

---
 api/tests/test_declaration_flow.py   | 24 ++++++++++++++++++++++++
 api/views/declaration/declaration.py | 10 ++++++++--
 2 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/api/tests/test_declaration_flow.py b/api/tests/test_declaration_flow.py
index c13a117b4..75d6b8a35 100644
--- a/api/tests/test_declaration_flow.py
+++ b/api/tests/test_declaration_flow.py
@@ -657,6 +657,30 @@ def test_accept_visa(self):
         self.assertEqual(latest_snapshot.comment, "Observation")
         self.assertEqual(latest_snapshot.expiration_days, 23)
 
+    @authenticate
+    def test_visor_can_modify_decision(self):
+        """
+        La viseuse peut modifier la décision de l'instructrice
+        """
+        VisaRoleFactory(user=authenticate.user)
+
+        # L'instructrice à marqué cette déclaration comme « autorisée », mais la viseuse la fera
+        # passer en observation
+        declaration = OngoingVisaDeclarationFactory(
+            post_validation_status=Declaration.DeclarationStatus.AUTHORIZED,
+            post_validation_producer_message="À authoriser",
+        )
+
+        body = {"override": "OBSERVATION", "comment": "Observation"}
+        response = self.client.post(reverse("api:accept_visa", kwargs={"pk": declaration.id}), body, format="json")
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+
+        declaration.refresh_from_db()
+        latest_snapshot = declaration.snapshots.latest("creation_date")
+        self.assertEqual(declaration.status, Declaration.DeclarationStatus.OBSERVATION)
+        self.assertEqual(latest_snapshot.comment, "Observation")
+        self.assertEqual(latest_snapshot.status, Declaration.DeclarationStatus.OBSERVATION)
+
     @authenticate
     def test_visor_can_modify_comment(self):
         """
diff --git a/api/views/declaration/declaration.py b/api/views/declaration/declaration.py
index 639f68070..c91843afa 100644
--- a/api/views/declaration/declaration.py
+++ b/api/views/declaration/declaration.py
@@ -649,9 +649,15 @@ class DeclarationAcceptVisaView(VisaDecisionView):
 
     snapshot_action = Snapshot.SnapshotActions.ACCEPT_VISA
 
-    def get_snapshot_post_validation_status(self, request, declaration):
+    def get_validation_status(self, request, declaration):
+        overriden_status = request.data.get("override")
+        if overriden_status:
+            return Declaration.DeclarationStatus(overriden_status)
         return declaration.post_validation_status
 
+    def get_snapshot_post_validation_status(self, request, declaration):
+        return self.get_validation_status(request, declaration)
+
     def perform_snapshot_creation(self, request, declaration):
         """
         Possible de le surcharger si la création du snapshot nécessite un
@@ -672,7 +678,7 @@ def get_transition(self, request, declaration):
             Declaration.DeclarationStatus.OBJECTION: "accept_visa_object",
             Declaration.DeclarationStatus.OBSERVATION: "accept_visa_observe",
         }
-        return transition_map.get(declaration.post_validation_status)
+        return transition_map.get(self.get_validation_status(request, declaration))
 
     def get_brevo_template_id(self, request, declaration):
         template_map = {

From 2c400eee482920dc2bc0b7132478a8d7f594e196 Mon Sep 17 00:00:00 2001
From: Alejandro MG <alejandro@amguillen.dev>
Date: Mon, 20 Jan 2025 12:32:45 +0100
Subject: [PATCH 03/15] UI for overriden decision items

---
 .../VisaPage/DecisionModificationModal.vue    | 89 ++++++++++++++-----
 frontend/src/views/VisaPage/VisaInfoLine.vue  |  5 +-
 .../src/views/VisaPage/VisaValidationTab.vue  | 50 +++++++----
 3 files changed, 101 insertions(+), 43 deletions(-)

diff --git a/frontend/src/views/VisaPage/DecisionModificationModal.vue b/frontend/src/views/VisaPage/DecisionModificationModal.vue
index 6a03ab780..a3612e3a4 100644
--- a/frontend/src/views/VisaPage/DecisionModificationModal.vue
+++ b/frontend/src/views/VisaPage/DecisionModificationModal.vue
@@ -1,6 +1,15 @@
 <template>
   <div>
     <div class="text-right">
+      <DsfrButton
+        v-if="showUndoButton"
+        label="Annuler la modification"
+        size="sm"
+        secondary
+        icon="ri-close-fill"
+        @click="undo"
+        class="mr-2"
+      />
       <DsfrButton label="Modifier la décision" size="sm" secondary icon="ri-edit-fill" @click="open" />
     </div>
 
@@ -12,9 +21,9 @@
       title="Modifier la décision de l'instruction"
       size="xl"
     >
-      <div class="grid grid-cols-2 gap-4">
+      <div class="grid grid-cols-2 gap-4 mb-2">
         <div class="col-span-2 sm:col-span-1">
-          <DsfrInputGroup>
+          <DsfrInputGroup :error-message="firstErrorMsg(v$, 'proposal')">
             <DsfrSelect
               label="Nouvelle décision"
               v-model="overridenDecision.proposal"
@@ -23,8 +32,8 @@
             />
           </DsfrInputGroup>
         </div>
-        <div class="col-span-2 sm:col-span-1">
-          <DsfrInputGroup>
+        <div class="col-span-2 sm:col-span-1" v-if="showDelayDays">
+          <DsfrInputGroup :error-message="firstErrorMsg(v$, 'delayDays')">
             <DsfrInput
               v-model="overridenDecision.delayDays"
               label="Délai de réponse (jours)"
@@ -34,16 +43,11 @@
           </DsfrInputGroup>
         </div>
       </div>
-      <DsfrInputGroup>
-        <DsfrInput
-          is-textarea
-          label="Message au déclarant·e"
-          v-model="overridenDecision.producerMessage"
-          label-visible
-        />
+      <DsfrInputGroup :error-message="firstErrorMsg(v$, 'comment')">
+        <DsfrInput is-textarea label="Message au déclarant·e" v-model="overridenDecision.comment" label-visible />
       </DsfrInputGroup>
       <div v-if="showReasons" class="border p-4">
-        <DsfrInputGroup>
+        <DsfrInputGroup :error-message="firstErrorMsg(v$, 'reasons')">
           <div class="mb-8" v-for="reason in blockingReasons" :key="reason.title">
             <p class="font-bold">{{ reason.title }}</p>
             <DsfrCheckboxSet
@@ -58,19 +62,46 @@
 </template>
 
 <script setup>
-import { ref, computed, onUpdated } from "vue"
+import { ref, computed, watch } from "vue"
 import { blockingReasons } from "@/utils/mappings"
-const emit = defineEmits(["override"])
-const props = defineProps({ originalOverridenDecision: { type: Object, default: () => {} } })
+import { errorRequiredField, firstErrorMsg } from "@/utils/forms"
+import { helpers, required } from "@vuelidate/validators"
+import { useVuelidate } from "@vuelidate/core"
+
+const modelValue = defineModel()
+const overridenDecision = ref()
+
+const copyModelValueToRef = () =>
+  (overridenDecision.value = modelValue.value ? JSON.parse(JSON.stringify(modelValue.value)) : { reasons: [] })
+
+copyModelValueToRef()
 
-const overridenDecision = ref(props.originalOverridenDecision || {})
+const rules = computed(() => {
+  if (!overridenDecision.value?.proposal) return { proposal: errorRequiredField }
+  if (overridenDecision.value?.proposal === "AUTHORIZED") return {}
+  return {
+    comment: errorRequiredField,
+    reasons: { required: helpers.withMessage("Au moins une raison doit être selectionnée", required) },
+    proposal: errorRequiredField,
+    delayDays: overridenDecision.value?.proposal !== "REJECTED" ? errorRequiredField : {},
+  }
+})
+
+const $externalResults = ref({})
+const v$ = useVuelidate(rules, overridenDecision, { $externalResults })
 
 const opened = ref(false)
 
 const actions = [
   {
     label: "Modifier la décision",
-    onClick: () => emit("override", overridenDecision.value),
+    onClick: () => {
+      v$.value.$reset()
+      v$.value.$validate()
+      if (v$.value.$error) return
+      modelValue.value = overridenDecision.value
+      close()
+    },
     icon: { name: "ri-edit-fill" },
   },
   {
@@ -80,19 +111,29 @@ const actions = [
   },
 ]
 
-const close = () => (opened.value = false)
+const close = () => {
+  opened.value = false
+  copyModelValueToRef()
+}
 const open = () => (opened.value = true)
+const undo = () => (modelValue.value = undefined)
+
+const showUndoButton = computed(() => !!modelValue.value?.proposal)
 
 const proposalOptions = [
-  { text: "Autorisation", value: "autorisation" },
-  { text: "Observation", value: "observation" },
-  { text: "Objection", value: "objection" },
-  { text: "Refus", value: "rejection" },
+  { text: "Autorisation", value: "AUTHORIZED" },
+  { text: "Observation", value: "OBSERVATION" },
+  { text: "Objection", value: "OBJECTION" },
+  { text: "Refus", value: "REJECTED" },
 ]
 
 const showReasons = computed(
-  () => overridenDecision.value.proposal && overridenDecision.value.proposal !== "autorisation"
+  () => overridenDecision.value.proposal && overridenDecision.value.proposal !== "AUTHORIZED"
+)
+
+const showDelayDays = computed(
+  () => overridenDecision.value.proposal === "OBSERVATION" || overridenDecision.value.proposal === "OBJECTION"
 )
 
-onUpdated(() => (overridenDecision.value = props.originalOverridenDecision || {}))
+watch(modelValue, () => copyModelValueToRef())
 </script>
diff --git a/frontend/src/views/VisaPage/VisaInfoLine.vue b/frontend/src/views/VisaPage/VisaInfoLine.vue
index 690d5c4bc..20a3349fe 100644
--- a/frontend/src/views/VisaPage/VisaInfoLine.vue
+++ b/frontend/src/views/VisaPage/VisaInfoLine.vue
@@ -6,14 +6,15 @@
     </div>
     <div class="comment sm:flex-auto">
       <slot name="value">
-        {{ text }}
+        <p class="mb-0 line-through" v-if="strikethroughText">{{ strikethroughText }}</p>
+        <p class="mb-0">{{ text }}</p>
       </slot>
     </div>
   </div>
 </template>
 
 <script setup>
-defineProps(["icon", "title", "text"])
+defineProps(["icon", "title", "text", "strikethroughText"])
 </script>
 <style scoped>
 .comment {
diff --git a/frontend/src/views/VisaPage/VisaValidationTab.vue b/frontend/src/views/VisaPage/VisaValidationTab.vue
index fd54ea50d..94aaa8085 100644
--- a/frontend/src/views/VisaPage/VisaValidationTab.vue
+++ b/frontend/src/views/VisaPage/VisaValidationTab.vue
@@ -4,33 +4,34 @@
       <h3>Proposition à viser / signer</h3>
       <div class="border p-2">
         <VisaInfoLine title="Instructeur·ice" :text="instructorName" icon="ri-account-circle-line" />
-        <VisaInfoLine title="Décision" :text="postValidationStatus" icon="ri-focus-2-fill" />
+        <VisaInfoLine
+          title="Décision"
+          icon="ri-focus-2-fill"
+          :strikethroughText="hasOverridenOriginalDecision ? declarationProposal : ''"
+          :text="hasOverridenOriginalDecision ? overridenProposal : declarationProposal"
+        />
         <VisaInfoLine
           v-if="declaration.blockingReasons?.length"
           title="Raisons de la décision"
           icon="ri-edit-line"
-          :text="declaration.blockingReasons.join(',\n') || '< non spécifié >'"
+          :strikethroughText="hasOverridenOriginalDecision ? declarationReasons : ''"
+          :text="hasOverridenOriginalDecision ? overridenReasons : declarationReasons"
+        />
+        <VisaInfoLine
+          title="Message au déclarant·e"
+          icon="ri-chat-3-line"
+          :strikethroughText="hasOverridenOriginalDecision ? declarationComment : ''"
+          :text="hasOverridenOriginalDecision ? overridenComment : declarationComment"
         />
-        <VisaInfoLine title="Message au déclarant·e" icon="ri-chat-3-line">
-          <template v-slot:value>
-            <DsfrInputGroup>
-              <DsfrInput
-                is-textarea
-                label="Motivation de la décision (à destination du professionnel)"
-                v-model="producerMessage"
-                class="!mt-0"
-              />
-            </DsfrInputGroup>
-          </template>
-        </VisaInfoLine>
         <VisaInfoLine
           v-if="showExpirationDays"
           title="Délai de réponse"
           icon="ri-time-fill"
-          :text="declaration.postValidationExpirationDays || '< non spécifié >'"
+          :strikethroughText="hasOverridenOriginalDecision ? declarationExpirationDays : ''"
+          :text="hasOverridenOriginalDecision ? overridenExpirationDays : declarationExpirationDays"
         />
         <div class="px-4 py-2 border bg-gray-50">
-          <DecisionModificationModal :overridenDecision="overridenDecision" />
+          <DecisionModificationModal v-model="overridenDecision" />
         </div>
       </div>
     </div>
@@ -73,7 +74,10 @@ const $externalResults = ref({})
 const emit = defineEmits(["decision-done"])
 const declaration = defineModel()
 
-const overridenDecision = ref({})
+const overridenDecision = ref()
+const hasOverridenOriginalDecision = computed(
+  () => overridenDecision.value && Object.keys(overridenDecision.value).length > 0
+)
 
 const producerMessage = ref(declaration.value.postValidationProducerMessage)
 
@@ -146,4 +150,16 @@ const decisionCategories = computed(() => {
     },
   ]
 })
+
+const declarationReasons = computed(() => declaration.value?.blockingReasons?.join(",\n"))
+const overridenReasons = computed(() => overridenDecision.value?.reasons?.join(",\n"))
+
+const declarationComment = computed(() => declaration.value?.postValidationProducerMessage)
+const overridenComment = computed(() => overridenDecision.value?.comment)
+
+const declarationExpirationDays = computed(() => declaration.value?.postValidationExpirationDays)
+const overridenExpirationDays = computed(() => overridenDecision.value?.delayDays)
+
+const declarationProposal = computed(() => postValidationStatus)
+const overridenProposal = computed(() => statusProps[overridenDecision.value?.proposal]?.label)
 </script>

From 47dcc0c1c048177c7abe56d68c84a76544f038b6 Mon Sep 17 00:00:00 2001
From: Alejandro MG <alejandro@amguillen.dev>
Date: Tue, 21 Jan 2025 11:09:58 +0100
Subject: [PATCH 04/15] Requests between back and front

---
 api/tests/test_declaration_flow.py            | 14 +++++++++--
 api/views/declaration/declaration.py          | 24 ++++++++++++++-----
 .../VisaPage/DecisionModificationModal.vue    |  6 ++++-
 .../src/views/VisaPage/VisaValidationTab.vue  | 20 ++++++++++++----
 4 files changed, 50 insertions(+), 14 deletions(-)

diff --git a/api/tests/test_declaration_flow.py b/api/tests/test_declaration_flow.py
index 75d6b8a35..650f23dbb 100644
--- a/api/tests/test_declaration_flow.py
+++ b/api/tests/test_declaration_flow.py
@@ -671,15 +671,25 @@ def test_visor_can_modify_decision(self):
             post_validation_producer_message="À authoriser",
         )
 
-        body = {"override": "OBSERVATION", "comment": "Observation"}
+        body = {
+            "comment": "overriden comment",
+            "proposal": "OBSERVATION",
+            "delayDays": 6,
+            "reasons": [
+                "a",
+                "b",
+            ],
+        }
         response = self.client.post(reverse("api:accept_visa", kwargs={"pk": declaration.id}), body, format="json")
         self.assertEqual(response.status_code, status.HTTP_200_OK)
 
         declaration.refresh_from_db()
         latest_snapshot = declaration.snapshots.latest("creation_date")
         self.assertEqual(declaration.status, Declaration.DeclarationStatus.OBSERVATION)
-        self.assertEqual(latest_snapshot.comment, "Observation")
+        self.assertEqual(latest_snapshot.comment, "overriden comment")
         self.assertEqual(latest_snapshot.status, Declaration.DeclarationStatus.OBSERVATION)
+        self.assertEqual(latest_snapshot.expiration_days, 6)
+        self.assertEqual(latest_snapshot.blocking_reasons, ["a", "b"])
 
     @authenticate
     def test_visor_can_modify_comment(self):
diff --git a/api/views/declaration/declaration.py b/api/views/declaration/declaration.py
index c91843afa..5de84976a 100644
--- a/api/views/declaration/declaration.py
+++ b/api/views/declaration/declaration.py
@@ -645,12 +645,20 @@ def perform_snapshot_creation(self, request, declaration):
 class DeclarationAcceptVisaView(VisaDecisionView):
     """
     ONGOING_VISA -> { AUTHORIZED | REJECTED | OBJECTION | OBSERVATION }
+    Le ou la viseuse peut surcharger la décision de l'instructrice en envoyant
+    un objet dans le payload de cette forme :
+    {
+        comment: "overriden comment",
+        proposal: "OBSERVATION", // (ou un autre statut)
+        delayDays: 10,
+        reasons: ["a", "b"],
+    }
     """
 
     snapshot_action = Snapshot.SnapshotActions.ACCEPT_VISA
 
     def get_validation_status(self, request, declaration):
-        overriden_status = request.data.get("override")
+        overriden_status = request.data.get("proposal")
         if overriden_status:
             return Declaration.DeclarationStatus(overriden_status)
         return declaration.post_validation_status
@@ -663,12 +671,16 @@ def perform_snapshot_creation(self, request, declaration):
         Possible de le surcharger si la création du snapshot nécessite un
         traitement spécial
         """
-        declaration.create_snapshot(
+        overriden = request.data.get("proposal")
+        data = request.data
+        d = declaration
+        d.create_snapshot(
             user=request.user,
-            comment=request.data.get("comment", declaration.post_validation_producer_message),
-            expiration_days=declaration.post_validation_expiration_days,
-            action=self.get_snapshot_action(request, declaration),
-            post_validation_status=self.get_snapshot_post_validation_status(request, declaration),
+            comment=data.get("comment") if overriden else d.post_validation_producer_message,
+            expiration_days=data.get("delay_days") if overriden else d.post_validation_expiration_days,
+            action=self.get_snapshot_action(request, d),
+            post_validation_status=self.get_snapshot_post_validation_status(request, d),
+            blocking_reasons=data.get("reasons") if overriden else None,
         )
 
     def get_transition(self, request, declaration):
diff --git a/frontend/src/views/VisaPage/DecisionModificationModal.vue b/frontend/src/views/VisaPage/DecisionModificationModal.vue
index a3612e3a4..40bd58a2b 100644
--- a/frontend/src/views/VisaPage/DecisionModificationModal.vue
+++ b/frontend/src/views/VisaPage/DecisionModificationModal.vue
@@ -39,6 +39,7 @@
               label="Délai de réponse (jours)"
               label-visible
               class="max-w-96"
+              type="number"
             />
           </DsfrInputGroup>
         </div>
@@ -115,7 +116,10 @@ const close = () => {
   opened.value = false
   copyModelValueToRef()
 }
-const open = () => (opened.value = true)
+const open = () => {
+  v$.value.$reset()
+  opened.value = true
+}
 const undo = () => (modelValue.value = undefined)
 
 const showUndoButton = computed(() => !!modelValue.value?.proposal)
diff --git a/frontend/src/views/VisaPage/VisaValidationTab.vue b/frontend/src/views/VisaPage/VisaValidationTab.vue
index 94aaa8085..36b4d9919 100644
--- a/frontend/src/views/VisaPage/VisaValidationTab.vue
+++ b/frontend/src/views/VisaPage/VisaValidationTab.vue
@@ -93,7 +93,7 @@ const postValidationStatus = computed(() => statusProps[declaration.value.postVa
 
 const refusalUrl = computed(() => `/api/v1/declarations/${declaration.value.id}/refuse-visa/`)
 const acceptanceUrl = computed(() => `/api/v1/declarations/${declaration.value.id}/accept-visa/`)
-const postData = computed(() => ({ comment: producerMessage.value }))
+const postData = computed(() => overridenDecision.value || {})
 
 const {
   execute: refuseExecute,
@@ -133,9 +133,7 @@ const decisionCategories = computed(() => {
       title: "Je valide cette décision",
       icon: "ri-checkbox-circle-fill",
       iconColor: "green",
-      description: shouldBlockApproval.value
-        ? "La déclaration ne peut pas être autorisée en nécessitant une saisine ANSEES."
-        : "Je vise cette déclaration et signe.",
+      description: validationHelperText.value,
       buttonText: "Valider",
       buttonHandler: acceptVisa,
       blockedByAnses: shouldBlockApproval.value,
@@ -144,13 +142,25 @@ const decisionCategories = computed(() => {
       title: "Je ne suis pas d'accord",
       icon: "ri-close-circle-fill",
       iconColor: "red",
-      description: "Je renvoie le dossier en instruction.",
+      description: refusalHelperText.value,
       buttonText: "Refuser",
       buttonHandler: refuseVisa,
     },
   ]
 })
 
+const validationHelperText = computed(() => {
+  if (shouldBlockApproval.value) return "La déclaration ne peut pas être autorisée en nécessitant une saisine ANSEES."
+  if (hasOverridenOriginalDecision.value) return "Je vise cette déclaration avec les modifications effectuées et signe."
+  return "Je vise cette déclaration et signe."
+})
+
+const refusalHelperText = computed(() => {
+  if (hasOverridenOriginalDecision.value)
+    return "Je renvoie le dossier en instruction. Les modifications effectuées ne seront pas prises en compte."
+  return "Je renvoie le dossier en instruction."
+})
+
 const declarationReasons = computed(() => declaration.value?.blockingReasons?.join(",\n"))
 const overridenReasons = computed(() => overridenDecision.value?.reasons?.join(",\n"))
 

From 5e3d13e52bd5c0aa72e9883c15870029ca85aec1 Mon Sep 17 00:00:00 2001
From: Alejandro MG <alejandro@amguillen.dev>
Date: Tue, 21 Jan 2025 11:15:19 +0100
Subject: [PATCH 05/15] Number validation for delay days

---
 .../src/views/VisaPage/DecisionModificationModal.vue  | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/frontend/src/views/VisaPage/DecisionModificationModal.vue b/frontend/src/views/VisaPage/DecisionModificationModal.vue
index 40bd58a2b..9dbedf622 100644
--- a/frontend/src/views/VisaPage/DecisionModificationModal.vue
+++ b/frontend/src/views/VisaPage/DecisionModificationModal.vue
@@ -39,7 +39,6 @@
               label="Délai de réponse (jours)"
               label-visible
               class="max-w-96"
-              type="number"
             />
           </DsfrInputGroup>
         </div>
@@ -66,7 +65,7 @@
 import { ref, computed, watch } from "vue"
 import { blockingReasons } from "@/utils/mappings"
 import { errorRequiredField, firstErrorMsg } from "@/utils/forms"
-import { helpers, required } from "@vuelidate/validators"
+import { helpers, required, integer } from "@vuelidate/validators"
 import { useVuelidate } from "@vuelidate/core"
 
 const modelValue = defineModel()
@@ -84,7 +83,13 @@ const rules = computed(() => {
     comment: errorRequiredField,
     reasons: { required: helpers.withMessage("Au moins une raison doit être selectionnée", required) },
     proposal: errorRequiredField,
-    delayDays: overridenDecision.value?.proposal !== "REJECTED" ? errorRequiredField : {},
+    delayDays:
+      overridenDecision.value?.proposal !== "REJECTED"
+        ? {
+            required: helpers.withMessage("Ce champ doit être rempli", required),
+            integer: helpers.withMessage("Ce champ doit être un chiffre entier", integer),
+          }
+        : {},
   }
 })
 

From 494597232961b9f3a4e5e8dd48140d73a8f71ce8 Mon Sep 17 00:00:00 2001
From: Alejandro MG <alejandro@amguillen.dev>
Date: Tue, 21 Jan 2025 11:27:15 +0100
Subject: [PATCH 06/15] Removes outdated test

---
 api/tests/test_declaration_flow.py | 38 ------------------------------
 1 file changed, 38 deletions(-)

diff --git a/api/tests/test_declaration_flow.py b/api/tests/test_declaration_flow.py
index 650f23dbb..64b21dad6 100644
--- a/api/tests/test_declaration_flow.py
+++ b/api/tests/test_declaration_flow.py
@@ -691,44 +691,6 @@ def test_visor_can_modify_decision(self):
         self.assertEqual(latest_snapshot.expiration_days, 6)
         self.assertEqual(latest_snapshot.blocking_reasons, ["a", "b"])
 
-    @authenticate
-    def test_visor_can_modify_comment(self):
-        """
-        Une personne avec le rôle de visa peut modifier le commentaire à destination du pro
-        """
-        VisaRoleFactory(user=authenticate.user)
-
-        # Visa acceptée
-        declaration = OngoingVisaDeclarationFactory(
-            post_validation_status=Declaration.DeclarationStatus.AUTHORIZED,
-            post_validation_producer_message="À authoriser",
-            post_validation_expiration_days=12,
-        )
-
-        response = self.client.post(
-            reverse("api:accept_visa", kwargs={"pk": declaration.id}), {"comment": "Overriden comment"}, format="json"
-        )
-        self.assertEqual(response.status_code, status.HTTP_200_OK)
-
-        declaration.refresh_from_db()
-        self.assertEqual(declaration.last_administration_comment, "Overriden comment")
-
-        # Visa refusée
-        declaration = OngoingVisaDeclarationFactory(
-            post_validation_status=Declaration.DeclarationStatus.REJECTED,
-            post_validation_producer_message="À refuser",
-            post_validation_expiration_days=20,
-        )
-
-        response = self.client.post(
-            reverse("api:refuse_visa", kwargs={"pk": declaration.id}),
-            {"comment": "Overriden comment 2"},
-            format="json",
-        )
-
-        declaration.refresh_from_db()
-        self.assertEqual(declaration.last_administration_comment, "Overriden comment 2")
-
     @authenticate
     def accept_visa_unauthorized(self):
         """

From 40cde0f9b4c08a8e39e1ad690d1c046756204890 Mon Sep 17 00:00:00 2001
From: Alejandro MG <alejandro@amguillen.dev>
Date: Tue, 21 Jan 2025 19:25:58 +0100
Subject: [PATCH 07/15] Change overriden par overridden

---
 api/tests/test_declaration_flow.py            |  4 +-
 api/views/declaration/declaration.py          | 16 ++++----
 .../VisaPage/DecisionModificationModal.vue    | 26 ++++++-------
 .../src/views/VisaPage/VisaValidationTab.vue  | 39 ++++++++++---------
 4 files changed, 43 insertions(+), 42 deletions(-)

diff --git a/api/tests/test_declaration_flow.py b/api/tests/test_declaration_flow.py
index 64b21dad6..229b8a356 100644
--- a/api/tests/test_declaration_flow.py
+++ b/api/tests/test_declaration_flow.py
@@ -672,7 +672,7 @@ def test_visor_can_modify_decision(self):
         )
 
         body = {
-            "comment": "overriden comment",
+            "comment": "overridden comment",
             "proposal": "OBSERVATION",
             "delayDays": 6,
             "reasons": [
@@ -686,7 +686,7 @@ def test_visor_can_modify_decision(self):
         declaration.refresh_from_db()
         latest_snapshot = declaration.snapshots.latest("creation_date")
         self.assertEqual(declaration.status, Declaration.DeclarationStatus.OBSERVATION)
-        self.assertEqual(latest_snapshot.comment, "overriden comment")
+        self.assertEqual(latest_snapshot.comment, "overridden comment")
         self.assertEqual(latest_snapshot.status, Declaration.DeclarationStatus.OBSERVATION)
         self.assertEqual(latest_snapshot.expiration_days, 6)
         self.assertEqual(latest_snapshot.blocking_reasons, ["a", "b"])
diff --git a/api/views/declaration/declaration.py b/api/views/declaration/declaration.py
index 5de84976a..c104379a7 100644
--- a/api/views/declaration/declaration.py
+++ b/api/views/declaration/declaration.py
@@ -648,7 +648,7 @@ class DeclarationAcceptVisaView(VisaDecisionView):
     Le ou la viseuse peut surcharger la décision de l'instructrice en envoyant
     un objet dans le payload de cette forme :
     {
-        comment: "overriden comment",
+        comment: "overridden comment",
         proposal: "OBSERVATION", // (ou un autre statut)
         delayDays: 10,
         reasons: ["a", "b"],
@@ -658,9 +658,9 @@ class DeclarationAcceptVisaView(VisaDecisionView):
     snapshot_action = Snapshot.SnapshotActions.ACCEPT_VISA
 
     def get_validation_status(self, request, declaration):
-        overriden_status = request.data.get("proposal")
-        if overriden_status:
-            return Declaration.DeclarationStatus(overriden_status)
+        overridden_status = request.data.get("proposal")
+        if overridden_status:
+            return Declaration.DeclarationStatus(overridden_status)
         return declaration.post_validation_status
 
     def get_snapshot_post_validation_status(self, request, declaration):
@@ -671,16 +671,16 @@ def perform_snapshot_creation(self, request, declaration):
         Possible de le surcharger si la création du snapshot nécessite un
         traitement spécial
         """
-        overriden = request.data.get("proposal")
+        overridden = request.data.get("proposal")
         data = request.data
         d = declaration
         d.create_snapshot(
             user=request.user,
-            comment=data.get("comment") if overriden else d.post_validation_producer_message,
-            expiration_days=data.get("delay_days") if overriden else d.post_validation_expiration_days,
+            comment=data.get("comment") if overridden else d.post_validation_producer_message,
+            expiration_days=data.get("delay_days") if overridden else d.post_validation_expiration_days,
             action=self.get_snapshot_action(request, d),
             post_validation_status=self.get_snapshot_post_validation_status(request, d),
-            blocking_reasons=data.get("reasons") if overriden else None,
+            blocking_reasons=data.get("reasons") if overridden else None,
         )
 
     def get_transition(self, request, declaration):
diff --git a/frontend/src/views/VisaPage/DecisionModificationModal.vue b/frontend/src/views/VisaPage/DecisionModificationModal.vue
index 9dbedf622..5d26013e2 100644
--- a/frontend/src/views/VisaPage/DecisionModificationModal.vue
+++ b/frontend/src/views/VisaPage/DecisionModificationModal.vue
@@ -26,7 +26,7 @@
           <DsfrInputGroup :error-message="firstErrorMsg(v$, 'proposal')">
             <DsfrSelect
               label="Nouvelle décision"
-              v-model="overridenDecision.proposal"
+              v-model="overriddenDecision.proposal"
               :options="proposalOptions"
               class="max-w-96"
             />
@@ -35,7 +35,7 @@
         <div class="col-span-2 sm:col-span-1" v-if="showDelayDays">
           <DsfrInputGroup :error-message="firstErrorMsg(v$, 'delayDays')">
             <DsfrInput
-              v-model="overridenDecision.delayDays"
+              v-model="overriddenDecision.delayDays"
               label="Délai de réponse (jours)"
               label-visible
               class="max-w-96"
@@ -44,14 +44,14 @@
         </div>
       </div>
       <DsfrInputGroup :error-message="firstErrorMsg(v$, 'comment')">
-        <DsfrInput is-textarea label="Message au déclarant·e" v-model="overridenDecision.comment" label-visible />
+        <DsfrInput is-textarea label="Message au déclarant·e" v-model="overriddenDecision.comment" label-visible />
       </DsfrInputGroup>
       <div v-if="showReasons" class="border p-4">
         <DsfrInputGroup :error-message="firstErrorMsg(v$, 'reasons')">
           <div class="mb-8" v-for="reason in blockingReasons" :key="reason.title">
             <p class="font-bold">{{ reason.title }}</p>
             <DsfrCheckboxSet
-              v-model="overridenDecision.reasons"
+              v-model="overriddenDecision.reasons"
               :options="reason.items.map((x) => ({ label: x, value: x }))"
             />
           </div>
@@ -69,22 +69,22 @@ import { helpers, required, integer } from "@vuelidate/validators"
 import { useVuelidate } from "@vuelidate/core"
 
 const modelValue = defineModel()
-const overridenDecision = ref()
+const overriddenDecision = ref()
 
 const copyModelValueToRef = () =>
-  (overridenDecision.value = modelValue.value ? JSON.parse(JSON.stringify(modelValue.value)) : { reasons: [] })
+  (overriddenDecision.value = modelValue.value ? JSON.parse(JSON.stringify(modelValue.value)) : { reasons: [] })
 
 copyModelValueToRef()
 
 const rules = computed(() => {
-  if (!overridenDecision.value?.proposal) return { proposal: errorRequiredField }
-  if (overridenDecision.value?.proposal === "AUTHORIZED") return {}
+  if (!overriddenDecision.value?.proposal) return { proposal: errorRequiredField }
+  if (overriddenDecision.value?.proposal === "AUTHORIZED") return {}
   return {
     comment: errorRequiredField,
     reasons: { required: helpers.withMessage("Au moins une raison doit être selectionnée", required) },
     proposal: errorRequiredField,
     delayDays:
-      overridenDecision.value?.proposal !== "REJECTED"
+      overriddenDecision.value?.proposal !== "REJECTED"
         ? {
             required: helpers.withMessage("Ce champ doit être rempli", required),
             integer: helpers.withMessage("Ce champ doit être un chiffre entier", integer),
@@ -94,7 +94,7 @@ const rules = computed(() => {
 })
 
 const $externalResults = ref({})
-const v$ = useVuelidate(rules, overridenDecision, { $externalResults })
+const v$ = useVuelidate(rules, overriddenDecision, { $externalResults })
 
 const opened = ref(false)
 
@@ -105,7 +105,7 @@ const actions = [
       v$.value.$reset()
       v$.value.$validate()
       if (v$.value.$error) return
-      modelValue.value = overridenDecision.value
+      modelValue.value = overriddenDecision.value
       close()
     },
     icon: { name: "ri-edit-fill" },
@@ -137,11 +137,11 @@ const proposalOptions = [
 ]
 
 const showReasons = computed(
-  () => overridenDecision.value.proposal && overridenDecision.value.proposal !== "AUTHORIZED"
+  () => overriddenDecision.value.proposal && overriddenDecision.value.proposal !== "AUTHORIZED"
 )
 
 const showDelayDays = computed(
-  () => overridenDecision.value.proposal === "OBSERVATION" || overridenDecision.value.proposal === "OBJECTION"
+  () => overriddenDecision.value.proposal === "OBSERVATION" || overriddenDecision.value.proposal === "OBJECTION"
 )
 
 watch(modelValue, () => copyModelValueToRef())
diff --git a/frontend/src/views/VisaPage/VisaValidationTab.vue b/frontend/src/views/VisaPage/VisaValidationTab.vue
index 36b4d9919..331ce747d 100644
--- a/frontend/src/views/VisaPage/VisaValidationTab.vue
+++ b/frontend/src/views/VisaPage/VisaValidationTab.vue
@@ -7,31 +7,31 @@
         <VisaInfoLine
           title="Décision"
           icon="ri-focus-2-fill"
-          :strikethroughText="hasOverridenOriginalDecision ? declarationProposal : ''"
-          :text="hasOverridenOriginalDecision ? overridenProposal : declarationProposal"
+          :strikethroughText="hasoverriddenOriginalDecision ? declarationProposal : ''"
+          :text="hasoverriddenOriginalDecision ? overriddenProposal : declarationProposal"
         />
         <VisaInfoLine
           v-if="declaration.blockingReasons?.length"
           title="Raisons de la décision"
           icon="ri-edit-line"
-          :strikethroughText="hasOverridenOriginalDecision ? declarationReasons : ''"
-          :text="hasOverridenOriginalDecision ? overridenReasons : declarationReasons"
+          :strikethroughText="hasoverriddenOriginalDecision ? declarationReasons : ''"
+          :text="hasoverriddenOriginalDecision ? overriddenReasons : declarationReasons"
         />
         <VisaInfoLine
           title="Message au déclarant·e"
           icon="ri-chat-3-line"
-          :strikethroughText="hasOverridenOriginalDecision ? declarationComment : ''"
-          :text="hasOverridenOriginalDecision ? overridenComment : declarationComment"
+          :strikethroughText="hasoverriddenOriginalDecision ? declarationComment : ''"
+          :text="hasoverriddenOriginalDecision ? overriddenComment : declarationComment"
         />
         <VisaInfoLine
           v-if="showExpirationDays"
           title="Délai de réponse"
           icon="ri-time-fill"
-          :strikethroughText="hasOverridenOriginalDecision ? declarationExpirationDays : ''"
-          :text="hasOverridenOriginalDecision ? overridenExpirationDays : declarationExpirationDays"
+          :strikethroughText="hasoverriddenOriginalDecision ? declarationExpirationDays : ''"
+          :text="hasoverriddenOriginalDecision ? overriddenExpirationDays : declarationExpirationDays"
         />
         <div class="px-4 py-2 border bg-gray-50">
-          <DecisionModificationModal v-model="overridenDecision" />
+          <DecisionModificationModal v-model="overriddenDecision" />
         </div>
       </div>
     </div>
@@ -74,9 +74,9 @@ const $externalResults = ref({})
 const emit = defineEmits(["decision-done"])
 const declaration = defineModel()
 
-const overridenDecision = ref()
-const hasOverridenOriginalDecision = computed(
-  () => overridenDecision.value && Object.keys(overridenDecision.value).length > 0
+const overriddenDecision = ref()
+const hasoverriddenOriginalDecision = computed(
+  () => overriddenDecision.value && Object.keys(overriddenDecision.value).length > 0
 )
 
 const producerMessage = ref(declaration.value.postValidationProducerMessage)
@@ -93,7 +93,7 @@ const postValidationStatus = computed(() => statusProps[declaration.value.postVa
 
 const refusalUrl = computed(() => `/api/v1/declarations/${declaration.value.id}/refuse-visa/`)
 const acceptanceUrl = computed(() => `/api/v1/declarations/${declaration.value.id}/accept-visa/`)
-const postData = computed(() => overridenDecision.value || {})
+const postData = computed(() => overriddenDecision.value || {})
 
 const {
   execute: refuseExecute,
@@ -151,25 +151,26 @@ const decisionCategories = computed(() => {
 
 const validationHelperText = computed(() => {
   if (shouldBlockApproval.value) return "La déclaration ne peut pas être autorisée en nécessitant une saisine ANSEES."
-  if (hasOverridenOriginalDecision.value) return "Je vise cette déclaration avec les modifications effectuées et signe."
+  if (hasoverriddenOriginalDecision.value)
+    return "Je vise cette déclaration avec les modifications effectuées et signe."
   return "Je vise cette déclaration et signe."
 })
 
 const refusalHelperText = computed(() => {
-  if (hasOverridenOriginalDecision.value)
+  if (hasoverriddenOriginalDecision.value)
     return "Je renvoie le dossier en instruction. Les modifications effectuées ne seront pas prises en compte."
   return "Je renvoie le dossier en instruction."
 })
 
 const declarationReasons = computed(() => declaration.value?.blockingReasons?.join(",\n"))
-const overridenReasons = computed(() => overridenDecision.value?.reasons?.join(",\n"))
+const overriddenReasons = computed(() => overriddenDecision.value?.reasons?.join(",\n"))
 
 const declarationComment = computed(() => declaration.value?.postValidationProducerMessage)
-const overridenComment = computed(() => overridenDecision.value?.comment)
+const overriddenComment = computed(() => overriddenDecision.value?.comment)
 
 const declarationExpirationDays = computed(() => declaration.value?.postValidationExpirationDays)
-const overridenExpirationDays = computed(() => overridenDecision.value?.delayDays)
+const overriddenExpirationDays = computed(() => overriddenDecision.value?.delayDays)
 
 const declarationProposal = computed(() => postValidationStatus)
-const overridenProposal = computed(() => statusProps[overridenDecision.value?.proposal]?.label)
+const overriddenProposal = computed(() => statusProps[overriddenDecision.value?.proposal]?.label)
 </script>

From cd394ec5d1c213f3e5f7c3ba0dda5c21d7aaa5c5 Mon Sep 17 00:00:00 2001
From: Alejandro MG <alejandro@amguillen.dev>
Date: Tue, 21 Jan 2025 19:26:21 +0100
Subject: [PATCH 08/15] Usage de `del` pour a11y

---
 frontend/src/views/VisaPage/VisaInfoLine.vue | 22 +++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/frontend/src/views/VisaPage/VisaInfoLine.vue b/frontend/src/views/VisaPage/VisaInfoLine.vue
index 20a3349fe..d50251ef9 100644
--- a/frontend/src/views/VisaPage/VisaInfoLine.vue
+++ b/frontend/src/views/VisaPage/VisaInfoLine.vue
@@ -6,7 +6,9 @@
     </div>
     <div class="comment sm:flex-auto">
       <slot name="value">
-        <p class="mb-0 line-through" v-if="strikethroughText">{{ strikethroughText }}</p>
+        <p class="mb-0 line-through" v-if="strikethroughText">
+          <del>{{ strikethroughText }}</del>
+        </p>
         <p class="mb-0">{{ text }}</p>
       </slot>
     </div>
@@ -23,4 +25,22 @@ defineProps(["icon", "title", "text", "strikethroughText"])
 .comment :deep(.fr-input-group) {
   @apply !mt-0;
 }
+del::before,
+del::after {
+  clip-path: inset(100%);
+  clip: rect(1px, 1px, 1px, 1px);
+  height: 1px;
+  overflow: hidden;
+  position: absolute;
+  white-space: nowrap;
+  width: 1px;
+}
+
+del::before {
+  content: " [début de la suppression] ";
+}
+
+del::after {
+  content: " [fin de la suppression] ";
+}
 </style>

From 680e74df3dc8aaa0fe0fac1339933c524065737e Mon Sep 17 00:00:00 2001
From: Alejandro MG <alejandro@amguillen.dev>
Date: Tue, 21 Jan 2025 19:30:24 +0100
Subject: [PATCH 09/15] Usage de `legend` pour a11y

---
 frontend/src/views/VisaPage/DecisionModificationModal.vue | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/frontend/src/views/VisaPage/DecisionModificationModal.vue b/frontend/src/views/VisaPage/DecisionModificationModal.vue
index 5d26013e2..542c97ff5 100644
--- a/frontend/src/views/VisaPage/DecisionModificationModal.vue
+++ b/frontend/src/views/VisaPage/DecisionModificationModal.vue
@@ -49,10 +49,10 @@
       <div v-if="showReasons" class="border p-4">
         <DsfrInputGroup :error-message="firstErrorMsg(v$, 'reasons')">
           <div class="mb-8" v-for="reason in blockingReasons" :key="reason.title">
-            <p class="font-bold">{{ reason.title }}</p>
             <DsfrCheckboxSet
               v-model="overriddenDecision.reasons"
               :options="reason.items.map((x) => ({ label: x, value: x }))"
+              :legend="reason.title"
             />
           </div>
         </DsfrInputGroup>
@@ -146,3 +146,9 @@ const showDelayDays = computed(
 
 watch(modelValue, () => copyModelValueToRef())
 </script>
+
+<style scoped>
+div :deep(.fr-fieldset__legend) {
+  @apply !font-bold;
+}
+</style>

From 482b54ee5512b5edb6093d382aef493f946bfab6 Mon Sep 17 00:00:00 2001
From: Alejandro MG <alejandro@amguillen.dev>
Date: Tue, 21 Jan 2025 21:26:39 +0100
Subject: [PATCH 10/15] Modifies logic to display visa rows

---
 .../src/views/VisaPage/VisaValidationTab.vue  | 35 ++++++++++---------
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git a/frontend/src/views/VisaPage/VisaValidationTab.vue b/frontend/src/views/VisaPage/VisaValidationTab.vue
index 331ce747d..51bcd843b 100644
--- a/frontend/src/views/VisaPage/VisaValidationTab.vue
+++ b/frontend/src/views/VisaPage/VisaValidationTab.vue
@@ -7,28 +7,28 @@
         <VisaInfoLine
           title="Décision"
           icon="ri-focus-2-fill"
-          :strikethroughText="hasoverriddenOriginalDecision ? declarationProposal : ''"
-          :text="hasoverriddenOriginalDecision ? overriddenProposal : declarationProposal"
+          :strikethroughText="hasOverriddenOriginalDecision ? declarationProposal : ''"
+          :text="hasOverriddenOriginalDecision ? overriddenProposal : declarationProposal"
         />
         <VisaInfoLine
-          v-if="declaration.blockingReasons?.length"
+          v-if="hasOverriddenOriginalDecision ? overriddenReasons : declarationReasons"
           title="Raisons de la décision"
           icon="ri-edit-line"
-          :strikethroughText="hasoverriddenOriginalDecision ? declarationReasons : ''"
-          :text="hasoverriddenOriginalDecision ? overriddenReasons : declarationReasons"
+          :strikethroughText="hasOverriddenOriginalDecision ? declarationReasons : ''"
+          :text="hasOverriddenOriginalDecision ? overriddenReasons : declarationReasons"
         />
         <VisaInfoLine
           title="Message au déclarant·e"
           icon="ri-chat-3-line"
-          :strikethroughText="hasoverriddenOriginalDecision ? declarationComment : ''"
-          :text="hasoverriddenOriginalDecision ? overriddenComment : declarationComment"
+          :strikethroughText="hasOverriddenOriginalDecision ? declarationComment : ''"
+          :text="hasOverriddenOriginalDecision ? overriddenComment : declarationComment"
         />
         <VisaInfoLine
           v-if="showExpirationDays"
           title="Délai de réponse"
           icon="ri-time-fill"
-          :strikethroughText="hasoverriddenOriginalDecision ? declarationExpirationDays : ''"
-          :text="hasoverriddenOriginalDecision ? overriddenExpirationDays : declarationExpirationDays"
+          :strikethroughText="hasOverriddenOriginalDecision ? declarationExpirationDays : ''"
+          :text="hasOverriddenOriginalDecision ? overriddenExpirationDays : declarationExpirationDays"
         />
         <div class="px-4 py-2 border bg-gray-50">
           <DecisionModificationModal v-model="overriddenDecision" />
@@ -75,7 +75,7 @@ const emit = defineEmits(["decision-done"])
 const declaration = defineModel()
 
 const overriddenDecision = ref()
-const hasoverriddenOriginalDecision = computed(
+const hasOverriddenOriginalDecision = computed(
   () => overriddenDecision.value && Object.keys(overriddenDecision.value).length > 0
 )
 
@@ -85,10 +85,13 @@ const instructorName = computed(() => {
   if (!declaration.value?.instructor) return "-"
   return `${declaration.value.instructor.firstName || ""} ${declaration.value.instructor.lastName || ""}`
 })
-const showExpirationDays = computed(
-  () =>
-    declaration.value.postValidationStatus === "OBJECTION" || declaration.value.postValidationStatus === "OBSERVATION"
-)
+const showExpirationDays = computed(() => {
+  const concernedStatuses = ["OBJECTION", "OBSERVATION"]
+  const validationStatus = hasOverriddenOriginalDecision.value
+    ? overriddenDecision.value.proposal
+    : declaration.value.postValidationStatus
+  return concernedStatuses.indexOf(validationStatus) > -1
+})
 const postValidationStatus = computed(() => statusProps[declaration.value.postValidationStatus].label)
 
 const refusalUrl = computed(() => `/api/v1/declarations/${declaration.value.id}/refuse-visa/`)
@@ -151,13 +154,13 @@ const decisionCategories = computed(() => {
 
 const validationHelperText = computed(() => {
   if (shouldBlockApproval.value) return "La déclaration ne peut pas être autorisée en nécessitant une saisine ANSEES."
-  if (hasoverriddenOriginalDecision.value)
+  if (hasOverriddenOriginalDecision.value)
     return "Je vise cette déclaration avec les modifications effectuées et signe."
   return "Je vise cette déclaration et signe."
 })
 
 const refusalHelperText = computed(() => {
-  if (hasoverriddenOriginalDecision.value)
+  if (hasOverriddenOriginalDecision.value)
     return "Je renvoie le dossier en instruction. Les modifications effectuées ne seront pas prises en compte."
   return "Je renvoie le dossier en instruction."
 })

From ac0f8fed14afc8f5f089282f7217de236e3720af Mon Sep 17 00:00:00 2001
From: Alejandro MG <alejandro@amguillen.dev>
Date: Tue, 21 Jan 2025 21:35:08 +0100
Subject: [PATCH 11/15] Bottom alignment for buttons

---
 frontend/src/views/VisaPage/VisaValidationTab.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/views/VisaPage/VisaValidationTab.vue b/frontend/src/views/VisaPage/VisaValidationTab.vue
index 51bcd843b..59da17ce5 100644
--- a/frontend/src/views/VisaPage/VisaValidationTab.vue
+++ b/frontend/src/views/VisaPage/VisaValidationTab.vue
@@ -37,12 +37,12 @@
     </div>
 
     <div class="grid grid-cols-2 gap-10">
-      <div class="border p-4" v-for="decision in decisionCategories" :key="decision.title">
+      <div class="border p-4 flex flex-col" v-for="decision in decisionCategories" :key="decision.title">
         <h6 class="font-bold">
           <v-icon :color="decision.iconColor" :name="decision.icon" scale="1.2" aria-hidden class="mr-1" />
           {{ decision.title }}
         </h6>
-        <p class="fr-text--sm">
+        <p class="fr-text--sm grow">
           {{ decision.description }}
         </p>
         <ArticleInfoRow class="mb-2" v-if="decision.blockedByAnses" v-model="declaration" />

From 573b40bc65c55c96e4b110a00ea206bdc50f2d96 Mon Sep 17 00:00:00 2001
From: Alejandro MG <alejandro@amguillen.dev>
Date: Tue, 21 Jan 2025 21:39:25 +0100
Subject: [PATCH 12/15] Enleve la ligne qui permettait de surcharger le
 commentaire dans le refus de visa

---
 api/views/declaration/declaration.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/api/views/declaration/declaration.py b/api/views/declaration/declaration.py
index c104379a7..c6630f5d1 100644
--- a/api/views/declaration/declaration.py
+++ b/api/views/declaration/declaration.py
@@ -637,7 +637,7 @@ def perform_snapshot_creation(self, request, declaration):
         declaration.create_snapshot(
             user=request.user,
             action=self.get_snapshot_action(request, declaration),
-            comment=request.data.get("comment", declaration.post_validation_producer_message),
+            comment=declaration.post_validation_producer_message,
             post_validation_status=self.get_snapshot_post_validation_status(request, declaration),
         )
 

From 738d4cc3360b72d0cf85d8b6e287647fe50eeec0 Mon Sep 17 00:00:00 2001
From: Alejandro MG <alejandro@amguillen.dev>
Date: Tue, 21 Jan 2025 21:50:30 +0100
Subject: [PATCH 13/15] Ajout du test pour le refus de visa

---
 api/tests/test_declaration_flow.py | 32 ++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/api/tests/test_declaration_flow.py b/api/tests/test_declaration_flow.py
index 229b8a356..ca6da8396 100644
--- a/api/tests/test_declaration_flow.py
+++ b/api/tests/test_declaration_flow.py
@@ -691,6 +691,38 @@ def test_visor_can_modify_decision(self):
         self.assertEqual(latest_snapshot.expiration_days, 6)
         self.assertEqual(latest_snapshot.blocking_reasons, ["a", "b"])
 
+    @authenticate
+    def test_visor_cant_modify_on_refuse(self):
+        """
+        Refuser un visa n'applique pas les modifications
+        """
+        VisaRoleFactory(user=authenticate.user)
+
+        declaration = OngoingVisaDeclarationFactory(
+            post_validation_status=Declaration.DeclarationStatus.AUTHORIZED,
+            post_validation_producer_message="À authoriser",
+        )
+
+        body = {
+            "comment": "overridden comment",
+            "proposal": "OBSERVATION",
+            "delayDays": 6,
+            "reasons": [
+                "a",
+                "b",
+            ],
+        }
+        response = self.client.post(reverse("api:refuse_visa", kwargs={"pk": declaration.id}), body, format="json")
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+
+        declaration.refresh_from_db()
+        latest_snapshot = declaration.snapshots.latest("creation_date")
+        self.assertEqual(declaration.status, Declaration.DeclarationStatus.AUTHORIZED)
+        self.assertEqual(latest_snapshot.comment, "À authoriser")
+        self.assertEqual(latest_snapshot.status, Declaration.DeclarationStatus.AUTHORIZED)
+        self.assertEqual(latest_snapshot.expiration_days, None)
+        self.assertEqual(latest_snapshot.blocking_reasons, None)
+
     @authenticate
     def accept_visa_unauthorized(self):
         """

From 8907272c42eefa602b3314c291d535c584bcb7b8 Mon Sep 17 00:00:00 2001
From: Alejandro MG <alejandro@amguillen.dev>
Date: Tue, 21 Jan 2025 22:06:22 +0100
Subject: [PATCH 14/15] test fix

---
 api/tests/test_declaration_flow.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/api/tests/test_declaration_flow.py b/api/tests/test_declaration_flow.py
index ca6da8396..134213970 100644
--- a/api/tests/test_declaration_flow.py
+++ b/api/tests/test_declaration_flow.py
@@ -717,9 +717,9 @@ def test_visor_cant_modify_on_refuse(self):
 
         declaration.refresh_from_db()
         latest_snapshot = declaration.snapshots.latest("creation_date")
-        self.assertEqual(declaration.status, Declaration.DeclarationStatus.AUTHORIZED)
+        self.assertEqual(declaration.status, Declaration.DeclarationStatus.AWAITING_INSTRUCTION)
         self.assertEqual(latest_snapshot.comment, "À authoriser")
-        self.assertEqual(latest_snapshot.status, Declaration.DeclarationStatus.AUTHORIZED)
+        self.assertEqual(latest_snapshot.status, Declaration.DeclarationStatus.AWAITING_INSTRUCTION)
         self.assertEqual(latest_snapshot.expiration_days, None)
         self.assertEqual(latest_snapshot.blocking_reasons, None)
 

From 7d8b795451765624cc2b4ba05f5f495f0934245b Mon Sep 17 00:00:00 2001
From: Alejandro MG <alejandro@amguillen.dev>
Date: Thu, 23 Jan 2025 17:29:10 +0100
Subject: [PATCH 15/15] Solves issue with delay days set at 15 for approval
 visa requests

---
 frontend/src/views/InstructionPage/DecisionTab.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/frontend/src/views/InstructionPage/DecisionTab.vue b/frontend/src/views/InstructionPage/DecisionTab.vue
index 56709d008..061a62edb 100644
--- a/frontend/src/views/InstructionPage/DecisionTab.vue
+++ b/frontend/src/views/InstructionPage/DecisionTab.vue
@@ -121,7 +121,7 @@ const rules = computed(() => {
 })
 const declaration = defineModel()
 const proposal = ref(null)
-const delayDays = ref(15)
+const delayDays = ref()
 const comment = ref(declaration.value?.lastAdministrationComment || "")
 const reasons = ref([])
 
@@ -137,8 +137,8 @@ const disableDelayDays = computed(() => proposal.value === "rejection")
 watch(proposal, (newProposal) => {
   if (mandatoryVisaProposals.indexOf(newProposal) > -1) needsVisa.value = true
   if (newProposal === "objection") delayDays.value = 30
-  else if (newProposal === "rejection") delayDays.value = null
-  else delayDays.value = 15
+  else if (newProposal === "observation") delayDays.value = 15
+  else delayDays.value = null
 })
 
 const needsAnsesReferal = computed(() => declaration.value?.article === "ANSES_REFERAL")