From 296642c4edb4b56f8501618ed983d4fb555afbfc Mon Sep 17 00:00:00 2001
From: "florian.azizian" <florian.azizian@maarch.org>
Date: Sun, 23 Feb 2020 21:43:13 +0100
Subject: [PATCH] FIX #13120 Improve message displaying for mailing before
signatory user
---
.../send-external-signatory-book-action.component.html | 2 +-
.../continue-visa-circuit-action.component.html | 3 ++-
.../send-signature-book-action.component.html | 2 +-
.../send-signature-book-action.component.ts | 6 +-----
src/frontend/lang/lang-en.ts | 7 ++++---
src/frontend/lang/lang-fr.ts | 7 ++++---
src/frontend/lang/lang-nl.ts | 7 ++++---
7 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/src/frontend/app/actions/send-external-signatory-book-action/send-external-signatory-book-action.component.html b/src/frontend/app/actions/send-external-signatory-book-action/send-external-signatory-book-action.component.html
index cf14b1d7616..2d87ce849f3 100644
--- a/src/frontend/app/actions/send-external-signatory-book-action/send-external-signatory-book-action.component.html
+++ b/src/frontend/app/actions/send-external-signatory-book-action/send-external-signatory-book-action.component.html
@@ -19,7 +19,7 @@
<mat-checkbox color="primary" *ngFor="let inteKey of integrationsInfo | keyvalue" (click)="toggleIntegration(inteKey.key)" [checked]="data.resource.integrations[inteKey.key]">{{lang[inteKey.key+'_doc']}}</mat-checkbox>
</div>
<div *ngIf="resourcesMailing.length > 0" class="alert-message alert-message-info" role="alert">
- <p>{{lang.mailingActionInformations2}}</p>
+ <p>{{lang.mailingActionInformations}}</p>
<ul>
<li *ngFor="let ressource of resourcesMailing">
<b>{{ressource.alt_identifier}}</b>
diff --git a/src/frontend/app/actions/visa-continue-circuit-action/continue-visa-circuit-action.component.html b/src/frontend/app/actions/visa-continue-circuit-action/continue-visa-circuit-action.component.html
index dabda258023..effec9a1c4e 100644
--- a/src/frontend/app/actions/visa-continue-circuit-action/continue-visa-circuit-action.component.html
+++ b/src/frontend/app/actions/visa-continue-circuit-action/continue-visa-circuit-action.component.html
@@ -39,7 +39,8 @@
</li>
</ul>
</div>
- <div *ngIf="resourcesMailing.length > 0" class="alert-message alert-message-info" role="alert">
+ <div *ngIf="resourcesMailing.length > 0 && appVisaWorkflow !== undefined && appVisaWorkflow.getNextVisaUser() !== '' && appVisaWorkflow.getNextVisaUser().requested_signature"
+ class="alert-message alert-message-info" role="alert">
<p>{{lang.mailingActionInformations}}</p>
<ul>
<li *ngFor="let ressource of resourcesMailing">
diff --git a/src/frontend/app/actions/visa-send-signature-book-action/send-signature-book-action.component.html b/src/frontend/app/actions/visa-send-signature-book-action/send-signature-book-action.component.html
index 4e4db2f4db5..bf667a02eef 100644
--- a/src/frontend/app/actions/visa-send-signature-book-action/send-signature-book-action.component.html
+++ b/src/frontend/app/actions/visa-send-signature-book-action/send-signature-book-action.component.html
@@ -25,7 +25,7 @@
</li>
</ul>
</div>
- <div *ngIf="resourcesMailing.length > 0" class="alert-message alert-message-info" role="alert">
+ <div *ngIf="resourcesMailing.length > 0 && appVisaWorkflow.getFirstVisaUser() != '' && appVisaWorkflow.visaWorkflow.items[0].requested_signature" class="alert-message alert-message-info" role="alert">
<p>{{lang.mailingActionInformations}}</p>
<ul>
<li *ngFor="let ressource of resourcesMailing">
diff --git a/src/frontend/app/actions/visa-send-signature-book-action/send-signature-book-action.component.ts b/src/frontend/app/actions/visa-send-signature-book-action/send-signature-book-action.component.ts
index 5219a83fe1b..67ce4fc3e9f 100644
--- a/src/frontend/app/actions/visa-send-signature-book-action/send-signature-book-action.component.ts
+++ b/src/frontend/app/actions/visa-send-signature-book-action/send-signature-book-action.component.ts
@@ -91,11 +91,7 @@ export class SendSignatureBookActionComponent implements AfterViewInit {
}
this.noResourceToProcess = this.data.resIds.length === this.resourcesError.length;
if (data.resourcesInformations.success) {
- data.resourcesInformations.success.forEach((value: any) => {
- if (value.mailing) {
- this.resourcesMailing.push(value);
- }
- });
+ this.resourcesMailing = data.resourcesInformations.success.filter((element: any) => element.mailing);
}
resolve(true);
}, (err: any) => {
diff --git a/src/frontend/lang/lang-en.ts b/src/frontend/lang/lang-en.ts
index 6b4e43f82ad..22190e85af1 100755
--- a/src/frontend/lang/lang-en.ts
+++ b/src/frontend/lang/lang-en.ts
@@ -729,7 +729,7 @@ export const LANG_EN = {
"inSignatureBook" : "In signature Book",
"inShipping" : "In shipping",
"quickSearchInfo" : "Target search ",
- "quickSearchTarget" : "subject (mail / attachment), chrono number (courrier / attachment), reference mail, notes content, barcode, attachment contact (society / lastanme / firstname)",
+ "quickSearchTarget" : "subject (mail / attachment), chrono number (mail / attachment), notes content, barcode, EDM number (mail)",
"reactivateUserDeleted" : "The id filled is linked to a deleted user. Voulez-vous le réactiver ?",
"readyToGeneratePaperAr" : "paper acknowledgement receipt ready to be generated",
"readyToSendElectronicAr" : "electronic acknowledgement receipt ready to be send",
@@ -1537,8 +1537,7 @@ export const LANG_EN = {
"badEmailsFormat" : "Some email address are not correct",
"warnEmptySubject" : "You will send an email without subject, continue ?",
"emailDeleted" : "Email deleted",
- "mailingActionInformations" : "Following mails contain mailing attachments, if next person in visa circuit is signatory then mailing will be activate :",
- "mailingActionInformations2" : "Following mails contain mailing attachments, mailing will be activate :",
+ "mailingActionInformations" : "Following mails contain mailing attachments, mailing will be activate :",
"properties" : "Properties",
"generateARMode" : "Acknowledgement receipt mode allowed",
"autoAR" : "Automatic",
@@ -1553,6 +1552,8 @@ export const LANG_EN = {
"willBeTransferedToNewTag" : "will be transfered to selected tag",
"detailDoc" : "Detail page",
"emptySubject" : "Empty subject",
+ "noAvailableMenu" : "No available menu",
+ "emailSent" : "Email sent",
"editAcknowledgementReceipt" : "Edit the acknowledgement receipt",
"insufficientPrivilege" : "Privilege insuffisant",
"cannotMergeTags" : "This tag has a parent or children : impossible to merge tags",
diff --git a/src/frontend/lang/lang-fr.ts b/src/frontend/lang/lang-fr.ts
index f454edf137a..6e1074f975c 100755
--- a/src/frontend/lang/lang-fr.ts
+++ b/src/frontend/lang/lang-fr.ts
@@ -762,7 +762,7 @@ export const LANG_FR = {
"inSignatureBook" : "Intégré au parapheur",
"inShipping" : "Intégré à l'envoi Maileva",
"quickSearchInfo" : "Cible de la recherche",
- "quickSearchTarget" : "sujet (courrier / pièce jointe), numéro chrono (courrier / pièce jointe), référence courrier expéditeur, contenu d'annotations, code à barre, contact pièce jointe (Organisation / nom / prénom)",
+ "quickSearchTarget" : "sujet (courrier / pièce jointe), numéro chrono (courrier / pièce jointe), contenu d'annotations, code à barre, numéro GED (courrier)",
"reactivateUserDeleted" : "L'identifiant renseigné est attribué à un utilisateur supprimé. Voulez-vous le réactiver ?",
"readyToGeneratePaperAr" : "accusé(s) de réception papier prêt(s) à être généré(s)",
"readyToSendElectronicAr" : "accusé(s) de réception électronique prêt(s) à être envoyé(s)",
@@ -1576,8 +1576,7 @@ export const LANG_FR = {
"badEmailsFormat" : "Certaines adresses de courriel ne sont pas correctes",
"warnEmptySubject" : "Vous allez envoyer un courriel sans objet, continuer ?",
"emailDeleted" : "Courriel supprimé",
- "mailingActionInformations" : "Les courriers suivants contiennent des pièces jointes pour publipostage, si la prochaine personne du circuit de visa est signataire alors le publipostage s'effectuera dès la validation de cette action :",
- "mailingActionInformations2" : "Les courriers suivants contiennent des pièces jointes pour publipostage, celui-ci s'effectuera dès la validation de cette action :",
+ "mailingActionInformations" : "Les courriers suivants contiennent des pièces jointes pour publipostage, celui-ci s'effectuera dès la validation de cette action :",
"properties" : "Propriétés",
"generateARMode" : "Mode d'accusé de réception autorisé",
"autoAR" : "Automatique",
@@ -1592,6 +1591,8 @@ export const LANG_FR = {
"willBeTransferedToNewTag" : "seront transférés au mot clé sélectionné",
"detailDoc" : "Fiche détaillée",
"emptySubject" : "Objet vide",
+ "noAvailableMenu" : "Aucun menu disponible",
+ "emailSent" : "Courriel envoyé",
"editAcknowledgementReceipt" : "Editer l'accusé de réception",
"insufficientPrivilege" : "Privilège insuffisant",
"cannotMergeTags" : "Ce mot-clé possède un parent ou des enfants : impossible de le fusionner avec un autre mot clé.",
diff --git a/src/frontend/lang/lang-nl.ts b/src/frontend/lang/lang-nl.ts
index 80437b2e908..61010d4644f 100755
--- a/src/frontend/lang/lang-nl.ts
+++ b/src/frontend/lang/lang-nl.ts
@@ -755,7 +755,7 @@ export const LANG_NL = {
"quickSearchInfo" : "Target search ", //_TO_TRANSLATE
"inSignatureBook" : "In signature Book", //_TO_TRANSLATE
"inShipping" : "In shipping", //_TO_TRANSLATE
- "quickSearchTarget" : "subject (mail / attachment), chrono number (courrier / attachment), reference mail, notes content, barcode, attachment contact (society / lastanme / firstname)", //_TO_TRANSLATE
+ "quickSearchTarget" : "subject (mail / attachment), chrono number (courrier / attachment), notes content, barcode, EDM number (mail)", //_TO_TRANSLATE
"quota" : "Quota",
"quotaExceeded" : "Quota overschreden",
"reactivateUserDeleted" : "De ingevoerde gebruikersnaam is toegekend aan een verwijderde gebruiker. Wilt u deze opnieuw activeren?",
@@ -1562,8 +1562,7 @@ export const LANG_NL = {
"badEmailsFormat" : "Some email address are not correct", //_TO_TRANSLATE
"warnEmptySubject" : "You will send an email without subject, continue ?", //_TO_TRANSLATE
"emailDeleted" : "Email deleted", //_TO_TRANSLATE
- "mailingActionInformations" : "Following mails contain mailing attachments, if next person in visa circuit is signatory then mailing will be activate :", //_TO_TRANSLATE
- "mailingActionInformations2" : "Following mails contain mailing attachments, mailing will be activate :", //TRANSLATE
+ "mailingActionInformations" : "Following mails contain mailing attachments, mailing will be activate :", //TRANSLATE
"properties" : "Properties", //_TO_TRANSLATE
"generateARMode" : "Acknowledgement receipt mode allowed", //_TO_TRANSLATE
"autoAR" : "Automatic", //_TO_TRANSLATE
@@ -1578,6 +1577,8 @@ export const LANG_NL = {
"willBeTransferedToNewTag" : "will be transfered to selected tag", //_TO_TRANSLATE
"detailDoc" : "Detail page", //_TO_TRANSLATE
"emptySubject" : "Empty subject", //_TO_TRANSLATE
+ "noAvailableMenu" : "No available menu", //_TO_TRANSLATE
+ "emailSent" : "Email sent", //_TO_TRANSLATE
"editAcknowledgementReceipt" : "Edit the acknowledgement receipt", //_TO_TRANSLATE
"insufficientPrivilege" : "Privilege insuffisant", //TRANSLATE
"cannotMergeTags" : "This tag has a parent or children : impossible to merge tags",//_TO_TRANSLATE
--
GitLab