diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/images-all/images-all.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/images-all/images-all.component.ts
index 079f1d0dd..686de7e2b 100644
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/images-all/images-all.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/images-all/images-all.component.ts
@@ -17,23 +17,34 @@ export class ImagesAllComponent implements OnInit { imageData: any;
imgReCaptureBucket: any[] =[];
notifier: NotifierService;
dialogRef: any;
+ params: { pd_id: string; random_string: any; };
constructor(private _pd: PdTrigerService,
private dialog: MatDialog, notifier:NotifierService,
- @Inject(MAT_DIALOG_DATA) public pd_all_details: any) {
+ @Inject(MAT_DIALOG_DATA) public pd_all_details: any,@Inject(MAT_DIALOG_DATA) public data: any) {
this.notifier = notifier
}
ngOnInit() {
-
+
+ console.log('abi');
+ console.log(this.data);
this.getPDImageDetails();
}
getPDImageDetails() {
-
- let params = {"pd_id":"","random_string":this.pd_all_details.pdmaster_details.random_string}
+ if(this.data.page==1)
+ {
+
+ this.params = {"pd_id":"","random_string":this.data.random_string}
+ }
+ else
+ {
+
+ this.params = {"pd_id":"","random_string":this.pd_all_details.pdmaster_details.random_string}
+ }
//let params = {"pd_id":"","random_string":'i2PnHMA7cdGx8zkz'}
// console.log(params);
- this._pd.getPDImgDetails(params).subscribe(result=>{
+ this._pd.getPDImgDetails(this.params).subscribe(result=>{
if(result.dataStatus) {
this.records = result.records
@@ -49,7 +60,7 @@ export class ImagesAllComponent implements OnInit { imageData: any;
// let msgObj ={title:'',subtitle:'Link is Disabled',is_homebtn:false,message:'The requested url is Disabled. Please contant info@pdgenie.com'}
// this.goToErrorComponent(msgObj)
// }
- }
+ }
else{
// this.records.is_loaded = false
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 08c06a3e9..7231fdf0b 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
@@ -211,11 +211,12 @@
-
+
{{master.pd_status==pdStatusCheck.QC_COMPLETED ? 'QC Completed' : master.pd_status==pdStatusCheck.ADD_ON_PENDING ? 'Completed' : master.pd_status | titlecase}}
( {{master.agency_short_name}} - {{master.vendor_status}} )
-
+
+
@@ -226,7 +227,7 @@
-
+
{{master.pd_allocated_to | titlecase}}
@@ -237,7 +238,7 @@
{{master.centralofficer | titlecase}}
-
+
{{master.scheduled_on}}
@@ -255,18 +256,18 @@
0">
-
+
{{addresses.addtional_pd_data[0].pd_status==pdStatusCheck.QC_COMPLETED ? 'QC Completed' : addresses.addtional_pd_data[0].pd_status==pdStatusCheck.ADD_ON_PENDING ? 'Completed' : addresses.addtional_pd_data[0].pd_status | titlecase}}
( {{master.agency_short_name}} - {{master.vendor_status}} )
-
+
-
+
{{addresses.addtional_pd_data[0].pd_allocated_to | titlecase}}
@@ -277,7 +278,7 @@
{{addresses.addtional_pd_data[0].centralofficer | titlecase}}
-
+
{{addresses.addtional_pd_data[0].scheduled_on}}
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 a5a7dbee5..4b24803a8 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
@@ -23,6 +23,7 @@ import { VideoChatComponent } from 'app/video-chat/video-chat.component';
import { MastersComponent } from 'app/settings/masters/masters.component';
import { VideoPlayerComponent } from 'app/video-chat/video-player/video-player.component';
import { VendorPdAllocationComponent } from '../vendor-pd-allocation/VendorPdAllocationComponent';
+import { ImagesAllComponent } from '../start-pd/forms/images-all/images-all.component';
@Component({
selector: 'app-view-pd',
@@ -445,6 +446,24 @@ export class ViewPdComponent implements OnInit, OnDestroy {
// }
+ }
+ // pd allocation to
+ photographsection(pdData: any,childData: any) {
+ pdData.page = '1';
+ pdData.random_string=this.masterRandomString;
+ if (pdData.fk_pd_type == 1 || pdData.fk_pd_type == 3 || pdData.fk_pd_type == 2) {
+ const dialogRef = this.dialog.open(ImagesAllComponent, {
+ data: pdData,
+ //position: { right: '0' },
+ width: '80%',
+ disableClose: true
+ });
+ dialogRef.afterClosed()
+
+ }
+
+
+
}
// pd schedule details