+
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 5816e9e..e115ef0 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
@@ -59,25 +59,34 @@ export class ListPdComponent implements OnInit, OnDestroy {
this.user_role_name=role_name
})
if(localStorage.getItem('LocalSetEntity')) {
- let entity_id = localStorage.getItem('LocalSetEntity')
- if(entity_id) {
- this.allTabC.loadPDDetails();
- }
+ this.getUserFromLocal()
}
else{
// for Listening the local storage LocalSetEntity
this.userService.messageSubject.subscribe(rr=>{
console.log(rr)
- let entity_id = localStorage.getItem('LocalSetEntity')
- if(entity_id) {
- this.allTabC.loadPDDetails();
- this.userService.messageSubject.unsubscribe()
- }
+ this.getUserFromLocal()
+ // let entity_id = localStorage.getItem('LocalSetEntity')
+ // if(entity_id) {
+ // this.allTabC.loadPDDetails();
+ // this.userService.messageSubject.unsubscribe()
+ // }
})
}
}
+
+ getUserFromLocal() {
+ let user_role_id = localStorage.getItem('LenderRoleID')
+ if(user_role_id) {
+ this.LenderRoleID = user_role_id
+ }
+ let entity_id = localStorage.getItem('LocalSetEntity')
+ if(entity_id) {
+ this.allTabC.loadPDDetails();
+ }
+ }
// after view call all tabs component
ngAfterViewInit() {
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/form/form.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/form/form.component.ts
index 87df54e..ad767d0 100644
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/form/form.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/form/form.component.ts
@@ -74,7 +74,9 @@ export class FormComponent implements OnInit {
// this.pdTriggerService.loadTemplate(Number(this.pd_all_details.form_id)).subscribe(result=>{
let params = {"fk_entity_id":"35","fk_product_id":this.pd_all_details.pdmaster_details.fk_product_id,"pd_form_id":this.pd_all_details.form_id,"fk_pd_id":this.pd_all_details.pdmaster_details.pd_id}
this.pdTriggerService.loadCreditPDTemplate(params).subscribe(result=>{
- result.dataStatus = false
+ if(!environment.production){
+ // result.dataStatus = false
+ }
if(result.dataStatus) {
let question_template: any = result.records
if (question_template && question_template != null && question_template != undefined
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html
index 231766c..b42d999 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html
@@ -8,7 +8,7 @@
-
+
-
+
diff --git a/ng6-seed/src/app/personal-discussion/pd-service/pd-triger.service.ts b/ng6-seed/src/app/personal-discussion/pd-service/pd-triger.service.ts
index ea8f132..71e2233 100755
--- a/ng6-seed/src/app/personal-discussion/pd-service/pd-triger.service.ts
+++ b/ng6-seed/src/app/personal-discussion/pd-service/pd-triger.service.ts
@@ -169,10 +169,15 @@ export class PdTrigerService {
// get pd details
getPdDetails(lenderId): Observable
{
let entity_id=localStorage.getItem('LocalSetEntity');
- // let userid=this._aws.getlocale()
+ let LenderRoleID : any = localStorage.getItem('LenderRoleID');
+ let userid=this._aws.getlocale()
- const Lender = entity_id ?
- { params: new HttpParams().set('lenderid', entity_id) } : {};
+ const Lender:any = entity_id ?
+ { params: new HttpParams().set('lenderid', entity_id) } :
+ { };
+ if(LenderRoleID == '25') {
+ Lender.params = Lender.params.set('createdby',userid)
+ }
return this._http.get(this.apiUrl + "listLessPDDetails/get",Lender)
.pipe(
catchError(this.handleError('operation', []))
@@ -185,10 +190,17 @@ export class PdTrigerService {
// { params: new HttpParams().set('status', status)} : {};
let entity_id=localStorage.getItem('LocalSetEntity');
- let userid_local:string=this._aws.getlocale()
+ let LenderRoleID : any = localStorage.getItem('LenderRoleID');
+ let userid=this._aws.getlocale()
- const paramHttp= entity_id && status ?
+ // const Lender = entity_id && status && LenderRoleID != '25' ?
+ // { params: new HttpParams().set('lenderid', entity_id) } :
+ // { params: new HttpParams().set('createdby', userid) };
+ let paramHttp:any= entity_id && status ?
{params : new HttpParams().set('lenderid', entity_id).set('status',status)} : {};
+ if(LenderRoleID == '25') {
+ paramHttp.params = paramHttp.params.set('createdby',userid)
+ }
return this._http.get(this.apiUrl + "listLessPDDetails/get", paramHttp)
.pipe(
catchError(this.handleError('operation', []))
@@ -640,6 +652,11 @@ export class PdTrigerService {
*/
overAllSearchFormDetails(searchItem) {
+ let LenderRoleID : any = localStorage.getItem('LenderRoleID');
+ let userid=this._aws.getlocale()
+ if(LenderRoleID == '25') {
+ searchItem.createdby = userid
+ }
let records = { 'records': searchItem };
return this._http.post(this.apiUrl + 'filterPDList', records).pipe(
catchError(this.handleError('operation', []))