diff --git a/ng6-seed/src/app/layouts/admin/admin-layout.component.html b/ng6-seed/src/app/layouts/admin/admin-layout.component.html index 99f6263..260238d 100755 --- a/ng6-seed/src/app/layouts/admin/admin-layout.component.html +++ b/ng6-seed/src/app/layouts/admin/admin-layout.component.html @@ -120,83 +120,16 @@
-
- - - - - - - - - + + @@ -206,22 +139,43 @@
- +
+ +
+ + +
+ Settings +
+ + + + + +
diff --git a/ng6-seed/src/app/layouts/admin/admin-layout.component.ts b/ng6-seed/src/app/layouts/admin/admin-layout.component.ts index 4b2b1fb..af7ee82 100755 --- a/ng6-seed/src/app/layouts/admin/admin-layout.component.ts +++ b/ng6-seed/src/app/layouts/admin/admin-layout.component.ts @@ -54,6 +54,8 @@ export class AdminLayoutComponent implements OnInit, OnDestroy { alertMsgAllocateType : any[]; alertCount: any; userRoleType: String; + userrole: any; + status: boolean; constructor(private router: Router, public menuItems: MenuItems, public horizontalMenuItems : HorizontalMenuItems, public translate: TranslateService,public aws:AwsService,public users:UserService,private _dashboardService: DashboardService) { const browserLang: string = translate.getBrowserLang(); translate.use(browserLang.match(/en|fr/) ? browserLang : 'en'); @@ -71,6 +73,19 @@ export class AdminLayoutComponent implements OnInit, OnDestroy { console.log('this.currentUser',this.currentUser); console.log(this.currentUser.userid); localStorage.setItem('len_user_role_id',this.currentUser.user_role); + this.userrole=this.currentUser.user_role; + if(this.userrole=='11') + { + this.status=true; + } + else if(this.userrole=='12') + { + this.status=true; + } + else + { + this.status=false; + } localStorage.setItem('userid',this.currentUser.userid); localStorage.setItem('smc_agency_id',this.currentUser.smc_agency_id); window.localStorage.setItem('LenderRoleID', this.currentUser.user_role); diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.html index 76314d8..bb956f0 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.html @@ -1,4 +1,4 @@ -
+ @@ -280,8 +280,3 @@ color: brown;">Showing data for last {{common}}. To see older records, please use advanced filter -
-
-

data

- -
\ No newline at end of file diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.ts index 6f2f425..8121751 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.ts @@ -176,41 +176,8 @@ console.log(this.displayedColumns) // load inprogress pd list public LenderRoleID : string = localStorage.getItem('LenderRoleID'); loadPDDetails() { - const role=localStorage.getItem('len_user_role_id'); - alert(role); - if(role=='11') - { - alert('if'); - this._pd.getSalesPd() - .subscribe( - data => { - this.loaderService.closeMatSpinnerDialog(); - if (data.status == 200) { - this.PdListData = data.records; - console.log('pddataabi'); - console.log(this.PdListData); - // this.PdListData = ; - if(this.startIndex && this.endIndex) { - this.pagedList.next(this.PdListData.slice(this.startIndex, this.endIndex)); - } - else { - this.pagedList.next(this.PdListData.slice(0, 10)); - } - this.length = this.PdListData.length; - this.PdListData.forEach(value=>{ - let original=value.pd_sno - value.pd_sno_split={lender_name:original.replace(/[^a-z]/gi, ''),serial_no:original.match(/(\d+)/)[0]} - }) - // this.dataLengthTab1 = data.records.length; - // this.dataSourceTab1.data = this.PdListData; - this.recordStatus=false; - this.limitMsg = true - } - - }) - } - else - { + + this.LenderRoleID = localStorage.getItem('LenderRoleID'); if(this.PdListData.length == 0) { @@ -261,7 +228,7 @@ console.log(this.displayedColumns) this.notifier.notify('warning', 'Something Wents Wrong Try Again.!' + '-' + error.error_text + ' occur'); alert(error.html_format); }); - } + } OnPageChange(event: PageEvent){ diff --git a/ng6-seed/src/app/sales-pd/sales-pd-list/sales-pd.component.ts b/ng6-seed/src/app/sales-pd/sales-pd-list/sales-pd.component.ts index b1f3199..5026683 100644 --- a/ng6-seed/src/app/sales-pd/sales-pd-list/sales-pd.component.ts +++ b/ng6-seed/src/app/sales-pd/sales-pd-list/sales-pd.component.ts @@ -40,8 +40,8 @@ export class SalesPdComponent implements OnInit { constructor(private _pdSales: PdTrigerService,private dialog:MatDialog,private route: ActivatedRoute, private router: Router,private _creditPdService:ApiServiceService) { - this.common = JSON.parse(localStorage.getItem('commonSettings')).default_pd_list_count; - this.common = this.common.count+' '+this.common.factor + // this.common = JSON.parse(localStorage.getItem('commonSettings')).default_pd_list_count; + // this.common = this.common.count+' '+this.common.factor this.user_type = localStorage.getItem('len_user_role') } diff --git a/ng6-seed/src/app/session/login/login.component.ts b/ng6-seed/src/app/session/login/login.component.ts index a563805..390c677 100755 --- a/ng6-seed/src/app/session/login/login.component.ts +++ b/ng6-seed/src/app/session/login/login.component.ts @@ -66,7 +66,7 @@ export class LoginComponent implements OnInit{ * AWS login service */ login() { - + const mailid = this.email.split(/\s/).join(''); let auth = { 'Username': mailid, 'Password': this.password }; this.loaderService.showMatSpinnerDialog(''); @@ -77,8 +77,17 @@ export class LoginComponent implements OnInit{ console.log('ressss'); console.log(res); // local storage for validate user access - localStorage.setItem('user_role',res.idToken.payload["custom:role_id"]); - this.router.navigate(['/']); + + localStorage.setItem('user_role',res.idToken.payload["custom:role_id"]); + //this.router.navigate(['/']); + if(res.idToken.payload["custom:role_id"]=='11') + { + this.router.navigate(['sales-pd-list/list-pd']); + } + else + { + this.router.navigate(['personal_discussion/pdlist']); + } } this.loaderService.closeMatSpinnerDialog(); }, err => { diff --git a/ng6-seed/src/app/shared/menu-items/horizontal-menu-items.ts b/ng6-seed/src/app/shared/menu-items/horizontal-menu-items.ts index a2cf625..c8fd7c1 100755 --- a/ng6-seed/src/app/shared/menu-items/horizontal-menu-items.ts +++ b/ng6-seed/src/app/shared/menu-items/horizontal-menu-items.ts @@ -21,9 +21,7 @@ export interface Menu { children?: ChildrenItems[]; } -const roleh=localStorage.getItem('len_user_role_id'); -alert(roleh); -alert('tension1'); + const HORIZONTALMENUITEMS = [ // { // state: 'home', @@ -104,6 +102,8 @@ const salesmenu = [ @Injectable() export class HorizontalMenuItems { getAll(): Menu[] { + console.log(HORIZONTALMENUITEMS); + console.log('menus'); return HORIZONTALMENUITEMS; } salesgetAll(): Menu[] { @@ -112,6 +112,7 @@ export class HorizontalMenuItems { // if(user_type != 'credit'){ // filtered_sales_menu = salesmenu.filter(vv=>vv.state != 'credit_pd') // } + return filtered_sales_menu; } add(menu: Menu) { diff --git a/ng6-seed/src/app/shared/menu-items/menu-items.ts b/ng6-seed/src/app/shared/menu-items/menu-items.ts index 88e7953..265bafb 100755 --- a/ng6-seed/src/app/shared/menu-items/menu-items.ts +++ b/ng6-seed/src/app/shared/menu-items/menu-items.ts @@ -31,8 +31,6 @@ export interface Menu { multichild?:Multichild[]; } const role=localStorage.getItem('len_user_role_id'); -alert(role); -alert('tension'); const MENUITEMS : Menu[] = [ // { @@ -178,13 +176,14 @@ const salesMenus: Menu[]= [ // icon:'report', // } ]; -console.log(salesMenus); -console.log('salesman'); -if(role=='12') -{ - const index = salesMenus.findIndex(user => user.name == 'Sales PD'); - salesMenus.splice(index, 1); -} +// console.log(salesMenus); +// console.log('salesman'); +// if(role=='12') +// { +// alert('delete menu'); +// const index = salesMenus.findIndex(user => user.name == 'Sales PD'); +// salesMenus.splice(index, 1); +// } @Injectable() export class MenuItems { getAll(): Menu[] {