From d559c179645144f617c00affbfef7be1eda06b30 Mon Sep 17 00:00:00 2001
From: Alex Orluc <alex.orluc@maarch.org>
Date: Thu, 13 Feb 2020 21:13:25 +0100
Subject: [PATCH] FEAT #12072 TIME 0:15 fix format
---
.../sended-resource-page.component.html | 2 +-
.../sended-resource-page.component.ts | 12 +++++++-----
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/frontend/app/sendedResource/sended-resource-page/sended-resource-page.component.html b/src/frontend/app/sendedResource/sended-resource-page/sended-resource-page.component.html
index a79ef1214db..92720f065e3 100644
--- a/src/frontend/app/sendedResource/sended-resource-page/sended-resource-page.component.html
+++ b/src/frontend/app/sendedResource/sended-resource-page/sended-resource-page.component.html
@@ -129,5 +129,5 @@
<div mat-dialog-actions class="actions" *ngIf="emailStatus !== 'SENT'">
<button mat-raised-button color="primary" (click)="onSubmit()">Envoyer</button>
<button mat-raised-button color="primary" (click)="saveDraft()">Enregistrer le brouilon</button>
- <button mat-raised-button color="warn" (click)="deleteEmail()" [disabled]="emailStatus === 'SENT' || emailStatus === 'WAITING'">Supprimer</button>
+ <button mat-raised-button color="warn" (click)="deleteEmail()" *ngIf="data.emailId" [disabled]="emailStatus === 'SENT' || emailStatus === 'WAITING'">Supprimer</button>
</div>
diff --git a/src/frontend/app/sendedResource/sended-resource-page/sended-resource-page.component.ts b/src/frontend/app/sendedResource/sended-resource-page/sended-resource-page.component.ts
index f63b83d78c3..be0fa410ede 100644
--- a/src/frontend/app/sendedResource/sended-resource-page/sended-resource-page.component.ts
+++ b/src/frontend/app/sendedResource/sended-resource-page/sended-resource-page.component.ts
@@ -300,12 +300,12 @@ export class SendedResourcePageComponent implements OnInit {
Object.keys(data.document).forEach(element => {
if (['id', 'isLinked', 'original'].indexOf(element) === -1) {
data.document[element].forEach((dataAttach: any) => {
- const elem = this.emailAttachTool[element].list.filter((item: any) => item.id === dataAttach.id);
+ const elem = this.emailAttachTool[element].list.filter((item: any) => item.id === dataAttach.id || item.id === dataAttach);
if (elem.length > 0) {
this.emailAttach[element] = elem.map((item: any) => {
return {
...item,
- format: dataAttach.original ? item.format : 'pdf',
+ format: dataAttach.original || dataAttach.original === undefined ? item.format : 'pdf',
original: dataAttach.original
}
})
@@ -316,8 +316,9 @@ export class SendedResourcePageComponent implements OnInit {
this.emailAttach.document.original = data.document.original;
}
});
- data.document
-
+ console.log(this.emailAttachTool);
+ console.log(this.emailAttach);
+
resolve(true);
}),
catchError((err) => {
@@ -402,12 +403,13 @@ export class SendedResourcePageComponent implements OnInit {
this.emailAttachTool[element].list = data[element].map((item: any) => {
return {
...item,
+ original : item.original !== undefined ? item.original : true,
title: item.chrono !== undefined ? `${item.chrono} - ${item.label} (${item.typeLabel})` : `${item.label} (${item.typeLabel})`
}
});
}
});
-
+
resolve(true);
}),
catchError((err: any) => {
--
GitLab