diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-allocation/pd-allocation.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-allocation/pd-allocation.component.html index 88d57a9..9bce0ff 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-allocation/pd-allocation.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-allocation/pd-allocation.component.html @@ -1,199 +1,166 @@ -
-

-
- - Allocate to Vendor -
-
- - - -
- -

- - - - - - -
-
-
- - {{v_officer.name}} - -
- -
- -
- - - - - - -

No Regional Credit Managers available.

- - - - - - - - -
-

Regional Credit Manager: {{selectedItem.first_name}}

-
-
- - -
-
- - -
- - - - - -
-
+

-
- Allocation -
-
- +
+ + Allocate to Vendor +
+
+ - -
- -

- - - - - - - Allocation To Credit Manager - - - - - - - -
-
-
- - {{officer.first_name}} {{officer.last_name}} - -
- -
- -
- - - - - - -

No Regional Credit Managers available.

- - - - - - - - -
-

Regional Credit Manager: {{selectedItem.first_name}}

-
-
- - -
- - - - - Vendor Allocate - - - - - - - -
-
-
- - {{v_officer.full_name}} - -
- -
- -
- - - - - - -

No Regional Credit Managers available.

- - - - - - - - -
-

Regional Vendor Manager: {{selectedItem.full_name}}

-
-
- - -
- - - - - - - - - - - - -
- - +
+ + + + + +
+
+
+ + {{v_officer.name}} + +
+ +
+
+ + + + +

No Regional Credit Managers available.

+ + + + + + + +
+

Regional Credit Manager: {{selectedItem.first_name}}

+
+
+ + +
+
+ + +
+ + + + +
+

+
+ Allocation +
+
+ +
+

+ + + + + Allocation To Credit Manager + + + + + + +
+
+
+ + {{officer.first_name}} {{officer.last_name}} + +
+ +
+
+ + + + +

No Regional Credit Managers available.

+ + + + + + + +
+

Regional Credit Manager: {{selectedItem.first_name}}

+
+
+ + +
+ + + + Vendor Allocate + + + + + + +
+
+
+ + {{v_officer.full_name}} + +
+ +
+
+ + + + +

No Regional Credit Managers available.

+ + + + + + + +
+

Regional Vendor Manager: {{selectedItem.full_name}}

+
+
+ + +
+ + + + + + +
+ \ No newline at end of file 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 d497a26..3ac1e18 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 @@ -38,7 +38,7 @@ export class PdAllocationComponent implements OnInit { private dialogRef: MatDialogRef, private _pd: PdTrigerService, private dialog: MatDialog, @Inject(MAT_DIALOG_DATA) public data: any,private _aws:AwsService) { - console.log(data) + console.log(data) this.notifier=notifier; if(this.data.lender_role_id == '25') { this.pageTitle = "Allocation To Regional Credit Manager" @@ -48,11 +48,14 @@ export class PdAllocationComponent implements OnInit { ngOnInit() { this.usertype=localStorage.getItem('usertype'); this.isDisabled=true; - + if(this.data.lender_role_id=='28') { this.getSmcVendorPdOfficerList(); } + // else if(this.data.lender_role_id=='30' && this.data.lender_admin_flag == 0){ + // this.getSmcVendorPdOfficerList(); + // } else { this.getPDOfficerList(this.data.pd_id); @@ -71,10 +74,10 @@ export class PdAllocationComponent implements OnInit { getPDOfficerList(pdID:string){ let user_type - if(this.data.lender_role_id == '25' || this.data.lender_role_id == '30') { + if(this.data.lender_role_id == '25' ) { user_type = "RCM" } - else if(this.data.lender_role_id == '27') { + else if(this.data.lender_role_id == '27' || this.data.lender_role_id == '30') { user_type = "CM" } this._pd.getCMUsers(this.data.state_id,user_type).subscribe( 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 0c8c19e..7086445 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 @@ -230,16 +230,37 @@ - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.ts index 3321c23..44057d0 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.ts @@ -609,12 +609,14 @@ dialogRef1.afterClosed().subscribe(rr=>{ } /** To update pd officer*/ selfAllocation(state_id) { - // console.log('selfAllocation city = ',this.pdMasterData[0].fk_city); + // console.log(this.pdMasterData[0]); // return + let flag : any = null;//admin role means introduce the flag. if((this.LenderRoleID == '27') || (this.LenderRoleID == '25') || (this.LenderRoleID == '28') || (this.LenderRoleID == '30')){ + flag = this.LenderRoleID=='30'&&localStorage.getItem('smc_agency_id')?0:1;//agency id and admin role means 1 else 0 means introduce the flag. const dialogRef1 = this.dialog.open(PdAllocationComponent, { - data: { pd_id:this.viewID, pd_status: this.pdStatusCheck.ALLOCATED,random_string:this.pdMasterData[0].random_string,city_id:this.pdMasterData[0].fk_city,dialogType:'actionOnly',state_id:state_id, lender_role_id:this.LenderRoleID }, + data: { pd_id:this.viewID, pd_status: this.pdStatusCheck.ALLOCATED,random_string:this.pdMasterData[0].random_string,city_id:this.pdMasterData[0].fk_city,dialogType:'actionOnly',state_id:state_id, lender_role_id:this.LenderRoleID,lender_admin_flag:flag }, disableClose: true, minWidth: '30%', }) 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 2948aa7..6d0086d 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 @@ -35,6 +35,7 @@ export class PdTrigerService { MAP_API_URL: string; // private apiUrl = "http://ssa.sineedge.com/sparqapi/api/"; private apiUrl = environment.apiEndpoint; + // private apiUrl2 = environment.devApiEndpoint; usertype: string; LenderRoleID: string; entity_id: string; @@ -1035,7 +1036,7 @@ loadTemplate(form_id) { getSMCVendorPDOfficersList(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'); + let agencyid = +localStorage.getItem('smc_agency_id'); return this._http.get(this.apiUrl+'getSMCVendorPDOfficersList?agency_id='+agencyid) .pipe( catchError(this.handleError('operation', [])) diff --git a/ng6-seed/src/environments/environment.ts b/ng6-seed/src/environments/environment.ts index cb85c8d..71447b6 100644 --- a/ng6-seed/src/environments/environment.ts +++ b/ng6-seed/src/environments/environment.ts @@ -8,7 +8,7 @@ export const environment = { environmentName: 'Development Environment',//Localhost Environment. - // apiEndpoint: 'https://apitest.pdgenie.com/sparqtest/api/', + devApiEndpoint: 'http://localhost/AWSEC2/sparqapi/api/', apiEndpoint: ' https://apitest.pdgenie.com/sparqtest/api/', authorization: 'sparqvenba2018',