From 35c892ae1330c80f56be725ef1e5feddfb1e0cb4 Mon Sep 17 00:00:00 2001
From: "florian.azizian" <florian.azizian@maarch.org>
Date: Fri, 4 Sep 2020 18:16:29 +0200
Subject: [PATCH] FIX #14540 TIME 0:20 Add registered mail number in filename
if only one registered mail printed
---
.../print-registered-mail-action.component.ts | 35 +++++++++++--------
1 file changed, 20 insertions(+), 15 deletions(-)
diff --git a/src/frontend/app/actions/print-registered-mail-action/print-registered-mail-action.component.ts b/src/frontend/app/actions/print-registered-mail-action/print-registered-mail-action.component.ts
index f510582a2a6..70dec308b5a 100644
--- a/src/frontend/app/actions/print-registered-mail-action/print-registered-mail-action.component.ts
+++ b/src/frontend/app/actions/print-registered-mail-action/print-registered-mail-action.component.ts
@@ -43,25 +43,30 @@ export class PrintRegisteredMailActionComponent implements OnInit {
} else {
Object.values(data.data).forEach((encodedFile: string) => {
if (!this.functions.empty(encodedFile)) {
+ let filenameDetail: string;
downloadLink.href = `data:application/pdf;base64,${encodedFile}`;
- let today: any;
- let dd: any;
- let mm: any;
- let yyyy: any;
+ if (this.data.resIds.length === 1) {
+ filenameDetail = this.data.resource.chrono.split(' ').join('_');
+ } else {
+ let today: any;
+ let dd: any;
+ let mm: any;
+ let yyyy: any;
- today = new Date();
- dd = today.getDate();
- mm = today.getMonth() + 1;
- yyyy = today.getFullYear();
+ today = new Date();
+ dd = today.getDate();
+ mm = today.getMonth() + 1;
+ yyyy = today.getFullYear();
- if (dd < 10) {
- dd = '0' + dd;
+ if (dd < 10) {
+ dd = '0' + dd;
+ }
+ if (mm < 10) {
+ mm = '0' + mm;
+ }
+ filenameDetail = dd + '-' + mm + '-' + yyyy;
}
- if (mm < 10) {
- mm = '0' + mm;
- }
- today = dd + '-' + mm + '-' + yyyy;
- downloadLink.setAttribute('download', 'recommande_' + today + '.pdf');
+ downloadLink.setAttribute('download', 'recommande_' + filenameDetail + '.pdf');
document.body.appendChild(downloadLink);
downloadLink.click();
this.dialogRef.close(this.data.resIds);
--
GitLab