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 bb956f0..1566015 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 @@ -173,7 +173,9 @@ {{details.scheduled_on}}
- {{details.fk_pd_allocated_to == user_id ? 'Self' : details.pd_allocated_to }} + +
+ {{details.pd_status=='ALLOCATED_TO_FIA'?details.SMC_vendor_agency_name:details.fk_pd_allocated_to == user_id ? 'Self' : details.pd_allocated_to }} 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 61b1aa5..5e44002 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 @@ -112,7 +112,7 @@ {{ (details.updatedon)? (details.updatedon | slice:0:10):(details.updatedon) }}
-

{{details.fk_pd_allocated_to == user_id ? 'Self' : details.pd_allocated_to }}

+

{{details.pd_status=='ALLOCATED_TO_FIA'?details.SMC_vendor_agency_name:details.fk_pd_allocated_to == user_id ? 'Self' : details.pd_allocated_to }}

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 fa0e012..f1dd3cb 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 @@ -111,7 +111,7 @@ {{ (details.updatedon)? (details.updatedon | slice:0:10):(details.updatedon) }}
-

{{details.fk_pd_allocated_to == user_id ? 'Self' : details.pd_allocated_to }}

+

{{details.pd_status=='ALLOCATED_TO_FIA'?details.SMC_vendor_agency_name:details.fk_pd_allocated_to == user_id ? 'Self' : details.pd_allocated_to }}

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 53b24ad..9178b0a 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 @@ -176,7 +176,7 @@
- +
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 f8ca364..4e91b78 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 @@ -119,9 +119,7 @@ export class PdAllocationComponent implements OnInit { } /** To update pd officer*/ updatePdOfficer(allocateDetails:any) { - console.log(allocateDetails); - console.log('test'); - //return; + if(!allocateDetails){ this.notifier.notify('warning', 'Please Choose PD Officer.!'); } @@ -129,7 +127,7 @@ 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, @@ -140,6 +138,7 @@ export class PdAllocationComponent implements OnInit { else { + //this.userId = this._aws.getlocale() this.updateData = { "pd_id":this.data.pd_id, @@ -167,6 +166,36 @@ export class PdAllocationComponent implements OnInit { }); } } + updateagency(allocateDetails:any) + { + console.log(allocateDetails); + // return + + this.updateData = { + "pd_id":this.data.pd_id, + // "fk_pd_allocated_to":allocateDetails.fk_user_id, + "fk_pd_allocated_to":allocateDetails.fk_state_id, + "pd_agency_id":allocateDetails.entity_id + } + + console.log(this.updateData); + //return + this._pd.updatePdOfficer(this.updateData).subscribe( + result => { + if (result.status == 200) { + this.notifier.notify('success', 'PD Allocated.!'); + this.dialogRef.close(true); + } + else { + this.notifier.notify('warning', 'Something Went Wrong Try Again.!'); + this.errorMessage = "Something Went Wrong Try Again.!"; + } + }, error => { + this.notifier.notify('error', 'Something Went Wrong Try Again.! \t\"' + (error.error_type == 2 ? error.error_status + ' ( ' + error.error_text + ' ) ' : ' ( ' + error.error_text + ' ) ') +'\" Error Occur.!'); + this.errorMessage = "Some Thing Wents Wrong Try Again.!"; + // this.dialogRef.close(); + }); + } /** For Popup Close Button */ closeAllocationComponent(): void { this.dialogRef.close(); diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-status-change-dialogue/pd-status-change-dialogue.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-status-change-dialogue/pd-status-change-dialogue.component.html index c2321fe..60bca73 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-status-change-dialogue/pd-status-change-dialogue.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-status-change-dialogue/pd-status-change-dialogue.component.html @@ -22,7 +22,7 @@ - + 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 c26e5cb..1c0f0c8 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 @@ -25,6 +25,11 @@ export class PdStatusChangeDialogueComponent implements OnInit { usertype: string; vendorOfficerList: any; errorMessage: any; + updateData: { + pd_id: any; + // "fk_pd_allocated_to":allocateDetails.fk_user_id, + fk_pd_allocated_to: any; pd_agency_id: any; + }; constructor(notifier: NotifierService , private pd: PdTrigerService,private dialogRef: MatDialogRef,@Inject(MAT_DIALOG_DATA) public data: any) { @@ -38,7 +43,7 @@ export class PdStatusChangeDialogueComponent implements OnInit { } ngOnInit() { - + if(this.data.pd_status=='COMPLETED'){ let params: any={}; params.pd_id = this.data.pdid; @@ -87,7 +92,8 @@ export class PdStatusChangeDialogueComponent implements OnInit { // } - changePDStatus(status: string): void { + changePDStatus(status: string,pdid): void { + let pd=pdid; this.usertype=localStorage.getItem('usertype'); console.log(this.dialogType,this.enableAddonPD) @@ -141,6 +147,35 @@ export class PdStatusChangeDialogueComponent implements OnInit { this.notifier.notify('warning', 'Something Wents Wrong Try Again.!'); }); } + this.selfallocate(pd); + } + selfallocate(pd) + { + + this.updateData = { + "pd_id":pd, + "fk_pd_allocated_to":localStorage.getItem('userid'), + "pd_agency_id":localStorage.getItem('user_role')=='28'|| localStorage.getItem('user_role')=='29'?localStorage.getItem('smc_agency_id'):localStorage.getItem('user_role') + } + console.log(this.updateData); + // return + this.pd.updatePdOfficer(this.updateData).subscribe( + result => { + if (result.status == 200) { + this.notifier.notify('success', 'PD Allocated.!'); + this.dialogRef.close(true); + } + else { + this.notifier.notify('warning', 'Something Went Wrong Try Again.!'); + this.errorMessage = "Something Went Wrong Try Again.!"; + } + }, error => { + this.notifier.notify('error', 'Something Went Wrong Try Again.! \t\"' + (error.error_type == 2 ? error.error_status + ' ( ' + error.error_text + ' ) ' : ' ( ' + error.error_text + ' ) ') +'\" Error Occur.!'); + this.errorMessage = "Some Thing Wents Wrong Try Again.!"; + // this.dialogRef.close(); + }); + + } diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/dynamic-form/dynamic-form/dynamic-form.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/dynamic-form/dynamic-form/dynamic-form.component.ts index 7c402a8..b4e5e95 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/dynamic-form/dynamic-form/dynamic-form.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/dynamic-form/dynamic-form/dynamic-form.component.ts @@ -250,7 +250,7 @@ export class DynamicFormComponent implements OnInit { } if(this.json_answers[json_obj.group_key] != null && this.json_answers[json_obj.group_key] instanceof Array){ - this.json_answers[json_obj.group_key].splice(index,1) + //this.json_answers[json_obj.group_key].splice(index,1) } } diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/image-capture/image-capture.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/image-capture/image-capture.component.ts index 97000d0..5b30f38 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/image-capture/image-capture.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/image-capture/image-capture.component.ts @@ -71,6 +71,17 @@ export class ImageCaptureComponent implements OnInit { this.records = result.records if(this.records.is_cus_link_disabled != '1') { this.imageData =this.records.img_data; + + + // this.imageData.push({img_data: [], + // img_key: "additional_photograph", + // img_name: "Additional Photograph", + // is_loader: false, + // is_multiple: 1, + // is_saved: true, + // section_heading: "Additional Photograph"}); + // console.log(this.imageData); + console.log('imagedata'); this.imageData.forEach(val=>{ val.is_loader = false val.is_saved = true @@ -98,7 +109,10 @@ export class ImageCaptureComponent implements OnInit { // } addImage(event,index){ this.loaderService.showMatSpinnerDialog('Processing watermark..'); + console.log('event'); console.log(event,index); + console.log('event'); + var reader = new FileReader(); // let imagePath = event; reader.readAsDataURL(event); @@ -121,6 +135,12 @@ export class ImageCaptureComponent implements OnInit { if(this.imageData[this.current_index].is_multiple == 1) { console.log("multi"); let img_param={img_url:watermarked_img,is_base64:true,link:geoCoordinates} + + console.log('param'); + console.log(img_param); + console.log(this.imageData[this.current_index].img_data); + + console.log('param'); this.imageData[this.current_index].img_data.push(img_param) this.sendImage(this.imageData,this.imageData[this.current_index].img_data.length-1) } 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 8e70e2e..0e542a2 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 @@ -209,7 +209,7 @@ {{master.pd_status==pdStatusCheck.QC_COMPLETED ? 'QC Completed' : master.pd_status==pdStatusCheck.ADD_ON_PENDING ? 'Completed' : master.pd_status==pdStatusCheck.ALLOCATED_TO_FIA ?'Allocated to vendor':master.pd_status | titlecase}}
- {{master.pd_status==pdStatusCheck.QC_COMPLETED ? 'QC Completed' : master.pd_status==pdStatusCheck.ADD_ON_PENDING ? 'Completed' : master.pd_status | titlecase}} + {{master.pd_status==pdStatusCheck.QC_COMPLETED ? 'QC Completed' : master.pd_status==pdStatusCheck.ADD_ON_PENDING ? 'Completed' : master.pd_status==pdStatusCheck.ALLOCATED_TO_FIA ?'Allocated to vendor':master.pd_status | titlecase}}

{{master.vendor_status==pdStatusCheck.QC_COMPLETED ? 'QC Completed' : master.vendor_status==pdStatusCheck.ADD_ON_PENDING ? 'Completed' : master.vendor_status | titlecase}}

@@ -217,15 +217,15 @@ - + - + - - + + 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 d5fcd48..558cb51 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 @@ -355,8 +355,7 @@ export class ViewPdComponent implements OnInit, OnDestroy { // start pd getPDStart(pdDetails: any, status: string) { - console.log('pdddddd'); - + console.log(pdDetails); // console.log(pdDetails.fk_pd_id); // console.log('pddetails'); diff --git a/ng6-seed/src/app/shared/menu-items/horizontal-menu-items.ts b/ng6-seed/src/app/shared/menu-items/horizontal-menu-items.ts index c8fd7c1..ca96180 100755 --- a/ng6-seed/src/app/shared/menu-items/horizontal-menu-items.ts +++ b/ng6-seed/src/app/shared/menu-items/horizontal-menu-items.ts @@ -102,8 +102,7 @@ const salesmenu = [ @Injectable() export class HorizontalMenuItems { getAll(): Menu[] { - console.log(HORIZONTALMENUITEMS); - console.log('menus'); + return HORIZONTALMENUITEMS; } salesgetAll(): Menu[] {