diff --git a/apps/maarch_entreprise/xml/services.xml b/apps/maarch_entreprise/xml/services.xml index d5d7e97eb33c9033d09b4077fd1a8135497ae3b6..e71e5fd7688462c8c80615abba11ab436633a6fa 100755 --- a/apps/maarch_entreprise/xml/services.xml +++ b/apps/maarch_entreprise/xml/services.xml @@ -422,4 +422,16 @@ <enabled>true</enabled> <angular>true</angular> </SERVICE> + <SERVICE> + <id>admin_sendmail</id> + <name>_SENDMAIL_PARAM</name> + <comment>_SENDMAIL_PARAM_DESC</comment> + <servicepage>/administration/sendmail</servicepage> + <servicetype>admin</servicetype> + <category>supervision</category> + <system_service>false</system_service> + <style>fas fa-mail-bulk</style> + <enabled>true</enabled> + <angular>true</angular> + </SERVICE> </root> diff --git a/src/core/lang/lang-en.php b/src/core/lang/lang-en.php index 7ceb994b05d56b310d1719331a7b431c8d16451c..736d8ba1738070b9ed23128154daaa44ac6b1197 100755 --- a/src/core/lang/lang-en.php +++ b/src/core/lang/lang-en.php @@ -189,6 +189,8 @@ define('_ADMIN_NOTIFICATIONS_DESC', " Create and manage users' notifications bas define('_TEMPLATES', 'Templates'); define('_ADMIN_TEMPLATES_DESC', 'Manage templates for attachments, notifications, document generation, sendmail and notes'); define('_SECURITIES', 'Securities'); +define('_SENDMAIL_PARAM', 'Mail server'); +define('_SENDMAIL_PARAM_DESC', 'Link your mail serveur with application in order to send emails.'); //SERVICES define('_REDIRECT_TO_ACTION', 'Redirect to an action'); diff --git a/src/core/lang/lang-fr.php b/src/core/lang/lang-fr.php index cf656ba42fb0ff7d89a8ba6e0fa389ea1f4a4e52..4084f0ee4ec131b7b993d57acceb172558c2e4c0 100755 --- a/src/core/lang/lang-fr.php +++ b/src/core/lang/lang-fr.php @@ -189,6 +189,10 @@ define('_ADMIN_NOTIFICATIONS_DESC', "Créer et gérer des notifications aux util define('_TEMPLATES', 'Modèles de documents'); define('_ADMIN_TEMPLATES_DESC', "Gérer les modèles utilisés pour les pièces jointes, les notifications, la génération de courriers, l'envoi de courriels et les annotations"); define('_SECURITIES', 'Sécurités'); +define('_SENDMAIL_PARAM', 'Serveur mail'); +define('_SENDMAIL_PARAM_DESC', 'Connecter votre serveur de mail à Maarch Courrier afin de pouvoir envoyer des courriels.'); + + //SERVICES define('_REDIRECT_TO_ACTION', 'Rediriger vers une action'); diff --git a/src/core/lang/lang-nl.php b/src/core/lang/lang-nl.php index 21070c315742005fc50f42ddee7aae0784e83d97..f8928be7a31f3d6d163f4bc0ddb8ba678861050f 100644 --- a/src/core/lang/lang-nl.php +++ b/src/core/lang/lang-nl.php @@ -406,3 +406,5 @@ define('_SVA', 'Stilzwijgende aanvaarding'); define('_SVR', 'Stilzwijgende weigering'); define('_REDACTOR', 'Opsteller'); define('_ASSIGNEE', 'Toegekende persoon'); +define('_SENDMAIL_PARAM', '_TO_TRANSLATE'); +define('_SENDMAIL_PARAM_DESC', '_TO_TRANSLATE'); diff --git a/src/frontend/app/administration/administration-routing.module.ts b/src/frontend/app/administration/administration-routing.module.ts index 4565276335263bcf007b0fc5233a1c6aab22d9b4..efe7b06de51b788695f468b22fc202d22a1fdf8a 100755 --- a/src/frontend/app/administration/administration-routing.module.ts +++ b/src/frontend/app/administration/administration-routing.module.ts @@ -34,6 +34,7 @@ import { DocserverAdministrationComponent } from './docserver/docser import { TemplatesAdministrationComponent } from './template/templates-administration.component'; import { TemplateAdministrationComponent } from './template/template-administration.component'; import { SecuritiesAdministrationComponent } from './security/securities-administration.component'; +import { SendmailAdministrationComponent } from './sendmail/sendmail-administration.component'; @NgModule({ imports: [ @@ -82,6 +83,7 @@ import { SecuritiesAdministrationComponent } from './security/securit { path: 'administration/templates/new', component: TemplateAdministrationComponent }, { path: 'administration/templates/:id', component: TemplateAdministrationComponent }, { path: 'administration/securities', component: SecuritiesAdministrationComponent }, + { path: 'administration/sendmail', component: SendmailAdministrationComponent }, ]), ], exports: [ diff --git a/src/frontend/app/administration/administration.module.ts b/src/frontend/app/administration/administration.module.ts index 67f641503b0f775ec87a65e5dd0e2db77840048a..9876f8772f2ce9c7b3846a2cec9b1cad4bad27d9 100755 --- a/src/frontend/app/administration/administration.module.ts +++ b/src/frontend/app/administration/administration.module.ts @@ -43,6 +43,7 @@ import { DocserverAdministrationComponent } from './docserver/docser import { TemplatesAdministrationComponent } from './template/templates-administration.component'; import { TemplateAdministrationComponent } from './template/template-administration.component'; import { SecuritiesAdministrationComponent } from './security/securities-administration.component'; +import { SendmailAdministrationComponent } from './sendmail/sendmail-administration.component'; @NgModule({ imports: [ @@ -94,6 +95,7 @@ import { SecuritiesAdministrationComponent } from './security/securit TemplatesAdministrationComponent, TemplateAdministrationComponent, SecuritiesAdministrationComponent, + SendmailAdministrationComponent ], entryComponents: [ UsersAdministrationRedirectModalComponent, diff --git a/src/frontend/app/app-routing.module.ts b/src/frontend/app/app-routing.module.ts index 271f4700bd0731d919b9204e0fe19e0d9bf61e6a..f3190503a21ccd734a76e9218b30612cf56c3566 100755 --- a/src/frontend/app/app-routing.module.ts +++ b/src/frontend/app/app-routing.module.ts @@ -18,7 +18,7 @@ import { SaveNumericPackageComponent } from './save-numeric-package.compone { path: 'profile', component: ProfileComponent }, { path: 'about-us', component: AboutUsComponent }, { path: 'home', component: HomeComponent }, - { path: 'basketList/:groupSerialId/baskets/:basketId', component: BasketListComponent }, + { path: 'basketList/users/:userSerialId/groups/:groupSerialId/baskets/:basketId', component: BasketListComponent }, { path: 'saveNumericPackage', component: SaveNumericPackageComponent }, { path: 'groups/:groupId/baskets/:basketId/signatureBook/:resId', component: SignatureBookComponent }, { path: '**', redirectTo: 'home', pathMatch: 'full' },