From 979f2e56a5c8e4e3ba2a6b23a3f349baca7ff488 Mon Sep 17 00:00:00 2001 From: Pascal Date: Tue, 26 Nov 2024 16:37:29 +0100 Subject: [PATCH] load_file_signature_not_ok --- public/style/signature.css | 2 +- src/pages/signature/signature.ts | 48 ++++++++++++++++++++++++-------- 2 files changed, 38 insertions(+), 12 deletions(-) diff --git a/public/style/signature.css b/public/style/signature.css index 702f7a0..b4e8eb9 100755 --- a/public/style/signature.css +++ b/public/style/signature.css @@ -1525,7 +1525,7 @@ input[type="file"] { border-radius: 8px; max-width: 800px; width: 90%; - max-height: 75vh; + max-height: 90vh; overflow-y: auto; position: relative; } diff --git a/src/pages/signature/signature.ts b/src/pages/signature/signature.ts index 2b2a0c9..ccf3c19 100755 --- a/src/pages/signature/signature.ts +++ b/src/pages/signature/signature.ts @@ -1122,6 +1122,16 @@ function submitNewDocument(event: Event) { return; } + // Récupération des fichiers + const fileList = document.getElementById('fileList'); + const files = Array.from(fileList?.querySelectorAll('.file-item') || []).map(fileItem => { + const fileName = fileItem.querySelector('.file-name')?.textContent || ''; + return { + name: fileName, + url: '#', // URL simulée pour le prototype + }; + }); + // Récupération des valeurs du formulaire const processId = Number((form.querySelector('#processId') as HTMLInputElement)?.value); const documentId = Number((form.querySelector('#documentId') as HTMLInputElement)?.value); @@ -1168,7 +1178,8 @@ function submitNewDocument(event: Event) { member: member, signed: false, signedAt: null - })) + })), + files: files // Ajout des fichiers au document }; // Mettre à jour le document dans le rôle @@ -1247,6 +1258,15 @@ function submitCommonDocument(event: Event) { return acc.concat(role.members); }, []); + const fileList = document.getElementById('fileList'); + const files = Array.from(fileList?.querySelectorAll('.file-item') || []).map(fileItem => { + const fileName = fileItem.querySelector('.file-name')?.textContent || ''; + return { + name: fileName, + url: '#', // URL simulée pour le prototype + }; + }); + const updatedDocument = { id: documentId, name: documentName, @@ -1259,7 +1279,8 @@ function submitCommonDocument(event: Event) { member: member, signed: false, signedAt: null - })) + })), + files: files }; // Mettre à jour le document commun @@ -1549,15 +1570,20 @@ function signDocument(documentId: number, processId: number, isCommonDocument: b

Fichiers joints:

- ${targetDoc.files.map((file: any) => ` -
- - ${file.name} - - ⬇️ - -
- `).join('') || 'Aucun fichier joint'} + ${Array.isArray(targetDoc.files) && targetDoc.files.length > 0 ? + targetDoc.files.map((file: any) => ` +
+ 📄 + ${file.name} + ${file.url ? ` + + ⬇️ + + ` : ''} +
+ `).join('') + : '

Aucun fichier joint

' + }
` : ''}