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 cd74f65..07b88af 100755 --- a/ng6-seed/src/app/layouts/admin/admin-layout.component.html +++ b/ng6-seed/src/app/layouts/admin/admin-layout.component.html @@ -210,10 +210,12 @@ settings Setting + + 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 4e5ac18..31f2a87 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 @@ -297,15 +297,16 @@ export class SalesPdComponent implements OnInit { // window.location.href=data.records; let email = localStorage.getItem('officer_mail_id'); + console.log("redirected email = "+email); let applicant_id = value_obj.applicant_id; console.log(value_obj.applicant_id); if (environment.authorization == 'TnAwuc64pVpcB9xf') { - let salesapp_link = "https://salesapp.smcfinance.com/app/secure?saltkey=$2y$10$H4vSrWl15syQHO.tsT0DdOF7pYSTKZBT85sOFCJerttTdObBRsB36&applicantid=" + applicant_id + "&email=aniltiwari@smcfinance.com"; + let salesapp_link = "https://salesapp.smcfinance.com/app/secure?saltkey=$2y$10$H4vSrWl15syQHO.tsT0DdOF7pYSTKZBT85sOFCJerttTdObBRsB36&applicantid=" + applicant_id + "&email="+email; console.log('in list salesapp_link = ', salesapp_link); let salesapp_url = salesapp_link; window.open(salesapp_url); } else if (environment.authorization == 'sparqvenba2018') { - let salesapp_link = "http://salesapp.devopsmcfinance.com/secure?saltkey=$2y$10$H4vSrWl15syQHO.tsT0DdOF7pYSTKZBT85sOFCJerttTdObBRsB36&applicantid=" + applicant_id + "&email=aniltiwari@smcfinance.com"; + let salesapp_link = "http://salesapp.devopsmcfinance.com/secure?saltkey=$2y$10$H4vSrWl15syQHO.tsT0DdOF7pYSTKZBT85sOFCJerttTdObBRsB36&applicantid=" + applicant_id + "&email="+email; console.log('in list salesapp_link = ', salesapp_link); let salesapp_url = salesapp_link; window.open(salesapp_url); @@ -465,7 +466,7 @@ export class SalesPdComponent implements OnInit { // }); // this.SalesPDService.clearLocalData() // this.SalesPDService.clear_local_key('sales_pd_id_PRIMARYKEY'); - localStorage.removeItem('sales_pd_id_PRIMARYKEY') + parseInt(localStorage.getItem('login_type_id')) == 0 ? localStorage.removeItem('sales_pd_id_PRIMARYKEY') : ''; localStorage.removeItem('product_id_salesPD') localStorage.removeItem('sales_pd_type') // this.navCtrl.push(HomePage) diff --git a/ng6-seed/src/app/sales-pd/section-list/section-list.component.ts b/ng6-seed/src/app/sales-pd/section-list/section-list.component.ts index ec585be..32ab40d 100644 --- a/ng6-seed/src/app/sales-pd/section-list/section-list.component.ts +++ b/ng6-seed/src/app/sales-pd/section-list/section-list.component.ts @@ -37,6 +37,8 @@ export class SectionListComponent implements OnInit { flyHiUserId: any; sales_pd_id_PRIMARYKEY: string; rand_string: string; + login_type_id: number; + constructor(public dialogRef: MatDialogRef,private constantProvider:ConstantsProvider,notifier: NotifierService,private dialog: MatDialog, private fb: FormBuilder, private route: ActivatedRoute,private SalesPDService:SalesPdService, private router: Router,private loaderService:LoaderService ) { @@ -48,6 +50,7 @@ export class SectionListComponent implements OnInit { this.sales_pd_type = localStorage.getItem('sales_pd_type') console.log( this.sales_pd_type) this.sales_pd_id_PRIMARYKEY = localStorage.getItem('sales_pd_id_PRIMARYKEY') + this.login_type_id = parseInt(localStorage.getItem('login_type_id')); } if(this.route.snapshot.params['product_id']){ @@ -297,8 +300,9 @@ export class SectionListComponent implements OnInit { merge_saved_status(res){ let saved_sections=res['records'].map(val=>{return {'section_id':val.section_id , 'status':val.status,'is_synced':val.is_synced}}); - - console.log("saved",saved_sections); + console.log("B4 saved",saved_sections); + saved_sections = saved_sections.filter(val=>parseInt(val.status) == 1); + console.log("After saved",saved_sections); const mergeById = (a1, a2) => a1.map(itm => ({ ...a2.find((item) => (item.section_id === itm.section_id) && item), 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 7c454f1..313e99b 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 @@ -108,6 +108,9 @@ export class HorizontalMenuItems { salesgetAll(): Menu[] { let filtered_sales_menu = salesmenu let user_type= localStorage.getItem('len_user_role') + if(parseInt(localStorage.getItem('login_type_id')) == 1){ + filtered_sales_menu = salesmenu.filter(vv=>vv.icon != 'work') + } // if(user_type != 'credit'){ // filtered_sales_menu = salesmenu.filter(vv=>vv.state != 'credit_pd') // } 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 531a4eb..612a161 100755 --- a/ng6-seed/src/app/shared/menu-items/menu-items.ts +++ b/ng6-seed/src/app/shared/menu-items/menu-items.ts @@ -193,6 +193,9 @@ export class MenuItems { // if(user_type != 'credit'){ // filtered_sales_menu = salesMenus.filter(vv=>vv.state != 'credit_pd') // } + if(parseInt(localStorage.getItem('login_type_id')) == 1){ + filtered_sales_menu = salesMenus.filter(vv=>vv.icon != 'work') + } return filtered_sales_menu; }