Moved to Angular 6.0

----

Pending
* Table width for the points column in incentive
* Linting
* keyboard navigation where it was used earlier
* can remove the unused totals calculated serverside in productledger
* spinner and loading bars
* Activate Guard for Employee Function tabs
* Progress for Fingerprint uploads
* deleted reconcile and receipe features as they were not being used
* focus the right control on component load

overlord/src/app/client/client-detail/client-detail.component.css

@@ -0,0 +1,3 @@
+.example-card {
+  max-width: 400px;
+}

overlord/src/app/client/client-detail/client-detail.component.html

@@ -0,0 +1,40 @@
+<div fxLayout="row" fxFlex="50%" fxLayoutAlign="space-around center" class="example-card">
+  <mat-card fxFlex>
+    <mat-card-title-group>
+      <mat-card-title>Client</mat-card-title>
+    </mat-card-title-group>
+    <mat-card-content>
+      <form [formGroup]="form" fxLayout="column">
+        <div fxLayout="row" fxLayoutAlign="space-around start" fxLayout.lt-md="column" fxLayoutGap="20px"
+             fxLayoutGap.lt-md="0px">
+          <mat-form-field fxFlex>
+            <mat-label>Code</mat-label>
+            <input matInput placeholder="Code" formControlName="code">
+          </mat-form-field>
+        </div>
+        <div fxLayout="row" fxLayoutAlign="space-around start" fxLayout.lt-md="column" fxLayoutGap="20px"
+             fxLayoutGap.lt-md="0px">
+          <mat-form-field fxFlex>
+            <mat-label>Name</mat-label>
+            <input matInput #nameElement placeholder="Name" formControlName="name">
+          </mat-form-field>
+        </div>
+        <div fxLayout="row" fxLayoutAlign="space-around start" fxLayout.lt-md="column" fxLayoutGap="20px"
+             fxLayoutGap.lt-md="0px">
+          <mat-checkbox formControlName="enabled">Is Enabled?</mat-checkbox>
+        </div>
+        <div fxLayout="row" fxLayoutAlign="space-around start" fxLayout.lt-md="column" fxLayoutGap="20px"
+             fxLayoutGap.lt-md="0px">
+          <mat-form-field fxFlex>
+            <mat-label>OTP</mat-label>
+            <input matInput placeholder="OTP" formControlName="otp">
+          </mat-form-field>
+        </div>
+      </form>
+    </mat-card-content>
+    <mat-card-actions>
+      <button mat-raised-button color="primary" (click)="save()">Save</button>
+      <button mat-raised-button color="warn" (click)="confirmDelete()">Delete</button>
+    </mat-card-actions>
+  </mat-card>
+</div>

overlord/src/app/client/client-detail/client-detail.component.spec.ts

@@ -0,0 +1,25 @@
+import {async, ComponentFixture, TestBed} from '@angular/core/testing';
+
+import {ClientDetailComponent} from './client-detail.component';
+
+describe('ClientDetailComponent', () => {
+  let component: ClientDetailComponent;
+  let fixture: ComponentFixture<ClientDetailComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ClientDetailComponent]
+    })
+      .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(ClientDetailComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

overlord/src/app/client/client-detail/client-detail.component.ts

@@ -0,0 +1,110 @@
+import {AfterViewInit, Component, ElementRef, OnInit, ViewChild} from '@angular/core';
+
+import {ClientService} from '../client.service';
+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 {FormBuilder, FormGroup} from '@angular/forms';
+
+@Component({
+  selector: 'app-client-detail',
+  templateUrl: './client-detail.component.html',
+  styleUrls: ['./client-detail.component.css']
+})
+export class ClientDetailComponent implements OnInit, AfterViewInit {
+  @ViewChild('nameElement') nameElement: ElementRef;
+  form: FormGroup;
+  item: Client;
+
+  constructor(
+    private route: ActivatedRoute,
+    private router: Router,
+    private dialog: MatDialog,
+    private fb: FormBuilder,
+    private toaster: ToasterService,
+    private ser: ClientService
+  ) {
+    this.createForm();
+  }
+
+  createForm() {
+    this.form = this.fb.group({
+      code: {value: '', disabled: true},
+      name: '',
+      enabled: false,
+      otp: ''
+    });
+  }
+
+  ngOnInit() {
+    this.route.data
+      .subscribe((data: { item: Client }) => {
+        this.showItem(data.item);
+      });
+  }
+
+  showItem(item: Client) {
+    this.item = item;
+    this.form.setValue({
+      code: this.item.code || '(Auto)',
+      name: this.item.name,
+      enabled: this.item.enabled,
+      otp: this.item.otp
+    });
+  }
+
+  ngAfterViewInit() {
+    setTimeout(() => {
+      this.nameElement.nativeElement.focus();
+    }, 0);
+  }
+
+  save() {
+    this.ser.update(this.getItem())
+      .subscribe(
+        (result) => {
+          this.toaster.show('Success', '');
+          this.router.navigateByUrl('/Clients');
+        },
+        (error) => {
+          this.toaster.show('Danger', error.error);
+        }
+      );
+  }
+
+  delete() {
+    this.ser.delete(this.item.id)
+      .subscribe(
+        (result) => {
+          this.toaster.show('Success', '');
+          this.router.navigateByUrl('/Clients');
+        },
+        (error) => {
+          this.toaster.show('Danger', error.error);
+        }
+      );
+  }
+
+  confirmDelete(): void {
+    const dialogRef = this.dialog.open(ConfirmDialogComponent, {
+      width: '250px',
+      data: {title: 'Delete Client?', content: 'Are you sure? This cannot be undone.'}
+    });
+
+    dialogRef.afterClosed().subscribe((result: boolean) => {
+      if (result) {
+        this.delete();
+      }
+    });
+  }
+
+  getItem(): Client {
+    const formModel = this.form.value;
+    this.item.name = formModel.name;
+    this.item.enabled = formModel.enabled;
+    this.item.otp = formModel.otp;
+    return this.item;
+  }
+}

overlord/src/app/client/client-list-resolver.service.spec.ts

@@ -0,0 +1,15 @@
+import {inject, TestBed} from '@angular/core/testing';
+
+import {ClientListResolverService} from './client-list-resolver.service';
+
+describe('ClientListResolverService', () => {
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      providers: [ClientListResolverService]
+    });
+  });
+
+  it('should be created', inject([ClientListResolverService], (service: ClientListResolverService) => {
+    expect(service).toBeTruthy();
+  }));
+});

overlord/src/app/client/client-list-resolver.service.ts

@@ -0,0 +1,18 @@
+import {Injectable} from '@angular/core';
+import {ActivatedRouteSnapshot, Resolve, Router, RouterStateSnapshot} from '@angular/router';
+import {Client} from './client';
+import {Observable} from 'rxjs/internal/Observable';
+import {ClientService} from './client.service';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class ClientListResolver implements Resolve<Client[]> {
+
+  constructor(private ser: ClientService, private router: Router) {
+  }
+
+  resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<Client[]> {
+    return this.ser.list();
+  }
+}

overlord/src/app/client/client-list/client-list-datasource.ts

@@ -0,0 +1,58 @@
+import {DataSource} from '@angular/cdk/collections';
+import {MatPaginator, MatSort} from '@angular/material';
+import {map} from 'rxjs/operators';
+import {merge, Observable, of as observableOf} from 'rxjs';
+import {Client} from '../client';
+
+export class ClientListDataSource extends DataSource<Client> {
+
+  constructor(private paginator: MatPaginator, private sort: MatSort, public data: Client[]) {
+    super();
+  }
+
+  connect(): Observable<Client[]> {
+    const dataMutations = [
+      observableOf(this.data),
+      this.paginator.page,
+      this.sort.sortChange
+    ];
+
+    // Set the paginators length
+    this.paginator.length = this.data.length;
+
+    return merge(...dataMutations).pipe(map(() => {
+      return this.getPagedData(this.getSortedData([...this.data]));
+    }));
+  }
+
+  disconnect() {
+  }
+
+  private getPagedData(data: Client[]) {
+    const startIndex = this.paginator.pageIndex * this.paginator.pageSize;
+    return data.splice(startIndex, this.paginator.pageSize);
+  }
+
+  private getSortedData(data: Client[]) {
+    if (!this.sort.active || this.sort.direction === '') {
+      return data;
+    }
+
+    return data.sort((a, b) => {
+      const isAsc = this.sort.direction === 'asc';
+      switch (this.sort.active) {
+        case 'name':
+          return compare(a.name, b.name, isAsc);
+        case 'id':
+          return compare(+a.id, +b.id, isAsc);
+        default:
+          return 0;
+      }
+    });
+  }
+}
+
+/** Simple sort comparator for example ID/Name columns (for client-side sorting). */
+function compare(a, b, isAsc) {
+  return (a < b ? -1 : 1) * (isAsc ? 1 : -1);
+}

overlord/src/app/client/client-list/client-list.component.html

@@ -0,0 +1,55 @@
+<mat-card>
+  <mat-card-title-group>
+    <mat-card-title>Clients</mat-card-title>
+  </mat-card-title-group>
+  <mat-card-content>
+    <mat-table #table [dataSource]="dataSource" matSort aria-label="Elements">
+
+      <!-- Code Column -->
+      <ng-container matColumnDef="code">
+        <mat-header-cell *matHeaderCellDef mat-sort-header>Name</mat-header-cell>
+        <mat-cell *matCellDef="let row">{{row.code}}</mat-cell>
+      </ng-container>
+
+      <!-- Name Column -->
+      <ng-container matColumnDef="name">
+        <mat-header-cell *matHeaderCellDef mat-sort-header>Name</mat-header-cell>
+        <mat-cell *matCellDef="let row"><a [routerLink]="['/Client', row.id]">{{row.name}}</a></mat-cell>
+      </ng-container>
+
+      <!-- Enabled Column -->
+      <ng-container matColumnDef="enabled">
+        <mat-header-cell *matHeaderCellDef mat-sort-header>Is Enabled?</mat-header-cell>
+        <mat-cell *matCellDef="let row">{{row.enabled}}</mat-cell>
+      </ng-container>
+
+      <!-- OTP Column -->
+      <ng-container matColumnDef="otp">
+        <mat-header-cell *matHeaderCellDef mat-sort-header>otp</mat-header-cell>
+        <mat-cell *matCellDef="let row">{{row.otp}}</mat-cell>
+      </ng-container>
+
+      <!-- Created Column -->
+      <ng-container matColumnDef="created">
+        <mat-header-cell *matHeaderCellDef mat-sort-header>Created</mat-header-cell>
+        <mat-cell *matCellDef="let row">{{row.created | localTime}}</mat-cell>
+      </ng-container>
+
+      <!-- Last Login Column -->
+      <ng-container matColumnDef="lastLogin">
+        <mat-header-cell *matHeaderCellDef mat-sort-header>Last Login</mat-header-cell>
+        <mat-cell *matCellDef="let row">{{row.lastLogin | localTime}}</mat-cell>
+      </ng-container>
+
+      <mat-header-row *matHeaderRowDef="displayedColumns"></mat-header-row>
+      <mat-row *matRowDef="let row; columns: displayedColumns;"></mat-row>
+    </mat-table>
+
+    <mat-paginator #paginator
+                   [length]="dataSource.data.length"
+                   [pageIndex]="0"
+                   [pageSize]="50"
+                   [pageSizeOptions]="[25, 50, 100, 250]">
+    </mat-paginator>
+  </mat-card-content>
+</mat-card>

overlord/src/app/client/client-list/client-list.component.spec.ts

