diff --git a/src/frontend/app/administration/administration-routing.module.ts b/src/frontend/app/administration/administration-routing.module.ts
index 41846695794d9f110f424bb9c36bdbc2d889c02c..735427b23cf201255892e50fd0d770916bddb4df 100755
--- a/src/frontend/app/administration/administration-routing.module.ts
+++ b/src/frontend/app/administration/administration-routing.module.ts
@@ -83,13 +83,14 @@ import { ContactsPageAdministrationComponent } from './contact/page/contacts-pag
{ path: 'administration/history', canActivate: [AppGuard], component: HistoryAdministrationComponent },
{ path: 'administration/update-status', canActivate: [AppGuard], component: UpdateStatusAdministrationComponent },
{ path: 'administration/contacts', canActivate: [AppGuard], component: ContactsListAdministrationComponent },
- { path: 'administration/contacts/new', canActivate: [AppGuard], component: ContactsPageAdministrationComponent },
- { path: 'administration/contacts/:id', canActivate: [AppGuard], component: ContactsPageAdministrationComponent },
- { path: 'administration/contactsCustomFields', canActivate: [AppGuard], component: ContactsCustomFieldsAdministrationComponent },
- { path: 'administration/contacts-groups', canActivate: [AppGuard], component: ContactsGroupsAdministrationComponent },
- { path: 'administration/contacts-groups/new', canActivate: [AppGuard], component: ContactsGroupAdministrationComponent },
- { path: 'administration/contacts-groups/:id', canActivate: [AppGuard], component: ContactsGroupAdministrationComponent },
- { path: 'administration/contacts-parameters', canActivate: [AppGuard], component: ContactsParametersAdministrationComponent },
+ { path: 'administration/contacts/list', redirectTo: 'administration/contacts', pathMatch: 'full' },
+ { path: 'administration/contacts/list/new', canActivate: [AppGuard], component: ContactsPageAdministrationComponent },
+ { path: 'administration/contacts/list/:id', canActivate: [AppGuard], component: ContactsPageAdministrationComponent },
+ { path: 'administration/contacts/contactsCustomFields', canActivate: [AppGuard], component: ContactsCustomFieldsAdministrationComponent },
+ { path: 'administration/contacts/contacts-groups', canActivate: [AppGuard], component: ContactsGroupsAdministrationComponent },
+ { path: 'administration/contacts/contacts-groups/new', canActivate: [AppGuard], component: ContactsGroupAdministrationComponent },
+ { path: 'administration/contacts/contacts-groups/:id', canActivate: [AppGuard], component: ContactsGroupAdministrationComponent },
+ { path: 'administration/contacts/contacts-parameters', canActivate: [AppGuard], component: ContactsParametersAdministrationComponent },
{ path: 'administration/versions-update', canActivate: [AppGuard], component: VersionsUpdateAdministrationComponent },
{ path: 'administration/docservers', canActivate: [AppGuard], component: DocserversAdministrationComponent },
{ path: 'administration/docservers/new', canActivate: [AppGuard], component: DocserverAdministrationComponent },
diff --git a/src/frontend/app/administration/contact/customField/contacts-custom-fields-administration.component.html b/src/frontend/app/administration/contact/customField/contacts-custom-fields-administration.component.html
index 6ad73dd51fe9785eaa729f7d8e604063b483b406..516c75f2eebabba352a8b83aaeec0c2d164344be 100644
--- a/src/frontend/app/administration/contact/customField/contacts-custom-fields-administration.component.html
+++ b/src/frontend/app/administration/contact/customField/contacts-custom-fields-administration.component.html
@@ -3,6 +3,7 @@
fixedTopGap="56" [opened]="appService.getViewMode() ? false : true">
<header-panel [snavLeft]="snav"></header-panel>
<menu-shortcut></menu-shortcut>
+ <menu-nav></menu-nav>
<mat-nav-list>
<a mat-list-item *ngFor="let menu of subMenus | sortBy : 'label'" [routerLink]="menu.route">
<mat-icon color="primary" mat-list-icon [class]="menu.icon"></mat-icon>
@@ -12,7 +13,6 @@
</a>
</mat-nav-list>
<mat-divider></mat-divider>
- <menu-nav></menu-nav>
</mat-sidenav>
<mat-sidenav-content>
<div class="bg-head">
diff --git a/src/frontend/app/administration/contact/group/contacts-group-administration.component.html b/src/frontend/app/administration/contact/group/contacts-group-administration.component.html
index c74124ba424f178323d44c1f14fa05e7fc6e8a48..35081ff50fa9b9a9f28f5bd8d086e6ea181a3303 100644
--- a/src/frontend/app/administration/contact/group/contacts-group-administration.component.html
+++ b/src/frontend/app/administration/contact/group/contacts-group-administration.component.html
@@ -1,9 +1,19 @@
<div class="admin-container" [class.admin-is-mobile]="appService.getViewMode()">
- <mat-sidenav-container autosize class="admin-sidenav-container" >
- <mat-sidenav #snav [mode]="appService.getViewMode() ? 'over' : 'side'" [fixedInViewport]="appService.getViewMode()" fixedTopGap="56"
+ <mat-sidenav-container autosize class="admin-sidenav-container">
+ <mat-sidenav #snav [mode]="appService.getViewMode() ? 'over' : 'side'"
+ [fixedInViewport]="appService.getViewMode()" fixedTopGap="56"
[opened]="appService.getViewMode() ? false : true">
<menu-shortcut></menu-shortcut>
<menu-nav></menu-nav>
+ <mat-nav-list>
+ <a mat-list-item *ngFor="let menu of subMenus | sortBy : 'label'" [routerLink]="menu.route">
+ <mat-icon color="primary" mat-list-icon [class]="menu.icon"></mat-icon>
+ <p mat-line>
+ {{menu.label}}
+ </p>
+ </a>
+ </mat-nav-list>
+ <mat-divider></mat-divider>
</mat-sidenav>
<mat-sidenav-content>
<div *ngIf="loading" style="display:flex;height:100%;">
@@ -16,7 +26,8 @@
<div class="form-group">
<div class="col-sm-12">
<mat-form-field>
- <input matInput [(ngModel)]="contactsGroup.label" required name="label" id="label" title="{{lang.label}}" type="text" placeholder="{{lang.label}}"
+ <input matInput [(ngModel)]="contactsGroup.label" required name="label"
+ id="label" title="{{lang.label}}" type="text" placeholder="{{lang.label}}"
maxlength="32">
</mat-form-field>
</div>
@@ -24,20 +35,23 @@
<div class="form-group">
<div class="col-sm-12">
<mat-form-field>
- <input matInput [(ngModel)]="contactsGroup.description" required name="description" id="description" title="{{lang.description}}"
- type="text" placeholder="{{lang.description}}" maxlength="255">
+ <input matInput [(ngModel)]="contactsGroup.description" required
+ name="description" id="description" title="{{lang.description}}" type="text"
+ placeholder="{{lang.description}}" maxlength="255">
</mat-form-field>
</div>
</div>
<div class="form-group">
<div class="col-sm-6" style="text-align:center;">
- <mat-slide-toggle name="public" title="{{lang.contactsGroupDesc}}" id="public" color="primary" [(ngModel)]="contactsGroup.public"
+ <mat-slide-toggle name="public" title="{{lang.contactsGroupDesc}}" id="public"
+ color="primary" [(ngModel)]="contactsGroup.public"
[checked]="contactsGroup.public">{{lang.public}}</mat-slide-toggle>
</div>
</div>
<div class="form-group">
<div class="col-sm-12" style="text-align:center;">
- <button mat-raised-button color="primary" type="submit" [disabled]="!contactsGroupFormUp.form.valid">{{lang.save}}</button>
+ <button mat-raised-button color="primary" type="submit"
+ [disabled]="!contactsGroupFormUp.form.valid">{{lang.save}}</button>
</div>
</div>
</form>
@@ -47,28 +61,35 @@
<div class="col-md-8" style="padding:5px;">
<mat-form-field hintLabel="3 caractères minium">
<span matPrefix>
- <mat-icon class="fa fa-user-plus" color="primary"></mat-icon> </span>
- <input class="autocompleteSearch" type="text" placeholder="{{lang.linkContact}}" matInput [formControl]="searchTerm" autocomplete="off"
+ <mat-icon class="fa fa-user-plus" color="primary"></mat-icon>
+ </span>
+ <input class="autocompleteSearch" type="text" placeholder="{{lang.linkContact}}"
+ matInput [formControl]="searchTerm" autocomplete="off"
(keyup)="launchLoading();" minlength="3">
</mat-form-field>
</div>
<div class="col-md-6 col-xs-6">
- <div class="alert alert-danger" *ngIf="dataSource && dataSource.data.length == 1000" [innerHTML]="lang.limitDataReached_1000"></div>
+ <div class="alert alert-danger" *ngIf="dataSource && dataSource.data.length == 1000"
+ [innerHTML]="lang.limitDataReached_1000"></div>
</div>
<div class="col-md-6 col-xs-6">
<mat-paginator #paginatorContactList [length]="0" [pageSize]="10">
</mat-paginator>
</div>
</div>
- <mat-progress-bar mode="indeterminate" *ngIf="!dataSource && !initAutoCompleteContact"></mat-progress-bar>
+ <mat-progress-bar mode="indeterminate" *ngIf="!dataSource && !initAutoCompleteContact">
+ </mat-progress-bar>
<mat-table #tableContactList [dataSource]="dataSource" *ngIf="dataSource">
<ng-container matColumnDef="select">
<mat-header-cell *matHeaderCellDef style="flex:1;">
- <mat-checkbox color="primary" (change)="$event ? masterToggle($event) : null" [checked]="selection.hasValue()">
+ <mat-checkbox color="primary" (change)="$event ? masterToggle($event) : null"
+ [checked]="selection.hasValue()">
</mat-checkbox>
</mat-header-cell>
<mat-cell *matCellDef="let element" style="flex:1;">
- <mat-checkbox id="check_{{element.id}}" color="primary" (click)="$event.stopPropagation()" (change)="$event ? selection.toggle(element.id) : null"
+ <mat-checkbox id="check_{{element.id}}" color="primary"
+ (click)="$event.stopPropagation()"
+ (change)="$event ? selection.toggle(element.id) : null"
[disabled]="isInGrp(element)" [checked]="selection.isSelected(element.id)">
</mat-checkbox>
</mat-cell>
@@ -82,22 +103,27 @@
<mat-cell *matCellDef="let element" style="flex:3;"> {{element.address}} </mat-cell>
</ng-container>
<mat-header-row *matHeaderRowDef="displayedColumns"></mat-header-row>
- <mat-row *matRowDef="let element; columns: displayedColumns;" (click)="selectContact(element.id);" [ngStyle]="{'opacity': !isInGrp(element) ? '' : '0.5'}"
- style="cursor: pointer;"></mat-row>
+ <mat-row *matRowDef="let element; columns: displayedColumns;"
+ (click)="selectContact(element.id);"
+ [ngStyle]="{'opacity': !isInGrp(element) ? '' : '0.5'}" style="cursor: pointer;">
+ </mat-row>
</mat-table>
<div class="form-group">
<div class="col-sm-12" style="text-align:center;margin-top:30px">
- <button mat-raised-button color="primary" type="button" (click)="saveContactsList($event.target)" [disabled]="this.selection.selected.length == 0">{{lang.add}}</button>
+ <button mat-raised-button color="primary" type="button"
+ (click)="saveContactsList($event.target)"
+ [disabled]="this.selection.selected.length == 0">{{lang.add}}</button>
</div>
</div>
</mat-tab>
</mat-tab-group>
</mat-card>
</mat-sidenav-content>
- <mat-sidenav #snav2 [mode]="appService.getViewMode() ? 'over' : 'side'" [fixedInViewport]="appService.getViewMode()"
- fixedTopGap="56" position='end' [opened]="appService.getViewMode() || creationMode ? false : true" style="overflow-x:hidden;width:40%;">
+ <mat-sidenav #snav2 [mode]="appService.getViewMode() ? 'over' : 'side'"
+ [fixedInViewport]="appService.getViewMode()" fixedTopGap="56" position='end'
+ [opened]="appService.getViewMode() || creationMode ? false : true" style="overflow-x:hidden;width:40%;">
<mat-list>
- <h3 mat-subheader>{{nbContact}} {{lang.relatedContacts}} : </h3>
+ <h3 mat-subheader>{{nbContact}} {{lang.relatedContacts}} : </h3>
</mat-list>
<div class="row" style="margin:0px;">
<div class="col-md-6 col-xs-6">
@@ -110,19 +136,23 @@
</mat-paginator>
</div>
</div>
- <mat-table #tableAdded="matSort" [dataSource]="dataSourceAdded" matSort matSortActive="contact" matSortDirection="asc">
+ <mat-table #tableAdded="matSort" [dataSource]="dataSourceAdded" matSort matSortActive="contact"
+ matSortDirection="asc">
<ng-container matColumnDef="contact">
- <mat-header-cell *matHeaderCellDef mat-sort-header style="flex:3;">{{lang.contact}}</mat-header-cell>
+ <mat-header-cell *matHeaderCellDef mat-sort-header style="flex:3;">{{lang.contact}}
+ </mat-header-cell>
<mat-cell *matCellDef="let element" style="flex:3;"> {{element.contact}} </mat-cell>
</ng-container>
<ng-container matColumnDef="address">
- <mat-header-cell *matHeaderCellDef mat-sort-header style="flex:3;">{{lang.address}}</mat-header-cell>
+ <mat-header-cell *matHeaderCellDef mat-sort-header style="flex:3;">{{lang.address}}
+ </mat-header-cell>
<mat-cell *matCellDef="let element" style="flex:3;"> {{element.address}} </mat-cell>
</ng-container>
<ng-container matColumnDef="actions">
<mat-header-cell *matHeaderCellDef style="flex:1;"></mat-header-cell>
<mat-cell *matCellDef="let element" style="justify-content: flex-end;flex:1;">
- <button mat-icon-button color="warn" matTooltip="{{lang.delete}}" (click)="$event.stopPropagation();preDelete(element.position)">
+ <button mat-icon-button color="warn" matTooltip="{{lang.delete}}"
+ (click)="$event.stopPropagation();preDelete(element.position)">
<mat-icon class="fa fa-trash-alt fa-2x" aria-hidden="true"></mat-icon>
</button>
</mat-cell>
diff --git a/src/frontend/app/administration/contact/group/contacts-group-administration.component.ts b/src/frontend/app/administration/contact/group/contacts-group-administration.component.ts
index 5ce5ce285d6e2e6849a5230a56b6e74042cec0b6..e072b55b2af64ab86bded5822358d2c0924c4de6 100644
--- a/src/frontend/app/administration/contact/group/contacts-group-administration.component.ts
+++ b/src/frontend/app/administration/contact/group/contacts-group-administration.component.ts
@@ -26,6 +26,24 @@ export class ContactsGroupAdministrationComponent implements OnInit {
lang: any = LANG;
+ subMenus:any [] = [
+ {
+ icon: 'fa fa-book',
+ route: '/administration/contacts/list',
+ label : this.lang.contactsList
+ },
+ {
+ icon: 'fa fa-cog',
+ route: '/administration/contacts/contacts-parameters',
+ label : this.lang.contactsParameters
+ },
+ {
+ icon: 'fa fa-code',
+ route: '/administration/contacts/contactsCustomFields',
+ label : this.lang.customFields
+ },
+ ];
+
creationMode: boolean;
contactsGroup: any = {};
nbContact : number;
@@ -148,7 +166,7 @@ export class ContactsGroupAdministrationComponent implements OnInit {
if (this.creationMode) {
this.http.post('../../rest/contactsGroups', this.contactsGroup)
.subscribe((data: any) => {
- this.router.navigate(['/administration/contacts-groups/' + data.contactsGroup]);
+ this.router.navigate(['/administration/contacts/contacts-groups/' + data.contactsGroup]);
this.notify.success(this.lang.contactsGroupAdded);
}, (err) => {
this.notify.error(err.error.errors);
diff --git a/src/frontend/app/administration/contact/group/contacts-groups-administration.component.html b/src/frontend/app/administration/contact/group/contacts-groups-administration.component.html
index ed1d247f512bc5d436586818e4b609be25839c74..d7b205de540ff467128291fbc6632f43a6b6958b 100644
--- a/src/frontend/app/administration/contact/group/contacts-groups-administration.component.html
+++ b/src/frontend/app/administration/contact/group/contacts-groups-administration.component.html
@@ -1,12 +1,13 @@
<div class="admin-container" [class.admin-is-mobile]="appService.getViewMode()">
- <mat-sidenav-container autosize class="admin-sidenav-container" >
- <mat-sidenav #snav [mode]="appService.getViewMode() ? 'over' : 'side'" [fixedInViewport]="appService.getViewMode()" fixedTopGap="56"
+ <mat-sidenav-container autosize class="admin-sidenav-container">
+ <mat-sidenav #snav [mode]="appService.getViewMode() ? 'over' : 'side'"
+ [fixedInViewport]="appService.getViewMode()" fixedTopGap="56"
[opened]="appService.getViewMode() ? false : true">
<menu-shortcut></menu-shortcut>
<menu-nav></menu-nav>
<mat-nav-list>
<h3 mat-subheader>{{lang.actions}}</h3>
- <a mat-list-item routerLink="/administration/contacts-groups/new">
+ <a mat-list-item routerLink="/administration/contacts/contacts-groups/new">
<mat-icon color="primary" mat-list-icon class="fa fa-plus"></mat-icon>
<p mat-line>
{{lang.add}}
@@ -14,6 +15,15 @@
</a>
</mat-nav-list>
<mat-divider></mat-divider>
+ <mat-nav-list>
+ <a mat-list-item *ngFor="let menu of subMenus | sortBy : 'label'" [routerLink]="menu.route">
+ <mat-icon color="primary" mat-list-icon [class]="menu.icon"></mat-icon>
+ <p mat-line>
+ {{menu.label}}
+ </p>
+ </a>
+ </mat-nav-list>
+ <mat-divider></mat-divider>
</mat-sidenav>
<mat-sidenav-content>
<div *ngIf="loading" style="display:flex;height:100%;">
@@ -33,47 +43,63 @@
</div>
<mat-table #table [dataSource]="dataSource" matSort matSortActive="label" matSortDirection="asc">
<ng-container matColumnDef="label">
- <mat-header-cell *matHeaderCellDef mat-sort-header [class.hide-for-mobile]="appService.getViewMode()" style="flex:2;">{{lang.label}}</mat-header-cell>
- <mat-cell *matCellDef="let element" [class.hide-for-mobile]="appService.getViewMode()" style="flex:2;">{{element.label}}</mat-cell>
+ <mat-header-cell *matHeaderCellDef mat-sort-header
+ [class.hide-for-mobile]="appService.getViewMode()" style="flex:2;">{{lang.label}}
+ </mat-header-cell>
+ <mat-cell *matCellDef="let element" [class.hide-for-mobile]="appService.getViewMode()"
+ style="flex:2;">{{element.label}}</mat-cell>
</ng-container>
<ng-container matColumnDef="description">
- <mat-header-cell *matHeaderCellDef mat-sort-header style="flex:2;">{{lang.description}}</mat-header-cell>
+ <mat-header-cell *matHeaderCellDef mat-sort-header style="flex:2;">{{lang.description}}
+ </mat-header-cell>
<mat-cell *matCellDef="let element" style="flex:2;"> {{element.description}} </mat-cell>
</ng-container>
<ng-container matColumnDef="nbContacts">
- <mat-header-cell *matHeaderCellDef mat-sort-header style="flex:1;">{{lang.relatedContactNumber}}</mat-header-cell>
+ <mat-header-cell *matHeaderCellDef mat-sort-header style="flex:1;">{{lang.relatedContactNumber}}
+ </mat-header-cell>
<mat-cell *matCellDef="let element" style="flex:1;">
- <span *ngIf="element.nbContacts == 0">{{element.nbContacts}}</span>
- <span *ngIf="element.nbContacts > 0" color="primary" style="font-weight:bold;">{{element.nbContacts}}</span>
+ <span *ngIf="element.nbContacts == 0">{{element.nbContacts}}</span>
+ <span *ngIf="element.nbContacts > 0" color="primary"
+ style="font-weight:bold;">{{element.nbContacts}}</span>
</mat-cell>
</ng-container>
<ng-container matColumnDef="public">
- <mat-header-cell *matHeaderCellDef mat-sort-header [class.hide-for-mobile]="appService.getViewMode()" style="flex:1;">{{lang.public}}</mat-header-cell>
- <mat-cell *matCellDef="let element" [class.hide-for-mobile]="appService.getViewMode()" style="flex:1;">
+ <mat-header-cell *matHeaderCellDef mat-sort-header
+ [class.hide-for-mobile]="appService.getViewMode()" style="flex:1;">{{lang.public}}
+ </mat-header-cell>
+ <mat-cell *matCellDef="let element" [class.hide-for-mobile]="appService.getViewMode()"
+ style="flex:1;">
<span *ngIf="!element.public"> {{lang.no}} </span>
<span *ngIf="element.public"> {{lang.yes}} </span>
</mat-cell>
</ng-container>
<ng-container matColumnDef="owner">
- <mat-header-cell *matHeaderCellDef mat-sort-header style="flex:1;">{{lang.createdBy}}</mat-header-cell>
+ <mat-header-cell *matHeaderCellDef mat-sort-header style="flex:1;">{{lang.createdBy}}
+ </mat-header-cell>
<mat-cell *matCellDef="let element" style="flex:1;"> {{element.labelledOwner}} </mat-cell>
- </ng-container>
+ </ng-container>
<ng-container matColumnDef="actions">
<mat-header-cell *matHeaderCellDef></mat-header-cell>
<mat-cell *matCellDef="let element" style="justify-content: flex-end;">
- <button mat-icon-button color="warn" matTooltip="{{lang.delete}}" (click)="$event.stopPropagation();deleteContactsGroup(element.position)">
+ <button mat-icon-button color="warn" matTooltip="{{lang.delete}}"
+ (click)="$event.stopPropagation();deleteContactsGroup(element.position)">
<mat-icon class="fa fa-trash-alt fa-2x" aria-hidden="true"></mat-icon>
</button>
</mat-cell>
</ng-container>
<mat-header-row *matHeaderRowDef="displayedColumns"></mat-header-row>
- <mat-row *matRowDef="let row; columns: displayedColumns;" routerLink="/administration/contacts-groups/{{row.id}}" style="cursor:pointer;" matTooltip="{{lang.view}}"></mat-row>
+ <mat-row *matRowDef="let row; columns: displayedColumns;"
+ routerLink="/administration/contacts/contacts-groups/{{row.id}}" style="cursor:pointer;"
+ matTooltip="{{lang.view}}"></mat-row>
</mat-table>
- <div class="mat-paginator" style="min-height:48px;min-height: 48px;display: flex;justify-content: end;align-items: center;padding-right: 20px;">{{contactsGroups.length}} {{lang.contactsGroups}}</div>
+ <div class="mat-paginator"
+ style="min-height:48px;min-height: 48px;display: flex;justify-content: end;align-items: center;padding-right: 20px;">
+ {{contactsGroups.length}} {{lang.contactsGroups}}</div>
</mat-card>
</mat-sidenav-content>
- <mat-sidenav #snav2 [mode]="appService.getViewMode() ? 'over' : 'side'" [fixedInViewport]="appService.getViewMode()" fixedTopGap="56"
- position='end' [opened]="appService.getViewMode() ? false : false">
+ <mat-sidenav #snav2 [mode]="appService.getViewMode() ? 'over' : 'side'"
+ [fixedInViewport]="appService.getViewMode()" fixedTopGap="56" position='end'
+ [opened]="appService.getViewMode() ? false : false">
</mat-sidenav>
</mat-sidenav-container>
</div>
\ No newline at end of file
diff --git a/src/frontend/app/administration/contact/group/contacts-groups-administration.component.ts b/src/frontend/app/administration/contact/group/contacts-groups-administration.component.ts
index 449f07baf108919c414aab5f59422b4f041396d2..8012c62e74c88d830a7f72f6a4ae255dc64f44d6 100644
--- a/src/frontend/app/administration/contact/group/contacts-groups-administration.component.ts
+++ b/src/frontend/app/administration/contact/group/contacts-groups-administration.component.ts
@@ -29,6 +29,24 @@ export class ContactsGroupsAdministrationComponent implements OnInit {
loading: boolean = false;
+ subMenus:any [] = [
+ {
+ icon: 'fa fa-book',
+ route: '/administration/contacts/list',
+ label : this.lang.contactsList
+ },
+ {
+ icon: 'fa fa-cog',
+ route: '/administration/contacts/contacts-parameters',
+ label : this.lang.contactsParameters
+ },
+ {
+ icon: 'fa fa-code',
+ route: '/administration/contacts/contactsCustomFields',
+ label : this.lang.customFields
+ },
+ ];
+
displayedColumns = ['label', 'description', 'nbContacts', 'public', 'owner', 'actions',];
dataSource = new MatTableDataSource(this.contactsGroups);
@ViewChild(MatPaginator, { static: false }) paginator: MatPaginator;
diff --git a/src/frontend/app/administration/contact/list/contacts-list-administration.component.html b/src/frontend/app/administration/contact/list/contacts-list-administration.component.html
index abb64ad75c71d2987e844714227880942f19317f..4bd6a29f77cf48b21dedfded7352358de2cfb81a 100644
--- a/src/frontend/app/administration/contact/list/contacts-list-administration.component.html
+++ b/src/frontend/app/administration/contact/list/contacts-list-administration.component.html
@@ -4,22 +4,21 @@
<header-panel [snavLeft]="snav"></header-panel>
<menu-shortcut></menu-shortcut>
<menu-nav></menu-nav>
-
<mat-nav-list>
- <a mat-list-item *ngFor="let menu of subMenus | sortBy : 'label'" [routerLink]="menu.route">
- <mat-icon color="primary" mat-list-icon [class]="menu.icon"></mat-icon>
+ <h3 mat-subheader>{{lang.actions}}</h3>
+ <a mat-list-item routerLink="/administration/contacts/list/new">
+ <mat-icon color="primary" mat-list-icon class="fa fa-plus"></mat-icon>
<p mat-line>
- {{menu.label}}
+ {{lang.add}}
</p>
</a>
</mat-nav-list>
<mat-divider></mat-divider>
<mat-nav-list>
- <h3 mat-subheader>{{lang.actions}}</h3>
- <a mat-list-item routerLink="/administration/contacts/new">
- <mat-icon color="primary" mat-list-icon class="fa fa-plus"></mat-icon>
+ <a mat-list-item *ngFor="let menu of subMenus | sortBy : 'label'" [routerLink]="menu.route">
+ <mat-icon color="primary" mat-list-icon [class]="menu.icon"></mat-icon>
<p mat-line>
- {{lang.add}}
+ {{menu.label}}
</p>
</a>
</mat-nav-list>
@@ -46,8 +45,8 @@
<div class="table-head">
<div class="table-head-result">
<mat-form-field floatLabel="never" style="font-size: 13px;">
- <input type="text" #autoCompleteInput [placeholder]="lang.filterBy" matInput [formControl]="searchContact"
- (click)="$event.stopPropagation()" maxlength="128">
+ <input type="text" #autoCompleteInput [placeholder]="lang.filterBy" matInput
+ [formControl]="searchContact" (click)="$event.stopPropagation()" maxlength="128">
</mat-form-field>
</div>
<div class="table-head-tool">
@@ -72,16 +71,17 @@
</ng-container>
<ng-container matColumnDef="company">
<th mat-header-cell *matHeaderCellDef mat-sort-header
- [class.hide-for-mobile]="appService.getViewMode()">{{lang.contactsParameters_company}}</th>
+ [class.hide-for-mobile]="appService.getViewMode()">{{lang.contactsParameters_company}}
+ </th>
<td mat-cell *matCellDef="let element" [class.hide-for-mobile]="appService.getViewMode()">
{{element.company}} </td>
</ng-container>
<ng-container matColumnDef="formatedAddress">
- <th mat-header-cell *matHeaderCellDef
- [class.hide-for-mobile]="appService.getViewMode()">{{lang.address}}</th>
- <td mat-cell *matCellDef="let element" [class.hide-for-mobile]="appService.getViewMode()">
- {{element.formatedAddress}} </td>
- </ng-container>
+ <th mat-header-cell *matHeaderCellDef [class.hide-for-mobile]="appService.getViewMode()">
+ {{lang.address}}</th>
+ <td mat-cell *matCellDef="let element" [class.hide-for-mobile]="appService.getViewMode()">
+ {{element.formatedAddress}} </td>
+ </ng-container>
<ng-container matColumnDef="actions">
<th mat-header-cell *matHeaderCellDef>
</th>
@@ -102,10 +102,13 @@
</td>
</ng-container>
<tr mat-header-row *matHeaderRowDef="displayedColumnsContact"></tr>
- <tr mat-row *matRowDef="let row; columns: displayedColumnsContact;" routerLink="/administration/contacts/{{row.id}}" class="rowData">
+ <tr mat-row *matRowDef="let row; columns: displayedColumnsContact;"
+ routerLink="/administration/contacts/list/{{row.id}}" class="rowData">
</tr>
</table>
- <div class="mat-paginator" style="min-height:48px;min-height: 48px;display: flex;justify-content: end;align-items: center;padding-right: 20px;">{{resultsLength}} {{lang.contacts}}</div>
+ <div class="mat-paginator"
+ style="min-height:48px;min-height: 48px;display: flex;justify-content: end;align-items: center;padding-right: 20px;">
+ {{resultsLength}} {{lang.contacts}}</div>
</div>
<div class="table-head">
</div>
diff --git a/src/frontend/app/administration/contact/list/contacts-list-administration.component.ts b/src/frontend/app/administration/contact/list/contacts-list-administration.component.ts
index e832611310aac8bbe047720170cd540bcfb2cf78..9b3ae9e7727951a07850bf61d457a155b54e96e7 100644
--- a/src/frontend/app/administration/contact/list/contacts-list-administration.component.ts
+++ b/src/frontend/app/administration/contact/list/contacts-list-administration.component.ts
@@ -46,17 +46,17 @@ export class ContactsListAdministrationComponent implements OnInit {
subMenus:any [] = [
{
icon: 'fa fa-code',
- route: '/administration/contactsCustomFields',
+ route: '/administration/contacts/contactsCustomFields',
label : this.lang.customFields
},
{
icon: 'fa fa-cog',
- route: '/administration/contacts-parameters',
+ route: '/administration/contacts/contacts-parameters',
label : this.lang.contactsParameters
},
{
icon: 'fa fa-users',
- route: '/administration/contacts-groups',
+ route: '/administration/contacts/contacts-groups',
label : this.lang.contactsGroups
},
];
@@ -95,7 +95,7 @@ export class ContactsListAdministrationComponent implements OnInit {
this.isLoadingResults = false;
data = this.processPostData(data);
this.resultsLength = data.count;
- this.headerService.setHeader(this.lang.administration + ' ' + this.lang.contacts, '', '');
+ this.headerService.setHeader(this.lang.administration + ' ' + this.lang.contacts.toLowerCase(), '', '');
return data.contacts;
}),
catchError((err: any) => {
@@ -146,9 +146,9 @@ export class ContactsListAdministrationComponent implements OnInit {
tap((data: any) => {
this.refreshDao();
if (!contact.enabled === true) {
- this.notify.success(this.lang.contactActivated);
+ this.notify.success(this.lang.contactEnabled);
} else {
- this.notify.success(this.lang.contactSuspended);
+ this.notify.success(this.lang.contactDisabled);
}
}),
catchError((err: any) => {
diff --git a/src/frontend/app/administration/contact/page/contacts-page-administration.component.html b/src/frontend/app/administration/contact/page/contacts-page-administration.component.html
index 8a46de5ce777f0057b893484b93cee86398724fe..ccad6029e8b8bd98fb3c9e9f9b4dba95541a7ceb 100644
--- a/src/frontend/app/administration/contact/page/contacts-page-administration.component.html
+++ b/src/frontend/app/administration/contact/page/contacts-page-administration.component.html
@@ -27,104 +27,110 @@
</div>
</div>
<div class="container" [class.fullContainer]="appService.getViewMode()">
- <div class="container-content" *ngIf="!loading">
- <mat-menu #menu="matMenu">
- <button mat-menu-item [matMenuTriggerFor]="mainInfo"
- [disabled]="noField('mainInfo')">Dénomination</button>
- <button mat-menu-item [matMenuTriggerFor]="address" [disabled]="noField('address')">Adresse</button>
- <button mat-menu-item [matMenuTriggerFor]="complement"
- [disabled]="noField('complement')">Compément</button>
- </mat-menu>
+ <div class="container-content">
+ <div class="loading" *ngIf="loading; else elseTemplate">
+ <mat-spinner style="margin:auto;"></mat-spinner>
+ </div>
+ <ng-template #elseTemplate>
+ <mat-menu #menu="matMenu">
+ <button mat-menu-item [matMenuTriggerFor]="mainInfo"
+ [disabled]="noField('mainInfo')">{{lang.denomination}}</button>
+ <button mat-menu-item [matMenuTriggerFor]="address"
+ [disabled]="noField('address')">{{lang.address}}</button>
+ <button mat-menu-item [matMenuTriggerFor]="complement"
+ [disabled]="noField('complement')">{{lang.additionals}}</button>
+ </mat-menu>
- <mat-menu #mainInfo="matMenu">
- <button mat-menu-item (click)="toogleAllFieldsUnit('mainInfo')">Tout ajouter</button>
- <mat-divider></mat-divider>
- <ng-container *ngFor="let field of contactForm">
- <button mat-menu-item *ngIf="!field.default && field.unit === 'mainInfo'"
- (click)="field.default=!field.default">{{field.label}}</button>
- </ng-container>
- </mat-menu>
+ <mat-menu #mainInfo="matMenu">
+ <button mat-menu-item (click)="toogleAllFieldsUnit('mainInfo')" style="text-align: center;">{{lang.addAll}}</button>
+ <mat-divider></mat-divider>
+ <ng-container *ngFor="let field of contactForm">
+ <button mat-menu-item *ngIf="!field.default && field.unit === 'mainInfo'"
+ (click)="field.default=!field.default">{{field.label}}</button>
+ </ng-container>
+ </mat-menu>
- <mat-menu #address="matMenu">
- <button mat-menu-item (click)="toogleAllFieldsUnit('address')">Tout ajouter</button>
- <mat-divider></mat-divider>
- <ng-container *ngFor="let field of contactForm">
- <button mat-menu-item *ngIf="!field.default && field.unit === 'address'"
- (click)="field.default=!field.default">{{field.label}}</button>
- </ng-container>
- </mat-menu>
- <mat-menu #complement="matMenu">
- <button mat-menu-item (click)="toogleAllFieldsUnit('complement')">Tout ajouter</button>
- <mat-divider></mat-divider>
- <ng-container *ngFor="let field of contactForm">
- <button mat-menu-item *ngIf="!field.default && field.unit === 'complement'"
- (click)="field.default=!field.default">{{field.label}}</button>
- </ng-container>
- </mat-menu>
- <div [class.multipleUnits]="!isEmptyUnit('address') || !isEmptyUnit('complement')">
- <ng-container *ngFor="let unit of contactUnit">
- <div *ngIf="!isEmptyUnit(unit.id)">
- <mat-list>
- <h3 mat-subheader class="unitTitle"><span style="flex:1">{{unit.label}}</span><a
- *ngIf="unit.id === 'address'" (click)="addressBANMode=!addressBANMode"
- style="cursor: pointer;">{{addressBANMode ? lang.switchManualAddress : lang.searchAddressDb}}</a>
- </h3>
- <ng-container *ngFor="let field of contactForm;let i=index">
- <mat-list-item class="contact-item"
- *ngIf="(field.unit === unit.id && unit.id !== 'address') || (field.unit === unit.id && unit.id === 'address' && !addressBANMode)">
- <p mat-line class="contact-content" *ngIf="field.default">
- <ng-container *ngIf="field.type === 'string'">
- <mat-form-field>
- <input matInput [formControl]="field.control"
- [placeholder]="field.label" (blur)="checkCompany(field)"
- [required]="field.required">
- <mat-hint *ngIf="companyFound !== null && field.id === 'company'"
- align="end">Société <b>{{companyFound.company}}</b> trouvée !
- cliquez <a (click)="setAddress(companyFound)"
- style="cursor: pointer;">ici</a> pour copier son
- adresse</mat-hint>
- <mat-error *ngIf="field.control.hasError('required')">
- {{lang.requiredField}}</mat-error>
- </mat-form-field>
- </ng-container>
- <ng-container *ngIf="field.type === 'integer'">
- <mat-form-field>
- <input type="number" matInput [formControl]="field.control"
- [placeholder]="field.label" min="0" step="0.1"
- [required]="field.required">
- </mat-form-field>
- </ng-container>
- <ng-container *ngIf="field.type === 'select'">
- <plugin-select-search [label]="field.label"
- [formControlSelect]="field.control" [placeholderLabel]="field.label"
- [datas]="field.values" (afterSelected)="launchEvent($event, field)">
- </plugin-select-search>
- </ng-container>
- <ng-container *ngIf="field.type === 'date'">
- <mat-form-field (click)="picker.open()" style="cursor:pointer;">
- <mat-label *ngIf="appService.getViewMode()">{{field.label}}
- </mat-label>
- <input [formControl]="field.control" matInput
- [matDatepicker]="picker" [placeholder]="field.label" readonly
- style="cursor:pointer;"
- (dateChange)="launchEvent($event, field)">
- <mat-datepicker-toggle matSuffix [for]="picker"
- *ngIf="!field.control.value">
- </mat-datepicker-toggle>
- <mat-datepicker [touchUi]="appService.getViewMode()" #picker>
- </mat-datepicker>
- <button mat-button color="warn" matSuffix mat-icon-button
- *ngIf="field.control.value && !field.control.disabled"
- (click)="$event.stopPropagation();field.control.reset();"
- [title]="lang.eraseValue">
- <mat-icon color="warn" class="fa fa-calendar-times">
- </mat-icon>
- </button>
- </mat-form-field>
- </ng-container>
- <ng-container *ngIf="field.type === 'radio'">
- <mat-form-field>
- <input matInput style="display: none;">
+ <mat-menu #address="matMenu">
+ <button mat-menu-item (click)="toogleAllFieldsUnit('address')" style="text-align: center;">{{lang.addAll}}</button>
+ <mat-divider></mat-divider>
+ <ng-container *ngFor="let field of contactForm">
+ <button mat-menu-item *ngIf="!field.default && field.unit === 'address'"
+ (click)="field.default=!field.default">{{field.label}}</button>
+ </ng-container>
+ </mat-menu>
+ <mat-menu #complement="matMenu">
+ <button mat-menu-item (click)="toogleAllFieldsUnit('complement')" style="text-align: center;">{{lang.addAll}}</button>
+ <mat-divider></mat-divider>
+ <ng-container *ngFor="let field of contactForm">
+ <button mat-menu-item *ngIf="!field.default && field.unit === 'complement'"
+ (click)="field.default=!field.default">{{field.label}}</button>
+ </ng-container>
+ </mat-menu>
+ <div [class.multipleUnits]="!isEmptyUnit('address') || !isEmptyUnit('complement')">
+ <ng-container *ngFor="let unit of contactUnit">
+ <div *ngIf="!isEmptyUnit(unit.id)">
+ <mat-list>
+ <h3 mat-subheader class="unitTitle"><span style="flex:1">{{unit.label}}</span><a
+ *ngIf="unit.id === 'address'" (click)="addressBANMode=!addressBANMode"
+ style="cursor: pointer;">{{addressBANMode ? lang.switchManualAddress : lang.searchAddressDb}}</a>
+ </h3>
+ <ng-container *ngFor="let field of contactForm;let i=index">
+ <mat-list-item class="contact-item"
+ *ngIf="(field.unit === unit.id && unit.id !== 'address') || (field.unit === unit.id && unit.id === 'address' && !addressBANMode)">
+ <p mat-line class="contact-content" *ngIf="field.default">
+ <ng-container *ngIf="field.type === 'string'">
+ <mat-form-field>
+ <input matInput [formControl]="field.control"
+ [placeholder]="field.label" (blur)="checkCompany(field)"
+ [required]="field.required">
+ <mat-hint
+ *ngIf="companyFound !== null && field.id === 'company'"
+ align="end">Société <b>{{companyFound.company}}</b> trouvée
+ !
+ cliquez <a (click)="setAddress(companyFound)"
+ style="cursor: pointer;">ici</a> pour copier son
+ adresse</mat-hint>
+ <mat-error *ngIf="field.control.hasError('required')">
+ {{lang.requiredField}}</mat-error>
+ </mat-form-field>
+ </ng-container>
+ <ng-container *ngIf="field.type === 'integer'">
+ <mat-form-field>
+ <input type="number" matInput [formControl]="field.control"
+ [placeholder]="field.label" min="0" step="0.1"
+ [required]="field.required">
+ </mat-form-field>
+ </ng-container>
+ <ng-container *ngIf="field.type === 'select'">
+ <plugin-select-search [label]="field.label" [showLabel]="true"
+ [formControlSelect]="field.control"
+ [placeholderLabel]="field.label" [datas]="field.values"
+ [class]="''">
+ </plugin-select-search>
+ </ng-container>
+ <ng-container *ngIf="field.type === 'date'">
+ <mat-form-field (click)="picker.open()" style="cursor:pointer;">
+ <mat-label>{{field.label}}
+ </mat-label>
+ <input [formControl]="field.control" matInput
+ [matDatepicker]="picker" [placeholder]="field.label"
+ readonly style="cursor:pointer;"
+ (dateChange)="launchEvent($event, field)">
+ <mat-datepicker-toggle matSuffix [for]="picker"
+ *ngIf="!field.control.value">
+ </mat-datepicker-toggle>
+ <mat-datepicker [touchUi]="appService.getViewMode()" #picker>
+ </mat-datepicker>
+ <button mat-button color="warn" matSuffix mat-icon-button
+ *ngIf="field.control.value && !field.control.disabled"
+ (click)="$event.stopPropagation();field.control.reset();"
+ [title]="lang.eraseValue">
+ <mat-icon color="warn" class="fa fa-calendar-times">
+ </mat-icon>
+ </button>
+ </mat-form-field>
+ </ng-container>
+ <ng-container *ngIf="field.type === 'radio'">
<mat-radio-group class="radio-form" color="primary"
[formControl]="field.control">
<mat-radio-button *ngFor="let value of field.values"
@@ -132,102 +138,94 @@
{{value.label}}
</mat-radio-button>
</mat-radio-group>
- </mat-form-field>
- </ng-container>
- <ng-container *ngIf="field.type === 'checkbox'">
- <div class="input-form checkbox-form">
- <mat-selection-list #shoes class="div-list"
+ </ng-container>
+ <ng-container *ngIf="field.type === 'checkbox'">
+ <mat-selection-list #shoes class="checkbox-form"
[formControl]="field.control">
<mat-list-option *ngFor="let value of field.values"
- [value]="value.id" checkboxPosition="before">
+ [value]="value.id" color="primary" checkboxPosition="before">
{{value.label}}
</mat-list-option>
</mat-selection-list>
- </div>
- <mat-chip-list class="checkbox-selected-list"
- [disabled]="field.system && adminMode">
- <mat-chip *ngFor="let chip of shoes.selectedOptions.selected"
- selected>
- {{chip.value}}
- </mat-chip>
- </mat-chip-list>
- </ng-container>
- </p>
- <button *ngIf="field.default && canDelete(field)" mat-icon-button matSuffix
- color="warn" (click)="field.default = !field.default">
- <mat-icon class="fa fa-trash"></mat-icon>
- </button>
- </mat-list-item>
- <ng-container *ngIf="unit.id === 'address' && addressBANMode && i === 0">
- <mat-list-item>
- <p mat-line class="contact-content">
- <mat-form-field appearance='outline' class="smallInput">
- <button mat-button matSuffix [matMenuTriggerFor]="menuDep"
- (click)="$event.stopPropagation();initBanSearch()"
- [title]="lang.targetDepartment">
- {{addressBANCurrentDepartment}} <i
- class="fa fa-chevron-down"></i>
- </button>
- <mat-menu #menuDep="matMenu">
- <button mat-menu-item
- *ngFor="let dep of departmentList">{{dep}}</button>
- </mat-menu>
- <mat-icon color="primary" class="fa fa-search" matPrefix
- style="font-size: 15px;"></mat-icon>
- <input type="text" #autoCompleteInput
- [placeholder]="lang.searchAddressBan" matInput
- [formControl]="addressBANControl" [matAutocomplete]="auto"
- (click)="$event.stopPropagation()"
- (focus)="resetAutocompleteAddressBan()" maxlength="128">
- <mat-autocomplete #auto="matAutocomplete"
- (optionSelected)="selectAddressBan($event)">
- <ng-container
- *ngIf="addressBANResult.length > 0 && !addressBANLoading">
- <mat-option
- *ngFor="let addressBANResult of addressBANFilteredResult | async"
- [value]="addressBANResult">
- {{addressBANResult.address}}
- </mat-option>
- </ng-container>
- <mat-option class="autoCompleteInfoResult smallInputInfo"
- *ngIf="addressBANResult.length === 0 && !loading" disabled
- [innerHTML]="addressBANInfo">
- </mat-option>
- <mat-option *ngIf="addressBANLoading" disabled>
- <mat-spinner diameter="20"></mat-spinner>
- </mat-option>
- </mat-autocomplete>
- </mat-form-field>
- <mat-card style="margin:10px;" *ngIf="!emptyAddress()">
- <mat-list-item class="contact-address" (click)="goTo(contact)"
- [title]="lang.address">
- <mat-icon mat-list-icon color="primary"
- class="contact-group fas fa-map-marker-alt"></mat-icon>
- <p mat-line class="contact-content">
- {{getValue('addressNumber')}} {{getValue('addressStreet')}}
- </p>
- <p mat-line class="contact-content">
- {{getValue('addressPostcode')}} {{getValue('addressTown')}}
- </p>
- <p mat-line class="contact-content">
- {{getValue('addressCountry')}} </p>
- </mat-list-item>
- </mat-card>
+ </ng-container>
</p>
+ <button *ngIf="field.default && canDelete(field)" mat-icon-button matSuffix
+ color="warn" (click)="field.default = !field.default">
+ <mat-icon class="fa fa-trash"></mat-icon>
+ </button>
</mat-list-item>
+ <ng-container *ngIf="unit.id === 'address' && addressBANMode && i === 0">
+ <mat-list-item>
+ <p mat-line class="contact-content">
+ <mat-form-field appearance='outline' class="smallInput">
+ <button mat-button matSuffix [matMenuTriggerFor]="menuDep"
+ (click)="$event.stopPropagation();initBanSearch()"
+ [title]="lang.targetDepartment">
+ {{addressBANCurrentDepartment}} <i
+ class="fa fa-chevron-down"></i>
+ </button>
+ <mat-menu #menuDep="matMenu">
+ <button mat-menu-item *ngFor="let dep of departmentList"
+ (click)="addressBANCurrentDepartment = dep">{{dep}}</button>
+ </mat-menu>
+ <mat-icon color="primary" class="fa fa-search" matPrefix
+ style="font-size: 15px;"></mat-icon>
+ <input type="text" #autoCompleteInput
+ [placeholder]="lang.searchAddressBan" matInput
+ [formControl]="addressBANControl" [matAutocomplete]="auto"
+ (click)="$event.stopPropagation()"
+ (focus)="resetAutocompleteAddressBan()" maxlength="128">
+ <mat-autocomplete #auto="matAutocomplete"
+ (optionSelected)="selectAddressBan($event)">
+ <ng-container
+ *ngIf="addressBANResult.length > 0 && !addressBANLoading">
+ <mat-option
+ *ngFor="let addressBANResult of addressBANFilteredResult | async"
+ [value]="addressBANResult">
+ {{addressBANResult.address}}
+ </mat-option>
+ </ng-container>
+ <mat-option class="autoCompleteInfoResult smallInputInfo"
+ *ngIf="addressBANResult.length === 0 && !loading"
+ disabled [innerHTML]="addressBANInfo">
+ </mat-option>
+ <mat-option *ngIf="addressBANLoading" disabled>
+ <mat-spinner diameter="20"></mat-spinner>
+ </mat-option>
+ </mat-autocomplete>
+ </mat-form-field>
+ <mat-card style="margin:10px;" *ngIf="!emptyAddress()">
+ <mat-list-item class="contact-address" (click)="goTo(contact)"
+ [title]="lang.address">
+ <mat-icon mat-list-icon color="primary"
+ class="contact-group fas fa-map-marker-alt"></mat-icon>
+ <p mat-line class="contact-content">
+ {{getValue('addressNumber')}}
+ {{getValue('addressStreet')}}
+ </p>
+ <p mat-line class="contact-content">
+ {{getValue('addressPostcode')}}
+ {{getValue('addressTown')}}
+ </p>
+ <p mat-line class="contact-content">
+ {{getValue('addressCountry')}} </p>
+ </mat-list-item>
+ </mat-card>
+ </p>
+ </mat-list-item>
+ </ng-container>
</ng-container>
- </ng-container>
- </mat-list>
- </div>
- </ng-container>
- </div>
- <div style="text-align:center;">
- <button mat-raised-button color="default" type="button" [matMenuTriggerFor]="menu">Plus
- d'informations...</button>
+ </mat-list>
+ </div>
+ </ng-container>
+ </div>
+ <div style="text-align:center;">
+ <button mat-raised-button color="default" type="button" [matMenuTriggerFor]="menu">{{lang.moreInfos}}...</button>
- <button mat-raised-button color="primary" type="button"
- (click)="onSubmit()">{{lang.validate}}</button>
- </div>
+ <button mat-raised-button color="primary" type="button"
+ (click)="onSubmit()">{{lang.validate}}</button>
+ </div>
+ </ng-template>
</div>
</div>
</mat-sidenav-content>
diff --git a/src/frontend/app/administration/contact/page/contacts-page-administration.component.scss b/src/frontend/app/administration/contact/page/contacts-page-administration.component.scss
index f477cb8f2a72e827dc4212bcae3aa591ac756b6b..bec21155951a6c4392ebe604db9b375a623b281b 100644
--- a/src/frontend/app/administration/contact/page/contacts-page-administration.component.scss
+++ b/src/frontend/app/administration/contact/page/contacts-page-administration.component.scss
@@ -36,11 +36,34 @@
padding-right: 20px;
.mat-button {
width: 30px;
- height: 30px;
+ height: 25px;
color: $primary;
+
+ ::ng-deep.mat-button-wrapper {
+ display: flex;
+ line-height: initial;
+ align-items: center;
+ }
}
::ng-deep.mat-form-field-infix {
padding : 0px;
padding-bottom: 5px;
}
+}
+.radio-form {
+ display: flex;
+
+ .mat-radio-button {
+ flex: 1;
+ }
+}
+
+.checkbox-form {
+ overflow: auto;
+ max-height: 200px;
+}
+
+.loading {
+ display: flex;
+ height: 100%;
}
\ No newline at end of file
diff --git a/src/frontend/app/administration/contact/page/contacts-page-administration.component.ts b/src/frontend/app/administration/contact/page/contacts-page-administration.component.ts
index 564fffb693b0c0fb69720e71e55f852d6c4a2ab5..9666d2ad3669230eed082567ea5ddae4ca54ecd9 100644
--- a/src/frontend/app/administration/contact/page/contacts-page-administration.component.ts
+++ b/src/frontend/app/administration/contact/page/contacts-page-administration.component.ts
@@ -30,17 +30,17 @@ export class ContactsPageAdministrationComponent implements OnInit {
subMenus:any [] = [
{
icon: 'fa fa-code',
- route: '/administration/contactsCustomFields',
+ route: '/administration/contacts/contactsCustomFields',
label : this.lang.customFields
},
{
icon: 'fa fa-cog',
- route: '/administration/contacts-parameters',
+ route: '/administration/contacts/contacts-parameters',
label : this.lang.contactsParameters
},
{
icon: 'fa fa-users',
- route: '/administration/contacts-groups',
+ route: '/administration/contacts/contacts-groups',
label : this.lang.contactsGroups
},
];
@@ -50,15 +50,15 @@ export class ContactsPageAdministrationComponent implements OnInit {
contactUnit = [
{
id: 'mainInfo',
- label: 'Denomination'
+ label: this.lang.denomination
},
{
id: 'address',
- label: 'Adresse'
+ label: this.lang.address
},
{
id: 'complement',
- label: 'Complement'
+ label: this.lang.additionals
}
];
@@ -387,20 +387,9 @@ export class ContactsPageAdministrationComponent implements OnInit {
}
createContact() {
- let contact: any = {};
- contact['customFields'] = {};
- const regex = /customField_[.]*/g;
-
- this.contactForm.filter(field => field.default).forEach(element => {
- if (element.id.match(regex) !== null) {
- contact['customFields'][element.id.split('_')[1]] = element.control.value;
- } else {
- contact[element.id] = element.control.value;
- }
- });
- this.http.post("../../rest/contacts", contact).pipe(
+ this.http.post("../../rest/contacts", this.formatContact()).pipe(
tap(() => {
- this.router.navigate(["/administration/contacts"]);
+ this.router.navigate(["/administration/contacts/list"]);
this.notify.success(this.lang.contactAdded);
}),
//finalize(() => this.loading = false),
@@ -412,13 +401,9 @@ export class ContactsPageAdministrationComponent implements OnInit {
}
updateContact() {
- let contact: any = {};
- this.contactForm.filter(field => field.default).forEach(element => {
- contact[element.id] = element.control.value;
- });
- this.http.put(`../../rest/contacts/${this.contactId}`, contact).pipe(
+ this.http.put(`../../rest/contacts/${this.contactId}`, this.formatContact()).pipe(
tap(() => {
- this.router.navigate(["/administration/contacts"]);
+ this.router.navigate(["/administration/contacts/list"]);
this.notify.success(this.lang.contactUpdated);
}),
//finalize(() => this.loading = false),
@@ -429,6 +414,21 @@ export class ContactsPageAdministrationComponent implements OnInit {
).subscribe();
}
+ formatContact() {
+ let contact: any = {};
+ contact['customFields'] = {};
+ const regex = /customField_[.]*/g;
+
+ this.contactForm.filter(field => field.default).forEach(element => {
+ if (element.id.match(regex) !== null) {
+ contact['customFields'][element.id.split('_')[1]] = element.control.value;
+ } else {
+ contact[element.id] = element.control.value;
+ }
+ });
+ return contact;
+ }
+
isEmptyUnit(id: string) {
if (this.contactForm.filter(field => field.default && field.unit === id).length === 0) {
return true;
diff --git a/src/frontend/app/administration/contact/parameter/contacts-parameters-administration.component.html b/src/frontend/app/administration/contact/parameter/contacts-parameters-administration.component.html
index 3c3b6b40968efe7f27da8f8d6a3de1886a0db907..d1bb6d6d9354719baa83e371270051f83857960b 100644
--- a/src/frontend/app/administration/contact/parameter/contacts-parameters-administration.component.html
+++ b/src/frontend/app/administration/contact/parameter/contacts-parameters-administration.component.html
@@ -1,21 +1,34 @@
<div class="admin-container" [class.admin-is-mobile]="appService.getViewMode()">
<mat-sidenav-container autosize class="admin-sidenav-container">
- <mat-sidenav #snav [mode]="appService.getViewMode() ? 'over' : 'side'" [fixedInViewport]="appService.getViewMode()"
- fixedTopGap="56" [opened]="appService.getViewMode() ? false : true">
+ <mat-sidenav #snav [mode]="appService.getViewMode() ? 'over' : 'side'"
+ [fixedInViewport]="appService.getViewMode()" fixedTopGap="56"
+ [opened]="appService.getViewMode() ? false : true">
<menu-shortcut></menu-shortcut>
<menu-nav></menu-nav>
<mat-nav-list>
<h3 mat-subheader>{{lang.actions}}</h3>
<a mat-list-item disableRipple="true">
<mat-icon color="primary" mat-list-icon>
- <mat-slide-toggle [checked]="contactsFilling.enable" color="primary" (change)="toggleFillingContact();"></mat-slide-toggle>
+ <mat-slide-toggle [checked]="contactsFilling.enable" color="primary"
+ (change)="toggleFillingContact();"></mat-slide-toggle>
</mat-icon>
- <p mat-line (click)="toggleFillingContact();" [ngStyle]="{'opacity': contactsFilling.enable ? '' : '0.5'}">
+ <p mat-line (click)="toggleFillingContact();"
+ [ngStyle]="{'opacity': contactsFilling.enable ? '' : '0.5'}">
<span *ngIf="contactsFilling.enable">{{lang.disabledContactsFilling}}</span>
<span *ngIf="!contactsFilling.enable">{{lang.enabledContactsFilling}}</span>
</p>
</a>
</mat-nav-list>
+ <mat-divider></mat-divider>
+ <mat-nav-list>
+ <a mat-list-item *ngFor="let menu of subMenus | sortBy : 'label'" [routerLink]="menu.route">
+ <mat-icon color="primary" mat-list-icon [class]="menu.icon"></mat-icon>
+ <p mat-line>
+ {{menu.label}}
+ </p>
+ </a>
+ </mat-nav-list>
+ <mat-divider></mat-divider>
</mat-sidenav>
<mat-sidenav-content>
<div *ngIf="loading" style="display:flex;height:100%;">
@@ -28,7 +41,10 @@
<mat-card-header>
<mat-card-title>{{lang.contactsFillingStep1}}</mat-card-title>
</mat-card-header>
- <p>{{lang.fromRange}} <b [ngStyle]="{color : fillingColor.first_threshold}">0%</b> {{lang.toRange}} <b [ngStyle]="{color : fillingColor.first_threshold}">{{contactsFilling.first_threshold}}%</b> {{lang.contactsFillingStr}}</p>
+ <p>{{lang.fromRange}} <b [ngStyle]="{color : fillingColor.first_threshold}">0%</b>
+ {{lang.toRange}} <b
+ [ngStyle]="{color : fillingColor.first_threshold}">{{contactsFilling.first_threshold}}%</b>
+ {{lang.contactsFillingStr}}</p>
<mat-slider [(ngModel)]="contactsFilling.first_threshold" style="width:100%" color="primary"
max="98" min="1" step="1" thumbLabel="true" (change)="onSubmit()"></mat-slider>
<input disabled matInput type="color" name="color" value="{{fillingColor.first_threshold}}">
@@ -39,10 +55,16 @@
<mat-card-header>
<mat-card-title>{{lang.contactsFillingStep2}}</mat-card-title>
</mat-card-header>
- <p>{{lang.fromRange}} <b [ngStyle]="{color : fillingColor.second_threshold}">{{contactsFilling.first_threshold+1}}%</b> {{lang.toRange}} <b [ngStyle]="{color : fillingColor.second_threshold}">{{contactsFilling.second_threshold}}%</b> {{lang.contactsFillingStr}}</p>
- <mat-slider [(ngModel)]="contactsFilling.second_threshold" style="width:100%" color="primary"
- max="99" [min]="contactsFilling.first_threshold+1" step="1" thumbLabel="true" (change)="onSubmit()"></mat-slider>
- <input disabled matInput type="color" name="color" value="{{fillingColor.second_threshold}}">
+ <p>{{lang.fromRange}} <b
+ [ngStyle]="{color : fillingColor.second_threshold}">{{contactsFilling.first_threshold+1}}%</b>
+ {{lang.toRange}} <b
+ [ngStyle]="{color : fillingColor.second_threshold}">{{contactsFilling.second_threshold}}%</b>
+ {{lang.contactsFillingStr}}</p>
+ <mat-slider [(ngModel)]="contactsFilling.second_threshold" style="width:100%"
+ color="primary" max="99" [min]="contactsFilling.first_threshold+1" step="1"
+ thumbLabel="true" (change)="onSubmit()"></mat-slider>
+ <input disabled matInput type="color" name="color"
+ value="{{fillingColor.second_threshold}}">
</mat-card>
</div>
<div class="col-md-4 col-xs-12">
@@ -50,39 +72,68 @@
<mat-card-header>
<mat-card-title>{{lang.contactsFillingStep3}}</mat-card-title>
</mat-card-header>
- <p>{{lang.fromRange}} <b [ngStyle]="{color : fillingColor.third_threshold}">{{contactsFilling.second_threshold+1}}%</b> {{lang.toRange}} <b [ngStyle]="{color : fillingColor.third_threshold}">100%</b> {{lang.contactsFillingStr}}</p>
- <mat-slider style="width:100%" color="primary" max="100" min="100" step="1" thumbLabel="true" disabled></mat-slider>
+ <p>{{lang.fromRange}} <b
+ [ngStyle]="{color : fillingColor.third_threshold}">{{contactsFilling.second_threshold+1}}%</b>
+ {{lang.toRange}} <b [ngStyle]="{color : fillingColor.third_threshold}">100%</b>
+ {{lang.contactsFillingStr}}</p>
+ <mat-slider style="width:100%" color="primary" max="100" min="100" step="1"
+ thumbLabel="true" disabled></mat-slider>
<input disabled matInput type="color" name="color" value="{{fillingColor.third_threshold}}">
</mat-card>
</div>
</div>
<mat-table #table [dataSource]="dataSource" matSort>
- <ng-container matColumnDef="identifier">
- <mat-header-cell *matHeaderCellDef mat-sort-header>{{lang.label}}</mat-header-cell>
- <mat-cell *matCellDef="let element">
- <div *ngIf="!element.label">{{lang['contactsParameters_'+element.identifier]}}</div>
- <div *ngIf="element.label">{{element.label}}</div>
- </mat-cell>
- </ng-container>
- <ng-container matColumnDef="mandatory">
- <mat-header-cell *matHeaderCellDef mat-sort-header>{{lang.mandatory}}</mat-header-cell>
- <mat-cell *matCellDef="let element"><mat-slide-toggle style="margin-left:11px" color="primary" [disabled]="element.identifier == 'lastname' || element.identifier == 'company'" title="{{lang.mandatory}}" (change)="addCriteria($event, element, 'mandatory')" [checked]="element.mandatory"></mat-slide-toggle></mat-cell>
- </ng-container>
- <ng-container matColumnDef="filling">
- <mat-header-cell *matHeaderCellDef mat-sort-header>{{lang.contactsFillingCriteria}}</mat-header-cell>
- <mat-cell *matCellDef="let element"> <mat-slide-toggle style="margin-left:11px" color="primary" title="{{lang.contactsFillingCriteria}}" (change)="addCriteria($event, element, 'filling')" [checked]="element.filling"></mat-slide-toggle> </mat-cell>
- </ng-container>
- <ng-container matColumnDef="searchable">
- <mat-header-cell *matHeaderCellDef mat-sort-header>{{lang.autocompletionSearchable}}</mat-header-cell>
- <mat-cell *matCellDef="let element"> <mat-slide-toggle style="margin-left:11px" color="primary" [disabled]="element.identifier == 'lastname' || element.identifier == 'company' || element.identifier == 'civility'" title="{{lang.autocompletionSearchable}}" (change)="addCriteria($event, element, 'searchable')" [checked]="element.searchable"></mat-slide-toggle> </mat-cell>
- </ng-container>
- <ng-container matColumnDef="displayable">
- <mat-header-cell *matHeaderCellDef mat-sort-header>{{lang.autocompletionDisplayable}}</mat-header-cell>
- <mat-cell *matCellDef="let element"> <mat-slide-toggle style="margin-left:11px" color="primary" [disabled]="element.identifier == 'lastname' || element.identifier == 'company'" title="{{lang.autocompletionDisplayable}}" (change)="addCriteria($event, element, 'displayable')" [checked]="element.displayable"></mat-slide-toggle> </mat-cell>
- </ng-container>
- <mat-header-row *matHeaderRowDef="displayedColumns"></mat-header-row>
- <mat-row *matRowDef="let row; columns: displayedColumns;"></mat-row>
- </mat-table>
+ <ng-container matColumnDef="identifier">
+ <mat-header-cell *matHeaderCellDef mat-sort-header>{{lang.label}}</mat-header-cell>
+ <mat-cell *matCellDef="let element">
+ <div *ngIf="!element.label">{{lang['contactsParameters_'+element.identifier]}}</div>
+ <div *ngIf="element.label">{{element.label}}</div>
+ </mat-cell>
+ </ng-container>
+ <ng-container matColumnDef="mandatory">
+ <mat-header-cell *matHeaderCellDef mat-sort-header>{{lang.mandatory}}</mat-header-cell>
+ <mat-cell *matCellDef="let element">
+ <mat-slide-toggle style="margin-left:11px" color="primary"
+ [disabled]="element.identifier == 'lastname' || element.identifier == 'company'"
+ title="{{lang.mandatory}}" (change)="addCriteria($event, element, 'mandatory')"
+ [checked]="element.mandatory"></mat-slide-toggle>
+ </mat-cell>
+ </ng-container>
+ <ng-container matColumnDef="filling">
+ <mat-header-cell *matHeaderCellDef mat-sort-header>{{lang.contactsFillingCriteria}}
+ </mat-header-cell>
+ <mat-cell *matCellDef="let element">
+ <mat-slide-toggle style="margin-left:11px" color="primary"
+ title="{{lang.contactsFillingCriteria}}"
+ (change)="addCriteria($event, element, 'filling')" [checked]="element.filling">
+ </mat-slide-toggle>
+ </mat-cell>
+ </ng-container>
+ <ng-container matColumnDef="searchable">
+ <mat-header-cell *matHeaderCellDef mat-sort-header>{{lang.autocompletionSearchable}}
+ </mat-header-cell>
+ <mat-cell *matCellDef="let element">
+ <mat-slide-toggle style="margin-left:11px" color="primary"
+ [disabled]="element.identifier == 'lastname' || element.identifier == 'company' || element.identifier == 'civility'"
+ title="{{lang.autocompletionSearchable}}"
+ (change)="addCriteria($event, element, 'searchable')" [checked]="element.searchable">
+ </mat-slide-toggle>
+ </mat-cell>
+ </ng-container>
+ <ng-container matColumnDef="displayable">
+ <mat-header-cell *matHeaderCellDef mat-sort-header>{{lang.autocompletionDisplayable}}
+ </mat-header-cell>
+ <mat-cell *matCellDef="let element">
+ <mat-slide-toggle style="margin-left:11px" color="primary"
+ [disabled]="element.identifier == 'lastname' || element.identifier == 'company'"
+ title="{{lang.autocompletionDisplayable}}"
+ (change)="addCriteria($event, element, 'displayable')" [checked]="element.displayable">
+ </mat-slide-toggle>
+ </mat-cell>
+ </ng-container>
+ <mat-header-row *matHeaderRowDef="displayedColumns"></mat-header-row>
+ <mat-row *matRowDef="let row; columns: displayedColumns;"></mat-row>
+ </mat-table>
</mat-card>
</mat-sidenav-content>
</mat-sidenav-container>
diff --git a/src/frontend/app/administration/contact/parameter/contacts-parameters-administration.component.ts b/src/frontend/app/administration/contact/parameter/contacts-parameters-administration.component.ts
index b3a725eee7da90af7161fb00937d24aa617d672f..27a1001c6d41ba0f3b85994b507b718c1425f940 100644
--- a/src/frontend/app/administration/contact/parameter/contacts-parameters-administration.component.ts
+++ b/src/frontend/app/administration/contact/parameter/contacts-parameters-administration.component.ts
@@ -20,6 +20,24 @@ export class ContactsParametersAdministrationComponent implements OnInit {
lang: any = LANG;
+ subMenus:any [] = [
+ {
+ icon: 'fa fa-book',
+ route: '/administration/contacts/list',
+ label : this.lang.contactsList
+ },
+ {
+ icon: 'fa fa-users',
+ route: '/administration/contacts/contacts-groups',
+ label : this.lang.contactsGroups
+ },
+ {
+ icon: 'fa fa-code',
+ route: '/administration/contacts/contactsCustomFields',
+ label : this.lang.customFields
+ },
+ ];
+
contactsFilling: any = {
'enable': false,
'first_threshold': '33',
diff --git a/src/frontend/css/engine_2.scss b/src/frontend/css/engine_2.scss
index a562c134e8172f4f2044285aecdd281e61f84a51..41eb5ec3553d47ca5a356f85409e6e9944a0a475 100644
--- a/src/frontend/css/engine_2.scss
+++ b/src/frontend/css/engine_2.scss
@@ -148,4 +148,9 @@ html,body {
.badgePipe_warn{
color: red;
font-size: 8px;
+}
+
+.mat-menu-content:not(:empty) {
+ padding-top: 0 !important;
+ padding-bottom: 0 !important;
}
\ No newline at end of file
diff --git a/src/frontend/lang/lang-en.ts b/src/frontend/lang/lang-en.ts
index b16b4f57c48d2186f0b1e026d0a5e20166691086..cc170ce1b2a1ec185d739647c298640be1fa13b5 100755
--- a/src/frontend/lang/lang-en.ts
+++ b/src/frontend/lang/lang-en.ts
@@ -1346,4 +1346,10 @@ export const LANG_EN = {
"targetDepartment": "Target department",
"contactCreation": "Contact creation",
"contactModification": "Contact modification",
+ "contactEnabled": "Contact enabled",
+ "contactDisabled": "Contact disabled",
+ "addAll": "Add all",
+ "additionals": "Additional(s)",
+ "denomination": "Denomination",
+ "moreInfos" : "More data",
};
diff --git a/src/frontend/lang/lang-fr.ts b/src/frontend/lang/lang-fr.ts
index 9e1d69ae80417a71a360ead5b0f2cbcc11f116fe..902eae8a0b1aabbc186a52a2bb28770ce847a20d 100755
--- a/src/frontend/lang/lang-fr.ts
+++ b/src/frontend/lang/lang-fr.ts
@@ -1379,9 +1379,16 @@ export const LANG_FR = {
"listConfiguration": "Paramétrer l'affichage de la liste",
"noticeGroupeOrder": "Glisser-déposer les groupes pour définir l'ordre",
"searchAddressBan": "Recherche une adresse BAN",
- "searchAddressDb": "Rechercher dans la base d'addresse",
+ "searchAddressDb": "Rechercher dans la base d'adresse",
"switchManualAddress": "Basculer en adresse manuelle",
"targetDepartment": "Département cible",
"contactCreation": "Création d'un contact",
"contactModification": "Modification d'un contact",
+ "contactEnabled": "Contact activé",
+ "contactDisabled": "Contact désactivé",
+ "contactUpdated": "Contact mise à jour",
+ "addAll": "Tout ajouter",
+ "additionals": "Complément(s)",
+ "denomination": "Dénomination",
+ "moreInfos" : "Plus d'informations",
};
diff --git a/src/frontend/lang/lang-nl.ts b/src/frontend/lang/lang-nl.ts
index 77c2129a23e82ccf5b57dc3abbea3775b1b0443d..f75c3aeb16eabe47a09c394815a452d72f8f0277 100755
--- a/src/frontend/lang/lang-nl.ts
+++ b/src/frontend/lang/lang-nl.ts
@@ -1371,4 +1371,10 @@ export const LANG_NL = {
"targetDepartment": "Target department", //_TO_TRANSLATE
"contactCreation": "Contact creation", //_TO_TRANSLATE
"contactModification": "Contact modification", //_TO_TRANSLATE
+ "contactEnabled": "Contact enabled", //_TO_TRANSLATE
+ "contactDisabled": "Contact disabled", //_TO_TRANSLATE
+ "addAll": "Add all", //_TO_TRANSLATE
+ "additionals": "Additional(s)", //_TO_TRANSLATE
+ "denomination": "Denomination", //_TO_TRANSLATE
+ "moreInfos" : "More data", //_TO_TRANSLATE
};
diff --git a/src/frontend/plugins/select-search/select-search.component.html b/src/frontend/plugins/select-search/select-search.component.html
index fd2006abfacd5d8b60aef42579eb50e9673722a8..5ea2f07bf0a96e7d6a657867daa28d1d20aa1629 100644
--- a/src/frontend/plugins/select-search/select-search.component.html
+++ b/src/frontend/plugins/select-search/select-search.component.html
@@ -1,5 +1,5 @@
-<mat-form-field [class]="class + ' search-select'" [floatLabel]="appService.getViewMode() ? '' : 'never'">
- <mat-label *ngIf="appService.getViewMode()">{{label}}</mat-label>
+<mat-form-field [class]="class + ' search-select'" [floatLabel]="appService.getViewMode() || showLabel ? '' : 'never'">
+ <mat-label *ngIf="appService.getViewMode() || showLabel">{{label}}</mat-label>
<mat-select [formControl]="formControlSelect" [placeholder]="placeholderLabel" #test (selectionChange)="launchEvent($event)">
<input *ngIf="datas.length > 5" matInput class="mat-select-search-input mat-select-search-hidden" />
diff --git a/src/frontend/plugins/select-search/select-search.component.ts b/src/frontend/plugins/select-search/select-search.component.ts
index ab0faf03a9743d357f5f123f8a8d2c32dd8aeb76..f80dbf97413b6aff8f93607301a142101570ec01 100644
--- a/src/frontend/plugins/select-search/select-search.component.ts
+++ b/src/frontend/plugins/select-search/select-search.component.ts
@@ -31,6 +31,8 @@ export class PluginSelectSearchComponent implements OnInit, OnDestroy, AfterView
@Input('showResetOption') showResetOption: boolean;
+ @Input('showLabel') showLabel: boolean = false;
+
@Input('class') class: string = "input-form";
/**