From ac9a6a51148065f7f60af9db7f5e66916789343c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ma=C3=ABl=20QUAISSARD?= <mael.quaissard@smile.fr> Date: Thu, 30 Jul 2020 12:22:01 +0200 Subject: [PATCH] 19714 - probative value - Fix notification message Co-authored-by: benemart <benedicte.martinez@cea.fr> --- .../access-contract-list.component.html | 2 +- .../app/probative-value/probative-value.service.ts | 6 ++---- .../vitamui-snack-bar.component.html | 4 ++++ .../projects/referential/src/locale/messages.en.xlf | 10 +++++++++- .../projects/referential/src/locale/messages.fr.xlf | 12 +++++++++++- .../projects/referential/src/locale/messages.xlf | 9 +++++++++ 6 files changed, 36 insertions(+), 7 deletions(-) diff --git a/ui/ui-frontend/projects/referential/src/app/access-contract/access-contract-list/access-contract-list.component.html b/ui/ui-frontend/projects/referential/src/app/access-contract/access-contract-list/access-contract-list.component.html index fd91b7a2..d713819a 100644 --- a/ui/ui-frontend/projects/referential/src/app/access-contract/access-contract-list/access-contract-list.component.html +++ b/ui/ui-frontend/projects/referential/src/app/access-contract/access-contract-list/access-contract-list.component.html @@ -45,7 +45,7 @@ (orderChange)="emitOrderChange()"></vitamui-common-order-by-button> </div> </th> - <th i18n=""> + <th> <div class="vitamui-table-header"> <span i18n="accessContract creation date column header@@accessContractListCreationDateHeader">Date de création</span> <vitamui-common-order-by-button orderByKey="CreationDate" [(orderBy)]="orderBy" [(direction)]="direction" diff --git a/ui/ui-frontend/projects/referential/src/app/probative-value/probative-value.service.ts b/ui/ui-frontend/projects/referential/src/app/probative-value/probative-value.service.ts index ca037e6c..2cf37ffe 100644 --- a/ui/ui-frontend/projects/referential/src/app/probative-value/probative-value.service.ts +++ b/ui/ui-frontend/projects/referential/src/app/probative-value/probative-value.service.ts @@ -20,8 +20,6 @@ export class ProbativeValueService extends SearchService<Event> { } create(probativeValueRequest: any, headers: HttpHeaders) { - console.log('Probative value, DSL: ', probativeValueRequest); - for (const header in this.headers) { if (this.headers.hasOwnProperty(header)) { headers.set(header, this.headers.get(header)); @@ -31,10 +29,10 @@ export class ProbativeValueService extends SearchService<Event> { return this.operationApiService.runProbativeValue(probativeValueRequest, headers) .pipe( tap( - (response: any) => { + () => { this.snackBar.openFromComponent(VitamUISnackBarComponent, { panelClass: 'vitamui-snack-bar', - data: {type: 'probativeValueRun', name: response.identifier}, + data: {type: 'probativeValueRun'}, duration: 10000 }); }, diff --git a/ui/ui-frontend/projects/referential/src/app/shared/vitamui-snack-bar/vitamui-snack-bar.component.html b/ui/ui-frontend/projects/referential/src/app/shared/vitamui-snack-bar/vitamui-snack-bar.component.html index c5c02690..a0b7559c 100644 --- a/ui/ui-frontend/projects/referential/src/app/shared/vitamui-snack-bar/vitamui-snack-bar.component.html +++ b/ui/ui-frontend/projects/referential/src/app/shared/vitamui-snack-bar/vitamui-snack-bar.component.html @@ -91,6 +91,10 @@ <i class="vitamui-icon vitamui-icon-audit"></i> L'audit {{data?.id}} a bien été lancé. </ng-container> + <ng-container *ngSwitchCase="'probativeValueRun'" i18n="@@notificationProbativeValueRun"> + Le relevé de valeur probante a bien été lancé + </ng-container> + </span> <button class="close-btn" (click)="close()"><i class="material-icons">clear</i></button> diff --git a/ui/ui-frontend/projects/referential/src/locale/messages.en.xlf b/ui/ui-frontend/projects/referential/src/locale/messages.en.xlf index 592ff9de..d672dda5 100644 --- a/ui/ui-frontend/projects/referential/src/locale/messages.en.xlf +++ b/ui/ui-frontend/projects/referential/src/locale/messages.en.xlf @@ -771,7 +771,15 @@ <x id="START_ITALIC_TEXT" ctype="x-i" equiv-text="<i>"/><x id="CLOSE_ITALIC_TEXT" ctype="x-i" equiv-text="</i>"/> L'audit <x id="INTERPOLATION" equiv-text="{{data?.id}}"/> a bien été lancé. </source><target state="new"/> - <context-group purpose="location"><context context-type="sourcefile">src/app/shared/vitamui-snack-bar/vitamui-snack-bar.component.html</context><context context-type="linenumber">90</context></context-group></trans-unit><trans-unit id="confirmActionConfirmDialogConfirmLabel" datatype="html"> + <context-group purpose="location"><context context-type="sourcefile">src/app/shared/vitamui-snack-bar/vitamui-snack-bar.component.html</context><context context-type="linenumber">90</context></context-group></trans-unit><trans-unit id="notificationProbativeValueRun" datatype="html"> + <source> + Le relevé de valeur probante a bien été lancé + </source><target state="new"/> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/shared/vitamui-snack-bar/vitamui-snack-bar.component.html</context> + <context context-type="linenumber">94</context> + </context-group> + </trans-unit><trans-unit id="confirmActionConfirmDialogConfirmLabel" datatype="html"> <source>Valider</source><target state="new"/> diff --git a/ui/ui-frontend/projects/referential/src/locale/messages.fr.xlf b/ui/ui-frontend/projects/referential/src/locale/messages.fr.xlf index 289a6d5c..ea925933 100644 --- a/ui/ui-frontend/projects/referential/src/locale/messages.fr.xlf +++ b/ui/ui-frontend/projects/referential/src/locale/messages.fr.xlf @@ -859,7 +859,17 @@ <x id="START_ITALIC_TEXT" ctype="x-i" equiv-text="<i>"/><x id="CLOSE_ITALIC_TEXT" ctype="x-i" equiv-text="</i>"/> L'audit <x id="INTERPOLATION" equiv-text="{{data?.id}}"/> a bien été lancé. </target> - <context-group purpose="location"><context context-type="sourcefile">src/app/shared/vitamui-snack-bar/vitamui-snack-bar.component.html</context><context context-type="linenumber">90</context></context-group></trans-unit><trans-unit id="confirmActionConfirmDialogConfirmLabel" datatype="html"> + <context-group purpose="location"><context context-type="sourcefile">src/app/shared/vitamui-snack-bar/vitamui-snack-bar.component.html</context><context context-type="linenumber">90</context></context-group></trans-unit><trans-unit id="notificationProbativeValueRun" datatype="html"> + <source> + Le relevé de valeur probante a bien été lancé + </source><target state="final"> + Le relevé de valeur probante a bien été lancé + </target> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/shared/vitamui-snack-bar/vitamui-snack-bar.component.html</context> + <context context-type="linenumber">94</context> + </context-group> + </trans-unit><trans-unit id="confirmActionConfirmDialogConfirmLabel" datatype="html"> <source>Valider</source><target state="final">Valider</target> diff --git a/ui/ui-frontend/projects/referential/src/locale/messages.xlf b/ui/ui-frontend/projects/referential/src/locale/messages.xlf index 5ef39886..8ba9b54e 100644 --- a/ui/ui-frontend/projects/referential/src/locale/messages.xlf +++ b/ui/ui-frontend/projects/referential/src/locale/messages.xlf @@ -1062,6 +1062,15 @@ <context context-type="linenumber">90</context> </context-group> </trans-unit> + <trans-unit id="notificationProbativeValueRun" datatype="html"> + <source> + Le relevé de valeur probante a bien été lancé + </source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/shared/vitamui-snack-bar/vitamui-snack-bar.component.html</context> + <context context-type="linenumber">94</context> + </context-group> + </trans-unit> <trans-unit id="confirmActionConfirmDialogConfirmLabel" datatype="html"> <source>Valider</source> <context-group purpose="location"> -- GitLab