From c567141b890ec9d9be6dc57c5e1fa3d5c774f7e6 Mon Sep 17 00:00:00 2001
From: "florian.azizian" <florian.azizian@maarch.org>
Date: Sun, 8 Mar 2020 15:48:54 +0100
Subject: [PATCH] FIX #13471 TIME 0:30 AR visualisation without email
---
.../app/sentResource/sent-resource-list.component.ts | 8 +++++---
.../sent-resource-page/sent-resource-page.component.ts | 2 +-
src/frontend/lang/lang-en.ts | 1 +
src/frontend/lang/lang-fr.ts | 3 ++-
src/frontend/lang/lang-nl.ts | 1 +
5 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/src/frontend/app/sentResource/sent-resource-list.component.ts b/src/frontend/app/sentResource/sent-resource-list.component.ts
index ef70cb37f46..0fb0c3721df 100644
--- a/src/frontend/app/sentResource/sent-resource-list.component.ts
+++ b/src/frontend/app/sentResource/sent-resource-list.component.ts
@@ -74,11 +74,13 @@ export class SentResourceListComponent implements OnInit {
if (!this.functions.empty(item.contact.email)) {
email = item.contact.email;
} else {
- email = this.lang.contactDeleted;
+ email = this.lang.withoutEmail;
}
let name;
- if (!this.functions.empty(item.contact.firstname) && !this.functions.empty(item.contact.lastname)) {
- name = `${item.contact.firstname} ${item.contact.lastname}`
+ if (!this.functions.empty(item.contact.firstname) || !this.functions.empty(item.contact.lastname)) {
+ name = item.contact.firstname + ' ' + item.contact.lastname;
+ } else if (!this.functions.empty(item.contact.company)) {
+ name = item.contact.company;
} else {
name = this.lang.contactDeleted;
}
diff --git a/src/frontend/app/sentResource/sent-resource-page/sent-resource-page.component.ts b/src/frontend/app/sentResource/sent-resource-page/sent-resource-page.component.ts
index d6e03146515..21e3cb872ae 100644
--- a/src/frontend/app/sentResource/sent-resource-page/sent-resource-page.component.ts
+++ b/src/frontend/app/sentResource/sent-resource-page/sent-resource-page.component.ts
@@ -377,7 +377,7 @@ export class SentResourcePageComponent implements OnInit {
};
this.recipients = [{
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
+ email: !this.functions.empty(data.acknowledgementReceipt.contact.email) ? data.acknowledgementReceipt.contact.email : this.lang.withoutEmail
}];
this.emailStatus = 'SENT';
diff --git a/src/frontend/lang/lang-en.ts b/src/frontend/lang/lang-en.ts
index cf8dd00c4d6..048f2816db2 100755
--- a/src/frontend/lang/lang-en.ts
+++ b/src/frontend/lang/lang-en.ts
@@ -1580,6 +1580,7 @@ export const LANG_EN = {
"mailing" : "Mailing",
"goToBasket" : "Go to basket...",
"manualSendingAR" : "Manual sending...",
+ "withoutEmail" : "Without email",
"enableMailing" : "Enable mailing",
"disableMailing" : "Disable mailing",
"selectContact" : "select a contact",
diff --git a/src/frontend/lang/lang-fr.ts b/src/frontend/lang/lang-fr.ts
index b00c8c11bbc..24843307aea 100755
--- a/src/frontend/lang/lang-fr.ts
+++ b/src/frontend/lang/lang-fr.ts
@@ -1618,7 +1618,8 @@ export const LANG_FR = {
"willBeDeletedAndMerged" : "sera supprimé et fusionné avec le mot-clé",
"mailing" : "Publipostage",
"goToBasket" : "Accéder à la bannette...",
- "manualSendingAR" : "En cours d'envoi manuel...",
+ "manualSendingAR" : "Généré pour envoi manuel...",
+ "withoutEmail" : "Sans courriel",
"enableMailing" : "Activer le publipostage",
"disableMailing" : "Désactiver le publipostage",
"selectContact" : "Sélectionner un contact",
diff --git a/src/frontend/lang/lang-nl.ts b/src/frontend/lang/lang-nl.ts
index 5457fb211a0..88224385af1 100755
--- a/src/frontend/lang/lang-nl.ts
+++ b/src/frontend/lang/lang-nl.ts
@@ -1605,6 +1605,7 @@ export const LANG_NL = {
"mailing" : "Mailing", //_TO_TRANSLATE
"goToBasket" : "Go to basket...", //_TO_TRANSLATE
"manualSendingAR" : "Manual sending...", //_TO_TRANSLATE
+ "withoutEmail" : "Without email", //_TO_TRANSLATE
"enableMailing" : "Enable mailing", //_TO_TRANSLATE
"disableMailing" : "Disable mailing", //_TO_TRANSLATE
"selectContact" : "select a contact", //_TO_TRANSLATE
--
GitLab