diff --git a/apps/maarch_entreprise/js/angular/app/administration/entities-administration.component.ts b/apps/maarch_entreprise/js/angular/app/administration/entities-administration.component.ts
index 07af6a7bd3603d6335465a6b3e22a2784de9f01b..137706a1dbb58bfa95e7453ca61beb98328a8bf5 100644
--- a/apps/maarch_entreprise/js/angular/app/administration/entities-administration.component.ts
+++ b/apps/maarch_entreprise/js/angular/app/administration/entities-administration.component.ts
@@ -20,25 +20,25 @@ declare var angularGlobals: any;
})
export class EntitiesAdministrationComponent extends AutoCompletePlugin implements OnInit {
- private _mobileQueryListener: () => void;
- mobileQuery: MediaQueryList;
- dialogRef: MatDialogRef<any>;
+ private _mobileQueryListener : () => void;
+ mobileQuery : MediaQueryList;
+ dialogRef : MatDialogRef<any>;
- coreUrl: string;
- lang: any = LANG;
- loading: boolean = false;
+ coreUrl : string;
+ lang : any = LANG;
+ loading : boolean = false;
- entities: any[] = [];
- listTemplateRoles: any[] = [];
- entityTypeList: any[] = [];
- currentEntity: any = {};
- isDraggable: boolean = true;
- creationMode: boolean = false;
- idCircuitVisa: number;
- config: any = {};
+ entities : any[] = [];
+ listTemplateRoles : any[] = [];
+ entityTypeList : any[] = [];
+ currentEntity : any = {};
+ isDraggable : boolean = true;
+ creationMode : boolean = false;
+ idCircuitVisa : number;
+ config : any = {};
- dataSource = new MatTableDataSource(this.currentEntity.users);
- displayedColumns = ['firstname', 'lastname'];
+ dataSource = new MatTableDataSource(this.currentEntity.users);
+ displayedColumns = ['firstname', 'lastname'];
@ViewChild('snav2') sidenav: MatSidenav;
@@ -257,7 +257,7 @@ export class EntitiesAdministrationComponent extends AutoCompletePlugin implemen
this.http.put(this.coreUrl + "rest/listTemplates/" + this.currentEntity.listTemplate.id, newDiffList)
.subscribe((data: any) => {
this.currentEntity.listTemplate.id = data.id;
- this.notify.success(this.lang.entityUpdated);
+ this.notify.success(this.lang.diffusionModelUpdated);
}, (err) => {
this.notify.error(err.error.errors);
});
@@ -265,7 +265,7 @@ export class EntitiesAdministrationComponent extends AutoCompletePlugin implemen
this.http.post(this.coreUrl + "rest/listTemplates", newDiffList)
.subscribe((data: any) => {
this.currentEntity.listTemplate.id = data.id;
- this.notify.success(this.lang.entityUpdated);
+ this.notify.success(this.lang.diffusionModelUpdated);
}, (err) => {
this.notify.error(err.error.errors);
});
@@ -311,7 +311,7 @@ export class EntitiesAdministrationComponent extends AutoCompletePlugin implemen
.subscribe((data: any) => {
this.idCircuitVisa = data.id;
this.currentEntity.visaTemplate.push(newElemListModel);
- this.notify.success(this.lang.entityUpdated);
+ this.notify.success(this.lang.diffusionModelUpdated);
}, (err) => {
this.notify.error(err.error.errors);
});
@@ -320,7 +320,7 @@ export class EntitiesAdministrationComponent extends AutoCompletePlugin implemen
.subscribe((data: any) => {
this.idCircuitVisa = data.id;
this.currentEntity.visaTemplate.push(newElemListModel);
- this.notify.success(this.lang.entityUpdated);
+ this.notify.success(this.lang.diffusionModelUpdated);
}, (err) => {
this.notify.error(err.error.errors);
});
@@ -501,7 +501,7 @@ export class EntitiesAdministrationComponent extends AutoCompletePlugin implemen
}, (err) => {
this.notify.error(err.error.errors);
});
- this.notify.success(this.lang.entityUpdated);
+ this.notify.success(this.lang.diffusionModelUpdated);
}, (err) => {
this.notify.error(err.error.errors);
});
@@ -515,12 +515,13 @@ export class EntitiesAdministrationComponent extends AutoCompletePlugin implemen
}, (err) => {
this.notify.error(err.error.errors);
});
- this.notify.success(this.lang.entityUpdated);
+ this.notify.success(this.lang.diffusionModelUpdated);
}, (err) => {
this.notify.error(err.error.errors);
});
}
}
+
updateDiffListVisa(template: any): any {
var newDiffList = {
"object_id": this.currentEntity.entity_id,
@@ -547,12 +548,13 @@ export class EntitiesAdministrationComponent extends AutoCompletePlugin implemen
this.http.put(this.coreUrl + "rest/listTemplates/" + this.idCircuitVisa, newDiffList)
.subscribe((data: any) => {
this.idCircuitVisa = data.id;
- this.notify.success(this.lang.entityUpdated);
+ this.notify.success(this.lang.diffusionModelUpdated);
}, (err) => {
this.notify.error(err.error.errors);
});
}
+
removeDiffList(i: number, role: string): any {
this.currentEntity.listTemplate[role].splice(i, 1);
var newDiffList = {
@@ -585,11 +587,12 @@ export class EntitiesAdministrationComponent extends AutoCompletePlugin implemen
}, (err) => {
this.notify.error(err.error.errors);
});
- this.notify.success(this.lang.entityUpdated);
+ this.notify.success(this.lang.diffusionModelUpdated);
}, (err) => {
this.notify.error(err.error.errors);
});
}
+
removeDiffListVisa(template: any, i: number): any {
this.currentEntity.visaTemplate.splice(i, 1);
@@ -620,7 +623,7 @@ export class EntitiesAdministrationComponent extends AutoCompletePlugin implemen
this.http.put(this.coreUrl + "rest/listTemplates/" + this.idCircuitVisa, newDiffList)
.subscribe((data: any) => {
this.idCircuitVisa = data.id;
- this.notify.success(this.lang.entityUpdated);
+ this.notify.success(this.lang.diffusionModelUpdated);
}, (err) => {
this.notify.error(err.error.errors);
});
@@ -628,7 +631,7 @@ export class EntitiesAdministrationComponent extends AutoCompletePlugin implemen
this.http.delete(this.coreUrl + "rest/listTemplates/" + this.idCircuitVisa)
.subscribe(() => {
this.idCircuitVisa = null;
- this.notify.success(this.lang.entityUpdated);
+ this.notify.success(this.lang.diffusionModelUpdated);
}, (err) => {
this.notify.error(err.error.errors);
});
@@ -649,7 +652,7 @@ export class EntitiesAdministrationComponent extends AutoCompletePlugin implemen
if (this.currentEntity.listTemplate) {
this.currentEntity.listTemplate[role.id] = [];
}
- this.notify.success(this.lang.entityUpdated);
+ this.notify.success(this.lang.listTemplatesRolesUpdated);
}, (err) => {
this.notify.error(err.error.errors);
});
@@ -668,7 +671,7 @@ export class EntitiesAdministrationComponent extends AutoCompletePlugin implemen
this.notify.error(err.error.errors);
});
}
- this.notify.success(this.lang.entityUpdated);
+ this.notify.success(this.lang.listTemplatesRolesUpdated);
}, (err) => {
this.notify.error(err.error.errors);
});
diff --git a/apps/maarch_entreprise/js/angular/lang/lang-en.ts b/apps/maarch_entreprise/js/angular/lang/lang-en.ts
index 80b8f1cbac65ca7284f527d407e0eee15192c941..7f201042ded5a45ae4a48138706ef3acaa47609d 100755
--- a/apps/maarch_entreprise/js/angular/lang/lang-en.ts
+++ b/apps/maarch_entreprise/js/angular/lang/lang-en.ts
@@ -36,39 +36,39 @@ export const LANG_EN = {
"attachment" : "Attachment",
"attachments" : "Attachments",
"august" : "August",
- "authorize" : "Authorize",
- "autoLogoutAbsence" : "You are going to be automaticaly disconnected after your redirections",
- "available" : "available",
- "availableGroups" : "Available groups",
- "availableStatuses" : "Available statuses",
- "avis" : "Avis circuit",
- "back" : "Back",
- "basket" : "Basket",
- "basketAdded" : "Basket added",
- "basketCreation" : "Basket creation",
- "basketDeleted" : "Basket deleted",
- "basketModification" : "Basket modification",
- "basketNotification" : "Toggle notification for this basket",
- "baskets" : "Baskets",
- "basketsOrder" : "Manage baskets order",
- "basketUpdated" : "Basket updated",
- "browsing" : "Browsing",
- "calDays" : "calendar days",
- "canBeModified" : "Index modification",
- "canBeSearched" : "Searchable",
- "cancel" : "Cancel",
+ "authorize" : "Authorize",
+ "autoLogoutAbsence" : "You are going to be automaticaly disconnected after your redirections",
+ "available" : "available",
+ "availableGroups" : "Available groups",
+ "availableStatuses" : "Available statuses",
+ "avis" : "Avis circuit",
+ "back" : "Back",
+ "basket" : "Basket",
+ "basketAdded" : "Basket added",
+ "basketCreation" : "Basket creation",
+ "basketDeleted" : "Basket deleted",
+ "basketModification" : "Basket modification",
+ "basketNotification" : "Toggle notification for this basket",
+ "baskets" : "Baskets",
+ "basketsOrder" : "Manage baskets order",
+ "basketUpdated" : "Basket updated",
+ "browsing" : "Browsing",
+ "calDays" : "calendar days",
+ "canBeModified" : "Index modification",
+ "canBeSearched" : "Searchable",
+ "cancel" : "Cancel",
"cases" : "Cases",
- "changeMyPassword" : "Change my password",
- "chooseBasket" : "Choose a basket",
- "chooseCategoryAssociation" : "Choose one or some associatedd categories",
- "chooseDefaultAction" : "Choose main action",
- "chooseEntity" : "Choose a entity",
- "chooseGroup" : "Choose a group",
- "chooseRedirectGroup" : "Choose another group",
- "chronoNumber" : "Chrono number",
- "city" : "City",
- "clause" : "Clause",
- "clickOn" : "Click on",
+ "changeMyPassword" : "Change my password",
+ "chooseBasket" : "Choose a basket",
+ "chooseCategoryAssociation" : "Choose one or some associatedd categories",
+ "chooseDefaultAction" : "Choose main action",
+ "chooseEntity" : "Choose a entity",
+ "chooseGroup" : "Choose a group",
+ "chooseRedirectGroup" : "Choose another group",
+ "chronoNumber" : "Chrono number",
+ "city" : "City",
+ "clause" : "Clause",
+ "clickOn" : "Click on",
"color" : "Color",
"content_management" : "Ressource revision",
"country" : "Country",
@@ -168,6 +168,7 @@ export const LANG_EN = {
"lastname" : "Lastname",
"life_cycle" : "Life cycle",
"linkGroup" : "Link a group",
+ "listTemplatesRolesUpdated" : "Roles updated",
"logout" : "Logout",
"maarchApplication" : "Maarch App",
"manageAbsences" : "Manage absences",
@@ -198,7 +199,7 @@ export const LANG_EN = {
"noReplacement" : "No replacement",
"notes" : "Notes",
"notificationAdded" : "Notification added",
- "notificationCreation" : "Notification creation",
+ "notificationCreation" : "Notification creation",
"notificationDeleted" : "Notification deleted",
"NotificationDiffusionType" : "Diffusion type",
"NotificationEnabled" : "Enabled",
@@ -220,41 +221,41 @@ export const LANG_EN = {
"others" : "Other(s)",
"otherActions" : "Other(s) action(s)",
"otherInformations" : "Other(s) information(s)",
- "otherParameters" : "Other(s) parameter(s)",
- "outOf" : "of",
- "page" : "Page",
- "parameter" : "Parameter",
- "parameterAdded" : "Parameter added",
- "parameterCreation" : "Parameter creation",
- "parameterDeleted" : "Parameter deleted",
- "parameterModification" : "Parameter modification",
- "parameters" : "Parameters",
- "parameterUpdated" : "Parameter updated",
- "phoneNumber" : "Phone number",
- "primaryEntity" : "Primary entity",
- "priorities" : "Priorities",
+ "otherParameters" : "Other(s) parameter(s)",
+ "outOf" : "of",
+ "page" : "Page",
+ "parameter" : "Parameter",
+ "parameterAdded" : "Parameter added",
+ "parameterCreation" : "Parameter creation",
+ "parameterDeleted" : "Parameter deleted",
+ "parameterModification" : "Parameter modification",
+ "parameters" : "Parameters",
+ "parameterUpdated" : "Parameter updated",
+ "phoneNumber" : "Phone number",
+ "primaryEntity" : "Primary entity",
+ "priorities" : "Priorities",
"priorityAdded" : "Priority added",
- "priorityCreation" : "Priority creation",
- "priorityDeleted" : "Priority deleted",
- "priorityModification" : "Priority modification",
- "priorityUpdated" : "Priority updated",
- "privileges" : "Privileges",
- "processAction" : "Process action(s)",
- "processDelay" : "Process delay",
- "processDelayDoctype" : "doctype delay is used",
- "processType" : "Process type",
- "pswReseted" : "Password reseted",
- "record" : "element(s)",
- "records" : "result(s)",
- "recordsPerPage" : "result per page",
- "redirectBasket" : "Redirect basket",
- "redirects" : "Redirections",
- "reinitPassword" : "Reset password",
- "relatedUsers" : "Related users",
- "renewPsw" : "Enter the password again",
- "reports" : "Reports",
- "resetPsw" : "Reset password",
- "resId" : "Res Identifier",
+ "priorityCreation" : "Priority creation",
+ "priorityDeleted" : "Priority deleted",
+ "priorityModification" : "Priority modification",
+ "priorityUpdated" : "Priority updated",
+ "privileges" : "Privileges",
+ "processAction" : "Process action(s)",
+ "processDelay" : "Process delay",
+ "processDelayDoctype" : "doctype delay is used",
+ "processType" : "Process type",
+ "pswReseted" : "Password reseted",
+ "record" : "element(s)",
+ "records" : "result(s)",
+ "recordsPerPage" : "result per page",
+ "redirectBasket" : "Redirect basket",
+ "redirects" : "Redirections",
+ "reinitPassword" : "Reset password",
+ "relatedUsers" : "Related users",
+ "renewPsw" : "Enter the password again",
+ "reports" : "Reports",
+ "resetPsw" : "Reset password",
+ "resId" : "Res Identifier",
"resultPage" : "Result page",
"resultPageUpdated" : "Page de résultat modifié",
"role" : "Role",
@@ -405,6 +406,5 @@ export const LANG_EN = {
"numericPackageImported" : "Numeric package imported",
"enterValue" : "You must enter a value",
"patternId" : "Value must contain only alphanumeric, dot, underscore or dash",
- "alreadyExist" : "Identifiant already exists",
-
+ "alreadyExist" : "Identifiant already exists"
};
diff --git a/apps/maarch_entreprise/js/angular/lang/lang-fr.ts b/apps/maarch_entreprise/js/angular/lang/lang-fr.ts
index 8c095478c49d804df2e96f3b967fa8c552567e8a..40285d85715e2796ca4245fba25256941c832c84 100755
--- a/apps/maarch_entreprise/js/angular/lang/lang-fr.ts
+++ b/apps/maarch_entreprise/js/angular/lang/lang-fr.ts
@@ -22,7 +22,7 @@ export const LANG_FR = {
"active" : "Actif",
"activeCron" : "Tâche(s) active(s)",
"add" : "Ajouter",
- "additionalRoles" : "Role(s) supplémentaire(s)",
+ "additionalRoles" : "Rôle(s) supplémentaire(s)",
"address" : "Adresse",
"addStatus" : "Ajouter un statut",
"addUser" : "Ajouter un utilisateur",
@@ -182,6 +182,7 @@ export const LANG_FR = {
"lastname" : "Nom",
"life_cycle" : "Cycle de vie",
"linkGroup" : "Associer un groupe",
+ "listTemplatesRolesUpdated" : "Rôles modifiés",
"logout" : "Se déconnecter",
"maarchApplication" : "Application Maarch",
"manageAbsences" : "Rediriger mes bannettes",