@@ -0,0 +1,23 @@
+import {ComponentFixture, fakeAsync, TestBed} from '@angular/core/testing';
+
+import {ClientListComponent} from './client-list.component';
+
+describe('ClientListComponent', () => {
+  let component: ClientListComponent;
+  let fixture: ComponentFixture<ClientListComponent>;
+
+  beforeEach(fakeAsync(() => {
+    TestBed.configureTestingModule({
+      declarations: [ClientListComponent]
+    })
+      .compileComponents();
+
+    fixture = TestBed.createComponent(ClientListComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  }));
+
+  it('should compile', () => {
+    expect(component).toBeTruthy();
+  });
+});

overlord/src/app/client/client-list/client-list.component.ts

@@ -0,0 +1,30 @@
+import {Component, OnInit, ViewChild} from '@angular/core';
+import {MatPaginator, MatSort} from '@angular/material';
+import {ClientListDataSource} from './client-list-datasource';
+import {Client} from '../client';
+import {ActivatedRoute} from '@angular/router';
+
+@Component({
+  selector: 'app-client-list',
+  templateUrl: './client-list.component.html',
+  styleUrls: ['./client-list.component.css']
+})
+export class ClientListComponent implements OnInit {
+  @ViewChild(MatPaginator) paginator: MatPaginator;
+  @ViewChild(MatSort) sort: MatSort;
+  dataSource: ClientListDataSource;
+  list: Client[];
+  /** Columns displayed in the table. Columns IDs can be added, removed, or reordered. */
+  displayedColumns = ['code', 'name', 'enabled', 'otp', 'created', 'lastLogin'];
+
+  constructor(private route: ActivatedRoute) {
+  }
+
+  ngOnInit() {
+    this.route.data
+      .subscribe((data: { list: Client[] }) => {
+        this.list = data.list;
+      });
+    this.dataSource = new ClientListDataSource(this.paginator, this.sort, this.list);
+  }
+}

overlord/src/app/client/client-resolver.service.spec.ts

@@ -0,0 +1,15 @@
+import {inject, TestBed} from '@angular/core/testing';
+
+import {ClientResolverService} from './client-resolver.service';
+
+describe('ClientResolverService', () => {
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      providers: [ClientDetailResolverService]
+    });
+  });
+
+  it('should be created', inject([ClientDetailResolverService], (service: ClientDetailResolverService) => {
+    expect(service).toBeTruthy();
+  }));
+});

overlord/src/app/client/client-resolver.service.ts

@@ -0,0 +1,19 @@
+import {Injectable} from '@angular/core';
+import {ActivatedRouteSnapshot, Resolve, Router, RouterStateSnapshot} from '@angular/router';
+import {ClientService} from './client.service';
+import {Client} from './client';
+import {Observable} from 'rxjs/internal/Observable';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class ClientResolver implements Resolve<Client> {
+
+  constructor(private ser: ClientService, private router: Router) {
+  }
+
+  resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<Client> {
+    const id = route.paramMap.get('id');
+    return this.ser.get(id);
+  }
+}

overlord/src/app/client/client-routing.module.spec.ts

@@ -0,0 +1,13 @@
+import {ClientRoutingModule} from './client-routing.module';
+
+describe('ClientRoutingModule', () => {
+  let clientRoutingModule: ClientRoutingModule;
+
+  beforeEach(() => {
+    clientRoutingModule = new ClientRoutingModule();
+  });
+
+  it('should create an instance', () => {
+    expect(clientRoutingModule).toBeTruthy();
+  });
+});

overlord/src/app/client/client-routing.module.ts

@@ -0,0 +1,50 @@
+import {NgModule} from '@angular/core';
+import {CommonModule} from '@angular/common';
+import {RouterModule, Routes} from '@angular/router';
+import {ClientListResolver} from './client-list-resolver.service';
+import {ClientResolver} from './client-resolver.service';
+import {ClientListComponent} from './client-list/client-list.component';
+import {ClientDetailComponent} from './client-detail/client-detail.component';
+import {AuthGuard} from '../auth/auth-guard.service';
+
+const clientRoutes: Routes = [
+  {
+    path: 'Clients',
+    component: ClientListComponent,
+    canActivate: [AuthGuard],
+    data: {
+      permission: 'Cost Centres'
+    },
+    resolve: {
+      list: ClientListResolver
+    }
+  },
+  {
+    path: 'Client/:id',
+    component: ClientDetailComponent,
+    canActivate: [AuthGuard],
+    data: {
+      permission: 'Cost Centres'
+    },
+    resolve: {
+      item: ClientResolver
+    }
+  }
+];
+
+@NgModule({
+  imports: [
+    CommonModule,
+    RouterModule.forChild(clientRoutes)
+
+  ],
+  exports: [
+    RouterModule
+  ],
+  providers: [
+    ClientListResolver,
+    ClientResolver
+  ]
+})
+export class ClientRoutingModule {
+}

