diff --git a/apps/maarch_entreprise/Views/entities-administration-redirect-modal.component.html b/apps/maarch_entreprise/Views/entities-administration-redirect-modal.component.html
index e19bb17c34dc4d659746f1c9ccd00685537e5ff0..d1a00a0878c587a2f73a4fbc8f6c29448ab32e99 100644
--- a/apps/maarch_entreprise/Views/entities-administration-redirect-modal.component.html
+++ b/apps/maarch_entreprise/Views/entities-administration-redirect-modal.component.html
@@ -1,4 +1,4 @@
-<h2 mat-dialog-title>Remplacement de l'entité</h2>
+<h2 mat-dialog-title>{{lang.entityReplacement}}</h2>
<form #changeEntityForm="ngForm">
<mat-dialog-content>
<div class="alert alert-info" role="alert">
@@ -6,31 +6,31 @@
<mat-list-item *ngIf="data.entity.documents > 0">
<mat-icon color="primary" mat-list-icon class="fa fa-file fa-2x"></mat-icon>
<p mat-line>
- <b>{{data.entity.entity_label}}</b> est en destination de
- <b>{{data.entity.documents}}</b> document(s)</p>
+ <b>{{data.entity.entity_label}}</b> {{lang.isDestTo}}
+ <b>{{data.entity.documents}}</b> {{lang.documents}}</p>
</mat-list-item>
<mat-list-item *ngIf="data.entity.instances > 0">
<mat-icon color="primary" mat-list-icon class="fa fa-sitemap fa-2x"></mat-icon>
<p mat-line>
- <b>{{data.entity.entity_label}}</b> est en copie de
- <b>{{data.entity.instances}}</b> document(s)</p>
+ <b>{{data.entity.entity_label}}</b> {{lang.isCopyTo}}
+ <b>{{data.entity.instances}}</b> {{lang.documents}}</p>
</mat-list-item>
<mat-list-item *ngIf="data.entity.users.length > 0">
<mat-icon color="primary" mat-list-icon class="fa fa-user fa-2x"></mat-icon>
<p mat-line>
- <b>{{data.entity.entity_label}}</b> est associé Ã
- <b>{{data.entity.users.length}}</b> utilisateur(s)</p>
+ <b>{{data.entity.entity_label}}</b> {{lang.isLinkedTo | lowercase}}
+ <b>{{data.entity.users.length}}</b> {{lang.users | lowercase}}</p>
</mat-list-item>
<mat-list-item *ngIf="data.entity.templates > 0">
<mat-icon color="primary" mat-list-icon class="fa fa-file-text-o fa-2x"></mat-icon>
<p mat-line>
- <b>{{data.entity.entity_label}}</b> est associé Ã
- <b>{{data.entity.templates}}</b> modèle(s) de document(s)</p>
+ <b>{{data.entity.entity_label}}</b> {{lang.isLinkedTo | lowercase}}
+ <b>{{data.entity.templates}}</b> {{lang.templates | lowercase}}</p>
</mat-list-item>
</mat-list>
</div>
<mat-form-field>
- <input type="text" placeholder="Choisissez un service de remplacement" matInput [matAutocomplete]="auto" [formControl]="elementCtrl"
+ <input type="text" placeholder="{{lang.chooseEntity}}" matInput [matAutocomplete]="auto" [formControl]="elementCtrl"
[(ngModel)]="data.entity.redirectEntity">
<mat-autocomplete #auto="matAutocomplete">
<mat-option *ngFor="let elem of filteredElements | async" [value]="elem.id">
diff --git a/apps/maarch_entreprise/Views/entities-administration.component.html b/apps/maarch_entreprise/Views/entities-administration.component.html
index 3541c987477431ff4cb4876596594d4a8145ada6..38336978e0dac164152ea1a8d6ea86bf41caecfc 100644
--- a/apps/maarch_entreprise/Views/entities-administration.component.html
+++ b/apps/maarch_entreprise/Views/entities-administration.component.html
@@ -54,12 +54,16 @@
<mat-nav-list>
<mat-tab-group>
- <mat-tab label="Informations">
+ <mat-tab label="{{lang.informations}}">
<form class="form-horizontal" #entityForm="ngForm" style="overflow:hidden;">
<div class="form-group">
<div class="col-sm-12">
<mat-form-field>
- <mat-select id="entity_type" name="entity_type" title="{{lang.entityType}}" placeholder="{{lang.entityType}}" [(ngModel)]="currentEntity.entity_type"
+ <input matInput [(ngModel)]="currentEntity.parent_entity_id" required name="parent_entity_id" id="parent_entity_id" title="{{lang.isLinkedTo}}" type="text"
+ placeholder="{{lang.isLinkedTo}}" maxlength="32" disabled>
+ </mat-form-field>
+ <mat-form-field>
+ <mat-select id="entity_type" name="entity_type" title="{{lang.entityType}}" placeholder="{{lang.entityType}}" [(ngModel)]="currentEntity.entity_type" maxlength="32"
required>
<mat-option *ngFor="let entity_type of entityTypeList" [value]="entity_type.id">
{{entity_type.label}}
@@ -72,7 +76,7 @@
<div class="col-sm-12">
<mat-form-field>
<input matInput [(ngModel)]="currentEntity.entity_id" required name="entity_id" id="entity_id" title="{{lang.id}}" type="text"
- placeholder="{{lang.id}}" maxlength="255" [disabled]="!creationMode">
+ placeholder="{{lang.id}}" [disabled]="!creationMode" maxlength="32" pattern="^[\w.-]*$">
</mat-form-field>
</div>
</div>
@@ -88,7 +92,7 @@
<div class="col-sm-12">
<mat-form-field>
<input matInput [(ngModel)]="currentEntity.short_label" required name="short_label" id="short_label" title="{{lang.shortLabel}}"
- type="text" placeholder="{{lang.shortLabel}}" maxlength="255">
+ type="text" placeholder="{{lang.shortLabel}}" maxlength="50">
</mat-form-field>
</div>
</div>
@@ -96,7 +100,7 @@
<div class="col-sm-12">
<mat-form-field>
<input matInput [(ngModel)]="currentEntity.email" name="email" id="email" title="{{lang.email}}" type="text" placeholder="{{lang.email}}"
- maxlength="255">
+ maxlength="255" pattern="[^@\s]+@[^@\s]+">
</mat-form-field>
</div>
</div>
@@ -104,7 +108,7 @@
<mat-expansion-panel>
<mat-expansion-panel-header>
<mat-panel-title>
- Informations complémentaires
+ {{lang.otherInformations}}
</mat-panel-title>
</mat-expansion-panel-header>
<div class="form-group">
@@ -132,13 +136,12 @@
<div class="col-sm-6">
<mat-form-field>
<input matInput [(ngModel)]="currentEntity.zipcode" name="zipcode" id="zipcode" title="{{lang.zipcode}}" type="text" placeholder="{{lang.zipcode}}"
- maxlength="255">
+ maxlength="32">
</mat-form-field>
</div>
<div class="col-sm-6">
<mat-form-field>
- <input matInput [(ngModel)]="currentEntity.country" name="country" id="country" title="{{lang.country}}" type="text" placeholder="{{lang.country}}"
- maxlength="255">
+ <input matInput [(ngModel)]="currentEntity.country" name="country" id="country" title="{{lang.country}}" type="text" placeholder="{{lang.country}}">
</mat-form-field>
</div>
</div>
@@ -185,11 +188,11 @@
</div>
</form>
</mat-tab>
- <mat-tab label="Liste de diffusion" *ngIf="!creationMode">
+ <mat-tab label="{{lang.diffusionList}}" *ngIf="!creationMode">
<div class="row" style="margin:0px;">
<div class="col-md-12">
<mat-form-field>
- <input #autocompleteFilter type="text" placeholder="Ajouter une personne / un service" matInput [matAutocomplete]="auto"
+ <input #autocompleteFilter type="text" placeholder="{{lang.addUserOrEntity}}" matInput [matAutocomplete]="auto"
[formControl]="elementCtrl">
<mat-autocomplete #auto="matAutocomplete">
<mat-option *ngFor="let elem of filteredElements | async" [value]="elem.id" (click)="addElemListModel(elem)">
@@ -210,7 +213,7 @@
<h3 *ngIf="role.available" mat-subheader>{{role.label}}</h3>
<span *ngIf="role.available" dnd-sortable-container [dropZones]="['boxers-zone']" [sortableData]="currentEntity.listTemplate[role.id]">
<div style="min-height:30px;">
- <mat-list-item disableRipple="true" *ngFor="let template of currentEntity.listTemplate[role.id]; let i = index" title="deplacer"
+ <mat-list-item disableRipple="true" *ngFor="let template of currentEntity.listTemplate[role.id]; let i = index" title="{{lang.move}}"
dnd-sortable (onDropSuccess)="updateDiffList(template,role.id)" [sortableIndex]="i"
[dragEnabled]="role.id != 'dest' && template.type != 'entity'">
<mat-icon color="primary" mat-list-icon [class]="template.type == 'entity' ? 'fa fa-sitemap' : 'fa fa-user'"></mat-icon>
@@ -232,7 +235,7 @@
<div class="row" style="margin:0px;">
<div class="col-md-12">
<mat-form-field>
- <input #autocompleteFilter type="text" placeholder="Ajouter une personne" matInput [matAutocomplete]="auto" [formControl]="userCtrl">
+ <input #autocompleteFilter type="text" placeholder="{{lang.addUser}}" matInput [matAutocomplete]="auto" [formControl]="userCtrl">
<mat-autocomplete #auto="matAutocomplete">
<mat-option *ngFor="let elem of filteredUsers | async" [value]="elem.id" (click)="addElemListModelVisa(elem)">
<p mat-line *ngIf="elem.type == 'user'">
@@ -249,7 +252,7 @@
</mat-form-field>
<mat-list>
<span dnd-sortable-container [dropZones]="['boxers-zone']" [sortableData]="currentEntity.visaTemplate">
- <mat-list-item disableRipple="true" *ngFor="let template of currentEntity.visaTemplate; let i = index" title="deplacer" dnd-sortable
+ <mat-list-item disableRipple="true" *ngFor="let template of currentEntity.visaTemplate; let i = index" title="{{lang.move}}" dnd-sortable
[sortableIndex]="i">
<mat-icon color="primary" mat-list-icon>{{i+1}}</mat-icon>
<p mat-line>{{template.labelToDisplay}}
@@ -264,7 +267,7 @@
</div>
</div>
</mat-tab>
- <mat-tab label="Utilisateur(s) associé(s)" *ngIf="!creationMode">
+ <mat-tab label="{{lang.relatedUsers}}" *ngIf="!creationMode">
<div class="row" style="margin:0px;">
<div class="col-md-6 col-xs-6">
<mat-form-field>
diff --git a/apps/maarch_entreprise/js/angular/lang/lang-en.js b/apps/maarch_entreprise/js/angular/lang/lang-en.js
index 909f1d0acf9036ca61680d0329a68650806a706c..93f1b9d87f7eb6edde5cd916f7983e12da8e62d4 100755
--- a/apps/maarch_entreprise/js/angular/lang/lang-en.js
+++ b/apps/maarch_entreprise/js/angular/lang/lang-en.js
@@ -20,6 +20,8 @@ exports.LANG_EN = {
"add": "Add",
"address": "Address",
"addStatus": "Add a status",
+ "addUser": "Add a user",
+ "addUserOrEntity": "Add a user / an entity",
"administration": "Administration",
"administrationServices": "Administration services",
"allActions": "All actions",
@@ -70,8 +72,10 @@ exports.LANG_EN = {
"deleteMsg": "Do you really want to delete this element",
"desactivateAbsence": "Deactivate absence",
"description": "Description",
+ "diffusionList": "Diffusion list",
"diffusionModels": "Diffusion models",
"display": "display",
+ "documents": "document(s)",
"doNotModifyUnlessExpert": "Do not edit this section unless you know what you are doing. Incorrect settings can cause the application to malfunction !",
"email": "Email",
"emailSignatures": "Email signatures",
@@ -82,6 +86,7 @@ exports.LANG_EN = {
"entityTooglePrimary": "Pass to primary entity",
"entityType": "Entity type",
"entityUpdated": "Entité updated",
+ "entityReplacement": "Entity replacement",
"export_seda": "Seda export",
"fileplan": "Fileplan",
"filterBy": "Filter by",
@@ -108,10 +113,13 @@ exports.LANG_EN = {
"informations": "Informations",
"initials": "Initials",
"isAssociatedTo": "is associated to",
+ "isCopyTo": "is in copy to",
+ "isDestTo": "is in destination to",
"isFolderAction": "Folder action",
"isFolderActionDesc": "Use this action in a folder folder",
"isFolderBasket": "Folder basket",
"isFolderStatus": "Folder status",
+ "isLinkedTo": "Is linked to",
"isSearchBasket": "Only search basket",
"isSytemAction": "System action",
"keyword": "Keyword",
@@ -140,6 +148,7 @@ exports.LANG_EN = {
"module": "Module",
"modules": "Modules",
"moreOptions": "More options",
+ "move": "Move",
"myProfile": "My profile",
"newAction": "New action",
"newElement": "New element",
@@ -165,6 +174,7 @@ exports.LANG_EN = {
"NotificationToEnable": "To enable",
"notificationUpdated": "Notification updated",
"otherActions": "Other(s) action(s)",
+ "otherInformations": "Other(s) information(s)",
"otherParameters": "Other(s) parameter(s)",
"outOf": "of",
"page": "Page",
diff --git a/apps/maarch_entreprise/js/angular/lang/lang-en.ts b/apps/maarch_entreprise/js/angular/lang/lang-en.ts
index c4260de05ff1363457ecee6370da6f31fb59d423..179198ceec9d713f8d50ce2b63c214b85014d355 100755
--- a/apps/maarch_entreprise/js/angular/lang/lang-en.ts
+++ b/apps/maarch_entreprise/js/angular/lang/lang-en.ts
@@ -18,6 +18,8 @@ export const LANG_EN = {
"add" : "Add",
"address" : "Address",
"addStatus" : "Add a status",
+ "addUser" : "Add a user",
+ "addUserOrEntity" : "Add a user / an entity",
"administration" : "Administration",
"administrationServices" : "Administration services",
"allActions" : "All actions",
@@ -68,8 +70,10 @@ export const LANG_EN = {
"deleteMsg" : "Do you really want to delete this element",
"desactivateAbsence" : "Deactivate absence",
"description" : "Description",
+ "diffusionList" : "Diffusion list",
"diffusionModels" : "Diffusion models",
"display" : "display",
+ "documents" : "document(s)",
"doNotModifyUnlessExpert" : "Do not edit this section unless you know what you are doing. Incorrect settings can cause the application to malfunction !",
"email" : "Email",
"emailSignatures" : "Email signatures",
@@ -80,6 +84,7 @@ export const LANG_EN = {
"entityTooglePrimary" : "Pass to primary entity",
"entityType" : "Entity type",
"entityUpdated" : "Entité updated",
+ "entityReplacement" : "Entity replacement",
"export_seda" : "Seda export",
"fileplan" : "Fileplan",
"filterBy" : "Filter by",
@@ -106,10 +111,13 @@ export const LANG_EN = {
"informations" : "Informations",
"initials" : "Initials",
"isAssociatedTo" : "is associated to",
+ "isCopyTo" : "is in copy to",
+ "isDestTo" : "is in destination to",
"isFolderAction" : "Folder action",
"isFolderActionDesc" : "Use this action in a folder folder",
"isFolderBasket" : "Folder basket",
"isFolderStatus" : "Folder status",
+ "isLinkedTo" : "Is linked to",
"isSearchBasket" : "Only search basket",
"isSytemAction" : "System action",
"keyword" : "Keyword",
@@ -138,6 +146,7 @@ export const LANG_EN = {
"module" : "Module",
"modules" : "Modules",
"moreOptions" : "More options",
+ "move" : "Move",
"myProfile" : "My profile",
"newAction" : "New action",
"newElement" : "New element",
@@ -162,7 +171,8 @@ export const LANG_EN = {
"notificationsSchedule" : "Notifications schedule",
"NotificationToEnable" : "To enable",
"notificationUpdated" : "Notification updated",
- "otherActions" : "Other(s) action(s)",
+ "otherActions" : "Other(s) action(s)",
+ "otherInformations" : "Other(s) information(s)",
"otherParameters" : "Other(s) parameter(s)",
"outOf" : "of",
"page" : "Page",
diff --git a/apps/maarch_entreprise/js/angular/lang/lang-fr.js b/apps/maarch_entreprise/js/angular/lang/lang-fr.js
index 885a1ddc0247f24a2a935a8176ba439081972347..c7a100779abdb5fb03c9b17f800550a73bb11dff 100755
--- a/apps/maarch_entreprise/js/angular/lang/lang-fr.js
+++ b/apps/maarch_entreprise/js/angular/lang/lang-fr.js
@@ -23,6 +23,8 @@ exports.LANG_FR = {
"add": "Ajouter",
"address": "Adresse",
"addStatus": "Ajouter un statut",
+ "addUser": "Ajouter un utilisateur",
+ "addUserOrEntity": "Ajouter un utilisateur / une entité",
"administration": "Administration",
"administrationServices": "Droits d'administration",
"allActions": "Toutes les actions",
@@ -77,8 +79,10 @@ exports.LANG_FR = {
"deleteMsg": "Voulez-vous vraiment supprimer cet élément ?",
"desactivateAbsence": "Désactiver l'absence",
"description": "Description",
+ "diffusionList": "Liste de diffusion",
"diffusionModels": "Modèles de diffusion",
"display": "affichage",
+ "documents": "document(s)",
"doNotModifyUnlessExpert": "Ne pas modifier cette section à moins de savoir ce que vous faites. Un mauvais paramètrage peut entrainer des dysfonctionnements de l'application!",
"email": "Email",
"emailSignatures": "Signatures de mail",
@@ -89,6 +93,7 @@ exports.LANG_FR = {
"entityTooglePrimary": "Passage en entité primaire",
"entityType": "Type d'entité",
"entityUpdated": "Entité modifiée",
+ "entityReplacement": "Remplacement de l'entité",
"entries": "entrée(s)",
"event": "Événement",
"export_seda": "Export seda",
@@ -121,10 +126,13 @@ exports.LANG_FR = {
"integer": "Entier",
"ip": "Adresse IP",
"isAssociatedTo": "est associé à ",
+ "isCopyTo": "est en copie de",
+ "isDestTo": "est en destination de",
"isFolderAction": "Action de dossier",
"isFolderActionDesc": "Permet d'utiliser cette action dans une bannette de dossier",
"isFolderBasket": "Bannette de dossier",
"isFolderStatus": "Statut de dossier",
+ "isLinkedTo": "Est associé à ",
"isSearchBasket": "Bannette de recherche uniquement",
"isSytemAction": "Action système",
"keyword": "Mot-clé",
@@ -154,6 +162,7 @@ exports.LANG_FR = {
"module": "Module",
"modules": "Modules",
"moreOptions": "Plus d'options",
+ "move": "Déplaçer",
"myProfile": "Mon profil",
"newAction": "Nouvelle action",
"newElement": "Nouvel élément",
@@ -182,6 +191,7 @@ exports.LANG_FR = {
"NotificationToEnable": "Activer",
"notificationUpdated": "Notification mise à jour",
"otherActions": "Action(s) supplémentaire(s)",
+ "otherInformations": "Information(s) complémentaire(s)",
"otherParameters": "Autre(s) paramètre(s)",
"outOf": "sur",
"page": "Page",
@@ -212,7 +222,7 @@ exports.LANG_FR = {
"recordsPerPage": "résultats par page",
"redirects": "Redirections",
"reinitPassword": "Réinitialiser le mot de passe",
- "relatedUsers": "Utilisateurs associés",
+ "relatedUsers": "Utilisateur(s) associé(s)",
"renewPsw": "Retaper le mot de passe",
"reports": "Statistiques",
"resetPsw": "Réinitialiser le mot de passe",
diff --git a/apps/maarch_entreprise/js/angular/lang/lang-fr.ts b/apps/maarch_entreprise/js/angular/lang/lang-fr.ts
index 437c5f56e81e803f77ffddcb30b33ea55a38e5dd..d346831accf24dcebb50c6eb76f2c9ec35960e5f 100755
--- a/apps/maarch_entreprise/js/angular/lang/lang-fr.ts
+++ b/apps/maarch_entreprise/js/angular/lang/lang-fr.ts
@@ -21,6 +21,8 @@ export const LANG_FR = {
"add" : "Ajouter",
"address" : "Adresse",
"addStatus" : "Ajouter un statut",
+ "addUser" : "Ajouter un utilisateur",
+ "addUserOrEntity" : "Ajouter un utilisateur / une entité",
"administration" : "Administration",
"administrationServices" : "Droits d'administration",
"allActions" : "Toutes les actions",
@@ -75,8 +77,10 @@ export const LANG_FR = {
"deleteMsg" : "Voulez-vous vraiment supprimer cet élément ?",
"desactivateAbsence" : "Désactiver l'absence",
"description" : "Description",
+ "diffusionList" : "Liste de diffusion",
"diffusionModels" : "Modèles de diffusion",
"display" : "affichage",
+ "documents" : "document(s)",
"doNotModifyUnlessExpert" : "Ne pas modifier cette section à moins de savoir ce que vous faites. Un mauvais paramètrage peut entrainer des dysfonctionnements de l'application!",
"email" : "Email",
"emailSignatures" : "Signatures de mail",
@@ -87,6 +91,7 @@ export const LANG_FR = {
"entityTooglePrimary" : "Passage en entité primaire",
"entityType" : "Type d'entité",
"entityUpdated" : "Entité modifiée",
+ "entityReplacement" : "Remplacement de l'entité",
"entries" : "entrée(s)",
"event" : "Événement",
"export_seda" : "Export seda",
@@ -119,10 +124,13 @@ export const LANG_FR = {
"integer" : "Entier",
"ip" : "Adresse IP",
"isAssociatedTo" : "est associé à ",
+ "isCopyTo" : "est en copie de",
+ "isDestTo" : "est en destination de",
"isFolderAction" : "Action de dossier",
"isFolderActionDesc" : "Permet d'utiliser cette action dans une bannette de dossier",
"isFolderBasket" : "Bannette de dossier",
"isFolderStatus" : "Statut de dossier",
+ "isLinkedTo" : "Est associé à ",
"isSearchBasket" : "Bannette de recherche uniquement",
"isSytemAction" : "Action système",
"keyword" : "Mot-clé",
@@ -152,6 +160,7 @@ export const LANG_FR = {
"module" : "Module",
"modules" : "Modules",
"moreOptions" : "Plus d'options",
+ "move" : "Déplaçer",
"myProfile" : "Mon profil",
"newAction" : "Nouvelle action",
"newElement" : "Nouvel élément",
@@ -180,6 +189,7 @@ export const LANG_FR = {
"NotificationToEnable" : "Activer",
"notificationUpdated" : "Notification mise à jour",
"otherActions" : "Action(s) supplémentaire(s)",
+ "otherInformations" : "Information(s) complémentaire(s)",
"otherParameters" : "Autre(s) paramètre(s)",
"outOf" : "sur",
"page" : "Page",
@@ -210,7 +220,7 @@ export const LANG_FR = {
"recordsPerPage" : "résultats par page",
"redirects" : "Redirections",
"reinitPassword" : "Réinitialiser le mot de passe",
- "relatedUsers" : "Utilisateurs associés",
+ "relatedUsers" : "Utilisateur(s) associé(s)",
"renewPsw" : "Retaper le mot de passe",
"reports" : "Statistiques",
"resetPsw" : "Réinitialiser le mot de passe",