Skip to content
Snippets Groups Projects
Verified Commit cac99354 authored by Damien's avatar Damien
Browse files

[FEAT] #172 #186 Notifications more explicit

parent e2969555
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 372 additions and 370 deletions
apps/maarch_entreprise/Views/basket-administration.component.html
+ 1
− 3
View file @ cac99354
...@@ -162,8 +162,6 @@ ...@@ -162,8 +162,6 @@
</mat-expansion-panel> </mat-expansion-panel>
</mat-accordion> </mat-accordion>
</div> </div>
</mat-tab> </mat-tab>
</mat-tab-group> </mat-tab-group>
</mat-card> </mat-card>
...@@ -202,4 +200,4 @@ ...@@ -202,4 +200,4 @@
</mat-list> </mat-list>
</mat-sidenav> </mat-sidenav>
</mat-sidenav-container> </mat-sidenav-container>
</div> </div>
\ No newline at end of file
apps/maarch_entreprise/js/angular/app/administration/basket-administration.component.ts
+ 3
− 3
View file @ cac99354
...@@ -186,7 +186,7 @@ export class BasketAdministrationComponent implements OnInit { ...@@ -186,7 +186,7 @@ export class BasketAdministrationComponent implements OnInit {
updateResultPage(group: any) { updateResultPage(group: any) {
this.http.put(this.coreUrl + "rest/baskets/" + this.id + "/groups/" + group.group_id, { 'result_page': group.result_page, 'groupActions': group.groupActions }) this.http.put(this.coreUrl + "rest/baskets/" + this.id + "/groups/" + group.group_id, { 'result_page': group.result_page, 'groupActions': group.groupActions })
.subscribe(() => { .subscribe(() => {
this.notify.success(this.lang.basketUpdated); this.notify.success(this.lang.resultPageUpdated);
}, (err) => { }, (err) => {
this.notify.error(err.error.errors); this.notify.error(err.error.errors);
}); });
...@@ -236,7 +236,7 @@ export class BasketAdministrationComponent implements OnInit { ...@@ -236,7 +236,7 @@ export class BasketAdministrationComponent implements OnInit {
addAction(group: any) { addAction(group: any) {
this.http.put(this.coreUrl + "rest/baskets/" + this.id + "/groups/" + group.group_id, { 'result_page': group.result_page, 'groupActions': group.groupActions }) this.http.put(this.coreUrl + "rest/baskets/" + this.id + "/groups/" + group.group_id, { 'result_page': group.result_page, 'groupActions': group.groupActions })
.subscribe(() => { .subscribe(() => {
this.notify.success(this.lang.basketUpdated); this.notify.success(this.lang.actionsGroupBasketUpdated);
}, (err) => { }, (err) => {
this.notify.error(err.error.errors); this.notify.error(err.error.errors);
}); });
...@@ -249,7 +249,7 @@ export class BasketAdministrationComponent implements OnInit { ...@@ -249,7 +249,7 @@ export class BasketAdministrationComponent implements OnInit {
action.checked = false; action.checked = false;
this.http.put(this.coreUrl + "rest/baskets/" + this.id + "/groups/" + group.group_id, { 'result_page': group.result_page, 'groupActions': group.groupActions }) this.http.put(this.coreUrl + "rest/baskets/" + this.id + "/groups/" + group.group_id, { 'result_page': group.result_page, 'groupActions': group.groupActions })
.subscribe(() => { .subscribe(() => {
this.notify.success(this.lang.basketUpdated); this.notify.success(this.lang.actionsGroupBasketUpdated);
}, (err) => { }, (err) => {
this.notify.error(err.error.errors); this.notify.error(err.error.errors);
}); });
......
apps/maarch_entreprise/js/angular/app/administration/group-administration.component.ts
+ 2
− 3
View file @ cac99354
...@@ -7,7 +7,6 @@ import { NotificationService } from '../notification.service'; ...@@ -7,7 +7,6 @@ import { NotificationService } from '../notification.service';
import { MatPaginator, MatTableDataSource, MatSort} from '@angular/material'; import { MatPaginator, MatTableDataSource, MatSort} from '@angular/material';
declare function $j(selector: any) : any; declare function $j(selector: any) : any;
declare const angularGlobals : any; declare const angularGlobals : any;
...@@ -47,13 +46,13 @@ export class GroupAdministrationComponent implements OnInit { ...@@ -47,13 +46,13 @@ export class GroupAdministrationComponent implements OnInit {
this._mobileQueryListener = () => changeDetectorRef.detectChanges(); this._mobileQueryListener = () => changeDetectorRef.detectChanges();
this.mobileQuery.addListener(this._mobileQueryListener); this.mobileQuery.addListener(this._mobileQueryListener);
} }
ngOnDestroy(): void { ngOnDestroy(): void {
this.mobileQuery.removeListener(this._mobileQueryListener); this.mobileQuery.removeListener(this._mobileQueryListener);
} }
ngOnInit(): void { ngOnInit(): void {
this.coreUrl = angularGlobals.coreUrl; this.coreUrl = angularGlobals.coreUrl;
this.loading = true; this.loading = true;
this.route.params.subscribe(params => { this.route.params.subscribe(params => {
...@@ -102,7 +101,7 @@ export class GroupAdministrationComponent implements OnInit { ...@@ -102,7 +101,7 @@ export class GroupAdministrationComponent implements OnInit {
updateService(service: any) { updateService(service: any) {
this.http.put(this.coreUrl + "rest/groups/" + this.group['id'] + "/services/" + service['id'], service) this.http.put(this.coreUrl + "rest/groups/" + this.group['id'] + "/services/" + service['id'], service)
.subscribe(() => { .subscribe(() => {
this.notify.success(this.lang.groupUpdated); this.notify.success(this.lang.groupServicesUpdated);
}, (err) => { }, (err) => {
service.checked = !service.checked; service.checked = !service.checked;
this.notify.error(err.error.errors); this.notify.error(err.error.errors);
......
apps/maarch_entreprise/js/angular/lang/lang-en.ts
+ 124
− 122
View file @ cac99354
export const LANG_EN = { export const LANG_EN = {
"abs" : "Absent", "abs" : "Absent",
"action" : "Action", "action" : "Action",
"actionAdded" : "Action added", "actionAdded" : "Action added",
"actionAvailable" : "Availables actions", "actionAvailable" : "Availables actions",
"actionCreation" : "Action creation", "actionCreation" : "Action creation",
"actionDeleted" : "Action deleted", "actionDeleted" : "Action deleted",
"actionHistory" : "Log action in history", "actionsGroupBasketUpdated" : "Actions setting updated",
"actionHistoryDesc" : "Lets you plot this action in the document history. It is strongly recommended to check this option", "actionHistory" : "Log action in history",
"actionModification" : "Action modification", "actionHistoryDesc" : "Lets you plot this action in the document history. It is strongly recommended to check this option",
"actionName" : "Action name", "actionModification" : "Action modification",
"actionPage" : "Result page of the action", "actionName" : "Action name",
"actionParameters" : "Action parameters", "actionPage" : "Result page of the action",
"actions" : "Action(s)", "actionParameters" : "Action parameters",
"actionUpdated" : "Action updated", "actions" : "Action(s)",
"activateAbsence" : "Activate absence", "actionUpdated" : "Action updated",
"activateNotification" : "Activate notification", "activateAbsence" : "Activate absence",
"active" : "Active", "activateNotification" : "Activate notification",
"activeCron" : "Active cron", "active" : "Active",
"add" : "Add", "activeCron" : "Active cron",
"address" : "Address", "add" : "Add",
"addStatus" : "Add a status", "address" : "Address",
"addUser" : "Add a user", "addStatus" : "Add a status",
"addUserOrEntity" : "Add a user / an entity", "addUser" : "Add a user",
"addVisaSignUser" : "Add a visa / sign user", "addUserOrEntity" : "Add a user / an entity",
"administration" : "Administration", "addVisaSignUser" : "Add a visa / sign user",
"administrationServices" : "Administration services", "administration" : "Administration",
"allActions" : "All actions", "administrationServices" : "Administration services",
"application" : "Application", "allActions" : "All actions",
"april" : "April", "application" : "Application",
"archivalAgency" : "Archival agency", "april" : "April",
"archivalAgreement" : "Archival agreement", "archivalAgency" : "Archival agency",
"associatedStatus" : "Associated status", "archivalAgreement" : "Archival agreement",
"attachment" : "Attachment", "associatedStatus" : "Associated status",
"attachments" : "Attachments", "attachment" : "Attachment",
"august" : "August", "attachments" : "Attachments",
"august" : "August",
"authorize" : "Authorize", "authorize" : "Authorize",
"autoLogoutAbsence" : "You are going to be automaticaly disconnected after your redirections", "autoLogoutAbsence" : "You are going to be automaticaly disconnected after your redirections",
"available" : "available", "available" : "available",
...@@ -55,7 +56,7 @@ export const LANG_EN = { ...@@ -55,7 +56,7 @@ export const LANG_EN = {
"canBeModified" : "Index modification", "canBeModified" : "Index modification",
"canBeSearched" : "Searchable", "canBeSearched" : "Searchable",
"cancel" : "Cancel", "cancel" : "Cancel",
"cases" : "Cases", "cases" : "Cases",
"changeMyPassword" : "Change my password", "changeMyPassword" : "Change my password",
"chooseBasket" : "Choose a basket", "chooseBasket" : "Choose a basket",
"chooseCategoryAssociation" : "Choose one or some associatedd categories", "chooseCategoryAssociation" : "Choose one or some associatedd categories",
...@@ -85,10 +86,10 @@ export const LANG_EN = { ...@@ -85,10 +86,10 @@ export const LANG_EN = {
"diffusionList" : "Diffusion list", "diffusionList" : "Diffusion list",
"diffusionModelCreation" : "Diffusion model creation", "diffusionModelCreation" : "Diffusion model creation",
"diffusionModelDeleted" : "Diffusion model deleted", "diffusionModelDeleted" : "Diffusion model deleted",
"diffusionModelModification" : "Diffusion model modification", "diffusionModelModification" : "Diffusion model modification",
"diffusionModels" : "Diffusion models", "diffusionModels" : "Diffusion models",
"diffusionModelUpdated" : "Diffusion model updated", "diffusionModelUpdated" : "Diffusion model updated",
"diffusionType" : "Diffusion type", "diffusionType" : "Diffusion type",
"display" : "display", "display" : "display",
"documents" : "document(s)", "documents" : "document(s)",
"doNotModifyUnlessExpert" : "Do not edit this section unless you know what you are doing. Incorrect settings can cause the application to malfunction !", "doNotModifyUnlessExpert" : "Do not edit this section unless you know what you are doing. Incorrect settings can cause the application to malfunction !",
...@@ -112,7 +113,7 @@ export const LANG_EN = { ...@@ -112,7 +113,7 @@ export const LANG_EN = {
"filterBy" : "Filter by", "filterBy" : "Filter by",
"fingerprint" : "Digital fingerprint", "fingerprint" : "Digital fingerprint",
"firstname" : "Firstname", "firstname" : "Firstname",
"folder" : "Folder", "folder" : "Folder",
"folders" : "Folders", "folders" : "Folders",
"for" : "for", "for" : "for",
"friday" : "Friday", "friday" : "Friday",
...@@ -124,6 +125,7 @@ export const LANG_EN = { ...@@ -124,6 +125,7 @@ export const LANG_EN = {
"groupRedirect" : "Group change", "groupRedirect" : "Group change",
"groups" : "Groups", "groups" : "Groups",
"groupUpdated" : "Group updated", "groupUpdated" : "Group updated",
"groupServicesUpdated" : "Services updated",
"history" : "Historique", "history" : "Historique",
"historyBatch" : "Historique des batchs", "historyBatch" : "Historique des batchs",
"home" : "Accueil", "home" : "Accueil",
...@@ -131,7 +133,7 @@ export const LANG_EN = { ...@@ -131,7 +133,7 @@ export const LANG_EN = {
"id" : "Login", "id" : "Login",
"imgRelated" : "Associated image", "imgRelated" : "Associated image",
"inactive" : "Inactive", "inactive" : "Inactive",
"indexing" : "Indexing", "indexing" : "Indexing",
"informations" : "Informations", "informations" : "Informations",
"initials" : "Initials", "initials" : "Initials",
"isAssociatedTo" : "is associated to", "isAssociatedTo" : "is associated to",
...@@ -153,7 +155,7 @@ export const LANG_EN = { ...@@ -153,7 +155,7 @@ export const LANG_EN = {
"keywordHelpDesc_10" : "Immediate sub-entities (n-1) of entities passed in argument", "keywordHelpDesc_10" : "Immediate sub-entities (n-1) of entities passed in argument",
"keywordHelpDesc_11" : "Example of security definition for a group (where clause) : access of main entity of logged user or sub-entity of this entity", "keywordHelpDesc_11" : "Example of security definition for a group (where clause) : access of main entity of logged user or sub-entity of this entity",
"keywordHelpDesc_2" : "Email of logged user", "keywordHelpDesc_2" : "Email of logged user",
"keywordHelpDesc_3" : "All entities linked to logged user. Sub-entities are excludes", "keywordHelpDesc_3" : "All entities linked to logged user. Sub-entities are excludes",
"keywordHelpDesc_4" : "Primary entity of logged user", "keywordHelpDesc_4" : "Primary entity of logged user",
"keywordHelpDesc_5" : "Sub-entities of argument list, can be @my_entities or @my_primary_entity", "keywordHelpDesc_5" : "Sub-entities of argument list, can be @my_entities or @my_primary_entity",
"keywordHelpDesc_6" : "Parent entity passed to argument", "keywordHelpDesc_6" : "Parent entity passed to argument",
...@@ -175,7 +177,7 @@ export const LANG_EN = { ...@@ -175,7 +177,7 @@ export const LANG_EN = {
"memberDiffTypeUsers" : "Diffusion type users member", "memberDiffTypeUsers" : "Diffusion type users member",
"memberUserDest" : "Dest user member", "memberUserDest" : "Dest user member",
"memberUsersCopy" : "Copy users member", "memberUsersCopy" : "Copy users member",
"menus" : "Menus", "menus" : "Menus",
"minute" : "Minute", "minute" : "Minute",
"modificationSaved" : "Modification has been saved", "modificationSaved" : "Modification has been saved",
"module" : "Module", "module" : "Module",
...@@ -194,29 +196,29 @@ export const LANG_EN = { ...@@ -194,29 +196,29 @@ export const LANG_EN = {
"noAttachment" : "No attachment", "noAttachment" : "No attachment",
"noReplacement" : "No replacement", "noReplacement" : "No replacement",
"notes" : "Notes", "notes" : "Notes",
"notificationAdded" : "Notification added", "notificationAdded" : "Notification added",
"notificationCreation" : "Notification creation", "notificationCreation" : "Notification creation",
"notificationDeleted" : "Notification deleted", "notificationDeleted" : "Notification deleted",
"NotificationDiffusionType" : "Diffusion type", "NotificationDiffusionType" : "Diffusion type",
"NotificationEnabled" : "Enabled", "NotificationEnabled" : "Enabled",
"NotificationEvent" : "Event", "NotificationEvent" : "Event",
"notificationJoinDocument" : "Join document to notification", "notificationJoinDocument" : "Join document to notification",
"notificationModel" : "Sendmail template", "notificationModel" : "Sendmail template",
"notificationModification" : "Notification modification", "notificationModification" : "Notification modification",
"notifications" : "Notification(s)", "notifications" : "Notification(s)",
"notificationSchedule" : "Notifications schedule", "notificationSchedule" : "Notifications schedule",
"NotificationScheduleInfo" : "As a reminder,\n\ncrontab format : [minute] [hour] [day of month] [month] [day of week]", "NotificationScheduleInfo" : "As a reminder,\n\ncrontab format : [minute] [hour] [day of month] [month] [day of week]",
"notificationScheduleUpdated" : "Schedule updated", "notificationScheduleUpdated" : "Schedule updated",
"notificationsSchedule" : "Notifications schedule", "notificationsSchedule" : "Notifications schedule",
"NotificationToEnable" : "To enable", "NotificationToEnable" : "To enable",
"notificationUpdated" : "Notification updated", "notificationUpdated" : "Notification updated",
"notUsed" : "Not used", "notUsed" : "Not used",
"november" : "November", "november" : "November",
"october" : "October", "october" : "October",
"optional" : "Optional", "optional" : "Optional",
"others" : "Other(s)", "others" : "Other(s)",
"otherActions" : "Other(s) action(s)", "otherActions" : "Other(s) action(s)",
"otherInformations" : "Other(s) information(s)", "otherInformations" : "Other(s) information(s)",
"otherParameters" : "Other(s) parameter(s)", "otherParameters" : "Other(s) parameter(s)",
"outOf" : "of", "outOf" : "of",
"page" : "Page", "page" : "Page",
...@@ -230,7 +232,7 @@ export const LANG_EN = { ...@@ -230,7 +232,7 @@ export const LANG_EN = {
"phoneNumber" : "Phone number", "phoneNumber" : "Phone number",
"primaryEntity" : "Primary entity", "primaryEntity" : "Primary entity",
"priorities" : "Priorities", "priorities" : "Priorities",
"priorityAdded" : "Priority added", "priorityAdded" : "Priority added",
"priorityCreation" : "Priority creation", "priorityCreation" : "Priority creation",
"priorityDeleted" : "Priority deleted", "priorityDeleted" : "Priority deleted",
"priorityModification" : "Priority modification", "priorityModification" : "Priority modification",
...@@ -252,60 +254,61 @@ export const LANG_EN = { ...@@ -252,60 +254,61 @@ export const LANG_EN = {
"reports" : "Reports", "reports" : "Reports",
"resetPsw" : "Reset password", "resetPsw" : "Reset password",
"resId" : "Res Identifier", "resId" : "Res Identifier",
"resultPages" : "Rseult pages", "resultPage" : "Result page",
"role" : "Role", "resultPageUpdated" : "Page de résultat modifié",
"saturday" : "Saturday", "role" : "Role",
"save" : "Save", "saturday" : "Saturday",
"september" : "September", "save" : "Save",
"sbSignatures" : "Signature Book Signatures", "september" : "September",
"script" : "Script", "sbSignatures" : "Signature Book Signatures",
"scriptCreated" : "Script created", "script" : "Script",
"search" : "Search", "scriptCreated" : "Script created",
"searchEntities" : "Search entity", "search" : "Search",
"secondaryEntity" : "Secondary entity", "searchEntities" : "Search entity",
"selectAll" : "Select all", "secondaryEntity" : "Secondary entity",
"selectedDocumentStatus" : "Document status selected", "selectAll" : "Select all",
"sendmail" : "Sendmail", "selectedDocumentStatus" : "Document status selected",
"sendTo" : "Send to", "sendmail" : "Sendmail",
"shortLabel" : "Short label", "sendTo" : "Send to",
"signAdded" : "Sign added", "shortLabel" : "Short label",
"signDeleted" : "Sign deleted", "signAdded" : "Sign added",
"signUpdated" : "Sign updated", "signDeleted" : "Sign deleted",
"since" : "Since", "signUpdated" : "Sign updated",
"siretCode" : "SIRET code", "since" : "Since",
"status" : "Status", "siretCode" : "SIRET code",
"statusAdded" : "Status added", "status" : "Status",
"statusCreation" : "Status creation", "statusAdded" : "Status added",
"statusDeleted" : "Status deleted", "statusCreation" : "Status creation",
"statuses" : "Statuses", "statusDeleted" : "Status deleted",
"statusModification" : "Status modification", "statuses" : "Statuses",
"statusName" : "Status name", "statusModification" : "Status modification",
"statusUpdated" : "Status updated", "statusName" : "Status name",
"string" : "String", "statusUpdated" : "Status updated",
"sunday" : "Sunday", "string" : "String",
"suspend" : "Suspend", "sunday" : "Sunday",
"suspended" : "Suspended", "suspend" : "Suspend",
"suspendNotification" : "Suspend notification", "suspended" : "Suspended",
"system" : "System", "suspendNotification" : "Suspend notification",
"systemParameters" : "System parameters", "system" : "System",
"tags" : "Tags", "systemParameters" : "System parameters",
"templates" : "Templates", "tags" : "Tags",
"thesaurus" : "Thesaurus", "templates" : "Templates",
"thuesday" : "Thuesday", "thesaurus" : "Thesaurus",
"thursday" : "Thursday", "thuesday" : "Thuesday",
"to" : "to", "thursday" : "Thursday",
"toDefault" : "default", "to" : "to",
"toEntities" : "To entities", "toDefault" : "default",
"tools" : "Tools", "toEntities" : "To entities",
"tooltipFolderStatus" : "If checked, status can be used for folder baskets", "tools" : "Tools",
"tooltipIndexStatus" : "If checked, you can edit metadatas of the documents having this status", "tooltipFolderStatus" : "If checked, status can be used for folder baskets",
"tooltipSearchStatus" : "If checked, the status will be offered in the search criteria STATUS of the advanced search", "tooltipIndexStatus" : "If checked, you can edit metadatas of the documents having this status",
"toSchedule" : "To schedule", "tooltipSearchStatus" : "If checked, the status will be offered in the search criteria STATUS of the advanced search",
"toStatuses" : "To statuses", "toSchedule" : "To schedule",
"toStatusesDesc" : "You cannot choose a status, a default status has been chosen for this action.", "toStatuses" : "To statuses",
"totalErrors" : "Errors element(s)", "toStatusesDesc" : "You cannot choose a status, a default status has been chosen for this action.",
"totalProcessed" : "Processed element(s)", "totalErrors" : "Errors element(s)",
"toUsersEntities" : "To users in entities", "totalProcessed" : "Processed element(s)",
"toUsersEntities" : "To users in entities",
"triggerAction" : "Trigger action", "triggerAction" : "Trigger action",
"triggerSystem" : "System trigger", "triggerSystem" : "System trigger",
"type" : "Type", "type" : "Type",
...@@ -396,6 +399,5 @@ export const LANG_EN = { ...@@ -396,6 +399,5 @@ export const LANG_EN = {
"signatureDeleted" : "Signature deleted", "signatureDeleted" : "Signature deleted",
"saveNumericPackage" : "Save numeric package", "saveNumericPackage" : "Save numeric package",
"noNumericPackageSelected" : "No numeric package selected", "noNumericPackageSelected" : "No numeric package selected",
"numericPackageImported" : "Numeric package imported", "numericPackageImported" : "Numeric package imported"
}; };
apps/maarch_entreprise/js/angular/lang/lang-fr.ts
+ 242
− 239
View file @ cac99354
This diff is collapsed.
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment