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 9178b0a..88d57a9 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 @@ -52,10 +52,14 @@

Regional Credit Manager: {{selectedItem.first_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 4e91b78..c7c485e 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 @@ -120,14 +120,14 @@ export class PdAllocationComponent implements OnInit { /** To update pd officer*/ updatePdOfficer(allocateDetails:any) { + if(!allocateDetails){ this.notifier.notify('warning', 'Please Choose PD Officer.!'); } else { 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, @@ -138,6 +138,7 @@ export class PdAllocationComponent implements OnInit { else { + alert('empty'); //this.userId = this._aws.getlocale() this.updateData = { @@ -147,7 +148,10 @@ export class PdAllocationComponent implements OnInit { "pd_agency_id":allocateDetails.entity_id } } - console.log(this.updateData); + console.log(allocateDetails); + + // console.log(this.updateData); + // return; //return this._pd.updatePdOfficer(this.updateData).subscribe( result => { @@ -168,8 +172,7 @@ export class PdAllocationComponent implements OnInit { } updateagency(allocateDetails:any) { - console.log(allocateDetails); - // return + this.updateData = { "pd_id":this.data.pd_id, diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-status-change-dialogue/pd-status-change-dialogue.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-status-change-dialogue/pd-status-change-dialogue.component.ts index 0ac5093..0a95b6c 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-status-change-dialogue/pd-status-change-dialogue.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-status-change-dialogue/pd-status-change-dialogue.component.ts @@ -95,7 +95,8 @@ export class PdStatusChangeDialogueComponent implements OnInit { changePDStatus(status: string,pdid): void { let pd=pdid; - + // console.log(status); + // //return; this.usertype=localStorage.getItem('usertype'); console.log(this.dialogType,this.enableAddonPD) if(this.dialogType == 'actionOnly' && !this.enableAddonPD) { @@ -148,8 +149,11 @@ export class PdStatusChangeDialogueComponent implements OnInit { this.notifier.notify('warning', 'Something Wents Wrong Try Again.!'); }); } + if(status=='INPROGRESS') + { this.selfallocate(pd); } + } selfallocate(pd) {