Merge branch 'feat/1079-gestion-renouvellement-agrement' into feat/1092-bo-liste-agrements

Author: l-scherer

.talismanrc

@@ -278,7 +278,7 @@ fileignoreconfig:
 - filename: packages/frontend-usagers/src/components/utils/TableFull.vue
   checksum: 05743cc5c3dfd946e8ee41cb11571b1e505bbdb5260e9c59a53e4ca16cb11f08
 - filename: packages/frontend-usagers/src/pages/agrement/[[agrementId]].vue
-  checksum: 9f1b4a0e00392a84b23746ab66cad677bddc49b1f9999454b123cb7111c204c3
+  checksum: 8ab087483ddfb8b24d68de5ba5dcc292f06ffedcf6b5f89f16184f5906ff728b
 - filename: packages/frontend-usagers/src/pages/connexion/enregistrement.vue
   checksum: dd393d7c31566dfa3864bb9a63fe98f9bf040cc8321e8cad0f74e8634e8365f8
 - filename: packages/frontend-usagers/src/pages/connexion/index.vue
@@ -315,6 +315,8 @@ fileignoreconfig:
   checksum: 7b52636c4c49bf85a592f649f8fbf653e0203b390f4f9d220fe3ae4da06422a7
 - filename: packages/shared-bridge/src/dto/paginationQueryDto.ts
   checksum: 171d7cf0f68b404e3b648fcb9d7b3e36891da049bad2ede67007d0c03661145a
+- filename: packages/shared-bridge/src/constantes/file.ts
+  checksum: dded09b86eeb4c664e493ff12b023d20914b18ac5c9a98ac7e60235daec3927d
 - filename: packages/shared-bridge/src/utils/request.ts
   checksum: c29fc1527b710e177395fabd040b7e3cdd44b429b21d504ba6f192faf1cd861a
 - filename: packages/shared-ui/src/components/DsfrMultiselectV2.vue

packages/frontend-usagers/src/components/agrement/documents/index.vue

@@ -0,0 +1,83 @@
+<template>
+  <!-- TODO Filtrer ou mettre l'objet correspondant aux documents des DREETS-->
+  <div
+    v-if="
+      props.initAgrement.dreetsFiles &&
+      props.initAgrement.dreetsFiles.length > 0
+    "
+  >
+    <TableFull
+      title="Documents de la DREETS"
+      :headers="headers"
+      :data="props.initAgrement.dreetsFiles"
+    />
+  </div>
+  <div
+    v-if="
+      props.initAgrement.agrementFiles &&
+      props.initAgrement.agrementFiles.length > 0
+    "
+  >
+    <TableFull
+      title="Documents de l'OVA"
+      :headers="headers"
+      :data="props.initAgrement.agrementFiles"
+    />
+  </div>
+</template>
+
+<script setup lang="ts">
+import { TableFull } from "@vao/shared-ui";
+import {
+  type AgrementFilesDto,
+  type DocumentDto,
+  formatFRDateTime,
+  getFileCategoryLabel,
+} from "@vao/shared-bridge";
+
+const config = useRuntimeConfig();
+const NuxtLink = resolveComponent("NuxtLink");
+
+const props = defineProps({
+  initAgrement: { type: Object, required: true },
+});
+
+const headers = [
+  {
+    column: "name",
+    sorter: "name",
+    text: "Nom du fichier",
+    headerAttrs: {
+      class: "suivi",
+    },
+  },
+  {
+    column: "category",
+    sorter: "category",
+    text: "Type de fichier",
+    format: (item: AgrementFilesDto) => getFileCategoryLabel(item.category!),
+    headerAttrs: {
+      class: "suivi",
+    },
+  },
+  {
+    column: "createdAt",
+    sorter: "createdAt",
+    format: (item: DocumentDto) => formatFRDateTime(item.createdAt!),
+    text: "Date de dépose",
+    headerAttrs: {
+      class: "suivi",
+    },
+  },
+  {
+    text: "téléchargement",
+    component: (file: DocumentDto) => {
+      return {
+        component: NuxtLink,
+        to: `${config.public.backendUrl}/documents/${file.uuid}`,
+        class: "fr-icon-file-download-fill",
+      };
+    },
+  },
+];
+</script>

packages/frontend-usagers/src/pages/agrement/[[agrementId]].vue

