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 25f43a2..4b2b1fb 100755
--- a/ng6-seed/src/app/layouts/admin/admin-layout.component.ts
+++ b/ng6-seed/src/app/layouts/admin/admin-layout.component.ts
@@ -62,14 +62,17 @@ export class AdminLayoutComponent implements OnInit, OnDestroy {
if(this.currentUser.dataStatus == true){
this.currentUser = this.currentUser.records[0];
-
+
localStorage.setItem("LocalSetEntity",this.currentUser.fk_entity_id);
this.fullName = this.currentUser.user_first_name +' '+this.currentUser.user_last_name;
this.roleName = this.currentUser.role_name;
console.log('this.currentUser',this.currentUser);
+ console.log(this.currentUser.userid);
localStorage.setItem('len_user_role_id',this.currentUser.user_role);
+ localStorage.setItem('userid',this.currentUser.userid);
+ localStorage.setItem('smc_agency_id',this.currentUser.smc_agency_id);
window.localStorage.setItem('LenderRoleID', this.currentUser.user_role);
// FOR TELLING entity id updated to localstorage for list pd component
this.users.messageSubject.next('all_tab')
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.ts
index d6ba838..c106f45 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.ts
@@ -1192,6 +1192,8 @@ searchFun(control:any,i:number,option){
console.log(result,JSON.stringify(result));
// let formValues = {}
let records = result.records
+
+
if(records ) {
// records.forEach(val=>{
Object.keys(records).forEach(key_name=>{
@@ -1212,6 +1214,7 @@ searchFun(control:any,i:number,option){
}
}
if(key_name == 'address_details') {
+
this.addressList = records['address_details']
let control_address = this._PDtriggerForm.get('addresses')['controls'][0] as FormArray
control_address.get('addressline1').disable()
@@ -1230,6 +1233,9 @@ searchFun(control:any,i:number,option){
}
onChangeSelectedAddress(value) {
console.log(value)
+
+ let city_id=value.city;
+ this.getvendor(city_id)
if(value) {
let control_address = this._PDtriggerForm.get('addresses')['controls'][0] as FormArray
console.log(control_address);
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 bddfbac..8446ed9 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
@@ -71,7 +71,7 @@ export class ListPdComponent implements OnInit, OnDestroy {
this.userService.getroles().subscribe(res=>{
let role_name = this.userService.takeDecisionRouting(res['records'][0])
console.log('userrole');
-
+ console.log(res);
localStorage.setItem('smc_agency_id',res['records'][0].smc_agency_id);
localStorage.setItem('len_user_role',role_name);
this.user_role_name=role_name
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-allocation/pd-allocation.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-allocation/pd-allocation.component.ts
index 431c232..0fbc13e 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-allocation/pd-allocation.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-allocation/pd-allocation.component.ts
@@ -106,12 +106,12 @@ export class PdAllocationComponent implements OnInit {
this.usertype=localStorage.getItem('usertype');
if(this.usertype=='true')
{
-
+
this.updateData = {
"pd_id":this.data.pd_id,
// "fk_pd_allocated_to":allocateDetails.fk_user_id,
"fk_pd_allocated_to":allocateDetails.userid,
- "pd_agency_id":localStorage.getItem('user_role')
+ "pd_agency_id":localStorage.getItem('user_role')=='28'|| localStorage.getItem('user_role')=='29'?localStorage.getItem('smc_agency_id'):localStorage.getItem('user_role')
}
}
else
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 d231aab..2c12b3c 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
@@ -204,7 +204,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 a8e0a1c..5d890b7 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
@@ -38,6 +38,8 @@ export class PdTrigerService {
usertype: string;
LenderRoleID: string;
entity_id: string;
+ pdagencyid: string;
+ userRoleType: string;
constructor(private _http: HttpClient,
private _aws: AwsService) {
@@ -171,21 +173,46 @@ export class PdTrigerService {
// get pd details
getPdDetails(lenderId): Observable {
+
+ this.userRoleType=localStorage.getItem('user_role');
this.usertype=localStorage.getItem('usertype');
- if(this.usertype=='true1')
+ if(this.usertype=='true')
{
+ if(this.userRoleType=='29')
+ {
+ this.pdagencyid = localStorage.getItem('smc_agency_id');
+ this.entity_id=localStorage.getItem('LocalSetEntity');
+ let userid1=this._aws.getlocale()
+ let userid = localStorage.getItem('userid');
+ const Lender:any = this.entity_id ?
+ { params: new HttpParams().set('lenderid', this.entity_id) } :
+ {};
+
+ Lender.params = Lender && Lender.params ? Lender.params.set('createdby',userid1).set('pdagencyid',this.pdagencyid).set('pdofficerid',userid) : {}
+
+ return this._http.get(this.apiUrl + "listLessPDDetails/get", Lender)
+ .pipe(
+ catchError(this.handleError('operation', []))
+ )
+ }
+ else
+ {
+ this.pdagencyid = localStorage.getItem('smc_agency_id');
- this.entity_id = localStorage.getItem('smc_agency_id');
+ this.entity_id=localStorage.getItem('LocalSetEntity');
let userid1=this._aws.getlocale()
+
const Lender:any = this.entity_id ?
- { params: new HttpParams().set('smcagencyid', this.entity_id) } :
+ { params: new HttpParams().set('lenderid', this.entity_id) } :
{};
- Lender.params = Lender && Lender.params ? Lender.params.set('createdby',userid1) : {}
+ Lender.params = Lender && Lender.params ? Lender.params.set('createdby',userid1).set('pdagencyid',this.pdagencyid) : {}
+
return this._http.get(this.apiUrl + "listLessPDDetails/get", Lender)
.pipe(
catchError(this.handleError('operation', []))
)
+ }
}
else
@@ -212,18 +239,36 @@ export class PdTrigerService {
getTabStatusPdDetails(status: string,lenderId): Observable {
this.usertype=localStorage.getItem('usertype');
- if(this.usertype=='true1')
+ if(this.usertype=='true')
{
+ if(this.userRoleType=='29')
+ {
+ this.pdagencyid = localStorage.getItem('smc_agency_id');
+ this.entity_id=localStorage.getItem('LocalSetEntity');
+ let userid1=this._aws.getlocale()
+ let userid = localStorage.getItem('userid');
+ let paramHttp1:any= this.entity_id && status ?
+ {params : new HttpParams().set('lenderid', this.entity_id).set('status',status).set('pdagencyid',this.pdagencyid).set('pdofficerid',userid)} : {};
+ paramHttp1.params = paramHttp1.params.set('createdby',userid1)
+ return this._http.get(this.apiUrl + "listLessPDDetails/get", paramHttp1)
+ .pipe(
+ catchError(this.handleError('operation', []))
+ )
+ }
- this.entity_id = localStorage.getItem('smc_agency_id');
+ else
+ {
+ this.pdagencyid = localStorage.getItem('smc_agency_id');
+ this.entity_id=localStorage.getItem('LocalSetEntity');
let userid1=this._aws.getlocale()
let paramHttp1:any= this.entity_id && status ?
- {params : new HttpParams().set('smcagencyid', this.entity_id).set('status',status)} : {};
+ {params : new HttpParams().set('lenderid', this.entity_id).set('status',status).set('pdagencyid',this.pdagencyid)} : {};
paramHttp1.params = paramHttp1.params.set('createdby',userid1)
return this._http.get(this.apiUrl + "listLessPDDetails/get", paramHttp1)
.pipe(
catchError(this.handleError('operation', []))
)
+ }
}
else
{
@@ -706,7 +751,7 @@ export class PdTrigerService {
// if(LenderRoleID == '25') {
if(this.usertype=='true')
{
- searchItem.smc_agency_id = localStorage.getItem('smc_agency_id');
+ searchItem.pd_agency_id = localStorage.getItem('smc_agency_id');
}
searchItem.createdby = userid
// }
@@ -952,7 +997,9 @@ loadTemplate(form_id) {
}
getSMCVendorPDOfficersList(roleid)
{
- return this._http.get(this.apiUrl+'getSMCVendorPDOfficersList?role_id='+roleid)
+ //let agencyid=localStorage.getItem('user_role')=='28'|| localStorage.getItem('user_role')=='29'?localStorage.getItem('smc_agency_id'):localStorage.getItem('user_role')
+ let agencyid=this.pdagencyid = localStorage.getItem('smc_agency_id');
+ return this._http.get(this.apiUrl+'getSMCVendorPDOfficersList?agency_id='+agencyid)
.pipe(
catchError(this.handleError('operation', []))
)