overlord/src/app/client/client.module.spec.ts

@@ -0,0 +1,13 @@
+import {ClientModule} from './client.module';
+
+describe('ClientModule', () => {
+  let clientModule: ClientModule;
+
+  beforeEach(() => {
+    clientModule = new ClientModule();
+  });
+
+  it('should create an instance', () => {
+    expect(clientModule).toBeTruthy();
+  });
+});

overlord/src/app/client/client.module.ts

@@ -0,0 +1,48 @@
+import {NgModule} from '@angular/core';
+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 {CdkTableModule} from '@angular/cdk/table';
+import {SharedModule} from '../shared/shared.module';
+import {FlexLayoutModule, FlexModule} from '@angular/flex-layout';
+import {ReactiveFormsModule} from '@angular/forms';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    CdkTableModule,
+    FlexModule,
+    FlexLayoutModule,
+    MatButtonModule,
+    MatCardModule,
+    MatCheckboxModule,
+    MatIconModule,
+    MatInputModule,
+    MatPaginatorModule,
+    MatProgressSpinnerModule,
+    MatSortModule,
+    MatTableModule,
+    ReactiveFormsModule,
+    SharedModule,
+    ClientRoutingModule
+  ],
+  declarations: [
+    ClientListComponent,
+    ClientDetailComponent
+  ]
+})
+export class ClientModule {
+}

overlord/src/app/client/client.service.spec.ts

@@ -0,0 +1,15 @@
+import {inject, TestBed} from '@angular/core/testing';
+
+import {ClientService} from './client.service';
+
+describe('ClientService', () => {
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      providers: [ClientService]
+    });
+  });
+
+  it('should be created', inject([ClientService], (service: ClientService) => {
+    expect(service).toBeTruthy();
+  }));
+});

overlord/src/app/client/client.service.ts

@@ -0,0 +1,50 @@
+import {Injectable} from '@angular/core';
+import {HttpClient, HttpHeaders, HttpParams} from '@angular/common/http';
+import {ErrorLoggerService} from '../core/error-logger.service';
+import {catchError} from 'rxjs/operators';
+import {Observable} from 'rxjs/internal/Observable';
+import {Client} from './client';
+
+const httpOptions = {
+  headers: new HttpHeaders({'Content-Type': 'application/json'})
+};
+const url = '/api/Client';
+const serviceName = 'ClientService';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class ClientService {
+  constructor(private http: HttpClient, private log: ErrorLoggerService) {
+  }
+
+  get(id: string): Observable<Client> {
+    const getUrl: string = (id === null) ? url : `${url}/${id}`;
+    return <Observable<Client>>this.http.get<Client>(getUrl)
+      .pipe(
+        catchError(this.log.handleError(serviceName, `get id=${id}`))
+      );
+  }
+
+  list(): Observable<Client[]> {
+    const options = {params: new HttpParams().set('l', '')};
+    return <Observable<Client[]>>this.http.get<Client[]>(url, options)
+      .pipe(
+        catchError(this.log.handleError(serviceName, 'list'))
+      );
+  }
+
+  update(client: Client): Observable<Client> {
+    return <Observable<Client>>this.http.put<Client>(`${url}/${client.id}`, client, httpOptions)
+      .pipe(
+        catchError(this.log.handleError(serviceName, 'update'))
+      );
+  }
+
+  delete(id: string): Observable<Client> {
+    return <Observable<Client>>this.http.delete<Client>(`${url}/${id}`, httpOptions)
+      .pipe(
+        catchError(this.log.handleError(serviceName, 'delete'))
+      );
+  }
+}

overlord/src/app/client/client.ts

@@ -0,0 +1,9 @@
+export class Client {
+  id: string;
+  name: string;
+  code: number;
+  enabled: boolean;
+  otp: number;
+  creationDate: string;
+  lastLogin: string;
+}