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 edaa8f3dc..583de1a6a 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,10 +17,12 @@ export class ImagesAllComponent implements OnInit { imageData: any; imgReCaptureBucket: any[] =[]; notifier: NotifierService; dialogRef: any; + params: { pd_id: string; random_string: 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 } @@ -28,12 +30,26 @@ export class ImagesAllComponent implements OnInit { imageData: any; console.log(this.pd_all_details) 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} + } + console.log(this.pd_all_details) + console.log('abi'); + //let params = {"pd_id":"","random_string":this.pd_all_details.pdMasterList.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 +65,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..21ddcce91 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 @@