diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.html index dd94280e9..8595c692a 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.html @@ -74,7 +74,7 @@ Was the employer met Required -
+
@@ -93,20 +93,19 @@ required> --> Select - - {{deslist.designation}} + + {{deslist.name}} Designation of Person Met Required - - + + Specify Person Met Required -
{ if (data.status == 200) { this.company_relationship_list = data.records.filter(item => item.isactive == 1); - this.company_relationship_list = data.records.filter(item => item.name != 'Others'); - this.company_relationship_list.push({ 'company_relationship_id': 0, 'name': 'Not Applicable' }); + this.company_relationship_list.forEach(val=>{ + console.log(val.name) + if((val.name).includes('of')){ + val.name=(val.name).slice(0,-2); + } + }) + this.company_relationship_list = data['records'].filter(item => item.name != 'Others' && item.name != 'Not Applicable'); + this.company_relationship_list.push({ 'company_relationship_id': 1, 'name': 'Others' }); } }); // this.retriveFile(); diff --git a/ng6-seed/src/app/quality-check/qc-list/qc-pd-report/qc-pd-report.component.html b/ng6-seed/src/app/quality-check/qc-list/qc-pd-report/qc-pd-report.component.html index 3eafcff49..ec87d145b 100644 --- a/ng6-seed/src/app/quality-check/qc-list/qc-pd-report/qc-pd-report.component.html +++ b/ng6-seed/src/app/quality-check/qc-list/qc-pd-report/qc-pd-report.component.html @@ -52,10 +52,10 @@ - + - +
@@ -99,12 +99,12 @@
- +
@@ -136,9 +136,11 @@ + +
@@ -178,9 +180,9 @@
- + diff --git a/ng6-seed/src/app/quality-check/qc-list/qc-pd-report/qc-pd-report.component.ts b/ng6-seed/src/app/quality-check/qc-list/qc-pd-report/qc-pd-report.component.ts index 28067e4cf..59a23f447 100644 --- a/ng6-seed/src/app/quality-check/qc-list/qc-pd-report/qc-pd-report.component.ts +++ b/ng6-seed/src/app/quality-check/qc-list/qc-pd-report/qc-pd-report.component.ts @@ -69,6 +69,7 @@ export class QcPdReportComponent implements OnInit { pdf_viewer_split_size:String='70' html_viewer_split_size:String='30' model_edit='' + spinner_access:boolean=false; private notifier: NotifierService; constructor(notifier: NotifierService, private fb: FormBuilder, private route: ActivatedRoute, @@ -239,6 +240,27 @@ export class QcPdReportComponent implements OnInit { // alert(err.html_format); }); } + downloadPDImagesPDF(){ + this.spinner_access=true + let data = { + "pd_id": this.startPD, + "random_string":atob(this.route.snapshot.params['string']) + }; + this.notifier.notify("info","Processing please wait..") + this.pdTrigerService.photoPDFDownload(data).subscribe(data => { + if (data.dataStatus) { + window.open(data.records); + this.notifier.notify('success', 'Done Successfully..!'); + } else { + this.notifier.notify('warning', 'Something Went Wrong Try Again.!'); + } + this.spinner_access=false + }, err => { + this.spinner_access=false + this.notifier.notify('error', 'Something Went Wrong Try Again.! \t\"' + (err.error_type == 2 ? err.error_status + ' ( ' + err.error_text + ' ) ' : ' ( ' + err.error_text + ' ) ') +'\" Error Occur.!'); + // alert(err.html_format); + }); + } archivePDImages(){ let data = { @@ -592,5 +614,6 @@ export class DialogChangeCurrentVenrsion implements OnInit { getConfirmation(confim: Boolean) { this.dialogRef.close(confim); } + } diff --git a/ng6-seed/src/app/quality-check/qc-service/qc.service.ts b/ng6-seed/src/app/quality-check/qc-service/qc.service.ts index 310552cf6..09be837a2 100755 --- a/ng6-seed/src/app/quality-check/qc-service/qc.service.ts +++ b/ng6-seed/src/app/quality-check/qc-service/qc.service.ts @@ -613,6 +613,9 @@ export class QcService { archivePDImages(Dtl : any): Observable { return this._http.post(this.apiUrl + "archivePDImages", { "records": Dtl }); } + photoPDFDownload(params:any): Observable{ + return this._http.post(this.apiUrl + "photoPDFDownload", { "records": params }); + } getHTMLContent(id:any): Observable { return this._http.post(this.apiUrl+"getHTMLContent", {"pd_id":id}); diff --git a/ng6-seed/src/assets/spinner/spinner.svg b/ng6-seed/src/assets/spinner/spinner.svg new file mode 100644 index 000000000..46ae389d7 --- /dev/null +++ b/ng6-seed/src/assets/spinner/spinner.svg @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file