From d41e6c91986ca6b60728268acef4749b42b010c8 Mon Sep 17 00:00:00 2001 From: Guillaume Heurtier <guillaume.heurtier@maarch.org> Date: Fri, 27 Dec 2019 11:53:38 +0100 Subject: [PATCH] FEAT #12091 TIME 0:30 added message in generation modal --- .../app/list/summarySheet/summary-sheet.component.html | 3 +++ src/frontend/app/list/summarySheet/summary-sheet.component.ts | 3 ++- src/frontend/lang/lang-en.ts | 1 + src/frontend/lang/lang-fr.ts | 1 + src/frontend/lang/lang-nl.ts | 1 + 5 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/frontend/app/list/summarySheet/summary-sheet.component.html b/src/frontend/app/list/summarySheet/summary-sheet.component.html index 922e6745f50..2d96a7dc518 100644 --- a/src/frontend/app/list/summarySheet/summary-sheet.component.html +++ b/src/frontend/app/list/summarySheet/summary-sheet.component.html @@ -58,6 +58,9 @@ <div *ngIf="data.selectedRes.length > 500" mat-dialog-actions class="actions"> <span style="color: #d24747; font-style: italic">{{lang.firstSummarySheetsGenerated}}</span> </div> +<div> + <span class="alert-message alert-message-info">{{lang.arGenWithModelMessage}}</span> +</div> <div mat-dialog-actions class="actions"> <button mat-raised-button mat-button color="primary" (click)="genSummarySheets();">{{lang.genSummarySheets}}</button> <button mat-raised-button mat-button [mat-dialog-close]="">{{lang.cancel}}</button> diff --git a/src/frontend/app/list/summarySheet/summary-sheet.component.ts b/src/frontend/app/list/summarySheet/summary-sheet.component.ts index 84cb62b9d69..3e3b49aafe3 100644 --- a/src/frontend/app/list/summarySheet/summary-sheet.component.ts +++ b/src/frontend/app/list/summarySheet/summary-sheet.component.ts @@ -57,7 +57,8 @@ export class SummarySheetComponent implements OnInit { this.lang.category_id, this.lang.status, this.lang.priority, - this.lang.processLimitDate + this.lang.processLimitDate, + this.lang.customFieldsAdmin ], enabled: true }, diff --git a/src/frontend/lang/lang-en.ts b/src/frontend/lang/lang-en.ts index 083ec96ada0..8afefdc02d4 100755 --- a/src/frontend/lang/lang-en.ts +++ b/src/frontend/lang/lang-en.ts @@ -1363,4 +1363,5 @@ export const LANG_EN = { "badFormat": "Bad format", "contactFilledTo": "Contact filled to", "targetFillingField": "Target field for filling", + "arGenWithModelMessage" : "The summary sheets with the fields defined in the resource's indexing model.", }; diff --git a/src/frontend/lang/lang-fr.ts b/src/frontend/lang/lang-fr.ts index ced357d5580..157bf2b14b7 100755 --- a/src/frontend/lang/lang-fr.ts +++ b/src/frontend/lang/lang-fr.ts @@ -1401,4 +1401,5 @@ export const LANG_FR = { "badFormat": "Format incorrect", "contactFilledTo": "Contact rempli à ", "targetFillingField": "Champ cible de complétude", + "arGenWithModelMessage" : "Les fiches de liaisons seront générées avec les champs définis dans le model d'enregistrement du courrier.", }; diff --git a/src/frontend/lang/lang-nl.ts b/src/frontend/lang/lang-nl.ts index cccaff49c69..88ca567aa56 100755 --- a/src/frontend/lang/lang-nl.ts +++ b/src/frontend/lang/lang-nl.ts @@ -1388,4 +1388,5 @@ export const LANG_NL = { "badFormat": "Bad format", //_TO_TRANSLATE "contactFilledTo": "Contact filled to", //_TO_TRANSLATE "targetFillingField": "Target field for filling", //_TO_TRANSLATE + "arGenWithModelMessage" : "The summary sheets with the fields defined in the resource's indexing model.", //_TO_TRANSLATE }; -- GitLab