From 41561db4e15cf70ff9414909332db6b94365cdf2 Mon Sep 17 00:00:00 2001
From: Fadil <Fadil.zemmari@xelians.fr>
Date: Thu, 21 Jan 2021 19:15:02 +0100
Subject: [PATCH] [US TRTL-711] Rename "client" to "organisation"
---
.../event-type-label.component.html | 10 ++++-----
.../src/assets/shared-i18n/fr.json | 4 ++--
.../customer-create.component.html | 10 ++++-----
.../customer-list.component.html | 4 ++--
.../information-tab.component.html | 2 +-
.../src/app/customer/customer.component.html | 4 ++--
.../domains-input.component.html | 2 +-
.../vitamui-snack-bar.component.html | 6 ++---
.../subrogate-user.component.html | 2 +-
.../user-information-tab.component.html | 2 +-
.../user-information-tab.component.ts | 22 +++++++++----------
.../miscellaneous.component.html | 6 ++---
12 files changed, 37 insertions(+), 37 deletions(-)
diff --git a/ui/ui-frontend-common/src/app/modules/logbook/event-type-label/event-type-label.component.html b/ui/ui-frontend-common/src/app/modules/logbook/event-type-label/event-type-label.component.html
index 60ee4d2ce..56380e795 100644
--- a/ui/ui-frontend-common/src/app/modules/logbook/event-type-label/event-type-label.component.html
+++ b/ui/ui-frontend-common/src/app/modules/logbook/event-type-label/event-type-label.component.html
@@ -2555,14 +2555,14 @@
EXT_VITAMUI_AUTHENTIFICATION_OTP_USER {Authentification de l'utilisateur avec OTP}
EXT_VITAMUI_AUTHENTICATION_OTP_USER {Authentification de l'utilisateur avec OTP}
- EXT_VITAMUI_CREATE_CUSTOMER {Création du client}
- EXT_VITAMUI_UPDATE_CUSTOMER {Modification du client}
+ EXT_VITAMUI_CREATE_CUSTOMER {Création de l'organisation}
+ EXT_VITAMUI_UPDATE_CUSTOMER {Modification de l'organisation}
EXT_VITAMUI_CREATE_GROUP {Création du groupe}
EXT_VITAMUI_UPDATE_GROUP {Modification du groupe}
- EXT_VITAMUI_CREATE_IDP {Création de L'IDP du client}
- EXT_VITAMUI_UPDATE_IDP {Modification de L'IDP du client}
+ EXT_VITAMUI_CREATE_IDP {Création de L'IDP de l'organisaton}
+ EXT_VITAMUI_UPDATE_IDP {Modification de L'IDP de l'organisaton}
EXT_VITAMUI_CREATE_OWNER {Création du propriétaire}
EXT_VITAMUI_UPDATE_OWNER {Modification du propriétaire}
@@ -2570,7 +2570,7 @@
EXT_VITAMUI_CREATE_PROFILE {Création du profil}
EXT_VITAMUI_UPDATE_PROFILE {Modification du profil}
- EXT_VITAMUI_START_SURROGATE_USER {Démarrage de la subrogation de l'utilisateur client}
+ EXT_VITAMUI_START_SURROGATE_USER {Démarrage de la subrogation de l'utilisateur}
EXT_VITAMUI_START_SURROGATE_GENERIC {Démarrage de la subrogation de l'utilisateur générique}
EXT_VITAMUI_STOP_SURROGATE {Arrêt de la subrogation de l'utilisateur}
EXT_VITAMUI_DECLINE_SURROGATE {Refus de la subrogation par l'utilisateur}
diff --git a/ui/ui-frontend-common/src/assets/shared-i18n/fr.json b/ui/ui-frontend-common/src/assets/shared-i18n/fr.json
index cc924b241..fe2f7d86f 100644
--- a/ui/ui-frontend-common/src/assets/shared-i18n/fr.json
+++ b/ui/ui-frontend-common/src/assets/shared-i18n/fr.json
@@ -39,8 +39,8 @@
"DIALOG_BUTTON_LABEL" : "Accéder à "
},
"SELECT-CUSTOMER": {
- "SELECTED": "Client sélectionné",
- "SELECT" : "Sélectionner un client"
+ "SELECTED": "Organisation sélectionnée",
+ "SELECT" : "Sélectionner une organisation"
},
"SELECT-LANGUAGE": {
"LANGUAGE": "Langue",
diff --git a/ui/ui-frontend/projects/identity/src/app/customer/customer-create/customer-create.component.html b/ui/ui-frontend/projects/identity/src/app/customer/customer-create/customer-create.component.html
index 921a5e056..e0acdb96b 100644
--- a/ui/ui-frontend/projects/identity/src/app/customer/customer-create/customer-create.component.html
+++ b/ui/ui-frontend/projects/identity/src/app/customer/customer-create/customer-create.component.html
@@ -6,9 +6,9 @@
<vitamui-common-stepper (selectionChange)="stepIndex=$event.selectedIndex">
<cdk-step>
<div class="content">
- <div class="text large bold" i18n="Create customer title@@customerCreateTitle1">Création d'un client</div>
+ <div class="text large bold" i18n="Create customer title@@customerCreateTitle1">Création d'une organisation</div>
- <vitamui-common-input class="col-6 pl-0" formControlName="code" required placeholder="Code client (4 chiffres)"
+ <vitamui-common-input class="col-6 pl-0" formControlName="code" required placeholder="Code organisation (4 chiffres)"
i18n-placeholder="Customer code@@customerCreateCustomerCodeInputPlaceholder">
<ng-container *ngIf="form.get('code')?.touched">
@@ -23,7 +23,7 @@
</vitamui-common-input>
<div class="d-flex">
- <vitamui-common-input class="col-6 pl-0" formControlName="name" maxlength="100" required placeholder="Client"
+ <vitamui-common-input class="col-6 pl-0" formControlName="name" maxlength="100" required placeholder="Organisation"
i18n-placeholder="Customer name input placeholder@@customerCreateNameInputPlaceholder">
<vitamui-common-input-error *ngIf="form.get('name')?.touched && !!form.get('name')?.errors?.required"
i18n="Required field error hint@@formErrorRequiredField">Champ requis</vitamui-common-input-error>
@@ -115,7 +115,7 @@
<cdk-step>
<div class="content">
- <div class="text large bold" i18n="Customer access title@@customerCreateTitle2">Accès client</div>
+ <div class="text large bold" i18n="Customer access title@@customerCreateTitle2">Accès organisation</div>
<div class="col-12 p-0 d-flex align-items-center">
<div>
@@ -204,7 +204,7 @@
<app-owner-form [formControl]="form.get(['owners', 0])" [customerInfo]="customerInfo"></app-owner-form>
<p class="hint" i18n="the evidence tenant is automatically created with the owner@@customerCreateHint">
- Ce propriétaire détiendra les éléments de preuve du client.
+ Ce propriétaire détiendra les éléments de preuve de l'organisation.
</p>
</div>
diff --git a/ui/ui-frontend/projects/identity/src/app/customer/customer-list/customer-list.component.html b/ui/ui-frontend/projects/identity/src/app/customer/customer-list/customer-list.component.html
index 99aec6c0f..a3bd4ac69 100644
--- a/ui/ui-frontend/projects/identity/src/app/customer/customer-list/customer-list.component.html
+++ b/ui/ui-frontend/projects/identity/src/app/customer/customer-list/customer-list.component.html
@@ -2,8 +2,8 @@
<div class="vitamui-table">
<div class="vitamui-table-head">
<div class="col-1"><i class="vitamui-icon vitamui-icon-bank"></i></div>
- <div class="col-2" i18n="Customer code@@customerListCustomerCodeHeader">Code client</div>
- <div class="col-2" i18n="Customer name@@customerListNameHeader">Client</div>
+ <div class="col-2" i18n="Customer code@@customerListCustomerCodeHeader">Code organisation</div>
+ <div class="col-2" i18n="Customer name@@customerListNameHeader">Organisation</div>
<div class="col-3" i18n="Compagny name@@customerListCompanyNameHeader">Raison sociale</div>
<div class="col-2" i18n="SSO@@customerListSSOHeader">SSO</div>
<div class="col-2" i18n="Two factor validation@@customerListTwoStepsValidationHeader">Validation en deux étapes</div>
diff --git a/ui/ui-frontend/projects/identity/src/app/customer/customer-preview/information-tab/information-tab.component.html b/ui/ui-frontend/projects/identity/src/app/customer/customer-preview/information-tab/information-tab.component.html
index bdda9af98..5425e20f3 100644
--- a/ui/ui-frontend/projects/identity/src/app/customer/customer-preview/information-tab/information-tab.component.html
+++ b/ui/ui-frontend/projects/identity/src/app/customer/customer-preview/information-tab/information-tab.component.html
@@ -4,7 +4,7 @@
<vitamui-common-editable-input
formControlName="code"
maxlength="20"
- label="Code client" i18n-label="Customer code@@customerPreviewLabelCode"
+ label="Code organisation" i18n-label="Customer code@@customerPreviewLabelCode"
[validator]="form?.get('code')?.validator"
[asyncValidator]="form?.get('code')?.asyncValidator"
>
diff --git a/ui/ui-frontend/projects/identity/src/app/customer/customer.component.html b/ui/ui-frontend/projects/identity/src/app/customer/customer.component.html
index fc747d7c7..488b232bb 100644
--- a/ui/ui-frontend/projects/identity/src/app/customer/customer.component.html
+++ b/ui/ui-frontend/projects/identity/src/app/customer/customer.component.html
@@ -11,9 +11,9 @@
Paramétrer les organisations
</vitamui-common-title-breadcrumb>
- <vitamui-common-banner [searchbarPlaceholder]="'Nom, Raison sociale, Code client, Adresse...'" [disableSearchBar]="true">
+ <vitamui-common-banner [searchbarPlaceholder]="'Nom, Raison sociale, Code organisation, Adresse...'" [disableSearchBar]="true">
<button class="btn primary ml-5" (click)="openCreateCustomerDialog()">
- <span>Créer un Client</span>
+ <span>Créer un organisation</span>
</button>
</vitamui-common-banner>
</div>
diff --git a/ui/ui-frontend/projects/identity/src/app/shared/domains-input/domains-input.component.html b/ui/ui-frontend/projects/identity/src/app/shared/domains-input/domains-input.component.html
index 02b45dc12..49c4e37f0 100644
--- a/ui/ui-frontend/projects/identity/src/app/shared/domains-input/domains-input.component.html
+++ b/ui/ui-frontend/projects/identity/src/app/shared/domains-input/domains-input.component.html
@@ -13,7 +13,7 @@
<div class="vitamui-input-errors">
<div *ngIf="control?.hasError('pattern')" i18n="Wrong format (domain.xyz)@@domainInputErrorFormat">Format incorrect (domaine.xyz)</div>
<div *ngIf="domainExists" i18n="Domain already entered@@domainInputErrorDomainExists">Domaine déjà saisi</div>
- <div *ngIf="!domainExists && control?.hasError('uniqueDomain')" i18n="Domain used by another customer@@domainInputErrorUniqueDomain">Domaine utilisé par un autre client</div>
+ <div *ngIf="!domainExists && control?.hasError('uniqueDomain')" i18n="Domain used by another customer@@domainInputErrorUniqueDomain">Domaine utilisé par une autre organisation</div>
</div>
<div class="vitamui-chip-list ml-4">
diff --git a/ui/ui-frontend/projects/identity/src/app/shared/vitamui-snack-bar/vitamui-snack-bar.component.html b/ui/ui-frontend/projects/identity/src/app/shared/vitamui-snack-bar/vitamui-snack-bar.component.html
index 5c48405ed..762dba2ca 100644
--- a/ui/ui-frontend/projects/identity/src/app/shared/vitamui-snack-bar/vitamui-snack-bar.component.html
+++ b/ui/ui-frontend/projects/identity/src/app/shared/vitamui-snack-bar/vitamui-snack-bar.component.html
@@ -3,15 +3,15 @@
<span class="vitamui-snack-bar-content" [ngSwitch]="data?.type">
<ng-container *ngSwitchCase="'customerCreate'" i18n="@@notificationCustomerCreate">
- <i class="vitamui-icon vitamui-icon-bank"></i> Le client {{ data?.code }} a bien été créé
+ <i class="vitamui-icon vitamui-icon-bank"></i> L'organisation {{ data?.code }} a bien été créé
</ng-container>
<ng-container *ngSwitchCase="'customerCreateError'" i18n="@@notificationCustomerCreateError">
- <i class="vitamui-icon vitamui-icon-danger"></i> Le client n'a pas pu être créé, veuillez contacter un administrateur
+ <i class="vitamui-icon vitamui-icon-danger"></i> L'organisation n'a pas pu être créé, veuillez contacter un administrateur
</ng-container>
<ng-container *ngSwitchCase="'customerUpdate'" i18n="@@notificationCustomerUpdate">
- <i class="vitamui-icon vitamui-icon-bank"></i> Le client {{ data?.code }} a bien été modifié
+ <i class="vitamui-icon vitamui-icon-bank"></i> L'organisation {{ data?.code }} a bien été modifié
</ng-container>
<ng-container *ngSwitchCase="'providerCreate'" i18n="@@notificationProviderCreate">
diff --git a/ui/ui-frontend/projects/identity/src/app/subrogation/subrogate-user/subrogate-user.component.html b/ui/ui-frontend/projects/identity/src/app/subrogation/subrogate-user/subrogate-user.component.html
index 685949bb4..9891906fb 100644
--- a/ui/ui-frontend/projects/identity/src/app/subrogation/subrogate-user/subrogate-user.component.html
+++ b/ui/ui-frontend/projects/identity/src/app/subrogation/subrogate-user/subrogate-user.component.html
@@ -7,7 +7,7 @@
<vitamui-common-banner [searchbarPlaceholder]="'Utilisateur, Admin'" (search)="onSearchSubmit($event)">
<button class="btn primary ml-5" (click)="openUserSubrogationDialog()">
- Subroger un Utilisateur Client
+ Subroger un Utilisateur
</button>
</vitamui-common-banner>
</div>
diff --git a/ui/ui-frontend/projects/identity/src/app/user/user-preview/user-information-tab/user-information-tab.component.html b/ui/ui-frontend/projects/identity/src/app/user/user-preview/user-information-tab/user-information-tab.component.html
index 963068836..5682e940c 100644
--- a/ui/ui-frontend/projects/identity/src/app/user/user-preview/user-information-tab/user-information-tab.component.html
+++ b/ui/ui-frontend/projects/identity/src/app/user/user-preview/user-information-tab/user-information-tab.component.html
@@ -41,7 +41,7 @@
<div class="row">
<div class="col-12 form-control">
<vitamui-common-editable-email-input formControlName="email" [validator]="form?.get('email')?.validator"
- [asyncValidator]="form?.get('email')?.asyncValidator" [domains]="clientEmailDomains" label="Adresse E-mail"
+ [asyncValidator]="form?.get('email')?.asyncValidator" [domains]="customerEmailDomains" label="Adresse E-mail"
i18n-label="user info tab email@@UserInfoTabEmail">
<vitamui-common-field-error errorKey="email" i18n="Required field error hint@@formErrorRequiredField">Champ
requis
diff --git a/ui/ui-frontend/projects/identity/src/app/user/user-preview/user-information-tab/user-information-tab.component.ts b/ui/ui-frontend/projects/identity/src/app/user/user-preview/user-information-tab/user-information-tab.component.ts
index 93b170961..ebd0f2b51 100644
--- a/ui/ui-frontend/projects/identity/src/app/user/user-preview/user-information-tab/user-information-tab.component.ts
+++ b/ui/ui-frontend/projects/identity/src/app/user/user-preview/user-information-tab/user-information-tab.component.ts
@@ -59,13 +59,14 @@ export class UserInfoTabComponent implements OnChanges {
@Input() readOnly: boolean;
@Input() userInfo: AdminUserProfile;
- form: FormGroup;
- phoneForm: FormGroup;
- isPhoneRequired: boolean;
- showTooltip: boolean;
- isPopup: boolean;
- lastConnectionDate: Date;
- previousValue: {
+ public form: FormGroup;
+ public phoneForm: FormGroup;
+ public isPhoneRequired: boolean;
+ public showTooltip: boolean;
+ public isPopup: boolean;
+ public lastConnectionDate: Date;
+ public customerEmailDomains: string[];
+ public previousValue: {
firstname: string,
lastname: string,
email: string,
@@ -89,7 +90,6 @@ export class UserInfoTabComponent implements OnChanges {
siteCode: string,
internalCode: string
};
- clientEmailDomains: string[];
constructor(
private userService: UserService,
@@ -188,9 +188,9 @@ export class UserInfoTabComponent implements OnChanges {
}
private initFormActivationState(form: FormGroup, customer: Customer, userInfo: AdminUserProfile, readOnly: boolean) {
- // get client email domains
- this.clientEmailDomains = [];
- customer.emailDomains.forEach((domain) => this.clientEmailDomains.push(domain.replace('*.', '')));
+ // get customer email domains
+ this.customerEmailDomains = [];
+ customer.emailDomains.forEach((domain) => this.customerEmailDomains.push(domain.replace('*.', '')));
if (readOnly || !userInfo.standardAttrsAllowed) {
form.disable({ emitEvent: false });
diff --git a/ui/ui-frontend/projects/starter-kit/src/app/components/miscellaneous/miscellaneous.component.html b/ui/ui-frontend/projects/starter-kit/src/app/components/miscellaneous/miscellaneous.component.html
index fcba2ca63..2c4a4fe7d 100644
--- a/ui/ui-frontend/projects/starter-kit/src/app/components/miscellaneous/miscellaneous.component.html
+++ b/ui/ui-frontend/projects/starter-kit/src/app/components/miscellaneous/miscellaneous.component.html
@@ -1,6 +1,6 @@
<div>
<h4>Banner with searchbar & button</h4>
- <vitamui-common-banner [searchbarPlaceholder]="'Nom, raison sociale, code client, adresse...'"
+ <vitamui-common-banner [searchbarPlaceholder]="'Nom, raison sociale, code organisation, adresse...'"
[disableSearchBar]="true">
<button class="btn primary ml-5">
<span>Action1</span>
@@ -10,7 +10,7 @@
<div>
<h4>Banner with searchbar & buttons</h4>
- <vitamui-common-banner [searchbarPlaceholder]="'Nom, raison sociale, code client, adresse...'"
+ <vitamui-common-banner [searchbarPlaceholder]="'Nom, raison sociale, code organisation, adresse...'"
[disableSearchBar]="true">
<button class="btn primary ml-5">
<span>Action1</span>
@@ -26,7 +26,7 @@
<div>
<h4>Banner with searchbar only</h4>
- <vitamui-common-banner [searchbarPlaceholder]="'Nom, raison sociale, code client, adresse...'"
+ <vitamui-common-banner [searchbarPlaceholder]="'Nom, raison sociale, code organisation, adresse...'"
[disableSearchBar]="true"></vitamui-common-banner>
</div>
--
GitLab