diff --git a/overlord/src/browserslist b/overlord/browserslist similarity index 100% rename from overlord/src/browserslist rename to overlord/browserslist diff --git a/overlord/package.json b/overlord/package.json index 6fe8d3be..4f9da2bf 100644 --- a/overlord/package.json +++ b/overlord/package.json @@ -11,19 +11,18 @@ }, "private": true, "dependencies": { - "@angular/animations": "^7.1.0", - "@angular/cdk": "^7.1.0", - "@angular/common": "^7.1.0", - "@angular/compiler": "^7.1.0", - "@angular/core": "^7.1.0", - "@angular/flex-layout": "^7.0.0-beta.19", - "@angular/forms": "^7.1.0", - "@angular/http": "^7.1.0", - "@angular/material": "^7.1.0", - "@angular/material-moment-adapter": "^7.1.0", - "@angular/platform-browser": "^7.1.0", - "@angular/platform-browser-dynamic": "^7.1.0", - "@angular/router": "^7.1.0", + "@angular/animations": "^8.0.0", + "@angular/cdk": "^8.0.1", + "@angular/common": "^8.0.0", + "@angular/compiler": "^8.0.0", + "@angular/core": "^8.0.0", + "@angular/flex-layout": "^8.0.0-beta.26", + "@angular/forms": "^8.0.0", + "@angular/material": "^8.0.1", + "@angular/material-moment-adapter": "^8.0.1", + "@angular/platform-browser": "^8.0.0", + "@angular/platform-browser-dynamic": "^8.0.0", + "@angular/router": "^8.0.0", "@ngx-loading-bar/http-client": "^3.0.0", "@ngx-loading-bar/router": "^3.0.0", "angular2-hotkeys": "^2.1.4", @@ -33,17 +32,17 @@ "moment": "^2.22.2", "rxjs": "^6.2.2", "rxjs-tslint": "^0.1.5", - "zone.js": "^0.8.26" + "zone.js": "~0.9.1" }, "devDependencies": { - "@angular-devkit/build-angular": "~0.10.7", - "@angular/cli": "^7.0.6", - "@angular/compiler-cli": "^7.1.0", - "@angular/language-service": "^7.1.0", + "@angular-devkit/build-angular": "~0.800.0", + "@angular/cli": "^8.0.2", + "@angular/compiler-cli": "^8.0.0", + "@angular/language-service": "^8.0.0", "@types/jasmine": "^3.3.0", "@types/jasminewd2": "^2.0.3", "@types/node": "^10.5.4", - "codelyzer": "^4.4.2", + "codelyzer": "^5.0.1", "jasmine-core": "^3.1.0", "jasmine-spec-reporter": "^4.2.1", "karma": "^3.1.1", @@ -55,6 +54,6 @@ "standard-version": "^4.4.0", "ts-node": "^7.0.0", "tslint": "^5.11.0", - "typescript": "3.1.6" + "typescript": "3.4.5" } } diff --git a/overlord/src/app/account/account-detail/account-detail.component.ts b/overlord/src/app/account/account-detail/account-detail.component.ts index 5afbc2fa..5e40dd71 100644 --- a/overlord/src/app/account/account-detail/account-detail.component.ts +++ b/overlord/src/app/account/account-detail/account-detail.component.ts @@ -6,7 +6,7 @@ import {Account} from '../account'; import {AccountType} from '../account-type'; import {CostCentre} from '../../cost-centre/cost-centre'; import {ConfirmDialogComponent} from '../../shared/confirm-dialog/confirm-dialog.component'; -import {MatDialog} from '@angular/material'; +import { MatDialog } from '@angular/material/dialog'; import {FormBuilder, FormGroup} from '@angular/forms'; @Component({ @@ -15,7 +15,7 @@ import {FormBuilder, FormGroup} from '@angular/forms'; styleUrls: ['./account-detail.component.css'] }) export class AccountDetailComponent implements OnInit, AfterViewInit { - @ViewChild('nameElement') nameElement: ElementRef; + @ViewChild('nameElement', { static: true }) nameElement: ElementRef; form: FormGroup; accountTypes: AccountType[]; costCentres: CostCentre[]; diff --git a/overlord/src/app/account/account-list/account-list-datasource.ts b/overlord/src/app/account/account-list/account-list-datasource.ts index 285a17f1..8965b0b9 100644 --- a/overlord/src/app/account/account-list/account-list-datasource.ts +++ b/overlord/src/app/account/account-list/account-list-datasource.ts @@ -1,5 +1,6 @@ import {DataSource} from '@angular/cdk/collections'; -import {MatPaginator, MatSort} from '@angular/material'; +import { MatPaginator } from '@angular/material/paginator'; +import { MatSort } from '@angular/material/sort'; import {map, tap} from 'rxjs/operators'; import {merge, Observable, of as observableOf} from 'rxjs'; import {Account} from '../account'; diff --git a/overlord/src/app/account/account-list/account-list.component.ts b/overlord/src/app/account/account-list/account-list.component.ts index f6dcb675..7cc84640 100644 --- a/overlord/src/app/account/account-list/account-list.component.ts +++ b/overlord/src/app/account/account-list/account-list.component.ts @@ -1,5 +1,6 @@ import {AfterViewInit, Component, ElementRef, OnInit, ViewChild} from '@angular/core'; -import {MatPaginator, MatSort} from '@angular/material'; +import { MatPaginator } from '@angular/material/paginator'; +import { MatSort } from '@angular/material/sort'; import {AccountListDataSource} from './account-list-datasource'; import {Account} from '../account'; import {ActivatedRoute} from '@angular/router'; @@ -13,9 +14,9 @@ import {debounceTime, distinctUntilChanged, startWith} from 'rxjs/operators'; styleUrls: ['./account-list.component.css'] }) export class AccountListComponent implements OnInit, AfterViewInit { - @ViewChild('filterElement') filterElement: ElementRef; - @ViewChild(MatPaginator) paginator: MatPaginator; - @ViewChild(MatSort) sort: MatSort; + @ViewChild('filterElement', { static: true }) filterElement: ElementRef; + @ViewChild(MatPaginator, { static: true }) paginator: MatPaginator; + @ViewChild(MatSort, { static: true }) sort: MatSort; dataSource: AccountListDataSource; filter: Observable; form: FormGroup; diff --git a/overlord/src/app/account/account.module.ts b/overlord/src/app/account/account.module.ts index bb7b2008..1e5f5d4c 100644 --- a/overlord/src/app/account/account.module.ts +++ b/overlord/src/app/account/account.module.ts @@ -4,19 +4,17 @@ import {CommonModule} from '@angular/common'; import {AccountListComponent} from './account-list/account-list.component'; import {AccountDetailComponent} from './account-detail/account-detail.component'; import {AccountRoutingModule} from './account-routing.module'; -import { - MatButtonModule, - MatCardModule, - MatCheckboxModule, - MatIconModule, - MatInputModule, - MatOptionModule, - MatPaginatorModule, - MatProgressSpinnerModule, - MatSelectModule, - MatSortModule, - MatTableModule -} from '@angular/material'; +import { MatButtonModule } from '@angular/material/button'; +import { MatCardModule } from '@angular/material/card'; +import { MatCheckboxModule } from '@angular/material/checkbox'; +import { MatOptionModule } from '@angular/material/core'; +import { MatIconModule } from '@angular/material/icon'; +import { MatInputModule } from '@angular/material/input'; +import { MatPaginatorModule } from '@angular/material/paginator'; +import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; +import { MatSelectModule } from '@angular/material/select'; +import { MatSortModule } from '@angular/material/sort'; +import { MatTableModule } from '@angular/material/table'; import {CdkTableModule} from '@angular/cdk/table'; import {ReactiveFormsModule} from '@angular/forms'; import {FlexLayoutModule} from '@angular/flex-layout'; diff --git a/overlord/src/app/app.module.ts b/overlord/src/app/app.module.ts index dcfa31ec..ba5ff146 100644 --- a/overlord/src/app/app.module.ts +++ b/overlord/src/app/app.module.ts @@ -5,22 +5,20 @@ import enIN from '@angular/common/locales/en-IN'; import {AppComponent} from './app.component'; import {BrowserAnimationsModule} from '@angular/platform-browser/animations'; import {LayoutModule} from '@angular/cdk/layout'; -import { - MatButtonModule, - MatCardModule, - MatDividerModule, - MatIconModule, - MatInputModule, - MatListModule, - MatMenuModule, - MatPaginatorModule, - MatProgressSpinnerModule, - MatSidenavModule, - MatSnackBarModule, - MatSortModule, - MatTableModule, - MatToolbarModule -} from '@angular/material'; +import { MatButtonModule } from '@angular/material/button'; +import { MatCardModule } from '@angular/material/card'; +import { MatDividerModule } from '@angular/material/divider'; +import { MatIconModule } from '@angular/material/icon'; +import { MatInputModule } from '@angular/material/input'; +import { MatListModule } from '@angular/material/list'; +import { MatMenuModule } from '@angular/material/menu'; +import { MatPaginatorModule } from '@angular/material/paginator'; +import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; +import { MatSidenavModule } from '@angular/material/sidenav'; +import { MatSnackBarModule } from '@angular/material/snack-bar'; +import { MatSortModule } from '@angular/material/sort'; +import { MatTableModule } from '@angular/material/table'; +import { MatToolbarModule } from '@angular/material/toolbar'; import {LoginComponent} from './auth/login/login.component'; import {AppRoutingModule} from './app-routing.module'; import {ReactiveFormsModule} from '@angular/forms'; diff --git a/overlord/src/app/attendance/attendance.component.ts b/overlord/src/app/attendance/attendance.component.ts index c5c65690..34ce56a0 100644 --- a/overlord/src/app/attendance/attendance.component.ts +++ b/overlord/src/app/attendance/attendance.component.ts @@ -1,6 +1,6 @@ import {Component, OnInit} from '@angular/core'; import {FormArray, FormBuilder, FormGroup} from '@angular/forms'; -import {MatDialog} from '@angular/material'; +import { MatDialog } from '@angular/material/dialog'; import {ActivatedRoute, Router} from '@angular/router'; import {BehaviorSubject} from 'rxjs'; import {AttendanceDataSource} from './attendance-datasource'; diff --git a/overlord/src/app/attendance/attendance.module.ts b/overlord/src/app/attendance/attendance.module.ts index 4f33f082..ef8db218 100644 --- a/overlord/src/app/attendance/attendance.module.ts +++ b/overlord/src/app/attendance/attendance.module.ts @@ -1,26 +1,21 @@ import {NgModule} from '@angular/core'; import {CommonModule} from '@angular/common'; -import { - DateAdapter, - MAT_DATE_FORMATS, - MAT_DATE_LOCALE, - MatAutocompleteModule, - MatButtonModule, - MatCardModule, - MatCheckboxModule, - MatChipsModule, - MatDatepickerModule, - MatDialogModule, - MatFormFieldModule, - MatIconModule, - MatInputModule, - MatNativeDateModule, - MatPaginatorModule, - MatProgressSpinnerModule, - MatSelectModule, - MatSortModule, - MatTableModule -} from '@angular/material'; +import { MatAutocompleteModule } from '@angular/material/autocomplete'; +import { MatButtonModule } from '@angular/material/button'; +import { MatCardModule } from '@angular/material/card'; +import { MatCheckboxModule } from '@angular/material/checkbox'; +import { MatChipsModule } from '@angular/material/chips'; +import { DateAdapter, MAT_DATE_FORMATS, MAT_DATE_LOCALE, MatNativeDateModule } from '@angular/material/core'; +import { MatDatepickerModule } from '@angular/material/datepicker'; +import { MatDialogModule } from '@angular/material/dialog'; +import { MatFormFieldModule } from '@angular/material/form-field'; +import { MatIconModule } from '@angular/material/icon'; +import { MatInputModule } from '@angular/material/input'; +import { MatPaginatorModule } from '@angular/material/paginator'; +import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; +import { MatSelectModule } from '@angular/material/select'; +import { MatSortModule } from '@angular/material/sort'; +import { MatTableModule } from '@angular/material/table'; import {SharedModule} from '../shared/shared.module'; import {ReactiveFormsModule} from '@angular/forms'; import {CdkTableModule} from '@angular/cdk/table'; diff --git a/overlord/src/app/auth/login/login.component.ts b/overlord/src/app/auth/login/login.component.ts index a941f706..99708ea6 100644 --- a/overlord/src/app/auth/login/login.component.ts +++ b/overlord/src/app/auth/login/login.component.ts @@ -1,69 +1,69 @@ -import {AfterViewInit, Component, ElementRef, OnInit, ViewChild} from '@angular/core'; -import {AuthService} from '../auth.service'; -import {ActivatedRoute, Router} from '@angular/router'; -import {ToasterService} from '../../core/toaster.service'; -import {FormBuilder, FormGroup} from '@angular/forms'; -import {CookieService} from '../../shared/cookie.service'; - -@Component({ - selector: 'app-login', - templateUrl: './login.component.html', - styleUrls: ['./login.component.css'] -}) -export class LoginComponent implements OnInit, AfterViewInit { - @ViewChild('nameElement') nameElement: ElementRef; - form: FormGroup; - hide: boolean; - showOtp: boolean; - clientID: string; - private returnUrl: string; - - constructor(private route: ActivatedRoute, - private auth: AuthService, - private router: Router, - private toaster: ToasterService, - private cs: CookieService, - private fb: FormBuilder - ) { - this.hide = true; - this.showOtp = false; - this.createForm(); - } - - createForm() { - this.form = this.fb.group({ - username: '', - password: '', - otp: '', - clientName: '' - }); - } - - ngOnInit() { - this.returnUrl = this.route.snapshot.queryParams['returnUrl'] || '/'; - } - - ngAfterViewInit() { - setTimeout(() => { - this.nameElement.nativeElement.focus(); - }, 0); - } - - login(): void { - const formModel = this.form.value; - const username = formModel.username; - const password = formModel.password; - this.auth.login(username, password).subscribe( - (result) => { - this.router.navigateByUrl(this.returnUrl); - }, - (error) => { - if (error.status === 403 && ['Unknown Client', 'OTP not supplied', 'OTP is wrong'].indexOf(error.error) !== -1) { - this.showOtp = true; - this.clientID = this.cs.getCookie('ClientID'); - } - this.toaster.show('Danger', error.error); - } - ); - } -} +import {AfterViewInit, Component, ElementRef, OnInit, ViewChild} from '@angular/core'; +import {AuthService} from '../auth.service'; +import {ActivatedRoute, Router} from '@angular/router'; +import {ToasterService} from '../../core/toaster.service'; +import {FormBuilder, FormGroup} from '@angular/forms'; +import {CookieService} from '../../shared/cookie.service'; + +@Component({ + selector: 'app-login', + templateUrl: './login.component.html', + styleUrls: ['./login.component.css'] +}) +export class LoginComponent implements OnInit, AfterViewInit { + @ViewChild('nameElement', { static: true }) nameElement: ElementRef; + form: FormGroup; + hide: boolean; + showOtp: boolean; + clientID: string; + private returnUrl: string; + + constructor(private route: ActivatedRoute, + private auth: AuthService, + private router: Router, + private toaster: ToasterService, + private cs: CookieService, + private fb: FormBuilder + ) { + this.hide = true; + this.showOtp = false; + this.createForm(); + } + + createForm() { + this.form = this.fb.group({ + username: '', + password: '', + otp: '', + clientName: '' + }); + } + + ngOnInit() { + this.returnUrl = this.route.snapshot.queryParams['returnUrl'] || '/'; + } + + ngAfterViewInit() { + setTimeout(() => { + this.nameElement.nativeElement.focus(); + }, 0); + } + + login(): void { + const formModel = this.form.value; + const username = formModel.username; + const password = formModel.password; + this.auth.login(username, password).subscribe( + (result) => { + this.router.navigateByUrl(this.returnUrl); + }, + (error) => { + if (error.status === 403 && ['Unknown Client', 'OTP not supplied', 'OTP is wrong'].indexOf(error.error) !== -1) { + this.showOtp = true; + this.clientID = this.cs.getCookie('ClientID'); + } + this.toaster.show('Danger', error.error); + } + ); + } +} diff --git a/overlord/src/app/balance-sheet/balance-sheet-datasource.ts b/overlord/src/app/balance-sheet/balance-sheet-datasource.ts index 8e33965f..db9689af 100644 --- a/overlord/src/app/balance-sheet/balance-sheet-datasource.ts +++ b/overlord/src/app/balance-sheet/balance-sheet-datasource.ts @@ -1,5 +1,6 @@ import {DataSource} from '@angular/cdk/collections'; -import {MatPaginator, MatSort} from '@angular/material'; +import { MatPaginator } from '@angular/material/paginator'; +import { MatSort } from '@angular/material/sort'; import {map} from 'rxjs/operators'; import {merge, Observable, of as observableOf} from 'rxjs'; diff --git a/overlord/src/app/balance-sheet/balance-sheet.component.ts b/overlord/src/app/balance-sheet/balance-sheet.component.ts index c8f94a15..d7bc97ec 100644 --- a/overlord/src/app/balance-sheet/balance-sheet.component.ts +++ b/overlord/src/app/balance-sheet/balance-sheet.component.ts @@ -1,5 +1,6 @@ import {Component, OnInit, ViewChild} from '@angular/core'; -import {MatPaginator, MatSort} from '@angular/material'; +import { MatPaginator } from '@angular/material/paginator'; +import { MatSort } from '@angular/material/sort'; import {BalanceSheetDataSource} from './balance-sheet-datasource'; import {BalanceSheet} from './balance-sheet'; import {ActivatedRoute, Router} from '@angular/router'; @@ -12,8 +13,8 @@ import {FormBuilder, FormGroup} from '@angular/forms'; styleUrls: ['./balance-sheet.component.css'] }) export class BalanceSheetComponent implements OnInit { - @ViewChild(MatPaginator) paginator: MatPaginator; - @ViewChild(MatSort) sort: MatSort; + @ViewChild(MatPaginator, { static: true }) paginator: MatPaginator; + @ViewChild(MatSort, { static: true }) sort: MatSort; dataSource: BalanceSheetDataSource; form: FormGroup; info: BalanceSheet; diff --git a/overlord/src/app/balance-sheet/balance-sheet.module.ts b/overlord/src/app/balance-sheet/balance-sheet.module.ts index 488b03a8..8b955ead 100644 --- a/overlord/src/app/balance-sheet/balance-sheet.module.ts +++ b/overlord/src/app/balance-sheet/balance-sheet.module.ts @@ -1,21 +1,16 @@ import {NgModule} from '@angular/core'; import {CommonModule} from '@angular/common'; -import { - DateAdapter, - MAT_DATE_FORMATS, - MAT_DATE_LOCALE, - MatButtonModule, - MatCardModule, - MatCheckboxModule, - MatDatepickerModule, - MatIconModule, - MatInputModule, - MatNativeDateModule, - MatPaginatorModule, - MatProgressSpinnerModule, - MatSortModule, - MatTableModule -} from '@angular/material'; +import { MatButtonModule } from '@angular/material/button'; +import { MatCardModule } from '@angular/material/card'; +import { MatCheckboxModule } from '@angular/material/checkbox'; +import { DateAdapter, MAT_DATE_FORMATS, MAT_DATE_LOCALE, MatNativeDateModule } from '@angular/material/core'; +import { MatDatepickerModule } from '@angular/material/datepicker'; +import { MatIconModule } from '@angular/material/icon'; +import { MatInputModule } from '@angular/material/input'; +import { MatPaginatorModule } from '@angular/material/paginator'; +import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; +import { MatSortModule } from '@angular/material/sort'; +import { MatTableModule } from '@angular/material/table'; import {SharedModule} from '../shared/shared.module'; import {CdkTableModule} from '@angular/cdk/table'; import {BalanceSheetRoutingModule} from './balance-sheet-routing.module'; diff --git a/overlord/src/app/cash-flow/cash-flow.module.ts b/overlord/src/app/cash-flow/cash-flow.module.ts index 1e8cb387..641ba53d 100644 --- a/overlord/src/app/cash-flow/cash-flow.module.ts +++ b/overlord/src/app/cash-flow/cash-flow.module.ts @@ -1,21 +1,16 @@ import {NgModule} from '@angular/core'; import {CommonModule} from '@angular/common'; -import { - DateAdapter, - MAT_DATE_FORMATS, - MAT_DATE_LOCALE, - MatButtonModule, - MatCardModule, - MatCheckboxModule, - MatDatepickerModule, - MatIconModule, - MatInputModule, - MatNativeDateModule, - MatPaginatorModule, - MatProgressSpinnerModule, - MatSortModule, - MatTableModule -} from '@angular/material'; +import { MatButtonModule } from '@angular/material/button'; +import { MatCardModule } from '@angular/material/card'; +import { MatCheckboxModule } from '@angular/material/checkbox'; +import { DateAdapter, MAT_DATE_FORMATS, MAT_DATE_LOCALE, MatNativeDateModule } from '@angular/material/core'; +import { MatDatepickerModule } from '@angular/material/datepicker'; +import { MatIconModule } from '@angular/material/icon'; +import { MatInputModule } from '@angular/material/input'; +import { MatPaginatorModule } from '@angular/material/paginator'; +import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; +import { MatSortModule } from '@angular/material/sort'; +import { MatTableModule } from '@angular/material/table'; import {SharedModule} from '../shared/shared.module'; import {CdkTableModule} from '@angular/cdk/table'; import {CashFlowRoutingModule} from './cash-flow-routing.module'; diff --git a/overlord/src/app/client/client-detail/client-detail.component.ts b/overlord/src/app/client/client-detail/client-detail.component.ts index 2863171d..9e168e26 100644 --- a/overlord/src/app/client/client-detail/client-detail.component.ts +++ b/overlord/src/app/client/client-detail/client-detail.component.ts @@ -5,7 +5,7 @@ import {Client} from '../client'; import {ActivatedRoute, Router} from '@angular/router'; import {ToasterService} from '../../core/toaster.service'; import {ConfirmDialogComponent} from '../../shared/confirm-dialog/confirm-dialog.component'; -import {MatDialog} from '@angular/material'; +import { MatDialog } from '@angular/material/dialog'; import {FormBuilder, FormGroup} from '@angular/forms'; @Component({ @@ -14,7 +14,7 @@ import {FormBuilder, FormGroup} from '@angular/forms'; styleUrls: ['./client-detail.component.css'] }) export class ClientDetailComponent implements OnInit, AfterViewInit { - @ViewChild('nameElement') nameElement: ElementRef; + @ViewChild('nameElement', { static: true }) nameElement: ElementRef; form: FormGroup; item: Client; diff --git a/overlord/src/app/client/client-list/client-list-datasource.ts b/overlord/src/app/client/client-list/client-list-datasource.ts index 91566dc4..a7fd4078 100644 --- a/overlord/src/app/client/client-list/client-list-datasource.ts +++ b/overlord/src/app/client/client-list/client-list-datasource.ts @@ -1,5 +1,6 @@ import {DataSource} from '@angular/cdk/collections'; -import {MatPaginator, MatSort} from '@angular/material'; +import { MatPaginator } from '@angular/material/paginator'; +import { MatSort } from '@angular/material/sort'; import {map} from 'rxjs/operators'; import {merge, Observable, of as observableOf} from 'rxjs'; import {Client} from '../client'; diff --git a/overlord/src/app/client/client-list/client-list.component.ts b/overlord/src/app/client/client-list/client-list.component.ts index 4cf39a39..5d242572 100644 --- a/overlord/src/app/client/client-list/client-list.component.ts +++ b/overlord/src/app/client/client-list/client-list.component.ts @@ -1,5 +1,6 @@ import {Component, OnInit, ViewChild} from '@angular/core'; -import {MatPaginator, MatSort} from '@angular/material'; +import { MatPaginator } from '@angular/material/paginator'; +import { MatSort } from '@angular/material/sort'; import {ClientListDataSource} from './client-list-datasource'; import {Client} from '../client'; import {ActivatedRoute} from '@angular/router'; @@ -10,8 +11,8 @@ import {ActivatedRoute} from '@angular/router'; styleUrls: ['./client-list.component.css'] }) export class ClientListComponent implements OnInit { - @ViewChild(MatPaginator) paginator: MatPaginator; - @ViewChild(MatSort) sort: MatSort; + @ViewChild(MatPaginator, { static: true }) paginator: MatPaginator; + @ViewChild(MatSort, { static: true }) sort: MatSort; dataSource: ClientListDataSource; list: Client[]; /** Columns displayed in the table. Columns IDs can be added, removed, or reordered. */ diff --git a/overlord/src/app/client/client.module.ts b/overlord/src/app/client/client.module.ts index 64f45262..2ca10e67 100644 --- a/overlord/src/app/client/client.module.ts +++ b/overlord/src/app/client/client.module.ts @@ -4,17 +4,15 @@ import {CommonModule} from '@angular/common'; import {ClientListComponent} from './client-list/client-list.component'; import {ClientDetailComponent} from './client-detail/client-detail.component'; import {ClientRoutingModule} from './client-routing.module'; -import { - MatButtonModule, - MatCardModule, - MatCheckboxModule, - MatIconModule, - MatInputModule, - MatPaginatorModule, - MatProgressSpinnerModule, - MatSortModule, - MatTableModule -} from '@angular/material'; +import { MatButtonModule } from '@angular/material/button'; +import { MatCardModule } from '@angular/material/card'; +import { MatCheckboxModule } from '@angular/material/checkbox'; +import { MatIconModule } from '@angular/material/icon'; +import { MatInputModule } from '@angular/material/input'; +import { MatPaginatorModule } from '@angular/material/paginator'; +import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; +import { MatSortModule } from '@angular/material/sort'; +import { MatTableModule } from '@angular/material/table'; import {CdkTableModule} from '@angular/cdk/table'; import {SharedModule} from '../shared/shared.module'; import {FlexLayoutModule} from '@angular/flex-layout'; diff --git a/overlord/src/app/closing-stock/closing-stock-datasource.ts b/overlord/src/app/closing-stock/closing-stock-datasource.ts index 605f4d53..f5358743 100644 --- a/overlord/src/app/closing-stock/closing-stock-datasource.ts +++ b/overlord/src/app/closing-stock/closing-stock-datasource.ts @@ -1,5 +1,6 @@ import {DataSource} from '@angular/cdk/collections'; -import {MatPaginator, MatSort} from '@angular/material'; +import { MatPaginator } from '@angular/material/paginator'; +import { MatSort } from '@angular/material/sort'; import {map} from 'rxjs/operators'; import {merge, Observable, of as observableOf} from 'rxjs'; import {ClosingStockItem} from './closing-stock'; diff --git a/overlord/src/app/closing-stock/closing-stock.component.ts b/overlord/src/app/closing-stock/closing-stock.component.ts index 13c51617..78b57460 100644 --- a/overlord/src/app/closing-stock/closing-stock.component.ts +++ b/overlord/src/app/closing-stock/closing-stock.component.ts @@ -1,5 +1,6 @@ import {Component, OnInit, ViewChild} from '@angular/core'; -import {MatPaginator, MatSort} from '@angular/material'; +import { MatPaginator } from '@angular/material/paginator'; +import { MatSort } from '@angular/material/sort'; import {ClosingStockDataSource} from './closing-stock-datasource'; import {ClosingStock} from './closing-stock'; import {ActivatedRoute, Router} from '@angular/router'; @@ -13,8 +14,8 @@ import {ToCsvService} from '../shared/to-csv.service'; styleUrls: ['./closing-stock.component.css'] }) export class ClosingStockComponent implements OnInit { - @ViewChild(MatPaginator) paginator: MatPaginator; - @ViewChild(MatSort) sort: MatSort; + @ViewChild(MatPaginator, { static: true }) paginator: MatPaginator; + @ViewChild(MatSort, { static: true }) sort: MatSort; dataSource: ClosingStockDataSource; form: FormGroup; info: ClosingStock; diff --git a/overlord/src/app/closing-stock/closing-stock.module.ts b/overlord/src/app/closing-stock/closing-stock.module.ts index 9ced52d7..78d1c73f 100644 --- a/overlord/src/app/closing-stock/closing-stock.module.ts +++ b/overlord/src/app/closing-stock/closing-stock.module.ts @@ -1,21 +1,16 @@ import {NgModule} from '@angular/core'; import {CommonModule} from '@angular/common'; -import { - DateAdapter, - MAT_DATE_FORMATS, - MAT_DATE_LOCALE, - MatButtonModule, - MatCardModule, - MatCheckboxModule, - MatDatepickerModule, - MatIconModule, - MatInputModule, - MatNativeDateModule, - MatPaginatorModule, - MatProgressSpinnerModule, - MatSortModule, - MatTableModule -} from '@angular/material'; +import { MatButtonModule } from '@angular/material/button'; +import { MatCardModule } from '@angular/material/card'; +import { MatCheckboxModule } from '@angular/material/checkbox'; +import { DateAdapter, MAT_DATE_FORMATS, MAT_DATE_LOCALE, MatNativeDateModule } from '@angular/material/core'; +import { MatDatepickerModule } from '@angular/material/datepicker'; +import { MatIconModule } from '@angular/material/icon'; +import { MatInputModule } from '@angular/material/input'; +import { MatPaginatorModule } from '@angular/material/paginator'; +import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; +import { MatSortModule } from '@angular/material/sort'; +import { MatTableModule } from '@angular/material/table'; import {SharedModule} from '../shared/shared.module'; import {CdkTableModule} from '@angular/cdk/table'; import {ClosingStockRoutingModule} from './closing-stock-routing.module'; diff --git a/overlord/src/app/core/core.module.ts b/overlord/src/app/core/core.module.ts index 64bd2d92..265f511a 100644 --- a/overlord/src/app/core/core.module.ts +++ b/overlord/src/app/core/core.module.ts @@ -1,7 +1,10 @@ import {NgModule} from '@angular/core'; import {CommonModule} from '@angular/common'; import {NavBarComponent} from './nav-bar/nav-bar.component'; -import {MatButtonModule, MatIconModule, MatMenuModule, MatToolbarModule} from '@angular/material'; +import { MatButtonModule } from '@angular/material/button'; +import { MatIconModule } from '@angular/material/icon'; +import { MatMenuModule } from '@angular/material/menu'; +import { MatToolbarModule } from '@angular/material/toolbar'; import {RouterModule} from '@angular/router'; import {HTTP_INTERCEPTORS} from '@angular/common/http'; import {HttpAuthInterceptor} from './http-auth-interceptor'; diff --git a/overlord/src/app/core/http-auth-interceptor.ts b/overlord/src/app/core/http-auth-interceptor.ts index ca667e8a..2d8b99f9 100644 --- a/overlord/src/app/core/http-auth-interceptor.ts +++ b/overlord/src/app/core/http-auth-interceptor.ts @@ -6,7 +6,7 @@ import {catchError} from 'rxjs/operators'; import {ToasterService} from './toaster.service'; import {Router} from '@angular/router'; import {ConfirmDialogComponent} from '../shared/confirm-dialog/confirm-dialog.component'; -import {MatDialog} from '@angular/material'; +import { MatDialog } from '@angular/material/dialog'; @Injectable() export class HttpAuthInterceptor implements HttpInterceptor { diff --git a/overlord/src/app/core/toaster.service.ts b/overlord/src/app/core/toaster.service.ts index 638a2be6..28a21a60 100644 --- a/overlord/src/app/core/toaster.service.ts +++ b/overlord/src/app/core/toaster.service.ts @@ -1,5 +1,5 @@ import {Injectable} from '@angular/core'; -import {MatSnackBar} from '@angular/material'; +import { MatSnackBar } from '@angular/material/snack-bar'; @Injectable({ providedIn: 'root' diff --git a/overlord/src/app/cost-centre/cost-centre-detail/cost-centre-detail.component.ts b/overlord/src/app/cost-centre/cost-centre-detail/cost-centre-detail.component.ts index 07a69689..a4db4b26 100644 --- a/overlord/src/app/cost-centre/cost-centre-detail/cost-centre-detail.component.ts +++ b/overlord/src/app/cost-centre/cost-centre-detail/cost-centre-detail.component.ts @@ -12,7 +12,7 @@ import {FormBuilder, FormGroup} from '@angular/forms'; styleUrls: ['./cost-centre-detail.component.css'] }) export class CostCentreDetailComponent implements OnInit, AfterViewInit { - @ViewChild('nameElement') nameElement: ElementRef; + @ViewChild('nameElement', { static: true }) nameElement: ElementRef; form: FormGroup; item: CostCentre; diff --git a/overlord/src/app/cost-centre/cost-centre-list/cost-centre-list-datasource.ts b/overlord/src/app/cost-centre/cost-centre-list/cost-centre-list-datasource.ts index fe1e6e41..7fc2e0eb 100644 --- a/overlord/src/app/cost-centre/cost-centre-list/cost-centre-list-datasource.ts +++ b/overlord/src/app/cost-centre/cost-centre-list/cost-centre-list-datasource.ts @@ -1,5 +1,6 @@ import {DataSource} from '@angular/cdk/collections'; -import {MatPaginator, MatSort} from '@angular/material'; +import { MatPaginator } from '@angular/material/paginator'; +import { MatSort } from '@angular/material/sort'; import {map} from 'rxjs/operators'; import {merge, Observable, of as observableOf} from 'rxjs'; import {CostCentre} from '../cost-centre'; diff --git a/overlord/src/app/cost-centre/cost-centre-list/cost-centre-list.component.ts b/overlord/src/app/cost-centre/cost-centre-list/cost-centre-list.component.ts index 6f1f5409..b3166cc1 100644 --- a/overlord/src/app/cost-centre/cost-centre-list/cost-centre-list.component.ts +++ b/overlord/src/app/cost-centre/cost-centre-list/cost-centre-list.component.ts @@ -1,5 +1,6 @@ import {Component, OnInit, ViewChild} from '@angular/core'; -import {MatPaginator, MatSort} from '@angular/material'; +import { MatPaginator } from '@angular/material/paginator'; +import { MatSort } from '@angular/material/sort'; import {CostCentreListDataSource} from './cost-centre-list-datasource'; import {CostCentre} from '../cost-centre'; import {ActivatedRoute} from '@angular/router'; @@ -10,8 +11,8 @@ import {ActivatedRoute} from '@angular/router'; styleUrls: ['./cost-centre-list.component.css'] }) export class CostCentreListComponent implements OnInit { - @ViewChild(MatPaginator) paginator: MatPaginator; - @ViewChild(MatSort) sort: MatSort; + @ViewChild(MatPaginator, { static: true }) paginator: MatPaginator; + @ViewChild(MatSort, { static: true }) sort: MatSort; dataSource: CostCentreListDataSource; list: CostCentre[]; /** Columns displayed in the table. Columns IDs can be added, removed, or reordered. */ diff --git a/overlord/src/app/cost-centre/cost-centre.module.ts b/overlord/src/app/cost-centre/cost-centre.module.ts index 466bd2e9..af030dfb 100644 --- a/overlord/src/app/cost-centre/cost-centre.module.ts +++ b/overlord/src/app/cost-centre/cost-centre.module.ts @@ -4,16 +4,14 @@ import {CommonModule} from '@angular/common'; import {CostCentreListComponent} from './cost-centre-list/cost-centre-list.component'; import {CostCentreDetailComponent} from './cost-centre-detail/cost-centre-detail.component'; import {CostCentreRoutingModule} from './cost-centre-routing.module'; -import { - MatButtonModule, - MatCardModule, - MatIconModule, - MatInputModule, - MatPaginatorModule, - MatProgressSpinnerModule, - MatSortModule, - MatTableModule -} from '@angular/material'; +import { MatButtonModule } from '@angular/material/button'; +import { MatCardModule } from '@angular/material/card'; +import { MatIconModule } from '@angular/material/icon'; +import { MatInputModule } from '@angular/material/input'; +import { MatPaginatorModule } from '@angular/material/paginator'; +import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; +import { MatSortModule } from '@angular/material/sort'; +import { MatTableModule } from '@angular/material/table'; import {CdkTableModule} from '@angular/cdk/table'; import {ReactiveFormsModule} from '@angular/forms'; import {FlexLayoutModule} from '@angular/flex-layout'; diff --git a/overlord/src/app/daybook/daybook-datasource.ts b/overlord/src/app/daybook/daybook-datasource.ts index 798567a5..178cc905 100644 --- a/overlord/src/app/daybook/daybook-datasource.ts +++ b/overlord/src/app/daybook/daybook-datasource.ts @@ -1,5 +1,6 @@ import {DataSource} from '@angular/cdk/collections'; -import {MatPaginator, MatSort} from '@angular/material'; +import { MatPaginator } from '@angular/material/paginator'; +import { MatSort } from '@angular/material/sort'; import {map} from 'rxjs/operators'; import {merge, Observable, of as observableOf} from 'rxjs'; import {DaybookItem} from './daybook'; diff --git a/overlord/src/app/daybook/daybook.component.ts b/overlord/src/app/daybook/daybook.component.ts index 6374929e..b80af7ac 100644 --- a/overlord/src/app/daybook/daybook.component.ts +++ b/overlord/src/app/daybook/daybook.component.ts @@ -1,6 +1,7 @@ import {Component, OnInit, ViewChild} from '@angular/core'; import {FormBuilder, FormGroup} from '@angular/forms'; -import {MatPaginator, MatSort} from '@angular/material'; +import { MatPaginator } from '@angular/material/paginator'; +import { MatSort } from '@angular/material/sort'; import {ActivatedRoute, Router} from '@angular/router'; import * as moment from 'moment'; import {DaybookDataSource} from './daybook-datasource'; @@ -14,8 +15,8 @@ import {DaybookService} from './daybook.service'; styleUrls: ['./daybook.component.css'] }) export class DaybookComponent implements OnInit { - @ViewChild(MatPaginator) paginator: MatPaginator; - @ViewChild(MatSort) sort: MatSort; + @ViewChild(MatPaginator, { static: true }) paginator: MatPaginator; + @ViewChild(MatSort, { static: true }) sort: MatSort; dataSource: DaybookDataSource; form: FormGroup; info: Daybook; diff --git a/overlord/src/app/daybook/daybook.module.ts b/overlord/src/app/daybook/daybook.module.ts index 0bfbf5a3..26edecf7 100644 --- a/overlord/src/app/daybook/daybook.module.ts +++ b/overlord/src/app/daybook/daybook.module.ts @@ -1,23 +1,18 @@ import {NgModule} from '@angular/core'; import {CommonModule} from '@angular/common'; -import { - DateAdapter, - MAT_DATE_FORMATS, - MAT_DATE_LOCALE, - MatAutocompleteModule, - MatButtonModule, - MatCardModule, - MatCheckboxModule, - MatDatepickerModule, - MatFormFieldModule, - MatIconModule, - MatInputModule, - MatNativeDateModule, - MatPaginatorModule, - MatProgressSpinnerModule, - MatSortModule, - MatTableModule -} from '@angular/material'; +import { MatAutocompleteModule } from '@angular/material/autocomplete'; +import { MatButtonModule } from '@angular/material/button'; +import { MatCardModule } from '@angular/material/card'; +import { MatCheckboxModule } from '@angular/material/checkbox'; +import { DateAdapter, MAT_DATE_FORMATS, MAT_DATE_LOCALE, MatNativeDateModule } from '@angular/material/core'; +import { MatDatepickerModule } from '@angular/material/datepicker'; +import { MatFormFieldModule } from '@angular/material/form-field'; +import { MatIconModule } from '@angular/material/icon'; +import { MatInputModule } from '@angular/material/input'; +import { MatPaginatorModule } from '@angular/material/paginator'; +import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; +import { MatSortModule } from '@angular/material/sort'; +import { MatTableModule } from '@angular/material/table'; import {SharedModule} from '../shared/shared.module'; import {ReactiveFormsModule} from '@angular/forms'; import {CdkTableModule} from '@angular/cdk/table'; diff --git a/overlord/src/app/employee-attendance/employee-attendance.component.ts b/overlord/src/app/employee-attendance/employee-attendance.component.ts index 9a846164..03d8909a 100644 --- a/overlord/src/app/employee-attendance/employee-attendance.component.ts +++ b/overlord/src/app/employee-attendance/employee-attendance.component.ts @@ -1,6 +1,7 @@ import {AfterViewInit, Component, ElementRef, OnInit, ViewChild} from '@angular/core'; import {FormArray, FormBuilder, FormGroup} from '@angular/forms'; -import {MatAutocompleteSelectedEvent, MatDialog} from '@angular/material'; +import { MatAutocompleteSelectedEvent } from '@angular/material/autocomplete'; +import { MatDialog } from '@angular/material/dialog'; import {ActivatedRoute, Router} from '@angular/router'; import {BehaviorSubject, Observable, of as observableOf} from 'rxjs'; import {EmployeeAttendanceDataSource} from './employee-attendance-datasource'; @@ -20,7 +21,7 @@ import {AttendanceType} from '../attendance/attendance-type'; styleUrls: ['./employee-attendance.component.css'] }) export class EmployeeAttendanceComponent implements OnInit, AfterViewInit { - @ViewChild('employeeElement') employeeElement: ElementRef; + @ViewChild('employeeElement', { static: true }) employeeElement: ElementRef; public employeeAttendanceObservable = new BehaviorSubject([]); dataSource: EmployeeAttendanceDataSource; form: FormGroup; diff --git a/overlord/src/app/employee-attendance/employee-attendance.module.ts b/overlord/src/app/employee-attendance/employee-attendance.module.ts index 6ffbf20a..1a6edad3 100644 --- a/overlord/src/app/employee-attendance/employee-attendance.module.ts +++ b/overlord/src/app/employee-attendance/employee-attendance.module.ts @@ -1,26 +1,21 @@ import {NgModule} from '@angular/core'; import {CommonModule} from '@angular/common'; -import { - DateAdapter, - MAT_DATE_FORMATS, - MAT_DATE_LOCALE, - MatAutocompleteModule, - MatButtonModule, - MatCardModule, - MatCheckboxModule, - MatChipsModule, - MatDatepickerModule, - MatDialogModule, - MatFormFieldModule, - MatIconModule, - MatInputModule, - MatNativeDateModule, - MatPaginatorModule, - MatProgressSpinnerModule, - MatSelectModule, - MatSortModule, - MatTableModule -} from '@angular/material'; +import { MatAutocompleteModule } from '@angular/material/autocomplete'; +import { MatButtonModule } from '@angular/material/button'; +import { MatCardModule } from '@angular/material/card'; +import { MatCheckboxModule } from '@angular/material/checkbox'; +import { MatChipsModule } from '@angular/material/chips'; +import { DateAdapter, MAT_DATE_FORMATS, MAT_DATE_LOCALE, MatNativeDateModule } from '@angular/material/core'; +import { MatDatepickerModule } from '@angular/material/datepicker'; +import { MatDialogModule } from '@angular/material/dialog'; +import { MatFormFieldModule } from '@angular/material/form-field'; +import { MatIconModule } from '@angular/material/icon'; +import { MatInputModule } from '@angular/material/input'; +import { MatPaginatorModule } from '@angular/material/paginator'; +import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; +import { MatSelectModule } from '@angular/material/select'; +import { MatSortModule } from '@angular/material/sort'; +import { MatTableModule } from '@angular/material/table'; import {SharedModule} from '../shared/shared.module'; import {ReactiveFormsModule} from '@angular/forms'; import {CdkTableModule} from '@angular/cdk/table'; diff --git a/overlord/src/app/employee-benefits/employee-benefits.component.ts b/overlord/src/app/employee-benefits/employee-benefits.component.ts index a50db549..1460c65e 100644 --- a/overlord/src/app/employee-benefits/employee-benefits.component.ts +++ b/overlord/src/app/employee-benefits/employee-benefits.component.ts @@ -1,6 +1,7 @@ import {AfterViewInit, Component, ElementRef, OnInit, ViewChild} from '@angular/core'; import {FormBuilder, FormGroup} from '@angular/forms'; -import {MatAutocompleteSelectedEvent, MatDialog} from '@angular/material'; +import { MatAutocompleteSelectedEvent } from '@angular/material/autocomplete'; +import { MatDialog } from '@angular/material/dialog'; import {ActivatedRoute, Router} from '@angular/router'; import {BehaviorSubject, Observable, of as observableOf} from 'rxjs'; import {EmployeeBenefitsDataSource} from './employee-benefits-datasource'; @@ -21,7 +22,7 @@ import {Account} from '../account/account'; styleUrls: ['./employee-benefits.component.css'] }) export class EmployeeBenefitsComponent implements OnInit, AfterViewInit { - @ViewChild('employeeElement') employeeElement: ElementRef; + @ViewChild('employeeElement', { static: true }) employeeElement: ElementRef; public benefitsObservable = new BehaviorSubject([]); dataSource: EmployeeBenefitsDataSource; form: FormGroup; diff --git a/overlord/src/app/employee-benefits/employee-benefits.module.ts b/overlord/src/app/employee-benefits/employee-benefits.module.ts index 521e0d24..c2d8044d 100644 --- a/overlord/src/app/employee-benefits/employee-benefits.module.ts +++ b/overlord/src/app/employee-benefits/employee-benefits.module.ts @@ -1,22 +1,20 @@ import {NgModule} from '@angular/core'; import {CommonModule} from '@angular/common'; -import { - MatAutocompleteModule, - MatButtonModule, - MatCardModule, - MatCheckboxModule, - MatDatepickerModule, - MatDialogModule, - MatFormFieldModule, - MatIconModule, - MatInputModule, - MatNativeDateModule, - MatPaginatorModule, - MatProgressSpinnerModule, - MatSelectModule, - MatSortModule, - MatTableModule -} from '@angular/material'; +import { MatAutocompleteModule } from '@angular/material/autocomplete'; +import { MatButtonModule } from '@angular/material/button'; +import { MatCardModule } from '@angular/material/card'; +import { MatCheckboxModule } from '@angular/material/checkbox'; +import { MatNativeDateModule } from '@angular/material/core'; +import { MatDatepickerModule } from '@angular/material/datepicker'; +import { MatDialogModule } from '@angular/material/dialog'; +import { MatFormFieldModule } from '@angular/material/form-field'; +import { MatIconModule } from '@angular/material/icon'; +import { MatInputModule } from '@angular/material/input'; +import { MatPaginatorModule } from '@angular/material/paginator'; +import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; +import { MatSelectModule } from '@angular/material/select'; +import { MatSortModule } from '@angular/material/sort'; +import { MatTableModule } from '@angular/material/table'; import {ReactiveFormsModule} from '@angular/forms'; import {CdkTableModule} from '@angular/cdk/table'; import {A11yModule} from '@angular/cdk/a11y'; diff --git a/overlord/src/app/employee-functions/employee-functions.component.ts b/overlord/src/app/employee-functions/employee-functions.component.ts index 700a7106..11059696 100644 --- a/overlord/src/app/employee-functions/employee-functions.component.ts +++ b/overlord/src/app/employee-functions/employee-functions.component.ts @@ -1,6 +1,7 @@ import {Component, OnInit} from '@angular/core'; import {FormBuilder, FormGroup} from '@angular/forms'; -import {MatDatepicker, MatDialog} from '@angular/material'; +import { MatDatepicker } from '@angular/material/datepicker'; +import { MatDialog } from '@angular/material/dialog'; import {ActivatedRoute, Router} from '@angular/router'; import * as moment from 'moment'; import {Moment} from 'moment'; diff --git a/overlord/src/app/employee-functions/employee-functions.module.ts b/overlord/src/app/employee-functions/employee-functions.module.ts index 6bb90ba2..e45a3190 100644 --- a/overlord/src/app/employee-functions/employee-functions.module.ts +++ b/overlord/src/app/employee-functions/employee-functions.module.ts @@ -1,23 +1,21 @@ import {NgModule} from '@angular/core'; import {CommonModule} from '@angular/common'; -import { - MatAutocompleteModule, - MatButtonModule, - MatCardModule, - MatCheckboxModule, - MatDatepickerModule, - MatDialogModule, - MatFormFieldModule, - MatIconModule, - MatInputModule, - MatNativeDateModule, - MatPaginatorModule, - MatProgressSpinnerModule, - MatSelectModule, - MatSortModule, - MatTableModule, - MatTabsModule -} from '@angular/material'; +import { MatAutocompleteModule } from '@angular/material/autocomplete'; +import { MatButtonModule } from '@angular/material/button'; +import { MatCardModule } from '@angular/material/card'; +import { MatCheckboxModule } from '@angular/material/checkbox'; +import { MatNativeDateModule } from '@angular/material/core'; +import { MatDatepickerModule } from '@angular/material/datepicker'; +import { MatDialogModule } from '@angular/material/dialog'; +import { MatFormFieldModule } from '@angular/material/form-field'; +import { MatIconModule } from '@angular/material/icon'; +import { MatInputModule } from '@angular/material/input'; +import { MatPaginatorModule } from '@angular/material/paginator'; +import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; +import { MatSelectModule } from '@angular/material/select'; +import { MatSortModule } from '@angular/material/sort'; +import { MatTableModule } from '@angular/material/table'; +import { MatTabsModule } from '@angular/material/tabs'; import {ReactiveFormsModule} from '@angular/forms'; import {CdkTableModule} from '@angular/cdk/table'; import {A11yModule} from '@angular/cdk/a11y'; diff --git a/overlord/src/app/employee/employee-detail/employee-detail.component.ts b/overlord/src/app/employee/employee-detail/employee-detail.component.ts index a83aaa6b..3ee49e07 100644 --- a/overlord/src/app/employee/employee-detail/employee-detail.component.ts +++ b/overlord/src/app/employee/employee-detail/employee-detail.component.ts @@ -1,6 +1,6 @@ import {AfterViewInit, Component, ElementRef, OnInit, ViewChild} from '@angular/core'; import {FormBuilder, FormGroup} from '@angular/forms'; -import {MatDialog} from '@angular/material'; +import { MatDialog } from '@angular/material/dialog'; import {ActivatedRoute, Router} from '@angular/router'; import * as moment from 'moment'; @@ -17,7 +17,7 @@ import {ConfirmDialogComponent} from '../../shared/confirm-dialog/confirm-dialog styleUrls: ['./employee-detail.component.css'] }) export class EmployeeDetailComponent implements OnInit, AfterViewInit { - @ViewChild('nameElement') nameElement: ElementRef; + @ViewChild('nameElement', { static: true }) nameElement: ElementRef; form: FormGroup; costCentres: CostCentre[]; item: Employee; diff --git a/overlord/src/app/employee/employee-list/employee-list-datasource.ts b/overlord/src/app/employee/employee-list/employee-list-datasource.ts index 139b8dd5..63ce5d00 100644 --- a/overlord/src/app/employee/employee-list/employee-list-datasource.ts +++ b/overlord/src/app/employee/employee-list/employee-list-datasource.ts @@ -1,5 +1,6 @@ import {DataSource} from '@angular/cdk/collections'; -import {MatPaginator, MatSort} from '@angular/material'; +import { MatPaginator } from '@angular/material/paginator'; +import { MatSort } from '@angular/material/sort'; import {map, tap} from 'rxjs/operators'; import {merge, Observable, of as observableOf} from 'rxjs'; import {Employee} from '../employee'; diff --git a/overlord/src/app/employee/employee-list/employee-list.component.ts b/overlord/src/app/employee/employee-list/employee-list.component.ts index bf622a47..cacc9fd7 100644 --- a/overlord/src/app/employee/employee-list/employee-list.component.ts +++ b/overlord/src/app/employee/employee-list/employee-list.component.ts @@ -1,5 +1,6 @@ import {AfterViewInit, Component, ElementRef, OnInit, ViewChild} from '@angular/core'; -import {MatPaginator, MatSort} from '@angular/material'; +import { MatPaginator } from '@angular/material/paginator'; +import { MatSort } from '@angular/material/sort'; import {EmployeeListDataSource} from './employee-list-datasource'; import {Employee} from '../employee'; import {ActivatedRoute} from '@angular/router'; @@ -14,9 +15,9 @@ import {ToCsvService} from '../../shared/to-csv.service'; styleUrls: ['./employee-list.component.css'] }) export class EmployeeListComponent implements OnInit, AfterViewInit { - @ViewChild('filterElement') filterElement: ElementRef; - @ViewChild(MatPaginator) paginator: MatPaginator; - @ViewChild(MatSort) sort: MatSort; + @ViewChild('filterElement', { static: true }) filterElement: ElementRef; + @ViewChild(MatPaginator, { static: true }) paginator: MatPaginator; + @ViewChild(MatSort, { static: true }) sort: MatSort; dataSource: EmployeeListDataSource; filter: Observable; form: FormGroup; diff --git a/overlord/src/app/employee/employee.module.ts b/overlord/src/app/employee/employee.module.ts index 15b9b95e..09da52e8 100644 --- a/overlord/src/app/employee/employee.module.ts +++ b/overlord/src/app/employee/employee.module.ts @@ -4,21 +4,19 @@ import {CommonModule} from '@angular/common'; import {EmployeeListComponent} from './employee-list/employee-list.component'; import {EmployeeDetailComponent} from './employee-detail/employee-detail.component'; import {EmployeeRoutingModule} from './employee-routing.module'; -import { - MatButtonModule, - MatCardModule, - MatCheckboxModule, - MatDatepickerModule, - MatDialogModule, - MatIconModule, - MatInputModule, - MatOptionModule, - MatPaginatorModule, - MatProgressSpinnerModule, - MatSelectModule, - MatSortModule, - MatTableModule -} from '@angular/material'; +import { MatButtonModule } from '@angular/material/button'; +import { MatCardModule } from '@angular/material/card'; +import { MatCheckboxModule } from '@angular/material/checkbox'; +import { MatOptionModule } from '@angular/material/core'; +import { MatDatepickerModule } from '@angular/material/datepicker'; +import { MatDialogModule } from '@angular/material/dialog'; +import { MatIconModule } from '@angular/material/icon'; +import { MatInputModule } from '@angular/material/input'; +import { MatPaginatorModule } from '@angular/material/paginator'; +import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; +import { MatSelectModule } from '@angular/material/select'; +import { MatSortModule } from '@angular/material/sort'; +import { MatTableModule } from '@angular/material/table'; import {CdkTableModule} from '@angular/cdk/table'; import {ReactiveFormsModule} from '@angular/forms'; import {FlexLayoutModule} from '@angular/flex-layout'; diff --git a/overlord/src/app/group/group-detail/group-detail.component.ts b/overlord/src/app/group/group-detail/group-detail.component.ts index d0d5b69a..fbfa0f76 100644 --- a/overlord/src/app/group/group-detail/group-detail.component.ts +++ b/overlord/src/app/group/group-detail/group-detail.component.ts @@ -5,7 +5,7 @@ import {GroupService} from '../group.service'; import {Group} from '../group'; import {ToasterService} from '../../core/toaster.service'; import {ConfirmDialogComponent} from '../../shared/confirm-dialog/confirm-dialog.component'; -import {MatDialog} from '@angular/material'; +import { MatDialog } from '@angular/material/dialog'; import {FormArray, FormBuilder, FormGroup} from '@angular/forms'; @Component({ @@ -14,7 +14,7 @@ import {FormArray, FormBuilder, FormGroup} from '@angular/forms'; styleUrls: ['./group-detail.component.css'] }) export class GroupDetailComponent implements OnInit, AfterViewInit { - @ViewChild('nameElement') nameElement: ElementRef; + @ViewChild('nameElement', { static: true }) nameElement: ElementRef; form: FormGroup; item: Group; diff --git a/overlord/src/app/group/group-list/group-list-datasource.ts b/overlord/src/app/group/group-list/group-list-datasource.ts index 77b42fda..18fca3d1 100644 --- a/overlord/src/app/group/group-list/group-list-datasource.ts +++ b/overlord/src/app/group/group-list/group-list-datasource.ts @@ -1,5 +1,6 @@ import {DataSource} from '@angular/cdk/collections'; -import {MatPaginator, MatSort} from '@angular/material'; +import { MatPaginator } from '@angular/material/paginator'; +import { MatSort } from '@angular/material/sort'; import {map} from 'rxjs/operators'; import {merge, Observable, of as observableOf} from 'rxjs'; import {Group} from '../group'; diff --git a/overlord/src/app/group/group-list/group-list.component.ts b/overlord/src/app/group/group-list/group-list.component.ts index 53418e42..a07b8441 100644 --- a/overlord/src/app/group/group-list/group-list.component.ts +++ b/overlord/src/app/group/group-list/group-list.component.ts @@ -1,5 +1,6 @@ import {Component, OnInit, ViewChild} from '@angular/core'; -import {MatPaginator, MatSort} from '@angular/material'; +import { MatPaginator } from '@angular/material/paginator'; +import { MatSort } from '@angular/material/sort'; import {GroupListDataSource} from './group-list-datasource'; import {Group} from '../group'; import {ActivatedRoute} from '@angular/router'; @@ -10,8 +11,8 @@ import {ActivatedRoute} from '@angular/router'; styleUrls: ['./group-list.component.css'] }) export class GroupListComponent implements OnInit { - @ViewChild(MatPaginator) paginator: MatPaginator; - @ViewChild(MatSort) sort: MatSort; + @ViewChild(MatPaginator, { static: true }) paginator: MatPaginator; + @ViewChild(MatSort, { static: true }) sort: MatSort; dataSource: GroupListDataSource; list: Group[]; /** Columns displayed in the table. Columns IDs can be added, removed, or reordered. */ diff --git a/overlord/src/app/group/group.module.ts b/overlord/src/app/group/group.module.ts index f84defdb..309719cf 100644 --- a/overlord/src/app/group/group.module.ts +++ b/overlord/src/app/group/group.module.ts @@ -4,18 +4,16 @@ import {CommonModule} from '@angular/common'; import {GroupListComponent} from './group-list/group-list.component'; import {GroupDetailComponent} from './group-detail/group-detail.component'; import {GroupRoutingModule} from './group-routing.module'; -import { - MatButtonModule, - MatCardModule, - MatCheckboxModule, - MatDividerModule, - MatIconModule, - MatInputModule, - MatPaginatorModule, - MatProgressSpinnerModule, - MatSortModule, - MatTableModule -} from '@angular/material'; +import { MatButtonModule } from '@angular/material/button'; +import { MatCardModule } from '@angular/material/card'; +import { MatCheckboxModule } from '@angular/material/checkbox'; +import { MatDividerModule } from '@angular/material/divider'; +import { MatIconModule } from '@angular/material/icon'; +import { MatInputModule } from '@angular/material/input'; +import { MatPaginatorModule } from '@angular/material/paginator'; +import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; +import { MatSortModule } from '@angular/material/sort'; +import { MatTableModule } from '@angular/material/table'; import {CdkTableModule} from '@angular/cdk/table'; import {ReactiveFormsModule} from '@angular/forms'; import {SharedModule} from '../shared/shared.module'; diff --git a/overlord/src/app/incentive/incentive.component.ts b/overlord/src/app/incentive/incentive.component.ts index ff3158f4..4425d7bc 100644 --- a/overlord/src/app/incentive/incentive.component.ts +++ b/overlord/src/app/incentive/incentive.component.ts @@ -1,6 +1,6 @@ import {Component, OnInit} from '@angular/core'; import {FormArray, FormBuilder, FormGroup} from '@angular/forms'; -import {MatDialog} from '@angular/material'; +import { MatDialog } from '@angular/material/dialog'; import {ActivatedRoute, Router} from '@angular/router'; import {BehaviorSubject, Observable} from 'rxjs'; import {IncentiveDataSource} from './incentive-datasource'; diff --git a/overlord/src/app/incentive/incentive.module.ts b/overlord/src/app/incentive/incentive.module.ts index 87296162..07e92233 100644 --- a/overlord/src/app/incentive/incentive.module.ts +++ b/overlord/src/app/incentive/incentive.module.ts @@ -1,25 +1,20 @@ import {NgModule} from '@angular/core'; import {CommonModule} from '@angular/common'; -import { - DateAdapter, - MAT_DATE_FORMATS, - MAT_DATE_LOCALE, - MatAutocompleteModule, - MatButtonModule, - MatCardModule, - MatCheckboxModule, - MatDatepickerModule, - MatDialogModule, - MatFormFieldModule, - MatIconModule, - MatInputModule, - MatNativeDateModule, - MatPaginatorModule, - MatProgressSpinnerModule, - MatSelectModule, - MatSortModule, - MatTableModule -} from '@angular/material'; +import { MatAutocompleteModule } from '@angular/material/autocomplete'; +import { MatButtonModule } from '@angular/material/button'; +import { MatCardModule } from '@angular/material/card'; +import { MatCheckboxModule } from '@angular/material/checkbox'; +import { DateAdapter, MAT_DATE_FORMATS, MAT_DATE_LOCALE, MatNativeDateModule } from '@angular/material/core'; +import { MatDatepickerModule } from '@angular/material/datepicker'; +import { MatDialogModule } from '@angular/material/dialog'; +import { MatFormFieldModule } from '@angular/material/form-field'; +import { MatIconModule } from '@angular/material/icon'; +import { MatInputModule } from '@angular/material/input'; +import { MatPaginatorModule } from '@angular/material/paginator'; +import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; +import { MatSelectModule } from '@angular/material/select'; +import { MatSortModule } from '@angular/material/sort'; +import { MatTableModule } from '@angular/material/table'; import {SharedModule} from '../shared/shared.module'; import {ReactiveFormsModule} from '@angular/forms'; import {CdkTableModule} from '@angular/cdk/table'; diff --git a/overlord/src/app/issue/issue-dialog.component.ts b/overlord/src/app/issue/issue-dialog.component.ts index 04d3436e..a80f7003 100644 --- a/overlord/src/app/issue/issue-dialog.component.ts +++ b/overlord/src/app/issue/issue-dialog.component.ts @@ -1,5 +1,6 @@ import {Component, Inject, OnInit} from '@angular/core'; -import {MAT_DIALOG_DATA, MatAutocompleteSelectedEvent, MatDialogRef} from '@angular/material'; +import { MatAutocompleteSelectedEvent } from '@angular/material/autocomplete'; +import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import {FormBuilder, FormGroup} from '@angular/forms'; import {debounceTime, distinctUntilChanged, map, startWith, switchMap} from 'rxjs/operators'; import {Observable, of as observableOf} from 'rxjs'; diff --git a/overlord/src/app/issue/issue.component.ts b/overlord/src/app/issue/issue.component.ts index 8f80ce70..ed63dd3d 100644 --- a/overlord/src/app/issue/issue.component.ts +++ b/overlord/src/app/issue/issue.component.ts @@ -1,6 +1,7 @@ import {AfterViewInit, Component, ElementRef, OnInit, OnDestroy, ViewChild} from '@angular/core'; import {FormBuilder, FormGroup} from '@angular/forms'; -import {MatAutocompleteSelectedEvent, MatDialog} from '@angular/material'; +import { MatAutocompleteSelectedEvent } from '@angular/material/autocomplete'; +import { MatDialog } from '@angular/material/dialog'; import {ActivatedRoute, Router} from '@angular/router'; import {BehaviorSubject, Observable, of as observableOf} from 'rxjs'; import {debounceTime, distinctUntilChanged, map, startWith, switchMap} from 'rxjs/operators'; @@ -24,8 +25,8 @@ import {Hotkey, HotkeysService} from "angular2-hotkeys"; styleUrls: ['./issue.component.css'] }) export class IssueComponent implements OnInit, AfterViewInit, OnDestroy { - @ViewChild('batchElement') batchElement: ElementRef; - @ViewChild('dateElement') dateElement: ElementRef; + @ViewChild('batchElement', { static: true }) batchElement: ElementRef; + @ViewChild('dateElement', { static: true }) dateElement: ElementRef; public inventoryObservable = new BehaviorSubject([]); public gridObservable = new BehaviorSubject([]); dataSource: IssueDataSource; diff --git a/overlord/src/app/issue/issue.module.ts b/overlord/src/app/issue/issue.module.ts index f13b0e27..106eea1f 100644 --- a/overlord/src/app/issue/issue.module.ts +++ b/overlord/src/app/issue/issue.module.ts @@ -1,25 +1,20 @@ import {NgModule} from '@angular/core'; import {CommonModule} from '@angular/common'; -import { - DateAdapter, - MAT_DATE_FORMATS, - MAT_DATE_LOCALE, - MatAutocompleteModule, - MatButtonModule, - MatCardModule, - MatCheckboxModule, - MatDatepickerModule, - MatDialogModule, - MatFormFieldModule, - MatIconModule, - MatInputModule, - MatNativeDateModule, - MatPaginatorModule, - MatProgressSpinnerModule, - MatSelectModule, - MatSortModule, - MatTableModule -} from '@angular/material'; +import { MatAutocompleteModule } from '@angular/material/autocomplete'; +import { MatButtonModule } from '@angular/material/button'; +import { MatCardModule } from '@angular/material/card'; +import { MatCheckboxModule } from '@angular/material/checkbox'; +import { DateAdapter, MAT_DATE_FORMATS, MAT_DATE_LOCALE, MatNativeDateModule } from '@angular/material/core'; +import { MatDatepickerModule } from '@angular/material/datepicker'; +import { MatDialogModule } from '@angular/material/dialog'; +import { MatFormFieldModule } from '@angular/material/form-field'; +import { MatIconModule } from '@angular/material/icon'; +import { MatInputModule } from '@angular/material/input'; +import { MatPaginatorModule } from '@angular/material/paginator'; +import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; +import { MatSelectModule } from '@angular/material/select'; +import { MatSortModule } from '@angular/material/sort'; +import { MatTableModule } from '@angular/material/table'; import {SharedModule} from '../shared/shared.module'; import {ReactiveFormsModule} from '@angular/forms'; import {CdkTableModule} from '@angular/cdk/table'; diff --git a/overlord/src/app/journal/journal-dialog.component.ts b/overlord/src/app/journal/journal-dialog.component.ts index 6caa9f10..e61a69dd 100644 --- a/overlord/src/app/journal/journal-dialog.component.ts +++ b/overlord/src/app/journal/journal-dialog.component.ts @@ -1,5 +1,6 @@ import {Component, Inject, OnInit} from '@angular/core'; -import {MAT_DIALOG_DATA, MatAutocompleteSelectedEvent, MatDialogRef} from '@angular/material'; +import { MatAutocompleteSelectedEvent } from '@angular/material/autocomplete'; +import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import {debounceTime, distinctUntilChanged, map, startWith, switchMap} from 'rxjs/operators'; import {Account} from '../account/account'; import {AccountService} from '../account/account.service'; diff --git a/overlord/src/app/journal/journal.component.ts b/overlord/src/app/journal/journal.component.ts index 8c9ae2ee..bbfa56e3 100644 --- a/overlord/src/app/journal/journal.component.ts +++ b/overlord/src/app/journal/journal.component.ts @@ -1,6 +1,7 @@ import {AfterViewInit, Component, ElementRef, OnInit, OnDestroy, ViewChild} from '@angular/core'; import {FormBuilder, FormGroup} from '@angular/forms'; -import {MatAutocompleteSelectedEvent, MatDialog} from '@angular/material'; +import { MatAutocompleteSelectedEvent } from '@angular/material/autocomplete'; +import { MatDialog } from '@angular/material/dialog'; import {ActivatedRoute, Router} from '@angular/router'; import {BehaviorSubject, fromEvent, Observable, of as observableOf, zip} from 'rxjs'; import {JournalDataSource} from './journal-datasource'; @@ -24,8 +25,8 @@ import {Hotkey, HotkeysService} from "angular2-hotkeys"; styleUrls: ['./journal.component.css'] }) export class JournalComponent implements OnInit, AfterViewInit, OnDestroy { - @ViewChild('accountElement') accountElement: ElementRef; - @ViewChild('dateElement') dateElement: ElementRef; + @ViewChild('accountElement', { static: true }) accountElement: ElementRef; + @ViewChild('dateElement', { static: true }) dateElement: ElementRef; public journalObservable = new BehaviorSubject([]); dataSource: JournalDataSource; form: FormGroup; diff --git a/overlord/src/app/journal/journal.module.ts b/overlord/src/app/journal/journal.module.ts index 317688aa..b724bc66 100644 --- a/overlord/src/app/journal/journal.module.ts +++ b/overlord/src/app/journal/journal.module.ts @@ -1,25 +1,20 @@ import {NgModule} from '@angular/core'; import {CommonModule} from '@angular/common'; -import { - DateAdapter, - MAT_DATE_FORMATS, - MAT_DATE_LOCALE, - MatAutocompleteModule, - MatButtonModule, - MatCardModule, - MatCheckboxModule, - MatDatepickerModule, - MatDialogModule, - MatFormFieldModule, - MatIconModule, - MatInputModule, - MatNativeDateModule, - MatPaginatorModule, - MatProgressSpinnerModule, - MatSelectModule, - MatSortModule, - MatTableModule -} from '@angular/material'; +import { MatAutocompleteModule } from '@angular/material/autocomplete'; +import { MatButtonModule } from '@angular/material/button'; +import { MatCardModule } from '@angular/material/card'; +import { MatCheckboxModule } from '@angular/material/checkbox'; +import { DateAdapter, MAT_DATE_FORMATS, MAT_DATE_LOCALE, MatNativeDateModule } from '@angular/material/core'; +import { MatDatepickerModule } from '@angular/material/datepicker'; +import { MatDialogModule } from '@angular/material/dialog'; +import { MatFormFieldModule } from '@angular/material/form-field'; +import { MatIconModule } from '@angular/material/icon'; +import { MatInputModule } from '@angular/material/input'; +import { MatPaginatorModule } from '@angular/material/paginator'; +import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; +import { MatSelectModule } from '@angular/material/select'; +import { MatSortModule } from '@angular/material/sort'; +import { MatTableModule } from '@angular/material/table'; import {SharedModule} from '../shared/shared.module'; import {ReactiveFormsModule} from '@angular/forms'; import {CdkTableModule} from '@angular/cdk/table'; diff --git a/overlord/src/app/ledger/ledger-datasource.ts b/overlord/src/app/ledger/ledger-datasource.ts index ba730b24..12bd61c1 100644 --- a/overlord/src/app/ledger/ledger-datasource.ts +++ b/overlord/src/app/ledger/ledger-datasource.ts @@ -1,5 +1,6 @@ import {DataSource} from '@angular/cdk/collections'; -import {MatPaginator, MatSort} from '@angular/material'; +import { MatPaginator } from '@angular/material/paginator'; +import { MatSort } from '@angular/material/sort'; import {map} from 'rxjs/operators'; import {merge, Observable, of as observableOf} from 'rxjs'; import {LedgerItem} from './ledger'; diff --git a/overlord/src/app/ledger/ledger.component.ts b/overlord/src/app/ledger/ledger.component.ts index 6405fc8f..1e577cc2 100644 --- a/overlord/src/app/ledger/ledger.component.ts +++ b/overlord/src/app/ledger/ledger.component.ts @@ -1,6 +1,8 @@ import {AfterViewInit, Component, ElementRef, OnInit, ViewChild} from '@angular/core'; import {FormBuilder, FormGroup} from '@angular/forms'; -import {MatAutocompleteSelectedEvent, MatPaginator, MatSort} from '@angular/material'; +import { MatAutocompleteSelectedEvent } from '@angular/material/autocomplete'; +import { MatPaginator } from '@angular/material/paginator'; +import { MatSort } from '@angular/material/sort'; import {ActivatedRoute, Router} from '@angular/router'; import {Observable, of as observableOf} from 'rxjs'; import {debounceTime, distinctUntilChanged, map, startWith, switchMap} from 'rxjs/operators'; @@ -18,9 +20,9 @@ import {ToCsvService} from '../shared/to-csv.service'; styleUrls: ['./ledger.component.css'] }) export class LedgerComponent implements OnInit, AfterViewInit { - @ViewChild('accountElement') accountElement: ElementRef; - @ViewChild(MatPaginator) paginator: MatPaginator; - @ViewChild(MatSort) sort: MatSort; + @ViewChild('accountElement', { static: true }) accountElement: ElementRef; + @ViewChild(MatPaginator, { static: true }) paginator: MatPaginator; + @ViewChild(MatSort, { static: true }) sort: MatSort; dataSource: LedgerDataSource; form: FormGroup; info: Ledger; diff --git a/overlord/src/app/ledger/ledger.module.ts b/overlord/src/app/ledger/ledger.module.ts index c7ef0bb3..5be263d0 100644 --- a/overlord/src/app/ledger/ledger.module.ts +++ b/overlord/src/app/ledger/ledger.module.ts @@ -1,23 +1,18 @@ import {NgModule} from '@angular/core'; import {CommonModule} from '@angular/common'; -import { - DateAdapter, - MAT_DATE_FORMATS, - MAT_DATE_LOCALE, - MatAutocompleteModule, - MatButtonModule, - MatCardModule, - MatCheckboxModule, - MatDatepickerModule, - MatFormFieldModule, - MatIconModule, - MatInputModule, - MatNativeDateModule, - MatPaginatorModule, - MatProgressSpinnerModule, - MatSortModule, - MatTableModule -} from '@angular/material'; +import { MatAutocompleteModule } from '@angular/material/autocomplete'; +import { MatButtonModule } from '@angular/material/button'; +import { MatCardModule } from '@angular/material/card'; +import { MatCheckboxModule } from '@angular/material/checkbox'; +import { DateAdapter, MAT_DATE_FORMATS, MAT_DATE_LOCALE, MatNativeDateModule } from '@angular/material/core'; +import { MatDatepickerModule } from '@angular/material/datepicker'; +import { MatFormFieldModule } from '@angular/material/form-field'; +import { MatIconModule } from '@angular/material/icon'; +import { MatInputModule } from '@angular/material/input'; +import { MatPaginatorModule } from '@angular/material/paginator'; +import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; +import { MatSortModule } from '@angular/material/sort'; +import { MatTableModule } from '@angular/material/table'; import {SharedModule} from '../shared/shared.module'; import {ReactiveFormsModule} from '@angular/forms'; import {CdkTableModule} from '@angular/cdk/table'; diff --git a/overlord/src/app/net-transactions/net-transactions-datasource.ts b/overlord/src/app/net-transactions/net-transactions-datasource.ts index 74a119dc..8ed72e61 100644 --- a/overlord/src/app/net-transactions/net-transactions-datasource.ts +++ b/overlord/src/app/net-transactions/net-transactions-datasource.ts @@ -1,5 +1,6 @@ import {DataSource} from '@angular/cdk/collections'; -import {MatPaginator, MatSort} from '@angular/material'; +import { MatPaginator } from '@angular/material/paginator'; +import { MatSort } from '@angular/material/sort'; import {map} from 'rxjs/operators'; import {merge, Observable, of as observableOf} from 'rxjs'; import {NetTransactionsItem} from './net-transactions'; diff --git a/overlord/src/app/net-transactions/net-transactions.component.ts b/overlord/src/app/net-transactions/net-transactions.component.ts index 32069f32..ee56890b 100644 --- a/overlord/src/app/net-transactions/net-transactions.component.ts +++ b/overlord/src/app/net-transactions/net-transactions.component.ts @@ -1,6 +1,7 @@ import {Component, OnInit, ViewChild} from '@angular/core'; import {FormBuilder, FormGroup} from '@angular/forms'; -import {MatPaginator, MatSort} from '@angular/material'; +import { MatPaginator } from '@angular/material/paginator'; +import { MatSort } from '@angular/material/sort'; import {ActivatedRoute, Router} from '@angular/router'; import * as moment from 'moment'; import {NetTransactionsDataSource} from './net-transactions-datasource'; @@ -13,8 +14,8 @@ import {NetTransactionsService} from './net-transactions.service'; styleUrls: ['./net-transactions.component.css'] }) export class NetTransactionsComponent implements OnInit { - @ViewChild(MatPaginator) paginator: MatPaginator; - @ViewChild(MatSort) sort: MatSort; + @ViewChild(MatPaginator, { static: true }) paginator: MatPaginator; + @ViewChild(MatSort, { static: true }) sort: MatSort; dataSource: NetTransactionsDataSource; form: FormGroup; info: NetTransactions; diff --git a/overlord/src/app/net-transactions/net-transactions.module.ts b/overlord/src/app/net-transactions/net-transactions.module.ts index e395739a..1f714aca 100644 --- a/overlord/src/app/net-transactions/net-transactions.module.ts +++ b/overlord/src/app/net-transactions/net-transactions.module.ts @@ -1,23 +1,18 @@ import {NgModule} from '@angular/core'; import {CommonModule} from '@angular/common'; -import { - DateAdapter, - MAT_DATE_FORMATS, - MAT_DATE_LOCALE, - MatAutocompleteModule, - MatButtonModule, - MatCardModule, - MatCheckboxModule, - MatDatepickerModule, - MatFormFieldModule, - MatIconModule, - MatInputModule, - MatNativeDateModule, - MatPaginatorModule, - MatProgressSpinnerModule, - MatSortModule, - MatTableModule -} from '@angular/material'; +import { MatAutocompleteModule } from '@angular/material/autocomplete'; +import { MatButtonModule } from '@angular/material/button'; +import { MatCardModule } from '@angular/material/card'; +import { MatCheckboxModule } from '@angular/material/checkbox'; +import { DateAdapter, MAT_DATE_FORMATS, MAT_DATE_LOCALE, MatNativeDateModule } from '@angular/material/core'; +import { MatDatepickerModule } from '@angular/material/datepicker'; +import { MatFormFieldModule } from '@angular/material/form-field'; +import { MatIconModule } from '@angular/material/icon'; +import { MatInputModule } from '@angular/material/input'; +import { MatPaginatorModule } from '@angular/material/paginator'; +import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; +import { MatSortModule } from '@angular/material/sort'; +import { MatTableModule } from '@angular/material/table'; import {SharedModule} from '../shared/shared.module'; import {ReactiveFormsModule} from '@angular/forms'; import {CdkTableModule} from '@angular/cdk/table'; diff --git a/overlord/src/app/payment/payment-dialog.component.ts b/overlord/src/app/payment/payment-dialog.component.ts index 0078ad3e..07527caa 100644 --- a/overlord/src/app/payment/payment-dialog.component.ts +++ b/overlord/src/app/payment/payment-dialog.component.ts @@ -1,5 +1,6 @@ import {Component, Inject, OnInit} from '@angular/core'; -import {MAT_DIALOG_DATA, MatAutocompleteSelectedEvent, MatDialogRef} from '@angular/material'; +import { MatAutocompleteSelectedEvent } from '@angular/material/autocomplete'; +import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import {debounceTime, distinctUntilChanged, map, startWith, switchMap} from 'rxjs/operators'; import {Account} from '../account/account'; import {AccountService} from '../account/account.service'; diff --git a/overlord/src/app/payment/payment.component.ts b/overlord/src/app/payment/payment.component.ts index 8ea60932..9d23bfda 100644 --- a/overlord/src/app/payment/payment.component.ts +++ b/overlord/src/app/payment/payment.component.ts @@ -1,6 +1,7 @@ import {AfterViewInit, Component, ElementRef, OnInit, OnDestroy, ViewChild} from '@angular/core'; import {FormBuilder, FormGroup} from '@angular/forms'; -import {MatAutocompleteSelectedEvent, MatDialog} from '@angular/material'; +import { MatAutocompleteSelectedEvent } from '@angular/material/autocomplete'; +import { MatDialog } from '@angular/material/dialog'; import {ActivatedRoute, Router} from '@angular/router'; import {BehaviorSubject, fromEvent, Observable, of, of as observableOf, zip} from 'rxjs'; import {PaymentDataSource} from './payment-datasource'; @@ -24,8 +25,8 @@ import {Hotkey, HotkeysService} from "angular2-hotkeys"; styleUrls: ['./payment.component.css'] }) export class PaymentComponent implements OnInit, AfterViewInit, OnDestroy { - @ViewChild('accountElement') accountElement: ElementRef; - @ViewChild('dateElement') dateElement: ElementRef; + @ViewChild('accountElement', { static: true }) accountElement: ElementRef; + @ViewChild('dateElement', { static: true }) dateElement: ElementRef; public journalObservable = new BehaviorSubject([]); dataSource: PaymentDataSource; form: FormGroup; diff --git a/overlord/src/app/payment/payment.module.ts b/overlord/src/app/payment/payment.module.ts index 472423a8..5cae5e5d 100644 --- a/overlord/src/app/payment/payment.module.ts +++ b/overlord/src/app/payment/payment.module.ts @@ -1,25 +1,20 @@ import {NgModule} from '@angular/core'; import {CommonModule} from '@angular/common'; -import { - DateAdapter, - MAT_DATE_FORMATS, - MAT_DATE_LOCALE, - MatAutocompleteModule, - MatButtonModule, - MatCardModule, - MatCheckboxModule, - MatDatepickerModule, - MatDialogModule, - MatFormFieldModule, - MatIconModule, - MatInputModule, - MatNativeDateModule, - MatPaginatorModule, - MatProgressSpinnerModule, - MatSelectModule, - MatSortModule, - MatTableModule -} from '@angular/material'; +import { MatAutocompleteModule } from '@angular/material/autocomplete'; +import { MatButtonModule } from '@angular/material/button'; +import { MatCardModule } from '@angular/material/card'; +import { MatCheckboxModule } from '@angular/material/checkbox'; +import { DateAdapter, MAT_DATE_FORMATS, MAT_DATE_LOCALE, MatNativeDateModule } from '@angular/material/core'; +import { MatDatepickerModule } from '@angular/material/datepicker'; +import { MatDialogModule } from '@angular/material/dialog'; +import { MatFormFieldModule } from '@angular/material/form-field'; +import { MatIconModule } from '@angular/material/icon'; +import { MatInputModule } from '@angular/material/input'; +import { MatPaginatorModule } from '@angular/material/paginator'; +import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; +import { MatSelectModule } from '@angular/material/select'; +import { MatSortModule } from '@angular/material/sort'; +import { MatTableModule } from '@angular/material/table'; import {SharedModule} from '../shared/shared.module'; import {ReactiveFormsModule} from '@angular/forms'; import {CdkTableModule} from '@angular/cdk/table'; diff --git a/overlord/src/app/product-group/product-group-detail/product-group-detail.component.ts b/overlord/src/app/product-group/product-group-detail/product-group-detail.component.ts index 91c61c1f..87a9a01e 100644 --- a/overlord/src/app/product-group/product-group-detail/product-group-detail.component.ts +++ b/overlord/src/app/product-group/product-group-detail/product-group-detail.component.ts @@ -12,7 +12,7 @@ import {FormBuilder, FormGroup} from '@angular/forms'; styleUrls: ['./product-group-detail.component.css'] }) export class ProductGroupDetailComponent implements OnInit, AfterViewInit { - @ViewChild('nameElement') nameElement: ElementRef; + @ViewChild('nameElement', { static: true }) nameElement: ElementRef; form: FormGroup; item: ProductGroup; diff --git a/overlord/src/app/product-group/product-group-list/product-group-list-datasource.ts b/overlord/src/app/product-group/product-group-list/product-group-list-datasource.ts index 26040fb7..2710a44a 100644 --- a/overlord/src/app/product-group/product-group-list/product-group-list-datasource.ts +++ b/overlord/src/app/product-group/product-group-list/product-group-list-datasource.ts @@ -1,5 +1,6 @@ import {DataSource} from '@angular/cdk/collections'; -import {MatPaginator, MatSort} from '@angular/material'; +import { MatPaginator } from '@angular/material/paginator'; +import { MatSort } from '@angular/material/sort'; import {map} from 'rxjs/operators'; import {merge, Observable, of as observableOf} from 'rxjs'; import {ProductGroup} from '../product-group'; diff --git a/overlord/src/app/product-group/product-group-list/product-group-list.component.ts b/overlord/src/app/product-group/product-group-list/product-group-list.component.ts index 8f747e6f..755e9350 100644 --- a/overlord/src/app/product-group/product-group-list/product-group-list.component.ts +++ b/overlord/src/app/product-group/product-group-list/product-group-list.component.ts @@ -1,5 +1,6 @@ import {Component, OnInit, ViewChild} from '@angular/core'; -import {MatPaginator, MatSort} from '@angular/material'; +import { MatPaginator } from '@angular/material/paginator'; +import { MatSort } from '@angular/material/sort'; import {ProductGroupListDataSource} from './product-group-list-datasource'; import {ProductGroup} from '../product-group'; import {ActivatedRoute} from '@angular/router'; @@ -10,8 +11,8 @@ import {ActivatedRoute} from '@angular/router'; styleUrls: ['./product-group-list.component.css'] }) export class ProductGroupListComponent implements OnInit { - @ViewChild(MatPaginator) paginator: MatPaginator; - @ViewChild(MatSort) sort: MatSort; + @ViewChild(MatPaginator, { static: true }) paginator: MatPaginator; + @ViewChild(MatSort, { static: true }) sort: MatSort; dataSource: ProductGroupListDataSource; list: ProductGroup[]; /** Columns displayed in the table. Columns IDs can be added, removed, or reordered. */ diff --git a/overlord/src/app/product-group/product-group.module.ts b/overlord/src/app/product-group/product-group.module.ts index 384f3b6d..f8dbdcba 100644 --- a/overlord/src/app/product-group/product-group.module.ts +++ b/overlord/src/app/product-group/product-group.module.ts @@ -4,16 +4,14 @@ import {CommonModule} from '@angular/common'; import {ProductGroupListComponent} from './product-group-list/product-group-list.component'; import {ProductGroupDetailComponent} from './product-group-detail/product-group-detail.component'; import {ProductGroupRoutingModule} from './product-group-routing.module'; -import { - MatButtonModule, - MatCardModule, - MatIconModule, - MatInputModule, - MatPaginatorModule, - MatProgressSpinnerModule, - MatSortModule, - MatTableModule -} from '@angular/material'; +import { MatButtonModule } from '@angular/material/button'; +import { MatCardModule } from '@angular/material/card'; +import { MatIconModule } from '@angular/material/icon'; +import { MatInputModule } from '@angular/material/input'; +import { MatPaginatorModule } from '@angular/material/paginator'; +import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; +import { MatSortModule } from '@angular/material/sort'; +import { MatTableModule } from '@angular/material/table'; import {CdkTableModule} from '@angular/cdk/table'; import {FlexLayoutModule} from '@angular/flex-layout'; import {ReactiveFormsModule} from '@angular/forms'; diff --git a/overlord/src/app/product-ledger/product-ledger-datasource.ts b/overlord/src/app/product-ledger/product-ledger-datasource.ts index f2c9c50c..44b78b5b 100644 --- a/overlord/src/app/product-ledger/product-ledger-datasource.ts +++ b/overlord/src/app/product-ledger/product-ledger-datasource.ts @@ -1,5 +1,6 @@ import {DataSource} from '@angular/cdk/collections'; -import {MatPaginator, MatSort} from '@angular/material'; +import { MatPaginator } from '@angular/material/paginator'; +import { MatSort } from '@angular/material/sort'; import {map} from 'rxjs/operators'; import {merge, Observable, of as observableOf} from 'rxjs'; import {ProductLedgerItem} from './product-ledger'; diff --git a/overlord/src/app/product-ledger/product-ledger.component.ts b/overlord/src/app/product-ledger/product-ledger.component.ts index 99c29c8b..d0ecf157 100644 --- a/overlord/src/app/product-ledger/product-ledger.component.ts +++ b/overlord/src/app/product-ledger/product-ledger.component.ts @@ -1,6 +1,8 @@ import {Component, OnInit, ViewChild} from '@angular/core'; import {FormBuilder, FormGroup} from '@angular/forms'; -import {MatAutocompleteSelectedEvent, MatPaginator, MatSort} from '@angular/material'; +import { MatAutocompleteSelectedEvent } from '@angular/material/autocomplete'; +import { MatPaginator } from '@angular/material/paginator'; +import { MatSort } from '@angular/material/sort'; import {ActivatedRoute, Router} from '@angular/router'; import {Observable, of as observableOf} from 'rxjs'; import {debounceTime, distinctUntilChanged, map, startWith, switchMap} from 'rxjs/operators'; @@ -17,8 +19,8 @@ import {ProductService} from '../product/product.service'; styleUrls: ['./product-ledger.component.css'] }) export class ProductLedgerComponent implements OnInit { - @ViewChild(MatPaginator) paginator: MatPaginator; - @ViewChild(MatSort) sort: MatSort; + @ViewChild(MatPaginator, { static: true }) paginator: MatPaginator; + @ViewChild(MatSort, { static: true }) sort: MatSort; dataSource: ProductLedgerDataSource; form: FormGroup; info: ProductLedger; diff --git a/overlord/src/app/product-ledger/product-ledger.module.ts b/overlord/src/app/product-ledger/product-ledger.module.ts index 6e409828..90487f87 100644 --- a/overlord/src/app/product-ledger/product-ledger.module.ts +++ b/overlord/src/app/product-ledger/product-ledger.module.ts @@ -1,23 +1,18 @@ import {NgModule} from '@angular/core'; import {CommonModule} from '@angular/common'; -import { - DateAdapter, - MAT_DATE_FORMATS, - MAT_DATE_LOCALE, - MatAutocompleteModule, - MatButtonModule, - MatCardModule, - MatCheckboxModule, - MatDatepickerModule, - MatFormFieldModule, - MatIconModule, - MatInputModule, - MatNativeDateModule, - MatPaginatorModule, - MatProgressSpinnerModule, - MatSortModule, - MatTableModule -} from '@angular/material'; +import { MatAutocompleteModule } from '@angular/material/autocomplete'; +import { MatButtonModule } from '@angular/material/button'; +import { MatCardModule } from '@angular/material/card'; +import { MatCheckboxModule } from '@angular/material/checkbox'; +import { DateAdapter, MAT_DATE_FORMATS, MAT_DATE_LOCALE, MatNativeDateModule } from '@angular/material/core'; +import { MatDatepickerModule } from '@angular/material/datepicker'; +import { MatFormFieldModule } from '@angular/material/form-field'; +import { MatIconModule } from '@angular/material/icon'; +import { MatInputModule } from '@angular/material/input'; +import { MatPaginatorModule } from '@angular/material/paginator'; +import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; +import { MatSortModule } from '@angular/material/sort'; +import { MatTableModule } from '@angular/material/table'; import {SharedModule} from '../shared/shared.module'; import {ReactiveFormsModule} from '@angular/forms'; import {CdkTableModule} from '@angular/cdk/table'; diff --git a/overlord/src/app/product/product-detail/product-detail.component.ts b/overlord/src/app/product/product-detail/product-detail.component.ts index 865cec2b..35fa7215 100644 --- a/overlord/src/app/product/product-detail/product-detail.component.ts +++ b/overlord/src/app/product/product-detail/product-detail.component.ts @@ -5,7 +5,7 @@ import {ProductService} from '../product.service'; import {Product} from '../product'; import {ProductGroup} from '../../product-group/product-group'; import {ConfirmDialogComponent} from '../../shared/confirm-dialog/confirm-dialog.component'; -import {MatDialog} from '@angular/material'; +import { MatDialog } from '@angular/material/dialog'; import {FormBuilder, FormGroup} from '@angular/forms'; @Component({ @@ -14,7 +14,7 @@ import {FormBuilder, FormGroup} from '@angular/forms'; styleUrls: ['./product-detail.component.css'] }) export class ProductDetailComponent implements OnInit, AfterViewInit { - @ViewChild('nameElement') nameElement: ElementRef; + @ViewChild('nameElement', { static: true }) nameElement: ElementRef; form: FormGroup; productGroups: ProductGroup[]; item: Product; diff --git a/overlord/src/app/product/product-list/product-list-datasource.ts b/overlord/src/app/product/product-list/product-list-datasource.ts index c0511cf7..cec7903e 100644 --- a/overlord/src/app/product/product-list/product-list-datasource.ts +++ b/overlord/src/app/product/product-list/product-list-datasource.ts @@ -1,5 +1,6 @@ import {DataSource} from '@angular/cdk/collections'; -import {MatPaginator, MatSort} from '@angular/material'; +import { MatPaginator } from '@angular/material/paginator'; +import { MatSort } from '@angular/material/sort'; import {map, tap} from 'rxjs/operators'; import {merge, Observable, of as observableOf} from 'rxjs'; import {Product} from '../product'; diff --git a/overlord/src/app/product/product-list/product-list.component.ts b/overlord/src/app/product/product-list/product-list.component.ts index dd0eb7e8..50cd5207 100644 --- a/overlord/src/app/product/product-list/product-list.component.ts +++ b/overlord/src/app/product/product-list/product-list.component.ts @@ -1,5 +1,6 @@ import {AfterViewInit, Component, ElementRef, OnInit, ViewChild} from '@angular/core'; -import {MatPaginator, MatSort} from '@angular/material'; +import { MatPaginator } from '@angular/material/paginator'; +import { MatSort } from '@angular/material/sort'; import {ProductListDataSource} from './product-list-datasource'; import {Product} from '../product'; import {ActivatedRoute} from '@angular/router'; @@ -14,9 +15,9 @@ import {ToCsvService} from "../../shared/to-csv.service"; styleUrls: ['./product-list.component.css'] }) export class ProductListComponent implements OnInit, AfterViewInit { - @ViewChild('filterElement') filterElement: ElementRef; - @ViewChild(MatPaginator) paginator: MatPaginator; - @ViewChild(MatSort) sort: MatSort; + @ViewChild('filterElement', { static: true }) filterElement: ElementRef; + @ViewChild(MatPaginator, { static: true }) paginator: MatPaginator; + @ViewChild(MatSort, { static: true }) sort: MatSort; dataSource: ProductListDataSource; filter: Observable; form: FormGroup; diff --git a/overlord/src/app/product/product.module.ts b/overlord/src/app/product/product.module.ts index 25712f6b..961a628f 100644 --- a/overlord/src/app/product/product.module.ts +++ b/overlord/src/app/product/product.module.ts @@ -4,19 +4,17 @@ import {CommonModule} from '@angular/common'; import {ProductListComponent} from './product-list/product-list.component'; import {ProductDetailComponent} from './product-detail/product-detail.component'; import {ProductRoutingModule} from './product-routing.module'; -import { - MatButtonModule, - MatCardModule, - MatCheckboxModule, - MatIconModule, - MatInputModule, - MatOptionModule, - MatPaginatorModule, - MatProgressSpinnerModule, - MatSelectModule, - MatSortModule, - MatTableModule -} from '@angular/material'; +import { MatButtonModule } from '@angular/material/button'; +import { MatCardModule } from '@angular/material/card'; +import { MatCheckboxModule } from '@angular/material/checkbox'; +import { MatOptionModule } from '@angular/material/core'; +import { MatIconModule } from '@angular/material/icon'; +import { MatInputModule } from '@angular/material/input'; +import { MatPaginatorModule } from '@angular/material/paginator'; +import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; +import { MatSelectModule } from '@angular/material/select'; +import { MatSortModule } from '@angular/material/sort'; +import { MatTableModule } from '@angular/material/table'; import {CdkTableModule} from '@angular/cdk/table'; import {ReactiveFormsModule} from '@angular/forms'; import {FlexLayoutModule} from '@angular/flex-layout'; diff --git a/overlord/src/app/profit-loss/profit-loss-datasource.ts b/overlord/src/app/profit-loss/profit-loss-datasource.ts index 05ce61f3..5bf3c5e7 100644 --- a/overlord/src/app/profit-loss/profit-loss-datasource.ts +++ b/overlord/src/app/profit-loss/profit-loss-datasource.ts @@ -1,5 +1,6 @@ import {DataSource} from '@angular/cdk/collections'; -import {MatPaginator, MatSort} from '@angular/material'; +import { MatPaginator } from '@angular/material/paginator'; +import { MatSort } from '@angular/material/sort'; import {map} from 'rxjs/operators'; import {merge, Observable, of as observableOf} from 'rxjs'; import {ProfitLossItem} from './profit-loss'; diff --git a/overlord/src/app/profit-loss/profit-loss.component.ts b/overlord/src/app/profit-loss/profit-loss.component.ts index 5ac98c60..0764488f 100644 --- a/overlord/src/app/profit-loss/profit-loss.component.ts +++ b/overlord/src/app/profit-loss/profit-loss.component.ts @@ -1,6 +1,7 @@ import {Component, OnInit, ViewChild} from '@angular/core'; import {FormBuilder, FormGroup} from '@angular/forms'; -import {MatPaginator, MatSort} from '@angular/material'; +import { MatPaginator } from '@angular/material/paginator'; +import { MatSort } from '@angular/material/sort'; import {ActivatedRoute, Router} from '@angular/router'; import * as moment from 'moment'; import {ProfitLossDataSource} from './profit-loss-datasource'; @@ -12,8 +13,8 @@ import {ProfitLoss} from './profit-loss'; styleUrls: ['./profit-loss.component.css'] }) export class ProfitLossComponent implements OnInit { - @ViewChild(MatPaginator) paginator: MatPaginator; - @ViewChild(MatSort) sort: MatSort; + @ViewChild(MatPaginator, { static: true }) paginator: MatPaginator; + @ViewChild(MatSort, { static: true }) sort: MatSort; dataSource: ProfitLossDataSource; form: FormGroup; info: ProfitLoss; diff --git a/overlord/src/app/profit-loss/profit-loss.module.ts b/overlord/src/app/profit-loss/profit-loss.module.ts index c771f8b4..41a59f86 100644 --- a/overlord/src/app/profit-loss/profit-loss.module.ts +++ b/overlord/src/app/profit-loss/profit-loss.module.ts @@ -1,23 +1,18 @@ import {NgModule} from '@angular/core'; import {CommonModule} from '@angular/common'; -import { - DateAdapter, - MAT_DATE_FORMATS, - MAT_DATE_LOCALE, - MatAutocompleteModule, - MatButtonModule, - MatCardModule, - MatCheckboxModule, - MatDatepickerModule, - MatFormFieldModule, - MatIconModule, - MatInputModule, - MatNativeDateModule, - MatPaginatorModule, - MatProgressSpinnerModule, - MatSortModule, - MatTableModule -} from '@angular/material'; +import { MatAutocompleteModule } from '@angular/material/autocomplete'; +import { MatButtonModule } from '@angular/material/button'; +import { MatCardModule } from '@angular/material/card'; +import { MatCheckboxModule } from '@angular/material/checkbox'; +import { DateAdapter, MAT_DATE_FORMATS, MAT_DATE_LOCALE, MatNativeDateModule } from '@angular/material/core'; +import { MatDatepickerModule } from '@angular/material/datepicker'; +import { MatFormFieldModule } from '@angular/material/form-field'; +import { MatIconModule } from '@angular/material/icon'; +import { MatInputModule } from '@angular/material/input'; +import { MatPaginatorModule } from '@angular/material/paginator'; +import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; +import { MatSortModule } from '@angular/material/sort'; +import { MatTableModule } from '@angular/material/table'; import {SharedModule} from '../shared/shared.module'; import {ReactiveFormsModule} from '@angular/forms'; import {CdkTableModule} from '@angular/cdk/table'; diff --git a/overlord/src/app/purchase-entries/purchase-entries-datasource.ts b/overlord/src/app/purchase-entries/purchase-entries-datasource.ts index 585aca18..945bf563 100644 --- a/overlord/src/app/purchase-entries/purchase-entries-datasource.ts +++ b/overlord/src/app/purchase-entries/purchase-entries-datasource.ts @@ -1,5 +1,6 @@ import {DataSource} from '@angular/cdk/collections'; -import {MatPaginator, MatSort} from '@angular/material'; +import { MatPaginator } from '@angular/material/paginator'; +import { MatSort } from '@angular/material/sort'; import {map} from 'rxjs/operators'; import {merge, Observable, of as observableOf} from 'rxjs'; import {PurchaseEntriesItem} from './purchase-entries'; diff --git a/overlord/src/app/purchase-entries/purchase-entries.component.ts b/overlord/src/app/purchase-entries/purchase-entries.component.ts index 88b076c4..02e4fbc2 100644 --- a/overlord/src/app/purchase-entries/purchase-entries.component.ts +++ b/overlord/src/app/purchase-entries/purchase-entries.component.ts @@ -1,6 +1,7 @@ import {Component, OnInit, ViewChild} from '@angular/core'; import {FormBuilder, FormGroup} from '@angular/forms'; -import {MatPaginator, MatSort} from '@angular/material'; +import { MatPaginator } from '@angular/material/paginator'; +import { MatSort } from '@angular/material/sort'; import {ActivatedRoute, Router} from '@angular/router'; import * as moment from 'moment'; import {PurchaseEntriesDataSource} from './purchase-entries-datasource'; @@ -12,8 +13,8 @@ import {PurchaseEntries} from './purchase-entries'; styleUrls: ['./purchase-entries.component.css'] }) export class PurchaseEntriesComponent implements OnInit { - @ViewChild(MatPaginator) paginator: MatPaginator; - @ViewChild(MatSort) sort: MatSort; + @ViewChild(MatPaginator, { static: true }) paginator: MatPaginator; + @ViewChild(MatSort, { static: true }) sort: MatSort; dataSource: PurchaseEntriesDataSource; form: FormGroup; info: PurchaseEntries; diff --git a/overlord/src/app/purchase-entries/purchase-entries.module.ts b/overlord/src/app/purchase-entries/purchase-entries.module.ts index 6245010c..7ec3194d 100644 --- a/overlord/src/app/purchase-entries/purchase-entries.module.ts +++ b/overlord/src/app/purchase-entries/purchase-entries.module.ts @@ -1,23 +1,18 @@ import {NgModule} from '@angular/core'; import {CommonModule} from '@angular/common'; -import { - DateAdapter, - MAT_DATE_FORMATS, - MAT_DATE_LOCALE, - MatAutocompleteModule, - MatButtonModule, - MatCardModule, - MatCheckboxModule, - MatDatepickerModule, - MatFormFieldModule, - MatIconModule, - MatInputModule, - MatNativeDateModule, - MatPaginatorModule, - MatProgressSpinnerModule, - MatSortModule, - MatTableModule -} from '@angular/material'; +import { MatAutocompleteModule } from '@angular/material/autocomplete'; +import { MatButtonModule } from '@angular/material/button'; +import { MatCardModule } from '@angular/material/card'; +import { MatCheckboxModule } from '@angular/material/checkbox'; +import { DateAdapter, MAT_DATE_FORMATS, MAT_DATE_LOCALE, MatNativeDateModule } from '@angular/material/core'; +import { MatDatepickerModule } from '@angular/material/datepicker'; +import { MatFormFieldModule } from '@angular/material/form-field'; +import { MatIconModule } from '@angular/material/icon'; +import { MatInputModule } from '@angular/material/input'; +import { MatPaginatorModule } from '@angular/material/paginator'; +import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; +import { MatSortModule } from '@angular/material/sort'; +import { MatTableModule } from '@angular/material/table'; import {SharedModule} from '../shared/shared.module'; import {ReactiveFormsModule} from '@angular/forms'; import {CdkTableModule} from '@angular/cdk/table'; diff --git a/overlord/src/app/purchase-return/purchase-return-dialog.component.ts b/overlord/src/app/purchase-return/purchase-return-dialog.component.ts index deea7ca8..05d9015c 100644 --- a/overlord/src/app/purchase-return/purchase-return-dialog.component.ts +++ b/overlord/src/app/purchase-return/purchase-return-dialog.component.ts @@ -1,5 +1,6 @@ import {Component, Inject, OnInit} from '@angular/core'; -import {MAT_DIALOG_DATA, MatAutocompleteSelectedEvent, MatDialogRef} from '@angular/material'; +import { MatAutocompleteSelectedEvent } from '@angular/material/autocomplete'; +import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import {FormBuilder, FormGroup} from '@angular/forms'; import {debounceTime, distinctUntilChanged, map, startWith, switchMap} from 'rxjs/operators'; import {Observable, of as observableOf} from 'rxjs'; diff --git a/overlord/src/app/purchase-return/purchase-return.component.ts b/overlord/src/app/purchase-return/purchase-return.component.ts index 2d7cc2f8..125a3387 100644 --- a/overlord/src/app/purchase-return/purchase-return.component.ts +++ b/overlord/src/app/purchase-return/purchase-return.component.ts @@ -1,6 +1,7 @@ import {AfterViewInit, Component, ElementRef, OnInit, OnDestroy, ViewChild} from '@angular/core'; import {FormBuilder, FormGroup} from '@angular/forms'; -import {MatAutocompleteSelectedEvent, MatDialog} from '@angular/material'; +import { MatAutocompleteSelectedEvent } from '@angular/material/autocomplete'; +import { MatDialog } from '@angular/material/dialog'; import {ActivatedRoute, Router} from '@angular/router'; import {BehaviorSubject, fromEvent, Observable, of, of as observableOf, zip} from 'rxjs'; import {PurchaseReturnDataSource} from './purchase-return-datasource'; @@ -24,9 +25,9 @@ import {Hotkey, HotkeysService} from "angular2-hotkeys"; styleUrls: ['./purchase-return.component.css'] }) export class PurchaseReturnComponent implements OnInit, AfterViewInit, OnDestroy { - @ViewChild('accountElement') accountElement: ElementRef; - @ViewChild('batchElement') batchElement: ElementRef; - @ViewChild('dateElement') dateElement: ElementRef; + @ViewChild('accountElement', { static: true }) accountElement: ElementRef; + @ViewChild('batchElement', { static: true }) batchElement: ElementRef; + @ViewChild('dateElement', { static: true }) dateElement: ElementRef; public inventoryObservable = new BehaviorSubject([]); dataSource: PurchaseReturnDataSource; form: FormGroup; diff --git a/overlord/src/app/purchase-return/purchase-return.module.ts b/overlord/src/app/purchase-return/purchase-return.module.ts index b62cf123..6f8db99e 100644 --- a/overlord/src/app/purchase-return/purchase-return.module.ts +++ b/overlord/src/app/purchase-return/purchase-return.module.ts @@ -1,25 +1,20 @@ import {NgModule} from '@angular/core'; import {CommonModule} from '@angular/common'; -import { - DateAdapter, - MAT_DATE_FORMATS, - MAT_DATE_LOCALE, - MatAutocompleteModule, - MatButtonModule, - MatCardModule, - MatCheckboxModule, - MatDatepickerModule, - MatDialogModule, - MatFormFieldModule, - MatIconModule, - MatInputModule, - MatNativeDateModule, - MatPaginatorModule, - MatProgressSpinnerModule, - MatSelectModule, - MatSortModule, - MatTableModule -} from '@angular/material'; +import { MatAutocompleteModule } from '@angular/material/autocomplete'; +import { MatButtonModule } from '@angular/material/button'; +import { MatCardModule } from '@angular/material/card'; +import { MatCheckboxModule } from '@angular/material/checkbox'; +import { DateAdapter, MAT_DATE_FORMATS, MAT_DATE_LOCALE, MatNativeDateModule } from '@angular/material/core'; +import { MatDatepickerModule } from '@angular/material/datepicker'; +import { MatDialogModule } from '@angular/material/dialog'; +import { MatFormFieldModule } from '@angular/material/form-field'; +import { MatIconModule } from '@angular/material/icon'; +import { MatInputModule } from '@angular/material/input'; +import { MatPaginatorModule } from '@angular/material/paginator'; +import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; +import { MatSelectModule } from '@angular/material/select'; +import { MatSortModule } from '@angular/material/sort'; +import { MatTableModule } from '@angular/material/table'; import {SharedModule} from '../shared/shared.module'; import {ReactiveFormsModule} from '@angular/forms'; import {CdkTableModule} from '@angular/cdk/table'; diff --git a/overlord/src/app/purchase/purchase-dialog.component.ts b/overlord/src/app/purchase/purchase-dialog.component.ts index f9323941..fbafd70a 100644 --- a/overlord/src/app/purchase/purchase-dialog.component.ts +++ b/overlord/src/app/purchase/purchase-dialog.component.ts @@ -1,5 +1,6 @@ import {Component, Inject, OnInit} from '@angular/core'; -import {MAT_DIALOG_DATA, MatAutocompleteSelectedEvent, MatDialogRef} from '@angular/material'; +import { MatAutocompleteSelectedEvent } from '@angular/material/autocomplete'; +import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import {debounceTime, distinctUntilChanged, map, startWith, switchMap} from 'rxjs/operators'; import {FormBuilder, FormGroup} from '@angular/forms'; import {Observable, of as observableOf} from 'rxjs'; diff --git a/overlord/src/app/purchase/purchase.component.ts b/overlord/src/app/purchase/purchase.component.ts index bc8eaacd..7090c433 100644 --- a/overlord/src/app/purchase/purchase.component.ts +++ b/overlord/src/app/purchase/purchase.component.ts @@ -1,6 +1,7 @@ import {AfterViewInit, Component, ElementRef, OnInit, OnDestroy, ViewChild} from '@angular/core'; import {FormBuilder, FormGroup} from '@angular/forms'; -import {MatAutocompleteSelectedEvent, MatDialog} from '@angular/material'; +import { MatAutocompleteSelectedEvent } from '@angular/material/autocomplete'; +import { MatDialog } from '@angular/material/dialog'; import {ActivatedRoute, Router} from '@angular/router'; import {BehaviorSubject, fromEvent, Observable, of, of as observableOf, zip} from 'rxjs'; import {PurchaseDataSource} from './purchase-datasource'; @@ -25,9 +26,9 @@ import {Hotkey, HotkeysService} from "angular2-hotkeys"; styleUrls: ['./purchase.component.css'] }) export class PurchaseComponent implements OnInit, AfterViewInit, OnDestroy { - @ViewChild('accountElement') accountElement: ElementRef; - @ViewChild('productElement') productElement: ElementRef; - @ViewChild('dateElement') dateElement: ElementRef; + @ViewChild('accountElement', { static: true }) accountElement: ElementRef; + @ViewChild('productElement', { static: true }) productElement: ElementRef; + @ViewChild('dateElement', { static: true }) dateElement: ElementRef; public inventoryObservable = new BehaviorSubject([]); dataSource: PurchaseDataSource; form: FormGroup; diff --git a/overlord/src/app/purchase/purchase.module.ts b/overlord/src/app/purchase/purchase.module.ts index a6f65716..4c77ebfb 100644 --- a/overlord/src/app/purchase/purchase.module.ts +++ b/overlord/src/app/purchase/purchase.module.ts @@ -1,25 +1,20 @@ import {NgModule} from '@angular/core'; import {CommonModule} from '@angular/common'; -import { - DateAdapter, - MAT_DATE_FORMATS, - MAT_DATE_LOCALE, - MatAutocompleteModule, - MatButtonModule, - MatCardModule, - MatCheckboxModule, - MatDatepickerModule, - MatDialogModule, - MatFormFieldModule, - MatIconModule, - MatInputModule, - MatNativeDateModule, - MatPaginatorModule, - MatProgressSpinnerModule, - MatSelectModule, - MatSortModule, - MatTableModule -} from '@angular/material'; +import { MatAutocompleteModule } from '@angular/material/autocomplete'; +import { MatButtonModule } from '@angular/material/button'; +import { MatCardModule } from '@angular/material/card'; +import { MatCheckboxModule } from '@angular/material/checkbox'; +import { DateAdapter, MAT_DATE_FORMATS, MAT_DATE_LOCALE, MatNativeDateModule } from '@angular/material/core'; +import { MatDatepickerModule } from '@angular/material/datepicker'; +import { MatDialogModule } from '@angular/material/dialog'; +import { MatFormFieldModule } from '@angular/material/form-field'; +import { MatIconModule } from '@angular/material/icon'; +import { MatInputModule } from '@angular/material/input'; +import { MatPaginatorModule } from '@angular/material/paginator'; +import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; +import { MatSelectModule } from '@angular/material/select'; +import { MatSortModule } from '@angular/material/sort'; +import { MatTableModule } from '@angular/material/table'; import {SharedModule} from '../shared/shared.module'; import {ReactiveFormsModule} from '@angular/forms'; import {CdkTableModule} from '@angular/cdk/table'; diff --git a/overlord/src/app/purchases/purchases-datasource.ts b/overlord/src/app/purchases/purchases-datasource.ts index 4c24451d..24deef01 100644 --- a/overlord/src/app/purchases/purchases-datasource.ts +++ b/overlord/src/app/purchases/purchases-datasource.ts @@ -1,5 +1,6 @@ import {DataSource} from '@angular/cdk/collections'; -import {MatPaginator, MatSort} from '@angular/material'; +import { MatPaginator } from '@angular/material/paginator'; +import { MatSort } from '@angular/material/sort'; import {map} from 'rxjs/operators'; import {merge, Observable, of as observableOf} from 'rxjs'; import {PurchasesItem} from './purchases'; diff --git a/overlord/src/app/purchases/purchases.component.ts b/overlord/src/app/purchases/purchases.component.ts index f4acad37..ea1ff85f 100644 --- a/overlord/src/app/purchases/purchases.component.ts +++ b/overlord/src/app/purchases/purchases.component.ts @@ -1,6 +1,7 @@ import {Component, OnInit, ViewChild} from '@angular/core'; import {FormBuilder, FormGroup} from '@angular/forms'; -import {MatPaginator, MatSort} from '@angular/material'; +import { MatPaginator } from '@angular/material/paginator'; +import { MatSort } from '@angular/material/sort'; import {ActivatedRoute, Router} from '@angular/router'; import * as moment from 'moment'; import {PurchasesDataSource} from './purchases-datasource'; @@ -12,8 +13,8 @@ import {Purchases, PurchasesItem} from './purchases'; styleUrls: ['./purchases.component.css'] }) export class PurchasesComponent implements OnInit { - @ViewChild(MatPaginator) paginator: MatPaginator; - @ViewChild(MatSort) sort: MatSort; + @ViewChild(MatPaginator, { static: true }) paginator: MatPaginator; + @ViewChild(MatSort, { static: true }) sort: MatSort; dataSource: PurchasesDataSource; form: FormGroup; info: Purchases; diff --git a/overlord/src/app/purchases/purchases.module.ts b/overlord/src/app/purchases/purchases.module.ts index 94c64f1e..cd8ea1e4 100644 --- a/overlord/src/app/purchases/purchases.module.ts +++ b/overlord/src/app/purchases/purchases.module.ts @@ -1,23 +1,18 @@ import {NgModule} from '@angular/core'; import {CommonModule} from '@angular/common'; -import { - DateAdapter, - MAT_DATE_FORMATS, - MAT_DATE_LOCALE, - MatAutocompleteModule, - MatButtonModule, - MatCardModule, - MatCheckboxModule, - MatDatepickerModule, - MatFormFieldModule, - MatIconModule, - MatInputModule, - MatNativeDateModule, - MatPaginatorModule, - MatProgressSpinnerModule, - MatSortModule, - MatTableModule -} from '@angular/material'; +import { MatAutocompleteModule } from '@angular/material/autocomplete'; +import { MatButtonModule } from '@angular/material/button'; +import { MatCardModule } from '@angular/material/card'; +import { MatCheckboxModule } from '@angular/material/checkbox'; +import { DateAdapter, MAT_DATE_FORMATS, MAT_DATE_LOCALE, MatNativeDateModule } from '@angular/material/core'; +import { MatDatepickerModule } from '@angular/material/datepicker'; +import { MatFormFieldModule } from '@angular/material/form-field'; +import { MatIconModule } from '@angular/material/icon'; +import { MatInputModule } from '@angular/material/input'; +import { MatPaginatorModule } from '@angular/material/paginator'; +import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; +import { MatSortModule } from '@angular/material/sort'; +import { MatTableModule } from '@angular/material/table'; import {SharedModule} from '../shared/shared.module'; import {ReactiveFormsModule} from '@angular/forms'; import {CdkTableModule} from '@angular/cdk/table'; diff --git a/overlord/src/app/raw-material-cost/raw-material-cost-datasource.ts b/overlord/src/app/raw-material-cost/raw-material-cost-datasource.ts index 4e30fe49..63aa8898 100644 --- a/overlord/src/app/raw-material-cost/raw-material-cost-datasource.ts +++ b/overlord/src/app/raw-material-cost/raw-material-cost-datasource.ts @@ -1,5 +1,6 @@ import {DataSource} from '@angular/cdk/collections'; -import {MatPaginator, MatSort} from '@angular/material'; +import { MatPaginator } from '@angular/material/paginator'; +import { MatSort } from '@angular/material/sort'; import {map} from 'rxjs/operators'; import {merge, Observable, of as observableOf} from 'rxjs'; import {RawMaterialCostItem} from './raw-material-cost'; diff --git a/overlord/src/app/raw-material-cost/raw-material-cost.component.ts b/overlord/src/app/raw-material-cost/raw-material-cost.component.ts index 320ad40d..9f7f7a84 100644 --- a/overlord/src/app/raw-material-cost/raw-material-cost.component.ts +++ b/overlord/src/app/raw-material-cost/raw-material-cost.component.ts @@ -1,6 +1,7 @@ import {Component, OnInit, ViewChild} from '@angular/core'; import {FormBuilder, FormGroup} from '@angular/forms'; -import {MatPaginator, MatSort} from '@angular/material'; +import { MatPaginator } from '@angular/material/paginator'; +import { MatSort } from '@angular/material/sort'; import {ActivatedRoute, Router} from '@angular/router'; import {Observable} from 'rxjs'; import * as moment from 'moment'; @@ -15,8 +16,8 @@ import {ToCsvService} from '../shared/to-csv.service'; styleUrls: ['./raw-material-cost.component.css'] }) export class RawMaterialCostComponent implements OnInit { - @ViewChild(MatPaginator) paginator: MatPaginator; - @ViewChild(MatSort) sort: MatSort; + @ViewChild(MatPaginator, { static: true }) paginator: MatPaginator; + @ViewChild(MatSort, { static: true }) sort: MatSort; dataSource: RawMaterialCostDataSource; form: FormGroup; info: RawMaterialCost; diff --git a/overlord/src/app/raw-material-cost/raw-material-cost.module.ts b/overlord/src/app/raw-material-cost/raw-material-cost.module.ts index 0c3015b0..7f3f2569 100644 --- a/overlord/src/app/raw-material-cost/raw-material-cost.module.ts +++ b/overlord/src/app/raw-material-cost/raw-material-cost.module.ts @@ -1,23 +1,18 @@ import {NgModule} from '@angular/core'; import {CommonModule} from '@angular/common'; -import { - DateAdapter, - MAT_DATE_FORMATS, - MAT_DATE_LOCALE, - MatAutocompleteModule, - MatButtonModule, - MatCardModule, - MatCheckboxModule, - MatDatepickerModule, - MatFormFieldModule, - MatIconModule, - MatInputModule, - MatNativeDateModule, - MatPaginatorModule, - MatProgressSpinnerModule, - MatSortModule, - MatTableModule -} from '@angular/material'; +import { MatAutocompleteModule } from '@angular/material/autocomplete'; +import { MatButtonModule } from '@angular/material/button'; +import { MatCardModule } from '@angular/material/card'; +import { MatCheckboxModule } from '@angular/material/checkbox'; +import { DateAdapter, MAT_DATE_FORMATS, MAT_DATE_LOCALE, MatNativeDateModule } from '@angular/material/core'; +import { MatDatepickerModule } from '@angular/material/datepicker'; +import { MatFormFieldModule } from '@angular/material/form-field'; +import { MatIconModule } from '@angular/material/icon'; +import { MatInputModule } from '@angular/material/input'; +import { MatPaginatorModule } from '@angular/material/paginator'; +import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; +import { MatSortModule } from '@angular/material/sort'; +import { MatTableModule } from '@angular/material/table'; import {SharedModule} from '../shared/shared.module'; import {ReactiveFormsModule} from '@angular/forms'; import {CdkTableModule} from '@angular/cdk/table'; diff --git a/overlord/src/app/receipt/receipt-dialog.component.ts b/overlord/src/app/receipt/receipt-dialog.component.ts index fe2a0e37..c9c92b66 100644 --- a/overlord/src/app/receipt/receipt-dialog.component.ts +++ b/overlord/src/app/receipt/receipt-dialog.component.ts @@ -1,5 +1,6 @@ import {Component, Inject, OnInit} from '@angular/core'; -import {MAT_DIALOG_DATA, MatAutocompleteSelectedEvent, MatDialogRef} from '@angular/material'; +import { MatAutocompleteSelectedEvent } from '@angular/material/autocomplete'; +import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import {debounceTime, distinctUntilChanged, map, startWith, switchMap} from 'rxjs/operators'; import {Account} from '../account/account'; import {AccountService} from '../account/account.service'; diff --git a/overlord/src/app/receipt/receipt.component.ts b/overlord/src/app/receipt/receipt.component.ts index aea221af..b33c0c4e 100644 --- a/overlord/src/app/receipt/receipt.component.ts +++ b/overlord/src/app/receipt/receipt.component.ts @@ -1,6 +1,7 @@ import {AfterViewInit, Component, ElementRef, OnInit, OnDestroy, ViewChild} from '@angular/core'; import {FormBuilder, FormGroup} from '@angular/forms'; -import {MatAutocompleteSelectedEvent, MatDialog} from '@angular/material'; +import { MatAutocompleteSelectedEvent } from '@angular/material/autocomplete'; +import { MatDialog } from '@angular/material/dialog'; import {ActivatedRoute, Router} from '@angular/router'; import {BehaviorSubject, fromEvent, Observable, of, of as observableOf, zip} from 'rxjs'; import {ReceiptDataSource} from './receipt-datasource'; @@ -24,8 +25,8 @@ import {Hotkey, HotkeysService} from "angular2-hotkeys"; styleUrls: ['./receipt.component.css'] }) export class ReceiptComponent implements OnInit, AfterViewInit, OnDestroy { - @ViewChild('accountElement') accountElement: ElementRef; - @ViewChild('dateElement') dateElement: ElementRef; + @ViewChild('accountElement', { static: true }) accountElement: ElementRef; + @ViewChild('dateElement', { static: true }) dateElement: ElementRef; public journalObservable = new BehaviorSubject([]); dataSource: ReceiptDataSource; form: FormGroup; diff --git a/overlord/src/app/receipt/receipt.module.ts b/overlord/src/app/receipt/receipt.module.ts index 941b9a4e..a1cc6b3c 100644 --- a/overlord/src/app/receipt/receipt.module.ts +++ b/overlord/src/app/receipt/receipt.module.ts @@ -1,25 +1,20 @@ import {NgModule} from '@angular/core'; import {CommonModule} from '@angular/common'; -import { - DateAdapter, - MAT_DATE_FORMATS, - MAT_DATE_LOCALE, - MatAutocompleteModule, - MatButtonModule, - MatCardModule, - MatCheckboxModule, - MatDatepickerModule, - MatDialogModule, - MatFormFieldModule, - MatIconModule, - MatInputModule, - MatNativeDateModule, - MatPaginatorModule, - MatProgressSpinnerModule, - MatSelectModule, - MatSortModule, - MatTableModule -} from '@angular/material'; +import { MatAutocompleteModule } from '@angular/material/autocomplete'; +import { MatButtonModule } from '@angular/material/button'; +import { MatCardModule } from '@angular/material/card'; +import { MatCheckboxModule } from '@angular/material/checkbox'; +import { DateAdapter, MAT_DATE_FORMATS, MAT_DATE_LOCALE, MatNativeDateModule } from '@angular/material/core'; +import { MatDatepickerModule } from '@angular/material/datepicker'; +import { MatDialogModule } from '@angular/material/dialog'; +import { MatFormFieldModule } from '@angular/material/form-field'; +import { MatIconModule } from '@angular/material/icon'; +import { MatInputModule } from '@angular/material/input'; +import { MatPaginatorModule } from '@angular/material/paginator'; +import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; +import { MatSelectModule } from '@angular/material/select'; +import { MatSortModule } from '@angular/material/sort'; +import { MatTableModule } from '@angular/material/table'; import {SharedModule} from '../shared/shared.module'; import {ReactiveFormsModule} from '@angular/forms'; import {CdkTableModule} from '@angular/cdk/table'; diff --git a/overlord/src/app/settings/settings.component.ts b/overlord/src/app/settings/settings.component.ts index 2e8f46ec..1d644509 100644 --- a/overlord/src/app/settings/settings.component.ts +++ b/overlord/src/app/settings/settings.component.ts @@ -1,6 +1,7 @@ import {Component, OnInit} from '@angular/core'; import {FormBuilder, FormGroup} from '@angular/forms'; -import {MatAutocompleteSelectedEvent, MatDialog} from '@angular/material'; +import { MatAutocompleteSelectedEvent } from '@angular/material/autocomplete'; +import { MatDialog } from '@angular/material/dialog'; import {ActivatedRoute, Router} from '@angular/router'; import * as moment from 'moment'; import {AuthService} from '../auth/auth.service'; diff --git a/overlord/src/app/settings/settings.module.ts b/overlord/src/app/settings/settings.module.ts index 47f5af30..f13e2be7 100644 --- a/overlord/src/app/settings/settings.module.ts +++ b/overlord/src/app/settings/settings.module.ts @@ -1,23 +1,21 @@ import {NgModule} from '@angular/core'; import {CommonModule} from '@angular/common'; -import { - MatAutocompleteModule, - MatButtonModule, - MatCardModule, - MatCheckboxModule, - MatDatepickerModule, - MatDialogModule, - MatFormFieldModule, - MatIconModule, - MatInputModule, - MatNativeDateModule, - MatPaginatorModule, - MatProgressSpinnerModule, - MatSelectModule, - MatSortModule, - MatTableModule, - MatTabsModule -} from '@angular/material'; +import { MatAutocompleteModule } from '@angular/material/autocomplete'; +import { MatButtonModule } from '@angular/material/button'; +import { MatCardModule } from '@angular/material/card'; +import { MatCheckboxModule } from '@angular/material/checkbox'; +import { MatNativeDateModule } from '@angular/material/core'; +import { MatDatepickerModule } from '@angular/material/datepicker'; +import { MatDialogModule } from '@angular/material/dialog'; +import { MatFormFieldModule } from '@angular/material/form-field'; +import { MatIconModule } from '@angular/material/icon'; +import { MatInputModule } from '@angular/material/input'; +import { MatPaginatorModule } from '@angular/material/paginator'; +import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; +import { MatSelectModule } from '@angular/material/select'; +import { MatSortModule } from '@angular/material/sort'; +import { MatTableModule } from '@angular/material/table'; +import { MatTabsModule } from '@angular/material/tabs'; import {ReactiveFormsModule} from '@angular/forms'; import {CdkTableModule} from '@angular/cdk/table'; import {A11yModule} from '@angular/cdk/a11y'; diff --git a/overlord/src/app/shared/confirm-dialog/confirm-dialog.component.ts b/overlord/src/app/shared/confirm-dialog/confirm-dialog.component.ts index fc5eb4f9..0d7ca323 100644 --- a/overlord/src/app/shared/confirm-dialog/confirm-dialog.component.ts +++ b/overlord/src/app/shared/confirm-dialog/confirm-dialog.component.ts @@ -1,5 +1,5 @@ import {Component, Inject} from '@angular/core'; -import {MAT_DIALOG_DATA, MatDialogRef} from '@angular/material'; +import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; @Component({ selector: 'app-confirm-dialog', diff --git a/overlord/src/app/shared/image-dialog/image-dialog.component.ts b/overlord/src/app/shared/image-dialog/image-dialog.component.ts index 0bdb8955..22ab1e5a 100644 --- a/overlord/src/app/shared/image-dialog/image-dialog.component.ts +++ b/overlord/src/app/shared/image-dialog/image-dialog.component.ts @@ -1,5 +1,5 @@ import {Component, Inject} from '@angular/core'; -import {MAT_DIALOG_DATA, MatDialogRef} from '@angular/material'; +import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; @Component({ selector: 'app-image-dialog', diff --git a/overlord/src/app/shared/shared.module.ts b/overlord/src/app/shared/shared.module.ts index 4b6e4290..2a6b0aa9 100644 --- a/overlord/src/app/shared/shared.module.ts +++ b/overlord/src/app/shared/shared.module.ts @@ -1,7 +1,8 @@ import {NgModule} from '@angular/core'; import {CommonModule} from '@angular/common'; import {ConfirmDialogComponent} from './confirm-dialog/confirm-dialog.component'; -import {MatButtonModule, MatDialogModule} from '@angular/material'; +import { MatButtonModule } from '@angular/material/button'; +import { MatDialogModule } from '@angular/material/dialog'; import {LocalTimePipe} from './local-time.pipe'; import {ClearPipe} from './clear.pipe'; import {AccountingPipe} from './accounting.pipe'; diff --git a/overlord/src/app/stock-movement/stock-movement-datasource.ts b/overlord/src/app/stock-movement/stock-movement-datasource.ts index 2c744137..6a280e15 100644 --- a/overlord/src/app/stock-movement/stock-movement-datasource.ts +++ b/overlord/src/app/stock-movement/stock-movement-datasource.ts @@ -1,5 +1,6 @@ import {DataSource} from '@angular/cdk/collections'; -import {MatPaginator, MatSort} from '@angular/material'; +import { MatPaginator } from '@angular/material/paginator'; +import { MatSort } from '@angular/material/sort'; import {map} from 'rxjs/operators'; import {merge, Observable, of as observableOf} from 'rxjs'; import {StockMovementItem} from './stock-movement'; diff --git a/overlord/src/app/stock-movement/stock-movement.component.ts b/overlord/src/app/stock-movement/stock-movement.component.ts index b9d452be..32b6b240 100644 --- a/overlord/src/app/stock-movement/stock-movement.component.ts +++ b/overlord/src/app/stock-movement/stock-movement.component.ts @@ -1,6 +1,7 @@ import {Component, OnInit, ViewChild} from '@angular/core'; import {FormBuilder, FormGroup} from '@angular/forms'; -import {MatPaginator, MatSort} from '@angular/material'; +import { MatPaginator } from '@angular/material/paginator'; +import { MatSort } from '@angular/material/sort'; import {ActivatedRoute, Router} from '@angular/router'; import * as moment from 'moment'; import {StockMovementDataSource} from './stock-movement-datasource'; @@ -12,8 +13,8 @@ import {StockMovement} from './stock-movement'; styleUrls: ['./stock-movement.component.css'] }) export class StockMovementComponent implements OnInit { - @ViewChild(MatPaginator) paginator: MatPaginator; - @ViewChild(MatSort) sort: MatSort; + @ViewChild(MatPaginator, { static: true }) paginator: MatPaginator; + @ViewChild(MatSort, { static: true }) sort: MatSort; dataSource: StockMovementDataSource; form: FormGroup; info: StockMovement; diff --git a/overlord/src/app/stock-movement/stock-movement.module.ts b/overlord/src/app/stock-movement/stock-movement.module.ts index aeaf87e8..9c596a67 100644 --- a/overlord/src/app/stock-movement/stock-movement.module.ts +++ b/overlord/src/app/stock-movement/stock-movement.module.ts @@ -1,23 +1,18 @@ import {NgModule} from '@angular/core'; import {CommonModule} from '@angular/common'; -import { - DateAdapter, - MAT_DATE_FORMATS, - MAT_DATE_LOCALE, - MatAutocompleteModule, - MatButtonModule, - MatCardModule, - MatCheckboxModule, - MatDatepickerModule, - MatFormFieldModule, - MatIconModule, - MatInputModule, - MatNativeDateModule, - MatPaginatorModule, - MatProgressSpinnerModule, - MatSortModule, - MatTableModule -} from '@angular/material'; +import { MatAutocompleteModule } from '@angular/material/autocomplete'; +import { MatButtonModule } from '@angular/material/button'; +import { MatCardModule } from '@angular/material/card'; +import { MatCheckboxModule } from '@angular/material/checkbox'; +import { DateAdapter, MAT_DATE_FORMATS, MAT_DATE_LOCALE, MatNativeDateModule } from '@angular/material/core'; +import { MatDatepickerModule } from '@angular/material/datepicker'; +import { MatFormFieldModule } from '@angular/material/form-field'; +import { MatIconModule } from '@angular/material/icon'; +import { MatInputModule } from '@angular/material/input'; +import { MatPaginatorModule } from '@angular/material/paginator'; +import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; +import { MatSortModule } from '@angular/material/sort'; +import { MatTableModule } from '@angular/material/table'; import {SharedModule} from '../shared/shared.module'; import {ReactiveFormsModule} from '@angular/forms'; import {CdkTableModule} from '@angular/cdk/table'; diff --git a/overlord/src/app/trial-balance/trial-balance-datasource.ts b/overlord/src/app/trial-balance/trial-balance-datasource.ts index 247bbaa1..dd463bbb 100644 --- a/overlord/src/app/trial-balance/trial-balance-datasource.ts +++ b/overlord/src/app/trial-balance/trial-balance-datasource.ts @@ -1,5 +1,6 @@ import {DataSource} from '@angular/cdk/collections'; -import {MatPaginator, MatSort} from '@angular/material'; +import { MatPaginator } from '@angular/material/paginator'; +import { MatSort } from '@angular/material/sort'; import {map} from 'rxjs/operators'; import {merge, Observable, of as observableOf} from 'rxjs'; import {TrialBalanceItem} from './trial-balance'; diff --git a/overlord/src/app/trial-balance/trial-balance.component.ts b/overlord/src/app/trial-balance/trial-balance.component.ts index 7ef1ccd7..23cbb18b 100644 --- a/overlord/src/app/trial-balance/trial-balance.component.ts +++ b/overlord/src/app/trial-balance/trial-balance.component.ts @@ -1,5 +1,6 @@ import {Component, OnInit, ViewChild} from '@angular/core'; -import {MatPaginator, MatSort} from '@angular/material'; +import { MatPaginator } from '@angular/material/paginator'; +import { MatSort } from '@angular/material/sort'; import {TrialBalanceDataSource} from './trial-balance-datasource'; import {TrialBalance} from './trial-balance'; import {ActivatedRoute, Router} from '@angular/router'; @@ -12,8 +13,8 @@ import {FormBuilder, FormGroup} from '@angular/forms'; styleUrls: ['./trial-balance.component.css'] }) export class TrialBalanceComponent implements OnInit { - @ViewChild(MatPaginator) paginator: MatPaginator; - @ViewChild(MatSort) sort: MatSort; + @ViewChild(MatPaginator, { static: true }) paginator: MatPaginator; + @ViewChild(MatSort, { static: true }) sort: MatSort; dataSource: TrialBalanceDataSource; form: FormGroup; info: TrialBalance; diff --git a/overlord/src/app/trial-balance/trial-balance.module.ts b/overlord/src/app/trial-balance/trial-balance.module.ts index c69dbe1c..24ab8dee 100644 --- a/overlord/src/app/trial-balance/trial-balance.module.ts +++ b/overlord/src/app/trial-balance/trial-balance.module.ts @@ -1,21 +1,16 @@ import {NgModule} from '@angular/core'; import {CommonModule} from '@angular/common'; -import { - DateAdapter, - MAT_DATE_FORMATS, - MAT_DATE_LOCALE, - MatButtonModule, - MatCardModule, - MatCheckboxModule, - MatDatepickerModule, - MatIconModule, - MatInputModule, - MatNativeDateModule, - MatPaginatorModule, - MatProgressSpinnerModule, - MatSortModule, - MatTableModule -} from '@angular/material'; +import { MatButtonModule } from '@angular/material/button'; +import { MatCardModule } from '@angular/material/card'; +import { MatCheckboxModule } from '@angular/material/checkbox'; +import { DateAdapter, MAT_DATE_FORMATS, MAT_DATE_LOCALE, MatNativeDateModule } from '@angular/material/core'; +import { MatDatepickerModule } from '@angular/material/datepicker'; +import { MatIconModule } from '@angular/material/icon'; +import { MatInputModule } from '@angular/material/input'; +import { MatPaginatorModule } from '@angular/material/paginator'; +import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; +import { MatSortModule } from '@angular/material/sort'; +import { MatTableModule } from '@angular/material/table'; import {SharedModule} from '../shared/shared.module'; import {CdkTableModule} from '@angular/cdk/table'; import {TrialBalanceRoutingModule} from './trial-balance-routing.module'; diff --git a/overlord/src/app/unposted/unposted-datasource.ts b/overlord/src/app/unposted/unposted-datasource.ts index 8a69eba8..b89e105f 100644 --- a/overlord/src/app/unposted/unposted-datasource.ts +++ b/overlord/src/app/unposted/unposted-datasource.ts @@ -1,5 +1,6 @@ import {DataSource} from '@angular/cdk/collections'; -import {MatPaginator, MatSort} from '@angular/material'; +import { MatPaginator } from '@angular/material/paginator'; +import { MatSort } from '@angular/material/sort'; import {map} from 'rxjs/operators'; import {merge, Observable, of as observableOf} from 'rxjs'; import {Unposted} from './unposted'; diff --git a/overlord/src/app/unposted/unposted.component.ts b/overlord/src/app/unposted/unposted.component.ts index 9fd85cfe..fc949eb5 100644 --- a/overlord/src/app/unposted/unposted.component.ts +++ b/overlord/src/app/unposted/unposted.component.ts @@ -1,5 +1,6 @@ import {Component, OnInit, ViewChild} from '@angular/core'; -import {MatPaginator, MatSort} from '@angular/material'; +import { MatPaginator } from '@angular/material/paginator'; +import { MatSort } from '@angular/material/sort'; import {UnpostedDataSource} from './unposted-datasource'; import {Unposted} from './unposted'; import {ActivatedRoute, Router} from '@angular/router'; @@ -11,8 +12,8 @@ import {UnpostedService} from './unposted.service'; styleUrls: ['./unposted.component.css'] }) export class UnpostedComponent implements OnInit { - @ViewChild(MatPaginator) paginator: MatPaginator; - @ViewChild(MatSort) sort: MatSort; + @ViewChild(MatPaginator, { static: true }) paginator: MatPaginator; + @ViewChild(MatSort, { static: true }) sort: MatSort; dataSource: UnpostedDataSource; info: Unposted[]; /** Columns displayed in the table. Columns IDs can be added, removed, or reordered. */ diff --git a/overlord/src/app/unposted/unposted.module.ts b/overlord/src/app/unposted/unposted.module.ts index 3be2992b..7ace1448 100644 --- a/overlord/src/app/unposted/unposted.module.ts +++ b/overlord/src/app/unposted/unposted.module.ts @@ -1,17 +1,15 @@ import {NgModule} from '@angular/core'; import {CommonModule} from '@angular/common'; -import { - MatButtonModule, - MatCardModule, - MatCheckboxModule, - MatIconModule, - MatInputModule, - MatNativeDateModule, - MatPaginatorModule, - MatProgressSpinnerModule, - MatSortModule, - MatTableModule -} from '@angular/material'; +import { MatButtonModule } from '@angular/material/button'; +import { MatCardModule } from '@angular/material/card'; +import { MatCheckboxModule } from '@angular/material/checkbox'; +import { MatNativeDateModule } from '@angular/material/core'; +import { MatIconModule } from '@angular/material/icon'; +import { MatInputModule } from '@angular/material/input'; +import { MatPaginatorModule } from '@angular/material/paginator'; +import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; +import { MatSortModule } from '@angular/material/sort'; +import { MatTableModule } from '@angular/material/table'; import {SharedModule} from '../shared/shared.module'; import {CdkTableModule} from '@angular/cdk/table'; import {UnpostedRoutingModule} from './unposted-routing.module'; diff --git a/overlord/src/app/user/user-detail/user-detail.component.ts b/overlord/src/app/user/user-detail/user-detail.component.ts index 8d729917..cd4b0176 100644 --- a/overlord/src/app/user/user-detail/user-detail.component.ts +++ b/overlord/src/app/user/user-detail/user-detail.component.ts @@ -5,7 +5,7 @@ import {UserService} from '../user.service'; import {User} from '../user'; import {ToasterService} from '../../core/toaster.service'; import {ConfirmDialogComponent} from '../../shared/confirm-dialog/confirm-dialog.component'; -import {MatDialog} from '@angular/material'; +import { MatDialog } from '@angular/material/dialog'; import {FormArray, FormBuilder, FormGroup} from '@angular/forms'; import {Account} from "../../account/account"; @@ -15,7 +15,7 @@ import {Account} from "../../account/account"; styleUrls: ['./user-detail.component.css'] }) export class UserDetailComponent implements OnInit, AfterViewInit { - @ViewChild('nameElement') nameElement: ElementRef; + @ViewChild('nameElement', { static: true }) nameElement: ElementRef; form: FormGroup; item: User; hide: boolean; diff --git a/overlord/src/app/user/user-list/user-list-datasource.ts b/overlord/src/app/user/user-list/user-list-datasource.ts index f225fc4c..9ea6b54b 100644 --- a/overlord/src/app/user/user-list/user-list-datasource.ts +++ b/overlord/src/app/user/user-list/user-list-datasource.ts @@ -1,5 +1,6 @@ import {DataSource} from '@angular/cdk/collections'; -import {MatPaginator, MatSort} from '@angular/material'; +import { MatPaginator } from '@angular/material/paginator'; +import { MatSort } from '@angular/material/sort'; import {map} from 'rxjs/operators'; import {merge, Observable, of as observableOf} from 'rxjs'; import {User} from '../user'; diff --git a/overlord/src/app/user/user-list/user-list.component.ts b/overlord/src/app/user/user-list/user-list.component.ts index c076cbe6..c85b77d3 100644 --- a/overlord/src/app/user/user-list/user-list.component.ts +++ b/overlord/src/app/user/user-list/user-list.component.ts @@ -1,5 +1,6 @@ import {Component, OnInit, ViewChild} from '@angular/core'; -import {MatPaginator, MatSort} from '@angular/material'; +import { MatPaginator } from '@angular/material/paginator'; +import { MatSort } from '@angular/material/sort'; import {UserListDataSource} from './user-list-datasource'; import {User} from '../user'; import {ActivatedRoute} from '@angular/router'; @@ -10,8 +11,8 @@ import {ActivatedRoute} from '@angular/router'; styleUrls: ['./user-list.component.css'] }) export class UserListComponent implements OnInit { - @ViewChild(MatPaginator) paginator: MatPaginator; - @ViewChild(MatSort) sort: MatSort; + @ViewChild(MatPaginator, { static: true }) paginator: MatPaginator; + @ViewChild(MatSort, { static: true }) sort: MatSort; dataSource: UserListDataSource; list: User[]; /** Columns displayed in the table. Columns IDs can be added, removed, or reordered. */ diff --git a/overlord/src/app/user/user.module.ts b/overlord/src/app/user/user.module.ts index 5e395b22..467f5f5a 100644 --- a/overlord/src/app/user/user.module.ts +++ b/overlord/src/app/user/user.module.ts @@ -4,18 +4,16 @@ import {CommonModule} from '@angular/common'; import {UserListComponent} from './user-list/user-list.component'; import {UserDetailComponent} from './user-detail/user-detail.component'; import {UserRoutingModule} from './user-routing.module'; -import { - MatButtonModule, - MatCardModule, - MatCheckboxModule, - MatDividerModule, - MatIconModule, - MatInputModule, - MatPaginatorModule, - MatProgressSpinnerModule, - MatSortModule, - MatTableModule -} from '@angular/material'; +import { MatButtonModule } from '@angular/material/button'; +import { MatCardModule } from '@angular/material/card'; +import { MatCheckboxModule } from '@angular/material/checkbox'; +import { MatDividerModule } from '@angular/material/divider'; +import { MatIconModule } from '@angular/material/icon'; +import { MatInputModule } from '@angular/material/input'; +import { MatPaginatorModule } from '@angular/material/paginator'; +import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; +import { MatSortModule } from '@angular/material/sort'; +import { MatTableModule } from '@angular/material/table'; import {CdkTableModule} from '@angular/cdk/table'; import {ReactiveFormsModule} from '@angular/forms'; import {SharedModule} from '../shared/shared.module'; diff --git a/overlord/tsconfig.json b/overlord/tsconfig.json index edc39871..7994bd46 100644 --- a/overlord/tsconfig.json +++ b/overlord/tsconfig.json @@ -5,11 +5,11 @@ "outDir": "../brewman/static", "sourceMap": true, "declaration": false, - "module": "es2015", + "module": "esnext", "moduleResolution": "node", "emitDecoratorMetadata": true, "experimentalDecorators": true, - "target": "es5", + "target": "es2015", "typeRoots": [ "node_modules/@types" ], diff --git a/overlord/tslint.json b/overlord/tslint.json index 6ddb6b29..ea316552 100644 --- a/overlord/tslint.json +++ b/overlord/tslint.json @@ -118,12 +118,12 @@ "check-type" ], "no-output-on-prefix": true, - "use-input-property-decorator": true, - "use-output-property-decorator": true, - "use-host-property-decorator": true, + "no-inputs-metadata-property": true, + "no-outputs-metadata-property": true, + "no-host-metadata-property": true, "no-input-rename": true, "no-output-rename": true, - "use-life-cycle-interface": true, + "use-lifecycle-interface": true, "use-pipe-transform-interface": true, "component-class-suffix": true, "directive-class-suffix": true