Verified Commit 159c8cd4 authored by Alex ORLUC's avatar Alex ORLUC

FEAT #10815 TIME 1 migrate to angular 8

parent 7a02c17b
......@@ -32,24 +32,24 @@
"tooltipster": "^4.2.6",
"uglify-es": "3.2.2",
"uglifyjs-webpack-plugin": "2.1.1",
"zone.js": "^0.8.29"
"zone.js": "^0.9.1"
},
"devDependencies": {
"@angular-devkit/build-angular": "^0.12.4",
"@angular/animations": "^7.2.14",
"@angular/cdk": "^7.3.7",
"@angular/cli": "^7.3.8",
"@angular/common": "^7.2.14",
"@angular/compiler": "^7.2.14",
"@angular/compiler-cli": "^7.2.14",
"@angular/core": "^7.2.14",
"@angular/forms": "^7.2.14",
"@angular-devkit/build-angular": "^0.802.2",
"@angular/animations": "^9.0.0-next.2",
"@angular/cdk": "^8.1.3",
"@angular/cli": "^8.2.2",
"@angular/common": "^9.0.0-next.2",
"@angular/compiler": "^9.0.0-next.2",
"@angular/compiler-cli": "^9.0.0-next.2",
"@angular/core": "^9.0.0-next.2",
"@angular/forms": "^9.0.0-next.2",
"@angular/http": "^7.2.14",
"@angular/material": "^7.3.7",
"@angular/platform-browser": "^7.2.14",
"@angular/platform-browser-dynamic": "^7.2.14",
"@angular/platform-server": "^7.2.14",
"@angular/router": "^7.2.14",
"@angular/material": "^8.1.3",
"@angular/platform-browser": "^9.0.0-next.2",
"@angular/platform-browser-dynamic": "^9.0.0-next.2",
"@angular/platform-server": "^9.0.0-next.2",
"@angular/router": "^9.0.0-next.2",
"@types/datatables.net": "^1.10.17",
"@types/jquery": "^2.0.53",
"@types/node": "^7.10.6",
......@@ -62,7 +62,7 @@
"npm-check-updates": "^3.1.12",
"rxjs": "^6.5.1",
"tslib": "^1.9.3",
"typescript": "3.2.4",
"typescript": "3.5.3",
"url-loader": "^1.1.2",
"webpack": "^4.38.0"
},
......
......@@ -2,7 +2,7 @@ import { Component, OnInit, ViewChild } from '@angular/core';
import { LANG } from './translate.component';
import { NotificationService } from './notification.service';
import { HeaderService } from '../service/header.service';
import { MatSidenav } from '@angular/material';
import { MatSidenav } from '@angular/material/sidenav';
import { AppService } from '../service/app.service';
declare function $j(selector: any): any;
......@@ -16,8 +16,8 @@ declare var angularGlobals: any;
})
export class AboutUsComponent implements OnInit {
@ViewChild('snav') public sidenavLeft : MatSidenav;
@ViewChild('snav2') public sidenavRight : MatSidenav;
@ViewChild('snav', { static: false }) public sidenavLeft : MatSidenav;
@ViewChild('snav2', { static: false }) public sidenavRight : MatSidenav;
applicationVersion : string;
lang: any = LANG;
......
......@@ -2,7 +2,8 @@ import { Component, OnInit, Input, ViewChild, Output, EventEmitter } from '@angu
import { HttpClient } from '@angular/common/http';
import { LANG } from '../translate.component';
import { NotificationService } from '../notification.service';
import { MatDialog, MatMenuTrigger } from '@angular/material';
import { MatDialog } from '@angular/material/dialog';
import { MatMenuTrigger } from '@angular/material/menu';
import { ConfirmActionComponent } from './confirm-action/confirm-action.component';
import { EnabledBasketPersistenceActionComponent } from './enabled-basket-persistence-action/enabled-basket-persistence-action.component';
......@@ -32,7 +33,7 @@ export class ActionsListComponent implements OnInit {
lang: any = LANG;
loading: boolean = false;
@ViewChild(MatMenuTrigger) contextMenu: MatMenuTrigger;
@ViewChild(MatMenuTrigger, { static: false }) contextMenu: MatMenuTrigger;
@Output() triggerEvent = new EventEmitter<string>();
contextMenuPosition = { x: '0px', y: '0px' };
......
import { Component, OnInit, Inject, ViewChild } from '@angular/core';
import { LANG } from '../../translate.component';
import { NotificationService } from '../../notification.service';
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material';
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
import { HttpClient } from '@angular/common/http';
import { NoteEditorComponent } from '../../notes/note-editor.component';
......@@ -15,7 +15,7 @@ export class CloseAndIndexActionComponent implements OnInit {
lang: any = LANG;
loading: boolean = false;
@ViewChild('noteEditor') noteEditor: NoteEditorComponent;
@ViewChild('noteEditor', { static: false }) noteEditor: NoteEditorComponent;
constructor(public http: HttpClient, private notify: NotificationService, public dialogRef: MatDialogRef<CloseAndIndexActionComponent>, @Inject(MAT_DIALOG_DATA) public data: any) { }
......
import { Component, OnInit, Inject, ViewChild } from '@angular/core';
import { LANG } from '../../translate.component';
import { NotificationService } from '../../notification.service';
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material';
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
import { HttpClient } from '@angular/common/http';
import { NoteEditorComponent } from '../../notes/note-editor.component';
......@@ -15,7 +15,7 @@ export class CloseMailActionComponent implements OnInit {
lang: any = LANG;
loading: boolean = false;
@ViewChild('noteEditor') noteEditor: NoteEditorComponent;
@ViewChild('noteEditor', { static: false }) noteEditor: NoteEditorComponent;
constructor(public http: HttpClient, private notify: NotificationService, public dialogRef: MatDialogRef<CloseMailActionComponent>, @Inject(MAT_DIALOG_DATA) public data: any) { }
......
import { Component, OnInit, Inject, ViewChild } from '@angular/core';
import { LANG } from '../../translate.component';
import { NotificationService } from '../../notification.service';
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material';
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
import { HttpClient } from '@angular/common/http';
import { NoteEditorComponent } from '../../notes/note-editor.component';
......@@ -15,7 +15,7 @@ export class ConfirmActionComponent implements OnInit {
lang: any = LANG;
loading: boolean = false;
@ViewChild('noteEditor') noteEditor: NoteEditorComponent;
@ViewChild('noteEditor', { static: false }) noteEditor: NoteEditorComponent;
constructor(public http: HttpClient, private notify: NotificationService, public dialogRef: MatDialogRef<ConfirmActionComponent>, @Inject(MAT_DIALOG_DATA) public data: any) { }
......
import { Component, OnInit, Inject, ViewChild } from '@angular/core';
import { LANG } from '../../translate.component';
import { NotificationService } from '../../notification.service';
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material';
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
import { HttpClient } from '@angular/common/http';
import { NoteEditorComponent } from '../../notes/note-editor.component';
......@@ -24,7 +24,7 @@ export class CreateAcknowledgementReceiptActionComponent implements OnInit {
sendList : []
};
@ViewChild('noteEditor') noteEditor: NoteEditorComponent;
@ViewChild('noteEditor', { static: false }) noteEditor: NoteEditorComponent;
loadingExport: boolean;
constructor(public http: HttpClient, private notify: NotificationService, public dialogRef: MatDialogRef<CreateAcknowledgementReceiptActionComponent>, @Inject(MAT_DIALOG_DATA) public data: any) { }
......
import { Component, OnInit, Inject, ViewChild } from '@angular/core';
import { LANG } from '../../translate.component';
import { NotificationService } from '../../notification.service';
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material';
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
import { HttpClient } from '@angular/common/http';
import { NoteEditorComponent } from '../../notes/note-editor.component';
......@@ -15,7 +15,7 @@ export class DisabledBasketPersistenceActionComponent implements OnInit {
lang: any = LANG;
loading: boolean = false;
@ViewChild('noteEditor') noteEditor: NoteEditorComponent;
@ViewChild('noteEditor', { static: false }) noteEditor: NoteEditorComponent;
constructor(public http: HttpClient, private notify: NotificationService, public dialogRef: MatDialogRef<DisabledBasketPersistenceActionComponent>, @Inject(MAT_DIALOG_DATA) public data: any) { }
......
import { Component, OnInit, Inject, ViewChild } from '@angular/core';
import { LANG } from '../../translate.component';
import { NotificationService } from '../../notification.service';
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material';
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
import { HttpClient } from '@angular/common/http';
import { NoteEditorComponent } from '../../notes/note-editor.component';
......@@ -15,7 +15,7 @@ export class EnabledBasketPersistenceActionComponent implements OnInit {
lang: any = LANG;
loading: boolean = false;
@ViewChild('noteEditor') noteEditor: NoteEditorComponent;
@ViewChild('noteEditor', { static: false }) noteEditor: NoteEditorComponent;
constructor(public http: HttpClient, private notify: NotificationService, public dialogRef: MatDialogRef<EnabledBasketPersistenceActionComponent>, @Inject(MAT_DIALOG_DATA) public data: any) { }
......
import { Component, OnInit, Inject } from '@angular/core';
import { LANG } from '../../translate.component';
import { NotificationService } from '../../notification.service';
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material';
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
import { HttpClient } from '@angular/common/http';
@Component({
......
import { Component, OnInit, Inject, ViewChild } from '@angular/core';
import { LANG } from '../../translate.component';
import { NotificationService } from '../../notification.service';
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material';
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
import { HttpClient } from '@angular/common/http';
import { DiffusionsListComponent } from '../../diffusions/diffusions-list.component';
import { FormControl } from '@angular/forms';
......@@ -43,8 +43,8 @@ export class RedirectActionComponent implements OnInit {
filteredUserRedirect: Observable<any[]>;
isDestinationChanging: boolean = false;
@ViewChild('appDiffusionsList') appDiffusionsList: DiffusionsListComponent;
@ViewChild('noteEditor') noteEditor: NoteEditorComponent;
@ViewChild('appDiffusionsList', { static: false }) appDiffusionsList: DiffusionsListComponent;
@ViewChild('noteEditor', { static: false }) noteEditor: NoteEditorComponent;
constructor(public http: HttpClient, private notify: NotificationService, public dialogRef: MatDialogRef<RedirectActionComponent>, @Inject(MAT_DIALOG_DATA) public data: any) { }
......
import { Component, OnInit, Inject, ViewChild } from '@angular/core';
import { LANG } from '../../translate.component';
import { NotificationService } from '../../notification.service';
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material';
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
import { HttpClient } from '@angular/common/http';
import { NoteEditorComponent } from '../../notes/note-editor.component';
......@@ -15,7 +15,7 @@ export class ResMarkAsReadActionComponent implements OnInit {
lang: any = LANG;
loading: boolean = false;
@ViewChild('noteEditor') noteEditor: NoteEditorComponent;
@ViewChild('noteEditor', { static: false }) noteEditor: NoteEditorComponent;
constructor(public http: HttpClient, private notify: NotificationService, public dialogRef: MatDialogRef<ResMarkAsReadActionComponent>, @Inject(MAT_DIALOG_DATA) public data: any) { }
......
import { Component, OnInit, Inject, ViewChild } from '@angular/core';
import { LANG } from '../../translate.component';
import { NotificationService } from '../../notification.service';
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material';
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
import { HttpClient } from '@angular/common/http';
import { NoteEditorComponent } from '../../notes/note-editor.component';
......@@ -25,7 +25,7 @@ export class SendExternalNoteBookActionComponent implements OnInit {
};
errors: any;
@ViewChild('noteEditor') noteEditor: NoteEditorComponent;
@ViewChild('noteEditor', { static: false }) noteEditor: NoteEditorComponent;
constructor(public http: HttpClient, private notify: NotificationService, public dialogRef: MatDialogRef<SendExternalNoteBookActionComponent>, @Inject(MAT_DIALOG_DATA) public data: any) { }
......
......@@ -25,7 +25,7 @@ export class MaarchParaphComponent implements OnInit {
editable: true
};
@ViewChild('appVisaWorkflow') appVisaWorkflow: VisaWorkflowComponent;
@ViewChild('appVisaWorkflow', { static: false }) appVisaWorkflow: VisaWorkflowComponent;
@Input('additionalsInfos') additionalsInfos: any;
@Input('externalSignatoryBookDatas') externalSignatoryBookDatas: any;
......
import { Component, OnInit, Inject, ViewChild } from '@angular/core';
import { LANG } from '../../translate.component';
import { NotificationService } from '../../notification.service';
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material';
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
import { HttpClient } from '@angular/common/http';
import { NoteEditorComponent } from '../../notes/note-editor.component';
import { XParaphComponent } from './x-paraph/x-paraph.component';
......@@ -30,10 +30,10 @@ export class SendExternalSignatoryBookActionComponent implements OnInit {
};
errors: any;
@ViewChild('noteEditor') noteEditor: NoteEditorComponent;
@ViewChild('noteEditor', { static: false }) noteEditor: NoteEditorComponent;
@ViewChild('xParaph') xParaph: XParaphComponent;
@ViewChild('maarchParapheur') maarchParapheur: MaarchParaphComponent;
@ViewChild('xParaph', { static: false }) xParaph: XParaphComponent;
@ViewChild('maarchParapheur', { static: false }) maarchParapheur: MaarchParaphComponent;
constructor(public http: HttpClient, private notify: NotificationService, public dialogRef: MatDialogRef<SendExternalSignatoryBookActionComponent>, @Inject(MAT_DIALOG_DATA) public data: any) { }
......
import { Component, OnInit, Inject, ViewChild } from '@angular/core';
import { LANG } from '../../translate.component';
import { NotificationService } from '../../notification.service';
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material';
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
import { HttpClient } from '@angular/common/http';
import { NoteEditorComponent } from '../../notes/note-editor.component';
......@@ -36,7 +36,7 @@ export class SendShippingActionComponent implements OnInit {
mailsNotSend: any[] = []
@ViewChild('noteEditor') noteEditor: NoteEditorComponent;
@ViewChild('noteEditor', { static: false }) noteEditor: NoteEditorComponent;
constructor(public http: HttpClient, private notify: NotificationService, public dialogRef: MatDialogRef<SendShippingActionComponent>, @Inject(MAT_DIALOG_DATA) public data: any) { }
......
import { Component, OnInit, Inject, ViewChild } from '@angular/core';
import { LANG } from '../../translate.component';
import { NotificationService } from '../../notification.service';
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material';
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
import { HttpClient } from '@angular/common/http';
import { NoteEditorComponent } from '../../notes/note-editor.component';
......@@ -15,7 +15,7 @@ export class UpdateAcknowledgementSendDateActionComponent implements OnInit {
lang: any = LANG;
loading: boolean = false;
@ViewChild('noteEditor') noteEditor: NoteEditorComponent;
@ViewChild('noteEditor', { static: false }) noteEditor: NoteEditorComponent;
acknowledgementSendDate : Date = new Date();
acknowledgementSendDateEnd : Date = new Date();
......
import { Component, OnInit, Inject } from '@angular/core';
import { LANG } from '../../translate.component';
import { NotificationService } from '../../notification.service';
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material';
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
import { HttpClient } from '@angular/common/http';
@Component({
......
import { Component, OnInit, Inject } from '@angular/core';
import { LANG } from '../../translate.component';
import { NotificationService } from '../../notification.service';
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material';
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
import { DomSanitizer, SafeHtml } from '@angular/platform-browser';
@Component({
......
......@@ -3,7 +3,7 @@ import { HttpClient } from '@angular/common/http';
import { Router, ActivatedRoute } from '@angular/router';
import { LANG } from '../../translate.component';
import { NotificationService } from '../../notification.service';
import { MatSidenav } from '@angular/material';
import { MatSidenav } from '@angular/material/sidenav';
import { HeaderService } from '../../../service/header.service';
import { AppService } from '../../../service/app.service';
......@@ -16,8 +16,8 @@ declare function $j(selector: any): any;
export class ActionAdministrationComponent implements OnInit {
/*HEADER*/
@ViewChild('snav') public sidenavLeft : MatSidenav;
@ViewChild('snav2') public sidenavRight : MatSidenav;
@ViewChild('snav', { static: false }) public sidenavLeft : MatSidenav;
@ViewChild('snav2', { static: false }) public sidenavRight : MatSidenav;
lang: any = LANG;
creationMode: boolean;
......
......@@ -2,7 +2,10 @@ import { Component, ViewChild, OnInit } from '@angular/core';
import { HttpClient } from '@angular/common/http';
import { LANG } from '../../translate.component';
import { NotificationService } from '../../notification.service';
import { MatPaginator, MatTableDataSource, MatSort, MatSidenav} from '@angular/material';
import { MatPaginator } from '@angular/material/paginator';
import { MatSidenav } from '@angular/material/sidenav';
import { MatSort } from '@angular/material/sort';
import { MatTableDataSource } from '@angular/material/table';
import { HeaderService } from '../../../service/header.service';
import { AppService } from '../../../service/app.service';
......@@ -15,8 +18,8 @@ declare function $j(selector: any): any;
export class ActionsAdministrationComponent implements OnInit {
@ViewChild('snav') public sidenavLeft : MatSidenav;
@ViewChild('snav2') public sidenavRight : MatSidenav;
@ViewChild('snav', { static: false }) public sidenavLeft : MatSidenav;
@ViewChild('snav2', { static: false }) public sidenavRight : MatSidenav;
lang: any = LANG;
search: string = null;
......@@ -28,8 +31,8 @@ export class ActionsAdministrationComponent implements OnInit {
displayedColumns = ['id', 'label_action', 'history', 'actions'];
dataSource = new MatTableDataSource(this.actions);
@ViewChild(MatPaginator) paginator: MatPaginator;
@ViewChild(MatSort) sort: MatSort;
@ViewChild(MatPaginator, { static: false }) paginator: MatPaginator;
@ViewChild(MatSort, { static: false }) sort: MatSort;
applyFilter(filterValue: string) {
filterValue = filterValue.trim(); // Remove whitespace
filterValue = filterValue.toLowerCase(); // MatTableDataSource defaults to lowercase matches
......
import { Component, OnInit, Inject, ViewChild, ElementRef } from '@angular/core';
import { HttpClient } from '@angular/common/http';
import { Router, ActivatedRoute } from '@angular/router';
import { MatPaginator, MatTableDataSource, MatSort, MatDialog, MatDialogRef, MAT_DIALOG_DATA, MatSidenav } from '@angular/material';
import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
import { MatPaginator } from '@angular/material/paginator';
import { MatSidenav } from '@angular/material/sidenav';
import { MatSort } from '@angular/material/sort';
import { MatTableDataSource } from '@angular/material/table';
import { LANG } from '../../translate.component';
import { NotificationService } from '../../notification.service';
import { HeaderService } from '../../../service/header.service';
......@@ -17,8 +21,8 @@ declare function $j(selector: any): any;
})
export class BasketAdministrationComponent implements OnInit {
@ViewChild('snav') public sidenavLeft: MatSidenav;
@ViewChild('snav2') public sidenavRight: MatSidenav;
@ViewChild('snav', { static: false }) public sidenavLeft: MatSidenav;
@ViewChild('snav2', { static: false }) public sidenavRight: MatSidenav;
dialogRef: MatDialogRef<any>;
......@@ -48,8 +52,8 @@ export class BasketAdministrationComponent implements OnInit {
dataSource: any;
@ViewChild(MatPaginator) paginator: MatPaginator;
@ViewChild(MatSort) sort: MatSort;
@ViewChild(MatPaginator, { static: false }) paginator: MatPaginator;
@ViewChild(MatSort, { static: false }) sort: MatSort;
applyFilter(filterValue: string) {
filterValue = filterValue.trim();
filterValue = filterValue.toLowerCase();
......@@ -346,7 +350,7 @@ export class BasketAdministrationSettingsModalComponent {
constructor(public http: HttpClient, @Inject(MAT_DIALOG_DATA) public data: any, public dialogRef: MatDialogRef<BasketAdministrationSettingsModalComponent>) {
}
@ViewChild('statusInput') statusInput: ElementRef;
@ViewChild('statusInput', { static: false }) statusInput: ElementRef;
ngOnInit(): void {
this.http.get("../../rest/entities")
......
import { Component, OnInit, ViewChild } from '@angular/core';
import { HttpClient } from '@angular/common/http';
import { LANG } from '../../translate.component';
import { MatSidenav, MatPaginator, MatTableDataSource, MatSort } from '@angular/material';
import { MatPaginator } from '@angular/material/paginator';
import { MatSidenav } from '@angular/material/sidenav';
import { MatSort } from '@angular/material/sort';
import { MatTableDataSource } from '@angular/material/table';
import { NotificationService } from '../../notification.service';
import { HeaderService } from '../../../service/header.service';
import { AppService } from '../../../service/app.service';
......@@ -14,8 +17,8 @@ declare function $j(selector: any): any;
})
export class BasketsAdministrationComponent implements OnInit {
@ViewChild('snav') public sidenavLeft : MatSidenav;
@ViewChild('snav2') public sidenavRight : MatSidenav;
@ViewChild('snav', { static: false }) public sidenavLeft : MatSidenav;
@ViewChild('snav2', { static: false }) public sidenavRight : MatSidenav;
lang : any = LANG;
loading : boolean = false;
......@@ -26,8 +29,8 @@ export class BasketsAdministrationComponent implements OnInit {
displayedColumns = ['basket_id', 'basket_name', 'basket_desc', 'actions'];
dataSource : any;
@ViewChild(MatPaginator) paginator: MatPaginator;
@ViewChild(MatSort) sort: MatSort;
@ViewChild(MatPaginator, { static: false }) paginator: MatPaginator;
@ViewChild(MatSort, { static: false }) sort: MatSort;
applyFilter(filterValue: string) {
filterValue = filterValue.trim(); // Remove whitespace
filterValue = filterValue.toLowerCase(); // MatTableDataSource defaults to lowercase matches
......
......@@ -160,16 +160,16 @@
height: 35px;
}
/deep/ .mat-form-field-appearance-outline.mat-form-field-disabled .mat-form-field-outline {
::ng-deep .mat-form-field-appearance-outline.mat-form-field-disabled .mat-form-field-outline {
background: inherit;
}
/deep/ .mat-form-field-outline {
::ng-deep .mat-form-field-outline {
background: white;
}
}
/deep/ .mat-option-text {
::ng-deep .mat-option-text {
display: flex !important;
.dataIcon {
......
......@@ -3,7 +3,7 @@ import { HttpClient } from '@angular/common/http';
import { LANG } from '../../translate.component';
import { NotificationService } from '../../notification.service';
import { HeaderService } from '../../../service/header.service';
import { MatSidenav } from '@angular/material';
import { MatSidenav } from '@angular/material/sidenav';
import { AppService } from '../../../service/app.service';
declare function $j(selector: any): any;
......@@ -14,8 +14,8 @@ declare function $j(selector: any): any;
})
export class ContactsFillingAdministrationComponent implements OnInit {
@ViewChild('snav') public sidenavLeft: MatSidenav;
@ViewChild('snav2') public sidenavRight: MatSidenav;
@ViewChild('snav', { static: false }) public sidenavLeft: MatSidenav;
@ViewChild('snav2', { static: false }) public sidenavRight: MatSidenav;
lang: any = LANG;
......
......@@ -6,7 +6,10 @@ import { NotificationService } from '../../notification.service';
import { HeaderService } from '../../../service/header.service';
import { FormControl } from '@angular/forms';
import { debounceTime, switchMap, distinctUntilChanged, filter } from 'rxjs/operators';
import { MatPaginator, MatSort, MatTableDataSource, MatSidenav } from '@angular/material';
import { MatPaginator } from '@angular/material/paginator';
import { MatSidenav } from '@angular/material/sidenav';
import { MatSort } from '@angular/material/sort';
import { MatTableDataSource } from '@angular/material/table';
import { SelectionModel } from '@angular/cdk/collections';
import { AppService } from '../../../service/app.service';
......@@ -18,8 +21,8 @@ declare function $j(selector: any): any;
})
export class ContactsGroupAdministrationComponent implements OnInit {
@ViewChild('snav') public sidenavLeft : MatSidenav;
@ViewChild('snav2') public sidenavRight : MatSidenav;
@ViewChild('snav', { static: false }) public sidenavLeft : MatSidenav;
@ViewChild('snav2', { static: false }) public sidenavRight : MatSidenav;
lang: any = LANG;
......@@ -55,11 +58,11 @@ export class ContactsGroupAdministrationComponent implements OnInit {
}
}
@ViewChild('paginatorContactList') paginator: MatPaginator;
//@ViewChild('tableContactList') sortContactList: MatSort;
@ViewChild('paginatorContactList', { static: false }) paginator: MatPaginator;
//@ViewChild('tableContactList', { static: false }) sortContactList: MatSort;
@ViewChild('paginatorAdded') paginatorAdded: MatPaginator;
@ViewChild('tableAdded') sortAdded: MatSort;
@ViewChild('paginatorAdded', { static: false }) paginatorAdded: MatPaginator;
@ViewChild('tableAdded', { static: false }) sortAdded: MatSort;
applyFilter(filterValue: string) {
filterValue = filterValue.trim();
filterValue = filterValue.toLowerCase();
......
......@@ -3,7 +3,10 @@ import { HttpClient } from '@angular/common/http';
import { LANG } from '../../translate.component';
import { NotificationService } from '../../notification.service';
import { HeaderService } from '../../../service/header.service';
import { MatPaginator, MatTableDataSource, MatSort, MatSidenav } from '@angular/material';
import { MatPaginator } from '@angular/material/paginator';
import { MatSidenav } from '@angular/material/sidenav';
import { MatSort } from '@angular/material/sort';
import { MatTableDataSource } from '@angular/material/table';
import { AppService } from '../../../service/app.service';
declare function $j(selector: any): any;
......@@ -15,8 +18,8 @@ declare function $j(selector: any): any;
export class ContactsGroupsAdministrationComponent implements OnInit {
@ViewChild('snav') public sidenavLeft : MatSidenav;
@ViewChild('snav2') public sidenavRight : MatSidenav;
@ViewChild('snav', { static: false }) public sidenavLeft : MatSidenav;
@ViewChild('snav2', { static: false }) public sidenavRight : MatSidenav;
lang: any = LANG;
search: string = null;
......@@ -28,8 +31,8 @@ export class ContactsGroupsAdministrationComponent implements OnInit {
displayedColumns = ['label', 'description', 'nbContacts', 'public', 'owner', 'actions',];
dataSource = new MatTableDataSource(this.contactsGroups);
@ViewChild(MatPaginator) paginator: MatPaginator;
@ViewChild(MatSort) sort: MatSort;
@ViewChild(MatPaginator, { static: false }) paginator: MatPaginator;
@ViewChild(MatSort, { static: false }) sort: MatSort;
applyFilter(filterValue: string) {
filterValue = filterValue.trim(); // Remove whitespace
filterValue = filterValue.toLowerCase(); // MatTableDataSource defaults to lowercase matches
......
......@@ -4,7 +4,7 @@ import { ActivatedRoute, Router } from '@angular/router';
import { LANG } from '../../translate.component';
import { NotificationService } from '../../notification.service';
import { HeaderService } from '../../../service/header.service';
import { MatSidenav } from '@angular/material';
import