diff --git a/src/frontend/app/printedFolder/printed-folder-modal.component.scss b/src/frontend/app/printedFolder/printed-folder-modal.component.scss index d606206f9c08877cafbedd708207a1b5290e2df9..25e305f653574a1378e5e4f71c245b20d20dcaf2 100644 --- a/src/frontend/app/printedFolder/printed-folder-modal.component.scss +++ b/src/frontend/app/printedFolder/printed-folder-modal.component.scss @@ -58,7 +58,7 @@ grid-template-columns: 1fr 2fr 1fr 1fr 1fr; } -.linkedResources { +.linkedResourcesAttachments { grid-template-columns: 1fr 1fr 2fr 1fr 1fr 1fr; } diff --git a/src/frontend/app/printedFolder/printed-folder-modal.component.ts b/src/frontend/app/printedFolder/printed-folder-modal.component.ts index 12683492e0369199a08c5f8784fa5ec08bf22be1..d18d84f48e5576500dd79c5a3d608ae266ad178b 100644 --- a/src/frontend/app/printedFolder/printed-folder-modal.component.ts +++ b/src/frontend/app/printedFolder/printed-folder-modal.component.ts @@ -36,6 +36,7 @@ export class PrintedFolderModalComponent implements OnInit { emails: [], acknowledgementReceipts: [], linkedResources : [], + linkedResourcesAttachments : [], }; selectedPrintedFolderElement: any = {}; @@ -124,6 +125,13 @@ export class PrintedFolderModalComponent implements OnInit { this.http.get(`../rest/resources/${this.data.resId}/linkedResources`).pipe( tap(async (data: any) => { for (let index = 0; index < data.linkedResources.length; index++) { + this.printedFolderElement.linkedResources.push({ + id: data.linkedResources[index].resId, + label: data.linkedResources[index].subject, + chrono: !this.functions.empty(data.linkedResources[index].chrono) ? data.linkedResources[index].chrono : this.lang.undefined, + creationDate: data.linkedResources[index].documentDate, + canConvert: data.linkedResources[index].canConvert + }); await this.getLinkedAttachments(data.linkedResources[index]); } resolve(true); @@ -157,7 +165,7 @@ export class PrintedFolderModalComponent implements OnInit { return data.attachments; }), tap((data) => { - this.printedFolderElement.linkedResources = this.printedFolderElement.linkedResources.concat(this.sortPipe.transform(data, 'chronoMaster')); + this.printedFolderElement.linkedResourcesAttachments = this.printedFolderElement.linkedResourcesAttachments.concat(this.sortPipe.transform(data, 'chronoMaster')); resolve(true); }), catchError((err: any) => { @@ -330,14 +338,14 @@ export class PrintedFolderModalComponent implements OnInit { }); // for Linked ressource (complex array) - if (!this.functions.empty(resource['linkedResources'])) { - resource['linkedResources'] = []; - this.selectedPrintedFolderElement['linkedResources'].value.forEach((item: any) => { + if (!this.functions.empty(resource['linkedResourcesAttachments'])) { + resource['linkedResourcesAttachments'] = []; + this.selectedPrintedFolderElement['linkedResourcesAttachments'].value.forEach((item: any) => { const resIdMaster = this.printedFolderElement.linkedResources.filter((res: any) => res.id === item)[0].resIdMaster; - if (resource['linkedResources'].filter((res: any) => res.resId === resIdMaster).length > 0) { - resource['linkedResources'].filter((res: any) => res.resId === resIdMaster)[0].attachments.push(item); + if (resource['linkedResourcesAttachments'].filter((res: any) => res.resId === resIdMaster).length > 0) { + resource['linkedResourcesAttachments'].filter((res: any) => res.resId === resIdMaster)[0].attachments.push(item); } else { - resource['linkedResources'].push( + resource['linkedResourcesAttachments'].push( { resId : resIdMaster, attachments : [ diff --git a/src/frontend/lang/lang-en.ts b/src/frontend/lang/lang-en.ts index b4bf583289dde6e225e8383515efb33cc844ba84..54d16c36215e6c4c4d9660ad449f7cdf9c6f0dfa 100755 --- a/src/frontend/lang/lang-en.ts +++ b/src/frontend/lang/lang-en.ts @@ -1674,7 +1674,8 @@ export const LANG_EN = { "accountLocked": "Too many connections attemps. Retry in", "modelUsedByResources": "This model is used by resources, you can't delete it.", "mustChangePassword": "Please, you must change your password.", - "linkedResources": "Attachments (linked mails)", + "linkedResources": "Linked mails", + "linkedResourcesAttachments": "Attachments (linked mails)", "accessNotFound": "Access not found", "moreOneCustom": "This url is not an available instance of this application, please verify your address.", "linkedEntities": "Linked entities", diff --git a/src/frontend/lang/lang-fr.ts b/src/frontend/lang/lang-fr.ts index ba93f583b7899189779527ae7ee67e9b66e9ceba..43cb79faaeadda806b884f75dd767dcc66910bda 100755 --- a/src/frontend/lang/lang-fr.ts +++ b/src/frontend/lang/lang-fr.ts @@ -1674,7 +1674,8 @@ export const LANG_FR = { "accountLocked": "Nombre de tentatives de connexion dépassée. Réessayez dans", "modelUsedByResources": "Le modèle est utilisé par des courriers, vous ne pouvez pas le supprimer.", "mustChangePassword": "Vous êtes invités à changer votre mot de passe.", - "linkedResources": "Pièces jointes (courriers liés)", + "linkedResources": "Courriers liés", + "linkedResourcesAttachments": "Pièces jointes (courriers liés)", "accessNotFound": "Accès introuvable", "moreOneCustom": "Cette url ne correspond à aucune instance configurée, veuillez vérifier l'adresse.", "alfresco": "Alfresco", diff --git a/src/frontend/lang/lang-nl.ts b/src/frontend/lang/lang-nl.ts index cda2ae48a0892ce7eacae177ee00fd28d81c3e81..1f1505bfc50d28c23b9c2bd393f03a786df4bb8a 100755 --- a/src/frontend/lang/lang-nl.ts +++ b/src/frontend/lang/lang-nl.ts @@ -1658,7 +1658,8 @@ export const LANG_NL = { "accountLocked": "Too many connections attemps. Retry in", //_TO_TRANSLATE "modelUsedByResources": "This model is used by resources, you can't delete it.", //_TO_TRANSLATE "mustChangePassword": "Please, you must change your password.", //_TO_TRANSLATE - "linkedResources": "Attachments (linked mails)", //_TO_TRANSLATE + "linkedResources": "Linked mails", //_TO_TRANSLATE + "linkedResourcesAttachments": "Attachments (linked mails)", //_TO_TRANSLATE "accessNotFound": "Access not found", //_TO_TRANSLATE "moreOneCustom": "This url is not an available instance of this application, please verify your address.", //_TO_TRANSLATE "linkedEntities": "Linked entities", //_TO_TRANSLATE