From 082855a7a3d77f7387580f789ff5cc4f1b0a25c5 Mon Sep 17 00:00:00 2001
From: Guillaume Heurtier <guillaume.heurtier@maarch.org>
Date: Mon, 17 Feb 2020 12:27:55 +0100
Subject: [PATCH] FEAT #13199 TIME 0:50 show message if contact is deleted in
 ar

---
 .../sended-resource-list.component.ts           | 17 +++++++++++++++--
 .../sended-resource-page.component.ts           |  6 +++---
 src/frontend/lang/lang-en.ts                    |  3 ++-
 src/frontend/lang/lang-fr.ts                    |  3 ++-
 src/frontend/lang/lang-nl.ts                    |  1 +
 5 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/src/frontend/app/sendedResource/sended-resource-list.component.ts b/src/frontend/app/sendedResource/sended-resource-list.component.ts
index cd7d20d0cef..5632c6a9703 100644
--- a/src/frontend/app/sendedResource/sended-resource-list.component.ts
+++ b/src/frontend/app/sendedResource/sended-resource-list.component.ts
@@ -74,10 +74,23 @@ export class SendedResourceListComponent implements OnInit {
             this.http.get(`../../rest/resources/${this.resId}/acknowledgementReceipts?type=ar`).pipe(
                 map((data: any) => {
                     data = data.map((item: any) => {
+                        let email;
+                        if (!this.functions.empty(item.contact.email)) {
+                            email = item.contact.email;
+                        } else {
+                            email = this.lang.contactDeleted;
+                        }
+                        let name;
+                        if (!this.functions.empty(item.contact.firstname) && !this.functions.empty(item.contact.lastname)) {
+                            name = `${item.contact.firstname} ${item.contact.lastname}`
+                        } else {
+                            name = this.lang.contactDeleted;
+                        }
+
                         return {
                             id: item.id,
                             sender: false,
-                            recipients: item.format === 'html' ? item.contact.email : `${item.contact.firstname} ${item.contact.lastname}`,
+                            recipients: item.format === 'html' ? email : name,
                             creationDate: item.creationDate,
                             sendDate: item.sendDate,
                             type: 'acknowledgementReceipt',
@@ -261,4 +274,4 @@ export class SendedResourceListComponent implements OnInit {
             ).subscribe();
         }
     }
-}
\ No newline at end of file
+}
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 4b6ad252eea..88c37a80fdc 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
@@ -364,8 +364,8 @@ export class SendedResourcePageComponent implements OnInit {
                         email: data.acknowledgementReceipt.userLabel
                     };
                     this.recipients = [{
-                        label: this.contactService.formatContact(data.acknowledgementReceipt.contact),
-                        email: data.acknowledgementReceipt.contact.email
+                        label: !this.functions.empty(data.acknowledgementReceipt.contact) ? this.contactService.formatContact(data.acknowledgementReceipt.contact) : this.lang.contactDeleted,
+                        email: !this.functions.empty(data.acknowledgementReceipt.contact.email) ? data.acknowledgementReceipt.contact.email : this.lang.contactDeleted
                     }];
 
                     this.emailsubject = this.lang.shipping;
@@ -734,4 +734,4 @@ export class SendedResourcePageComponent implements OnInit {
             return false;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/frontend/lang/lang-en.ts b/src/frontend/lang/lang-en.ts
index f5cfa96a8d3..dba97375259 100755
--- a/src/frontend/lang/lang-en.ts
+++ b/src/frontend/lang/lang-en.ts
@@ -1523,5 +1523,6 @@ export const LANG_EN = {
     "draftSaved" : "Draft saved",
     "draftUpdated" : "Draft updated",
     "sendingEmail" : "Sending email...",
-    "restrictions" : "Restrictions",   
+    "restrictions" : "Restrictions",
+    "contactDeleted" : "Contact deleted"
 };
diff --git a/src/frontend/lang/lang-fr.ts b/src/frontend/lang/lang-fr.ts
index 3d78c6e924b..cc300c48b85 100755
--- a/src/frontend/lang/lang-fr.ts
+++ b/src/frontend/lang/lang-fr.ts
@@ -1562,5 +1562,6 @@ export const LANG_FR = {
     "draftSaved" : "Brouillon enregistré",
     "draftUpdated" : "Brouillon modifié",
     "sendingEmail" : "Email en cours d'envoi...",
-    "restrictions" : "Restrictions",    
+    "restrictions" : "Restrictions",
+    "contactDeleted" : "Contact supprimé"
 };
diff --git a/src/frontend/lang/lang-nl.ts b/src/frontend/lang/lang-nl.ts
index b175f7a32b3..daff9c6386d 100755
--- a/src/frontend/lang/lang-nl.ts
+++ b/src/frontend/lang/lang-nl.ts
@@ -1549,4 +1549,5 @@ export const LANG_NL = {
     "draftUpdated" : "Draft updated", //_TO_TRANSLATE
     "sendingEmail" : "Sending email...", //_TO_TRANSLATE
     "restrictions" : "Restrictions", //_TO_TRANSLATE
+    "contactDeleted" : "Contact deleted" //_TO_TRANSLATE
 };
-- 
GitLab