diff --git a/ng6-seed/package.json b/ng6-seed/package.json index c5bd085..7d623fb 100755 --- a/ng6-seed/package.json +++ b/ng6-seed/package.json @@ -3,8 +3,8 @@ "version": "0.0.0", "license": "MIT", "scripts": { - "production": "node --max_old_space_size=8192 node_modules/@angular/cli/bin/ng build --prod --build-optimizer=true", - "staging": "node --max_old_space_size=8192 node_modules/@angular/cli/bin/ng build --prod --configuration=staging", + "production": "node --max_old_space_size=6144 node_modules/@angular/cli/bin/ng build --prod --build-optimizer=true", + "staging": "node --max_old_space_size=6144 node_modules/@angular/cli/bin/ng build --prod --configuration=staging", "ng": "ng", "start": "ng serve", "build": "ng build", 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 3a66a13..705cb86 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 @@ -81,7 +81,7 @@ - + {{details.is_child == 0 ? details.applicant_name : 'Add On PD' }} @@ -134,9 +134,10 @@ matTooltip="View" matTooltipPosition="above"> visibility - + + 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 391f05a..1f55927 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 @@ -48,6 +48,7 @@ export class AllPdComponent implements OnInit, OnChanges { pageSize = 10; pageEvent: PageEvent; todaydate:Date = new Date(); + user_role_name: string; constructor(private _pd: PdTrigerService,private _fb:FormBuilder,notifier: NotifierService,private userService:UserService) { this.notifier = notifier; @@ -70,10 +71,21 @@ export class AllPdComponent implements OnInit, OnChanges { this.userService.getroles().subscribe(res=>{ let len_id=res['records'][0].fk_entity_id this.searchForm.controls['pd_lender'].setValue(len_id) + let role_name = this.userService.takeDecisionRouting(res['records'][0]) + localStorage.setItem('len_user_role',role_name); + this.user_role_name=role_name + if(this.user_role_name == 'sales'){ + this.displayedColumns = this.displayedColumns.filter(val=>val != 'Action') + } }) this.recordStatus=false; // this.loadPDDetails(); //this.getcommonDropDown(); + + + + +console.log(this.displayedColumns) } // get changes for filter from parent componnet filter @@ -81,6 +93,7 @@ export class AllPdComponent implements OnInit, OnChanges { let filteredText = changes.bindFilterValue.currentValue ? changes.bindFilterValue.currentValue.trim() : changes.bindFilterValue.currentValue; filteredText = filteredText ? filteredText.toLowerCase() : filteredText; this.dataSourceTab1.filter = filteredText; + // console.log("changes",this.bindFilterValue) } @@ -230,4 +243,5 @@ export class AllPdComponent implements OnInit, OnChanges { this.dataSourceTab1.paginator = this.paginator; this.dataSourceTab1.sort = this.sort; } + } diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.html index 2cb1ffb..c7cd87e 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.html @@ -81,7 +81,7 @@ - + {{details.is_child == 0 ? details.applicant_name : 'Add On PD' }} diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.ts index 9fa9094..f30f70a 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.ts @@ -47,6 +47,7 @@ export class CompletedPdComponent implements OnInit, OnChanges { pageSize = 10; pageEvent: PageEvent; todaydate:Date = new Date(); + user_role_name: string; constructor(private _pd: PdTrigerService,public _fb:FormBuilder,notifier: NotifierService,private userService:UserService) { this.notifier = notifier; @@ -70,10 +71,16 @@ export class CompletedPdComponent implements OnInit, OnChanges { this.userService.getroles().subscribe(res=>{ let len_id=res['records'][0].fk_entity_id this.searchForm.controls['pd_lender'].setValue(len_id) + let role_name = this.userService.takeDecisionRouting(res['records'][0]) + this.user_role_name=role_name + if(this.user_role_name == 'sales'){ + this.displayedColumns = this.displayedColumns.filter(val=>val != 'Action') + } }) this.recordStatus=false; // this.loadPDDetails(); // this.getcommonDropDown(); + } @@ -84,6 +91,7 @@ export class CompletedPdComponent implements OnInit, OnChanges { // filteredText = filteredText ? filteredText.trim() : filteredText; filteredText = filteredText ? filteredText.toLowerCase() : filteredText; this.dataSourceTab4.filter = filteredText; + } // load inprogress pd list diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.html index edbf549..db427c6 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.html @@ -78,7 +78,7 @@ - + {{details.is_child == 0 ? details.applicant_name : 'Add On PD' }} diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.ts index bcf53e5..a3c1021 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.ts @@ -45,6 +45,7 @@ export class InprogressPdComponent implements OnInit, OnChanges { pageSize = 10; pageEvent: PageEvent; searchForm:FormGroup; + user_role_name: string; constructor(private _pd: PdTrigerService,public _fb:FormBuilder,notifier: NotifierService,private userService:UserService) { this.notifier = notifier; @@ -67,10 +68,16 @@ export class InprogressPdComponent implements OnInit, OnChanges { this.userService.getroles().subscribe(res=>{ let len_id=res['records'][0].fk_entity_id this.searchForm.controls['pd_lender'].setValue(len_id) + let role_name = this.userService.takeDecisionRouting(res['records'][0]) + this.user_role_name=role_name + if(this.user_role_name == 'sales'){ + this.displayedColumns = this.displayedColumns.filter(val=>val != 'Action') + } }) this.recordStatus=false; // this.loadPDDetails(); // this.getcommonDropDown(); + } // get changes for filter from parent componnet filter diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/list-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/list-pd.component.html index c2b7a25..d8774c7 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/list-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/list-pd.component.html @@ -6,7 +6,7 @@ -
+
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/list-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/list-pd.component.ts index f06bc54..98db493 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/list-pd.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/list-pd.component.ts @@ -8,6 +8,7 @@ import { InprogressPdComponent } from './inprogress-pd/inprogress-pd.component'; import { ScheduledPdComponent } from './scheduled-pd/scheduled-pd.component'; import { CompletedPdComponent } from './completed-pd/completed-pd.component'; import { QcCompletedPdComponent } from './qc-completed-pd/qc-completed-pd.component'; +import { UserService } from 'app/settings/service/user.service'; @Component({ @@ -38,20 +39,28 @@ export class ListPdComponent implements OnInit, OnDestroy { // roles checks for enables events roleAccessDetails:any - public userRoleID = +localStorage.getItem('user_role') ; + public userRoleID; public LenderRoleID : any = +localStorage.getItem('LenderRoleID'); + user_role_name: string; constructor( notifier: NotifierService, private route: ActivatedRoute, - private router: Router, private _pd: PdTrigerService) { + private router: Router, private _pd: PdTrigerService,private userService:UserService) { this.notifier = notifier; this.roleAccessDetails=this._pd.getRoleAccessDetails(); + } ngOnInit() { this.viewPdList = true; this.recordStatus=false; this.allTab=true; - + this.userService.getroles().subscribe(res=>{ + let role_name = this.userService.takeDecisionRouting(res['records'][0]) + localStorage.setItem('len_user_role',role_name); + this.user_role_name=role_name + }) + } + // after view call all tabs component ngAfterViewInit() { this.allTabC.loadPDDetails(); diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.html index b5ad51e..1c8b6d2 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.html @@ -80,7 +80,7 @@ - + {{details.is_child == 0 ? details.applicant_name : 'Add On PD' }} diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.ts index 5b9ac2f..6c9400a 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.ts @@ -46,6 +46,7 @@ export class QcCompletedPdComponent implements OnInit, OnChanges { pageIndex = 0; pageSize = 10; pageEvent: PageEvent; + user_role_name: string; constructor(private _pd: PdTrigerService, public _fb: FormBuilder,notifier: NotifierService,private userService:UserService) { this.notifier = notifier; @@ -69,10 +70,17 @@ export class QcCompletedPdComponent implements OnInit, OnChanges { this.userService.getroles().subscribe(res=>{ let len_id=res['records'][0].fk_entity_id this.searchForm.controls['pd_lender'].setValue(len_id) + let role_name = this.userService.takeDecisionRouting(res['records'][0]) + this.user_role_name=role_name + if(this.user_role_name == 'sales'){ + this.displayedColumns = this.displayedColumns.filter(val=>val != 'Action') + } }) this.recordStatus = false; // this.loadPDDetails(); // this.getcommonDropDown(); + + } ngAfterViewInit() { diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.html index 1e7ee0a..6d95bcb 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.html @@ -78,7 +78,7 @@ - + {{details.is_child == 0 ? details.applicant_name : 'Add On PD'}} diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.ts index 4ddfffe..02aeb78 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.ts @@ -45,6 +45,7 @@ export class ScheduledPdComponent implements OnInit, OnChanges { pageIndex = 0; pageSize = 10; pageEvent: PageEvent; + user_role_name: string; constructor(private _pd: PdTrigerService,public _fb:FormBuilder,notifier: NotifierService,private userService:UserService) { this.notifier = notifier; @@ -68,10 +69,16 @@ export class ScheduledPdComponent implements OnInit, OnChanges { this.userService.getroles().subscribe(res=>{ let len_id=res['records'][0].fk_entity_id this.searchForm.controls['pd_lender'].setValue(len_id) + let role_name = this.userService.takeDecisionRouting(res['records'][0]) + this.user_role_name=role_name + if(this.user_role_name == 'sales'){ + this.displayedColumns = this.displayedColumns.filter(val=>val != 'Action') + } }) this.recordStatus=false; // this.loadPDDetails(); //this.getcommonDropDown(); + } ngAfterViewInit() { this.dataSourceTab3.paginator = this.paginator; diff --git a/ng6-seed/src/app/settings/service/user.service.ts b/ng6-seed/src/app/settings/service/user.service.ts index b379516..a0d20a7 100755 --- a/ng6-seed/src/app/settings/service/user.service.ts +++ b/ng6-seed/src/app/settings/service/user.service.ts @@ -230,5 +230,16 @@ export class UserService { getprofilepic(users){ return this.http.post(apiurl+'getSingedProfilePicURL',users); } + takeDecisionRouting(userDetails){ + let role_name=userDetails.role_name.toLowerCase() + console.log("e",role_name) + if(role_name.includes('sales')){ + return 'sales' + } + else{ + // this.navCtrl.setRoot(PdListPage,{'userDetails':this.userDetails}); + return 'credit' + } + } } diff --git a/ng6-seed/src/environments/environment.prod.ts b/ng6-seed/src/environments/environment.prod.ts index c3a7d17..d46af1f 100644 --- a/ng6-seed/src/environments/environment.prod.ts +++ b/ng6-seed/src/environments/environment.prod.ts @@ -3,7 +3,7 @@ export const environment = { environmentName: 'Production Environment',//Live Environment. - apiEndpoint: 'https://pdgenie.com/sparqprod/api/', + apiEndpoint: 'https://api.pdgenie.com/sparqprod/api/', authorization: 'TnAwuc64pVpcB9xf', login_string: "cognito-idp.ap-south-1.amazonaws.com/ap-south-1_MlTee1O5V", diff --git a/ng6-seed/src/environments/environment.stage.ts b/ng6-seed/src/environments/environment.stage.ts index ef34f8c..3ac869e 100644 --- a/ng6-seed/src/environments/environment.stage.ts +++ b/ng6-seed/src/environments/environment.stage.ts @@ -9,7 +9,7 @@ export const environment = { environmentName: 'Development Environment',//Localhost Environment. // apiEndpoint: 'https://demo.pdgenie.com/sparqtest/api/', - apiEndpoint: 'https://demo.pdgenie.com/sparqtest/api/', + apiEndpoint: ' https://apitest.pdgenie.com/sparqtest/api/', authorization: 'sparqvenba2018', diff --git a/ng6-seed/src/environments/environment.ts b/ng6-seed/src/environments/environment.ts index 72309be..144fb1a 100644 --- a/ng6-seed/src/environments/environment.ts +++ b/ng6-seed/src/environments/environment.ts @@ -9,7 +9,7 @@ export const environment = { environmentName: 'Development Environment',//Localhost Environment. // apiEndpoint: 'https://demo.pdgenie.com/sparqtest/api/', - apiEndpoint: 'https://demo.pdgenie.com/sparqapi/api/', + apiEndpoint: ' https://apitest.pdgenie.com/sparqapi/api/', authorization: 'sparqvenba2018',