diff --git a/apps/maarch_entreprise/xml/services.xml b/apps/maarch_entreprise/xml/services.xml index 7da21b4b9dea9c0db4fbd51038a7267c930e0c5f..e7627eef87523a61187f55e20c7f61a7b6d2410d 100755 --- a/apps/maarch_entreprise/xml/services.xml +++ b/apps/maarch_entreprise/xml/services.xml @@ -448,11 +448,11 @@ <id>admin_custom_fields</id> <name>_ADMIN_CUSTOM_FIELDS</name> <comment>_ADMIN_CUSTOM_FIELDS</comment> - <servicepage>/administration/custom_fields</servicepage> + <servicepage>/administration/customFields</servicepage> <servicetype>admin</servicetype> <category>organisation</category> <system_service>false</system_service> - <style>fa fa-user</style> + <style>fas fa-code</style> <enabled>true</enabled> <angular>true</angular> </SERVICE> diff --git a/src/frontend/app/administration/administration-routing.module.ts b/src/frontend/app/administration/administration-routing.module.ts index 789c8b712269efdc006db84c9fee52ca71c4c847..72adae6a73e2145e6116c32fc5e632c8c8f71fb8 100755 --- a/src/frontend/app/administration/administration-routing.module.ts +++ b/src/frontend/app/administration/administration-routing.module.ts @@ -37,6 +37,7 @@ import { SecuritiesAdministrationComponent } from './security/securit import { SendmailAdministrationComponent } from './sendmail/sendmail-administration.component'; import { ShippingsAdministrationComponent } from './shipping/shippings-administration.component'; import { ShippingAdministrationComponent } from './shipping/shipping-administration.component'; +import { CustomFieldsAdministrationComponent } from './customField/custom-fields-administration.component'; import { AppGuard } from '../../service/app.guard'; @NgModule({ @@ -90,6 +91,7 @@ import { AppGuard } from '../../service/app.guard'; { path: 'administration/shippings', canActivate: [AppGuard], component: ShippingsAdministrationComponent }, { path: 'administration/shippings/new', canActivate: [AppGuard], component: ShippingAdministrationComponent }, { path: 'administration/shippings/:id', canActivate: [AppGuard], component: ShippingAdministrationComponent }, + { path: 'administration/customFields', canActivate: [AppGuard], component: CustomFieldsAdministrationComponent }, ]), ], exports: [ diff --git a/src/frontend/app/administration/administration.module.ts b/src/frontend/app/administration/administration.module.ts index 83217774bccce234601395ed28dc96892c93546d..7a62b18c9125b8b3c7934b0c609bc1854a6bd2f0 100755 --- a/src/frontend/app/administration/administration.module.ts +++ b/src/frontend/app/administration/administration.module.ts @@ -49,6 +49,7 @@ import { TechnicalAdministrationComponent } from './technical/techni import { ListAdministrationComponent } from './basket/list/list-administration.component'; import { ShippingsAdministrationComponent } from './shipping/shippings-administration.component'; import { ShippingAdministrationComponent } from './shipping/shipping-administration.component'; +import { CustomFieldsAdministrationComponent } from './customField/custom-fields-administration.component'; @NgModule({ imports: [ @@ -107,7 +108,8 @@ import { ShippingAdministrationComponent } from './shipping/shippin TemplateAdministrationCheckEntitiesModalComponent, ShippingsAdministrationComponent, ShippingAdministrationComponent, - AccountLinkComponent + AccountLinkComponent, + CustomFieldsAdministrationComponent ], entryComponents: [ UsersAdministrationRedirectModalComponent, diff --git a/src/frontend/lang/lang-en.ts b/src/frontend/lang/lang-en.ts index 93cab7a90aea4bf146e154f5fc9cb9d4f8a68efc..cb8e868958de9aca12c63135c5da0dcc72997841 100755 --- a/src/frontend/lang/lang-en.ts +++ b/src/frontend/lang/lang-en.ts @@ -1073,4 +1073,12 @@ export const LANG_EN = { "noAvailableFolder" : "No available folder", "unclassifyQuestion" : "Do you want to unclassify", "mailsInFolder" : "mail(s) in folder", + "customFields" : "custom field(s)", + "avaiblableCustomFieldsTypes" : "Available(s) custom type(s)", + "customField" : "custom field", + "stringInput" : "String input", + "selectInput" : "Select input", + "dateInput" : "Date input", + "radioInput" : "Radio input", + "checkboxInput" : "Checbox input", }; diff --git a/src/frontend/lang/lang-fr.ts b/src/frontend/lang/lang-fr.ts index e4e5f4bebc14ff610c981dd3578e9ff6200b48ac..eec072c236614a57f05e001c30315d13b1796ea6 100755 --- a/src/frontend/lang/lang-fr.ts +++ b/src/frontend/lang/lang-fr.ts @@ -1110,4 +1110,12 @@ export const LANG_FR = { "noAvailableFolder" : "Aucun dossier disponible", "unclassifyQuestion" : "Voulez-vous retirer", "mailsInFolder" : "élément(s) du dossier", + "customFields" : "champ(s) personnalisé(s)", + "avaiblableCustomFieldsTypes" : "Type(s) de champ(s) disponible(s)", + "customField" : "champ personnalisé", + "stringInput" : "Chaine de caractère", + "selectInput" : "Liste déroulante", + "dateInput" : "Champ date", + "radioInput" : "Liste à choix unique", + "checkboxInput" : "Liste à choix multiple", }; diff --git a/src/frontend/lang/lang-nl.ts b/src/frontend/lang/lang-nl.ts index 1d2a4a6de313e965858935aa0b4fb360ae9993cc..847aec78d7c54aa25e8adaeb47de214efa8d4587 100755 --- a/src/frontend/lang/lang-nl.ts +++ b/src/frontend/lang/lang-nl.ts @@ -1099,4 +1099,12 @@ export const LANG_NL = { "noAvailableFolder" : "No available folder", //_TO_TRANSLATE "unclassifyQuestion" : "Do you want to unclassify", //_TO_TRANSLATE "mailsInFolder" : "mail(s) in folder", //_TO_TRANSLATE + "customFields" : "custom field(s)", //_TO_TRANSLATE + "avaiblableCustomFieldsTypes" : "Available(s) custom type(s)", //_TO_TRANSLATE + "customField" : "custom field", //_TO_TRANSLATE + "stringInput" : "String input", //_TO_TRANSLATE + "selectInput" : "Select input", //_TO_TRANSLATE + "dateInput" : "Date input", //_TO_TRANSLATE + "radioInput" : "Radio input", //_TO_TRANSLATE + "checkboxInput" : "Checbox input", //_TO_TRANSLATE };