From 8b64593522725f5930ebc7e836ed5d8088c4f19e Mon Sep 17 00:00:00 2001
From: Patrick Sun <patrick@lawipac.com>
Date: Sun, 21 Mar 2021 11:14:08 +1100
Subject: [PATCH] logout button installed with menu for different type of user;

---
 src/app/dashboard/dashboard.component.scss    |   5 +-
 .../basicinfo/basicinfo.component.html        |   2 +-
 .../trail-income/trail-income.component.ts    |  12 ++++-
 src/app/main-menu-items.ts                    |  27 +++++++++-
 src/app/models/api-v1-login-response.ts       |  13 +++--
 src/app/service/auth.service.ts               |  10 ++--
 src/app/top-bar/top-bar.component.html        |  16 ++++--
 src/app/top-bar/top-bar.component.ts          |  48 ++++++++++++++++--
 src/assets/img/logout.png                     | Bin 0 -> 3268 bytes
 9 files changed, 112 insertions(+), 21 deletions(-)
 create mode 100644 src/assets/img/logout.png

diff --git a/src/app/dashboard/dashboard.component.scss b/src/app/dashboard/dashboard.component.scss
index 9d406af..175cb18 100644
--- a/src/app/dashboard/dashboard.component.scss
+++ b/src/app/dashboard/dashboard.component.scss
@@ -1,11 +1,12 @@
 .container.outer{
     width:100%;
-    background: url('../../assets/img/body_bg.jpg') no-repeat center center fixed; 
+    max-width:100vw;
+    background: url('../../assets/img/body_bg.jpg') no-repeat center center fixed;
     -webkit-background-size: cover;
     -moz-background-size: cover;
     -o-background-size: cover;
     background-size: cover;
-    opacity:0.98;          
+    opacity:0.98;
 }
 .container.inner {
     width: 99%;
diff --git a/src/app/loan-edit/basicinfo/basicinfo.component.html b/src/app/loan-edit/basicinfo/basicinfo.component.html
index 122a7b7..0f99ca4 100644
--- a/src/app/loan-edit/basicinfo/basicinfo.component.html
+++ b/src/app/loan-edit/basicinfo/basicinfo.component.html
@@ -68,7 +68,7 @@
                 <kendo-label [for]="Settlement" [optional]="false" text="Settlement Date"></kendo-label>
                 <kendo-datepicker #Settlement name="Settlement"
                                   [(ngModel)]="Loan.Settlement"
-                                  [min]="minSettlement" [max]="maxSettlement">
+                                  [min]="minSettlement" [max]="maxSettlement" required>
                 </kendo-datepicker>
                 <kendo-formhint>Date settled or expected to be settled</kendo-formhint>
               </kendo-formfield>
diff --git a/src/app/loan-edit/trail-income/trail-income.component.ts b/src/app/loan-edit/trail-income/trail-income.component.ts
index 2efa892..441e49b 100644
--- a/src/app/loan-edit/trail-income/trail-income.component.ts
+++ b/src/app/loan-edit/trail-income/trail-income.component.ts
@@ -46,7 +46,7 @@ export class TrailIncomeComponent implements OnInit {
 
     let balance = -1;
     let offsetBalance = -1;
-    if ( this.Loan.PayIn.length >= 0) {
+    if ( this.Loan.PayIn.length > 0) {
       const idx = this.Loan.PayIn.length -1;
       balance = this.Loan.PayIn[idx].Balance;
       offsetBalance = this.Loan.PayIn[idx].OffsetBalance;
@@ -85,6 +85,16 @@ export class TrailIncomeComponent implements OnInit {
   public saveHandler({ sender, rowIndex, formGroup, isNew }): void {
     const v = formGroup.getRawValue();
 
+    if ( this.Loan.Lender === '')  {
+      this.errorOccurred.emit('Lender should not be empty');
+      return;
+    }
+
+    if ( this.Loan.LenderLoanNumber === '')  {
+      this.errorOccurred.emit('Lender Identification should not be empty');
+      return;
+    }
+
     if ( !this.showBalance) { v.Balance = -1; }
     if ( !this.showOffsetBalance) { v.OffsetBalance = -1; }
 
diff --git a/src/app/main-menu-items.ts b/src/app/main-menu-items.ts
index 3e3f0fa..30aae20 100644
--- a/src/app/main-menu-items.ts
+++ b/src/app/main-menu-items.ts
@@ -1,4 +1,4 @@
-import { faChartArea, faChartPie, faIdCard, faIdCardAlt, faMoneyCheck, faUniversity, faUserCircle } from '@fortawesome/free-solid-svg-icons';
+import { faChartArea, faIdCard, faIdCardAlt, faMoneyCheck, faUniversity, faUserCircle } from '@fortawesome/free-solid-svg-icons';
 
 export const mainMenuItems: any[] = [
     {
@@ -60,3 +60,28 @@ export const mainMenuItems: any[] = [
         ]
     }
 ];
+
+
+export const brokerMenuItems: any[] = [
+  {
+    text: 'broker',
+    fa: faUniversity,
+    url: './#canvas'
+  },
+];
+
+export const userMenuItems: any[] = [
+  {
+    text: 'user',
+    fa: faUniversity,
+    url: './#canvas'
+  },
+];
+
+export const peopleMenuItems: any[] = [
+  {
+    text: 'people',
+    fa: faUniversity,
+    url: './#canvas'
+  },
+];
diff --git a/src/app/models/api-v1-login-response.ts b/src/app/models/api-v1-login-response.ts
index 7a0a109..c9314a7 100644
--- a/src/app/models/api-v1-login-response.ts
+++ b/src/app/models/api-v1-login-response.ts
@@ -3,13 +3,12 @@
 // tslint:disable-next-line:class-name
 export class apiV1LoginResponse {
 
-
-  // tslint:disable-next-line:typedef
   constructor(
     public login: boolean,
     public machineId: string,
     public session: string,
-    public sessionExpire: number // unix timestamp
+    public sessionExpire: number, // unix timestamp
+    public role: string
   ) {
     this.login = login;
     this.machineId = machineId;
@@ -17,7 +16,12 @@ export class apiV1LoginResponse {
     this.sessionExpire = sessionExpire;
   }
 
-  // tslint:disable-next-line:typedef
+  public static EmptyNew(): apiV1LoginResponse{
+    return new apiV1LoginResponse(
+      false, '', '', 0, ''
+    );
+  }
+
   public hasValidSession(): boolean {
     if (this.session === undefined  || this.session === '') {
       return false;
@@ -26,7 +30,6 @@ export class apiV1LoginResponse {
     }
   }
 
-  // tslint:disable-next-line:typedef
   public hasValidMachineId(): boolean {
     if (this.machineId === undefined  || this.machineId === '') {
       return false;
diff --git a/src/app/service/auth.service.ts b/src/app/service/auth.service.ts
index 5dfc821..c6cfc3c 100644
--- a/src/app/service/auth.service.ts
+++ b/src/app/service/auth.service.ts
@@ -10,7 +10,7 @@ export class AuthService {
     public apiWsUrl = 'wss://svr2021.lawipac.com:8080/api/v1/ws';
     // public apiUrl = 'https://c5016.biukop.com.au:8080/api/v1/';
     // public apiWsUrl = 'wss://c5016.biukop.com.au:8080/api/v1/ws';
-    public loggedIn = new apiV1LoginResponse(false, '', '', 0 );
+    public loggedIn = apiV1LoginResponse.EmptyNew();
     loginSuccess = new EventEmitter <apiV1LoginResponse>();
 
     constructor( private http: HttpClient ,
@@ -28,7 +28,8 @@ export class AuthService {
         sfm.login,
         sfm.machineId,
         sfm.session,
-        sfm.sessionExpire
+        sfm.sessionExpire,
+        sfm.role
       );
       this.loginSuccess.emit(this.loggedIn);
       // console.log ( 'auto login emit events',  this.loggedIn);
@@ -56,11 +57,12 @@ export class AuthService {
            this.loggedIn.login = responseData.login;
            this.loggedIn.machineId = responseData['Biukop-Mid'];
            this.loggedIn.sessionExpire = responseData.sessionExpire;
+           this.loggedIn.role = responseData.role;
            this.saveSessionInfo();
            this.loginSuccess.emit(responseData);
          },
         error => {
-          const fail = new apiV1LoginResponse(false, '', '', 0);
+          const fail = apiV1LoginResponse.EmptyNew();
           this.loggedIn = fail;
           console.log('login error', error);
           this.loginSuccess.emit(this.loggedIn);
@@ -70,7 +72,7 @@ export class AuthService {
     }
 
     logout(): void {
-       this.loggedIn = new apiV1LoginResponse(false, '', '', 0);
+       this.loggedIn = apiV1LoginResponse.EmptyNew();
        localStorage.removeItem('sfm');
        this.loginSuccess.emit(this.loggedIn);
        this.router.navigate(['/login']).then(r => {
diff --git a/src/app/top-bar/top-bar.component.html b/src/app/top-bar/top-bar.component.html
index 60ebf68..2e97527 100644
--- a/src/app/top-bar/top-bar.component.html
+++ b/src/app/top-bar/top-bar.component.html
@@ -1,4 +1,4 @@
-<kendo-appbar id='topBar' *ngIf='login' class='appbar' [position]="'top'" [positionMode]="'sticky'">
+<kendo-appbar id='topBar' *ngIf='login && showMenu' class='appbar' [position]="'top'" [positionMode]="'sticky'">
   <kendo-appbar-section>
     <kendo-menu [items]="items" (select)="onSelect($event)">
       <ng-template kendoMenuItemTemplate let-item="item">
@@ -10,7 +10,7 @@
   </kendo-appbar-section>
   <kendo-appbar-spacer></kendo-appbar-spacer>
   <kendo-appbar-section class="actions">
-    <kendo-badge-container>
+    <kendo-badge-container *ngIf="false">
       <button class="k-button k-button-clear">
         <kendo-icon [name]="'bell'"></kendo-icon>
       </button>
@@ -20,6 +20,16 @@
   </kendo-appbar-section>
 
   <kendo-appbar-section>
-    <kendo-avatar [imageSrc]="Avatar" [shape]="'circle'" [width]="'26px'" [height]="'26px'"></kendo-avatar>
+    <kendo-avatar [imageSrc]="Avatar" [shape]="'circle'" [width]="'26px'" [height]="'26px'" (click)="logout()"></kendo-avatar>
   </kendo-appbar-section>
 </kendo-appbar>
+
+
+
+<kendo-dialog title="Please confirm" *ngIf="opened" (close)="close('cancel')" [minWidth]="250" [width]="450">
+  <p style="margin: 30px; text-align: center;">Are you sure you want to continue?</p>
+  <kendo-dialog-actions>
+    <button kendoButton (click)="close('no')">No</button>
+    <button kendoButton (click)="close('yes')" primary="true">Yes</button>
+  </kendo-dialog-actions>
+</kendo-dialog>
diff --git a/src/app/top-bar/top-bar.component.ts b/src/app/top-bar/top-bar.component.ts
index ad4c0d4..bf6d5c2 100644
--- a/src/app/top-bar/top-bar.component.ts
+++ b/src/app/top-bar/top-bar.component.ts
@@ -1,10 +1,11 @@
 import {Component, OnDestroy, OnInit} from '@angular/core';
 import {MenuService} from '../service/menu.service';
 import {AuthService} from '../service/auth.service';
-import {mainMenuItems} from '../main-menu-items';
+import {brokerMenuItems, mainMenuItems, peopleMenuItems, userMenuItems} from '../main-menu-items';
 import {apiV1LoginResponse} from '../models/api-v1-login-response';
 import {Subscription} from 'rxjs';
 
+
 @Component({
   selector: 'app-top-bar',
   templateUrl: './top-bar.component.html',
@@ -12,11 +13,16 @@ import {Subscription} from 'rxjs';
 })
 export class TopBarComponent implements OnInit , OnDestroy {
   login  = false;
-  Avatar = './assets/img/avatar.png';
+  Avatar = './assets/img/logout.png';
   public items: any[] = mainMenuItems;
   private loginSub: Subscription;
+  public showMenu = true;
+
+  public opened = false;
 
-  constructor(private menuService: MenuService, private authService: AuthService,) { }
+  constructor(private menuService: MenuService,
+              private authService: AuthService) {
+  }
 
   ngOnInit(): void {
     this.initAndSubLogin();
@@ -24,15 +30,39 @@ export class TopBarComponent implements OnInit , OnDestroy {
 
   public initAndSubLogin(): void{
     this.login = this.authService.loggedIn.login;
-    console.log('subscribe auto login');
+    this.selectMenuShow(this.authService.loggedIn.role);
+    // console.log('subscribe auto login', this.authService.loggedIn);
     this.loginSub = this.authService.loginSuccess.subscribe(
       (rsp: apiV1LoginResponse) => {
         this.login = rsp.login;
+        this.selectMenuShow(rsp.role);
         console.log ('topbar received auth events', rsp);
       }
     );
   }
 
+  private selectMenuShow(role: string): void {
+    this.showMenu = true;
+    switch ( role ){
+      case 'admin':
+        this.items = mainMenuItems;
+        break;
+      case 'broker':
+        this.items = brokerMenuItems;
+        break;
+      case 'user':
+        this.items = userMenuItems;
+        break;
+      case 'people':
+        this.items = peopleMenuItems;
+        break;
+
+      default:
+        this.showMenu = false;
+    }
+
+  }
+
   // check menuItem has fontawesome
   public menuItemHasFontawesome(item: any): boolean {
     return item.hasOwnProperty('fa');
@@ -57,4 +87,14 @@ export class TopBarComponent implements OnInit , OnDestroy {
     this.loginSub.unsubscribe();
   }
 
+  public logout(): void{
+    this.opened = true;
+  }
+
+  public close(action: string): void {
+    this.opened = false;
+    if ( action === 'yes') {
+      this.authService.logout();
+    }
+  }
 }
diff --git a/src/assets/img/logout.png b/src/assets/img/logout.png
new file mode 100644
index 0000000000000000000000000000000000000000..2e3e7587bca729b52fe0d8b626a7d31dd1af96d0
GIT binary patch
literal 3268
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
C$yuKO

literal 0
HcmV?d00001