@@ -107,11 +107,8 @@
   </div>
 </template>
 <script setup lang="ts">
-import {
-  FILE_CATEGORY,
-  type AgrementDto,
-  type FileKey,
-} from "@vao/shared-bridge";
+import type { FILE_CATEGORY, AgrementDto, FileKey } from "@vao/shared-bridge";
+import { FILE_CATEGORY_CONFIG } from "@vao/shared-bridge";
 import { useToaster } from "@vao/shared-ui";
 
 const route = useRoute();
@@ -135,154 +132,25 @@ async function updateOrCreate(formValues: AgrementFormValues) {
   const updatedData: AgrementFormValues = { ...formValues };
   try {
     updatedData.agrementFiles = [];
-    const fileMappings: {
-      key: FileKey;
-      multiple: boolean;
-      category: FILE_CATEGORY;
-    }[] = [
-      {
-        key: "filesMotivation",
-        multiple: true,
-        category: FILE_CATEGORY.MOTIVATION,
-      },
-      {
-        key: "fileProcesVerbal",
-        multiple: false,
-        category: FILE_CATEGORY.PROCVERBAL,
-      },
-      {
-        key: "fileImmatriculation",
-        multiple: false,
-        category: FILE_CATEGORY.IMMATRICUL,
-      },
-      {
-        key: "fileAttestationsRespCivile",
-        multiple: false,
-        category: FILE_CATEGORY.ASSURRESP,
-      },
-      {
-        key: "fileAttestationsRapatriement",
-        multiple: false,
-        category: FILE_CATEGORY.ASSURRAPAT,
-      },
-      {
-        key: "filesChangeEvol",
-        multiple: true,
-        category: FILE_CATEGORY.CHANGEEVOL,
-      },
-      {
-        key: "filesBilanQualit",
-        multiple: true,
-        category: FILE_CATEGORY.BILANQUALIT,
-      },
-      {
-        key: "filesBilanFinancier",
-        multiple: true,
-        category: FILE_CATEGORY.BILANFINANC,
-      },
-      {
-        key: "filesAgrementSejour",
-        multiple: true,
-        category: FILE_CATEGORY.SEJOUR,
-      },
-      {
-        key: "filesAccompResp",
-        multiple: true,
-        category: FILE_CATEGORY.ACCOMPRESP,
-      },
-      {
-        key: "filesSuiviMed",
-        multiple: true,
-        category: FILE_CATEGORY.SUIVIMED,
-      },
-      {
-        key: "filesBilanQualitPerception",
-        multiple: true,
-        category: FILE_CATEGORY.BILANQUALITPERCEPTION,
-      },
-      {
-        key: "filesBilanQualitPerspectives",
-        multiple: true,
-        category: FILE_CATEGORY.BILANQUALITPERSPECTIVE,
-      },
-      {
-        key: "filesBilanQualitElementsMarquants",
-        multiple: true,
-        category: FILE_CATEGORY.BILANQUALITELEMARQ,
-      },
-      {
-        key: "filesBilanQualitComplementaires",
-        multiple: true,
-        category: FILE_CATEGORY.BILANQUALITCOMPLEMENTAIRES,
-      },
-      {
-        key: "filesBilanFinancierQuatreAnnees",
-        multiple: true,
-        category: FILE_CATEGORY.BILANFINANCIERQUATREANNEES,
-      },
-      {
-        key: "filesProjetsSejoursPrevus",
-        multiple: true,
-        category: FILE_CATEGORY.PROJETSSEJOURSPREVUS,
-      },
-      {
-        key: "filesProjetsSejoursCompetencesExperience",
-        multiple: true,
-        category: FILE_CATEGORY.PROJETSSEJOURSCOMPETENCESEXPERIENCE,
-      },
-      {
-        key: "filesProjetsSejoursMesures",
-        multiple: true,
-        category: FILE_CATEGORY.PROJETSSEJOURSMESURES,
-      },
-      {
-        key: "filesProjetsSejoursComplementaires",
-        multiple: true,
-        category: FILE_CATEGORY.PROJETSSEJOURSCOMPLEMENTAIRES,
-      },
-      {
-        key: "fileProjetsSejoursCasier",
-        multiple: false,
-        category: FILE_CATEGORY.PROJETSSEJOURSCASIER,
-      },
-      {
-        key: "filesProjetsSejoursOrgaTransports",
-        multiple: true,
-        category: FILE_CATEGORY.PROJETSSEJOURSORGATRANSPORT,
-      },
-      {
-        key: "filesProjetsSejoursSuiviMed",
-        multiple: true,
-        category: FILE_CATEGORY.PROJETSSEJOURSSUIVIMED,
-      },
-      {
-        key: "filesProjetsSejoursProtocoleReorientation",
-        multiple: true,
-        category: FILE_CATEGORY.PROJSEJPROTCOREORIENT,
-      },
-      {
-        key: "filesProjetsSejoursProtocoleRapatriement",
-        multiple: true,
-        category: FILE_CATEGORY.PROJSSEJOURSPROTCOLERAPATR,
-      },
-      {
-        key: "filesProjSejoursBudgetPersonnes",
-        multiple: true,
-        category: FILE_CATEGORY.PROJSEJOURSBUDGETPERSONNES,
-      },
-    ];
 
-    for (const { key, multiple, category } of fileMappings) {
-      const value = updatedData[key as FileKey];
+    for (const category of Object.keys(
+      FILE_CATEGORY_CONFIG,
+    ) as (keyof typeof FILE_CATEGORY_CONFIG)[]) {
+      const { fileKey, multiple } = FILE_CATEGORY_CONFIG[category];
+      const value = updatedData[fileKey];
 
       if (!value) continue;
+
       if (multiple) {
-        const docs = await createDocuments({ documents: value, category });
+        const docs = await createDocuments({
+          documents: value,
+          category: category as FILE_CATEGORY,
+        });
         updatedData.agrementFiles.push(...docs);
       } else {
         const doc = await createDocument({
           document: value,
-          category,
+          category: category as FILE_CATEGORY,
         });
         if (doc) updatedData.agrementFiles.push(doc);
       }
@@ -351,7 +219,7 @@ async function createDocument({
 }) {
   if (document && Object.keys(document?.uuid ?? {}).length === 0) {
     try {
-      const uuid = await documentStore.postDocument(document);
+      const uuid = await documentStore.postDocument({ document, category });
       toaster.info({
         titleTag: "h2",
         description: `Fichier ${document.name} déposé`,

packages/frontend-usagers/src/pages/mon-agrement/index.vue

@@ -44,6 +44,9 @@
         :selected="selectedTabIndex === 1"
         :asc="asc"
       >
+        <AgrementDocuments
+          :init-agrement="agrementStore.agrementCourant ?? {}"
+        ></AgrementDocuments>
       </DsfrTabContent>
       <DsfrTabContent
         panel-id="agrement-content-2"

packages/frontend-usagers/src/services/documentService.ts

@@ -5,17 +5,19 @@ const DocumentService = {
   postDocument: async ({
     file,
     category,
-  }: { file: File, category: DocumentUsagersRoutes["PostDocument"]["body"]["category"] }) => {
-
+  }: {
+    file: File;
+    category: DocumentUsagersRoutes["PostDocument"]["body"]["category"];
+  }) => {
     const { uuid } = await buildRequestFile<
       DocumentUsagersRoutes["PostDocument"]
     >({
       path: "/documents/",
       method: "POST",
       body: {
-        category
+        category,
       },
-      file
+      file,
     })();
     return uuid;
   },

packages/frontend-usagers/src/stores/document.ts

@@ -17,7 +17,10 @@ export const useDocumentStore = defineStore("document", {
       if (!document) {
         throw new Error("Un document est requis pour le chargement");
       }
-      const uuid = await DocumentService.postDocument({ file: document, category });
+      const uuid = await DocumentService.postDocument({
+        file: document,
+        category,
+      });
       return uuid;
     },
   },

packages/frontend-usagers/src/utils/fetchBackend.ts

@@ -9,7 +9,7 @@ export const $fetchBackend = <T = any>(
   option: FetchBackendOptions = {},
 ): Promise<T> => {
   const config = useRuntimeConfig();
-   
+
   return $fetch(url, {
     baseURL: config.public.backendUrl,
     ...option,
@@ -82,9 +82,9 @@ export function buildRequestFile<Route extends BasicRoute>({
       return async () =>
         $fetchBackend(url, {
           ...OPTIONS_DEFAULT,
-          headers: {},
           method: "POST",
-          body,
+          body: formData,
+          headers: {},
         });
     default:
       throw new Error("Method not supported");