Merge pull request #849 from betagouv/842-expiration-date-display

Displays expiration date in declaration page
betagouv · Aug 15, 2024 · ed63717 · ed63717
2 parents 7c5aca2 + f61a98a
commit ed63717
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/api/serializers/declaration.py b/api/serializers/declaration.py
@@ -351,6 +351,7 @@ class Meta:
             "post_validation_expiration_days",
             "private_notes",
             "blocking_reasons",
+            "expiration_date",
         )
         read_only_fields = (
             "id",

diff --git a/frontend/src/components/DeclarationAlert.vue b/frontend/src/components/DeclarationAlert.vue
@@ -1,6 +1,10 @@
 <template>
   <DsfrAlert v-if="displayData" :type="displayData.type" :title="displayData.title">
     <p v-if="displayData.body">{{ displayData.body }}</p>
+    <p v-if="displayData.expirationDate">
+      <v-icon name="ri-error-warning-line"></v-icon>
+      Sans retour de votre part, ce dossier expirera le {{ isoToPrettyDate(displayData.expirationDate) }}.
+    </p>
     <DsfrButton v-if="displayData.canDownloadCertificate" icon="ri-file-text-line" class="mt-2" secondary>
       <a :href="`/declarations/${declaration.id}/certificate`" target="_blank" rel="noopener noreferrer">
         {{ displayData.downloadButtonText || "Télécharger l'attestation" }}
@@ -11,6 +15,7 @@
 
 <script setup>
 import { computed } from "vue"
+import { isoToPrettyDate } from "@/utils/date"
 const props = defineProps({ declaration: Object, role: { type: String, default: "declarant" } })
 
 const displayData = computed(() => {
@@ -63,13 +68,15 @@ const declarantDisplayData = computed(() => {
       return {
         type: "warning",
         title: "Une objection a été emise sur cette déclaration",
+        expirationDate: props.declaration?.expirationDate,
         body: blockingReasons.value,
         canDownloadCertificate: false,
       }
     case "OBSERVATION":
       return {
         type: "warning",
         title: "Une observation a été emise sur cette déclaration",
+        expirationDate: props.declaration?.expirationDate,
         body: blockingReasons.value,
         canDownloadCertificate: false,
       }