diff --git a/src/pages/pd-question/pd-question-assessed-business/pd-question-assessed-business.ts b/src/pages/pd-question/pd-question-assessed-business/pd-question-assessed-business.ts index ddb98159..e00dce82 100755 --- a/src/pages/pd-question/pd-question-assessed-business/pd-question-assessed-business.ts +++ b/src/pages/pd-question/pd-question-assessed-business/pd-question-assessed-business.ts @@ -81,6 +81,7 @@ export class PdQuestionAssessedBusinessPage { { pd_expense_id:[null], fk_pd_id:[this.pdDetails.pd_id], + company_id:[this.pdDetails.company_id], expense_item_id:[null,Validators.compose([Validators.required])], expense_value:[null,Validators.compose([Validators.required])], fk_frequency_id:[null,Validators.compose([Validators.required])], @@ -120,7 +121,7 @@ export class PdQuestionAssessedBusinessPage { let deleteRecords:any; if(item.fk_pd_id !=null){ deleteRecords=[{ - pd_expense_id:item.pd_expense_id, + pd_expense_id:item.pd_expense_id, fk_pd_id:item.fk_pd_id, company_id:this.pdDetails.company_id, isactive:false diff --git a/src/pages/pd-question/pd-question-assessed-info/pd-question-assessed-info.html b/src/pages/pd-question/pd-question-assessed-info/pd-question-assessed-info.html index 42cf8004..49fa597d 100755 --- a/src/pages/pd-question/pd-question-assessed-info/pd-question-assessed-info.html +++ b/src/pages/pd-question/pd-question-assessed-info/pd-question-assessed-info.html @@ -113,8 +113,8 @@ - - {{salesItem.sales_item}}({{salesItem.other_sales_item}}) + + {{salesItem.sales_item}}({{salesItem.other_sales_item}}) {{"₹"}} {{salesItem.annual_sale_value}} @@ -272,7 +272,7 @@ - + {{purchase.purchase_item}}({{purchase.other_purchase_item}}) @@ -387,7 +387,7 @@
- + {{expense.expense_item}} @@ -424,7 +424,7 @@
- + {{houseExepense.expense_item}} @@ -460,7 +460,7 @@
- + {{busIncome.business_income_item !='Others(Please Specify)'?busIncome.business_income_item:busIncome.other_frequncy_item}} diff --git a/src/pages/pd-question/pd-question-assessed-info/pd-question-assessed-info.ts b/src/pages/pd-question/pd-question-assessed-info/pd-question-assessed-info.ts index dc664f01..efe3c034 100755 --- a/src/pages/pd-question/pd-question-assessed-info/pd-question-assessed-info.ts +++ b/src/pages/pd-question/pd-question-assessed-info/pd-question-assessed-info.ts @@ -85,10 +85,10 @@ export class PdQuestionAssessedInfoPage { this.FormName = "Purchase Page"; break; case 3: - this.FormName = "Business Expense Page"; + this.FormName = "Business Expenses Page"; break; case 4: - this.FormName = "House Hold Page"; + this.FormName = "Household Expenses Page"; break; default: this.FormName = "Question Page"; diff --git a/src/pages/pd-question/pd-question-assessed-purchase/pd-question-assessed-purchase.html b/src/pages/pd-question/pd-question-assessed-purchase/pd-question-assessed-purchase.html index b17a1d00..badcd4d7 100755 --- a/src/pages/pd-question/pd-question-assessed-purchase/pd-question-assessed-purchase.html +++ b/src/pages/pd-question/pd-question-assessed-purchase/pd-question-assessed-purchase.html @@ -58,7 +58,6 @@
-<<<<<<< HEAD
@@ -423,12 +423,12 @@
- - + + + - - - - - \ No newline at end of file + + + + diff --git a/src/pages/pd-question/pd-question-business-group/pd-question-business-assets/pd-question-business-assets.html b/src/pages/pd-question/pd-question-business-group/pd-question-business-assets/pd-question-business-assets.html index be663297..4cf175df 100755 --- a/src/pages/pd-question/pd-question-business-group/pd-question-business-assets/pd-question-business-assets.html +++ b/src/pages/pd-question/pd-question-business-group/pd-question-business-assets/pd-question-business-assets.html @@ -187,7 +187,7 @@ - Approx Vintage + Age of Asset in Years @@ -376,7 +376,8 @@
- Approx Vintage + Age of Asset in Years + diff --git a/src/pages/pd-question/pd-question-business-group/pd-question-business-info/pd-question-business-info.html b/src/pages/pd-question/pd-question-business-group/pd-question-business-info/pd-question-business-info.html index 01322373..eaa65e45 100755 --- a/src/pages/pd-question/pd-question-business-group/pd-question-business-info/pd-question-business-info.html +++ b/src/pages/pd-question/pd-question-business-group/pd-question-business-info/pd-question-business-info.html @@ -111,14 +111,14 @@ {{monthErrorMessage[i]}} - {{errorMessageForExistTotalWorkExperience[i]}} - + @@ -1357,7 +1357,7 @@ - + @@ -1541,6 +1541,7 @@

+
@@ -1551,6 +1552,7 @@
+
@@ -1570,6 +1572,7 @@

+
@@ -1580,6 +1583,7 @@
+
@@ -1600,6 +1604,7 @@

+
@@ -1610,6 +1615,7 @@
+
@@ -1630,6 +1636,7 @@

+
@@ -1640,6 +1647,7 @@
+
@@ -1660,6 +1668,7 @@

+
@@ -1670,6 +1679,7 @@
+
@@ -1689,6 +1699,7 @@

+
@@ -1699,6 +1710,7 @@
+
@@ -1716,6 +1728,7 @@

+
@@ -1726,6 +1739,7 @@
+
diff --git a/src/pages/pd-question/pd-question-business-group/pd-question-business-info/pd-question-business-info.ts b/src/pages/pd-question/pd-question-business-group/pd-question-business-info/pd-question-business-info.ts index 80abff15..e16887cf 100755 --- a/src/pages/pd-question/pd-question-business-group/pd-question-business-info/pd-question-business-info.ts +++ b/src/pages/pd-question/pd-question-business-group/pd-question-business-info/pd-question-business-info.ts @@ -782,8 +782,8 @@ changeOfStartedBusiness(members,i,e){ console.log('businessVal',businessVal); if(data['records'].gst_Regn_cert =='yes'){ this.businessForm.addControl('gst_Regn_cert_pic', new FormControl('')); }else{ this.businessForm.removeControl('gst_Regn_cert_pic');} if(data['records'].factory_cert =='yes'){ this.businessForm.addControl('factory_cert_pic', new FormControl('')); }else{ this.businessForm.removeControl('factory_cert_pic');} - if(data['records'].practice_cert_cert =='yes'){ this.businessForm.addControl('practice_cert_pic', new FormControl('')); }else{ this.businessForm.removeControl('practice_cert_pic');} - if(data['records'].shop_eat_act_cert =='yes'){ alert('if control'); this.businessForm.addControl('shop_eat_act_cert_pic', new FormControl('')); }else{ this.businessForm.removeControl('shop_eat_act_cert_pic');} + if(data['records'].practice_cert =='yes'){ this.businessForm.addControl('practice_cert_pic', new FormControl('')); }else{ this.businessForm.removeControl('practice_cert_pic');} + if(data['records'].shop_eat_act_cert =='yes'){ this.businessForm.addControl('shop_eat_act_cert_pic', new FormControl('')); }else{ this.businessForm.removeControl('shop_eat_act_cert_pic');} if(data['records'].pf_regn =='yes'){ this.businessForm.addControl('pf_regn_pic', new FormControl('')); }else{ this.businessForm.removeControl('pf_regn_pic');} if(data['records'].esic_regn =='yes'){ this.businessForm.addControl('esic_regn_pic', new FormControl('')); }else{ this.businessForm.removeControl('esic_regn_pic');} if(data['records'].export_import_cert =='yes'){ this.businessForm.addControl('export_import_cert_pic', new FormControl('')); }else{ this.businessForm.removeControl('export_import_cert_pic');} @@ -2259,16 +2259,17 @@ toGetPOSMachinesDetails(e,flag){ } sendImage(){ this.loading.loaderForSendImage() - console.log("ll",JSON.stringify(this.imageBucket)); + console.log("about business - Images bucket",JSON.stringify(this.imageBucket)); let records:any={ 'pd_id':this.pdDetails.pd_id, 'formid':this.FormId, 'images':this.imageBucket, 'company_id':this.pdDetails.company_id } - console.log("records",JSON.stringify(records)) + console.log("about Business images ",JSON.stringify(records)); this.qustCat.savePDImages(records).subscribe(res=>{ + console.log('response records',res,res['record']); if(res['dataStatus']== true){ this.toast.pdTriggerappmessage("Image Saved Successfully") this.imageBucket=[] @@ -2286,20 +2287,15 @@ toGetPOSMachinesDetails(e,flag){ } ImageUpload(Flag : any){ - // alert('Inside Mobile Upload Function' + Flag); - // alert('is_person_met_pic 1'); this.cameraProvider.getpicture().then(res=>{ - - if(Flag == 1 ){ this.businessForm.controls.shop_eat_act_cert_pic.setValue(res != 'error' ? res : ''); alert('Inside Mobile Upload Function' + Flag);} - if(Flag == 2 ){ this.businessForm.controls.gst_Regn_cert_pic.setValue(res != 'error' ? res : ''); alert('Inside Mobile Upload Function' + Flag);} - if(Flag == 3 ){ this.businessForm.controls.export_import_cert_pic.setValue(res != 'error' ? res : ''); alert('Inside Mobile Upload Function' + Flag);} - if(Flag == 4 ){ this.businessForm.controls.factory_cert_pic.setValue(res != 'error' ? res : ''); alert('Inside Mobile Upload Function' + Flag);} - if(Flag == 5 ){ this.businessForm.controls.practice_cert_pic.setValue(res != 'error' ? res : ''); alert('Inside Mobile Upload Function' + Flag);} - if(Flag == 6 ){ this.businessForm.controls.pf_regn_pic.setValue(res != 'error' ? res : ''); alert('Inside Mobile Upload Function' + Flag);} - if(Flag == 7 ){ this.businessForm.controls.esic_regn_pic.setValue(res != 'error' ? res : ''); alert('Inside Mobile Upload Function' + Flag);} - - // console.table('1',this.businessForm.value); + if(Flag == 1 ){ this.businessForm.controls.shop_eat_act_cert_pic.setValue(res != 'error' ? res : ''); }//alert('Inside Mobile Upload Function' + Flag);} + if(Flag == 2 ){ this.businessForm.controls.gst_Regn_cert_pic.setValue(res != 'error' ? res : ''); }//alert('Inside Mobile Upload Function' + Flag);} + if(Flag == 3 ){ this.businessForm.controls.export_import_cert_pic.setValue(res != 'error' ? res : ''); }//alert('Inside Mobile Upload Function' + Flag);} + if(Flag == 4 ){ this.businessForm.controls.factory_cert_pic.setValue(res != 'error' ? res : ''); }//alert('Inside Mobile Upload Function' + Flag);} + if(Flag == 5 ){ this.businessForm.controls.practice_cert_pic.setValue(res != 'error' ? res : '');}// alert('Inside Mobile Upload Function' + Flag);} + if(Flag == 6 ){ this.businessForm.controls.pf_regn_pic.setValue(res != 'error' ? res : ''); }//alert('Inside Mobile Upload Function' + Flag);} + if(Flag == 7 ){ this.businessForm.controls.esic_regn_pic.setValue(res != 'error' ? res : ''); }//alert('Inside Mobile Upload Function' + Flag);} },error=>{ console.log("Camera Error ",JSON.stringify(error)); }) diff --git a/src/pages/pd-question/pd-question-general-info/pd-question-general-info.ts b/src/pages/pd-question/pd-question-general-info/pd-question-general-info.ts index 07effa0d..e8633936 100755 --- a/src/pages/pd-question/pd-question-general-info/pd-question-general-info.ts +++ b/src/pages/pd-question/pd-question-general-info/pd-question-general-info.ts @@ -190,6 +190,7 @@ export class PdQuestionGeneralInfoPage { else{ //AFTER FORM DIRTY CHECK if (this.imageBucket.length > 0) { + console.log('if part . this.imageBucket.length',this.imageBucket.length); return new Promise((resolve1, reject1) => { let alert = this.toast.setAlert("Captured Images are not Saved", "Note:To Save the image press the Save Image button
Are you sure want to Go Back?") alert.present(); @@ -215,6 +216,7 @@ export class PdQuestionGeneralInfoPage { else{ //REGULAR CHECK FOR IMAGE IS CAPTURED if (this.imageBucket.length > 0) { + console.log('else part . this.imageBucket.length',this.imageBucket.length) return new Promise((resolve, reject) => { let alert = this.toast.setAlert("Captured Images are not Saved", "Note:To Save the image press the 'Save Image' button
Are you sure want to Go Back?") alert.present(); @@ -1414,16 +1416,16 @@ console.log('1)',this.temp); } sendImage(){ + this.loading.loaderForSendImage() - console.log("ll",JSON.stringify(this.imageBucket)); + console.log("image bucket - json data",JSON.stringify(this.imageBucket)); let records:any={ 'pd_id':this.pdDetails.pd_id, 'formid':this.FormId.form_id, 'images':this.imageBucket, 'company_id':'' } - console.log("records",JSON.stringify(records)) - + console.log("DB - records",JSON.stringify(records)) this.qustCat.savePDImages(records).subscribe(res=>{ if(res['dataStatus']== true){ this.toast.pdTriggerappmessage("Image Saved Successfully") @@ -1445,15 +1447,11 @@ console.log('1)',this.temp); } ImageUpload(control,Flag : any){ - // alert('Inside Mobile Upload Function' + Flag);s if(Flag == 1){ - // alert('is_person_met_pic 1'); this.cameraProvider.getpicture().then(res=>{ - // alert("Response 1" + res); if(res != 'error'){ control.controls['is_person_met_pic'].setValue(res); - // alert(JSON.stringify(this.generalForm.value)); - // this.toast.pdTriggerappmessage('Flag 1 Success'); + //this.toast.pdTriggerappmessage('Flag 1 Success'); } else{ control.controls['is_person_met_pic'].setValue(''); @@ -1465,12 +1463,9 @@ console.log('1)',this.temp); }) } else if(Flag == 2){ - // alert('is_person_met_id_proof 2'); this.cameraProvider.getpicture().then(res=>{ - // alert("Response 2" + res); if(res != 'error'){ control.controls['is_person_met_id_proof'].setValue(res); - // alert(JSON.stringify(this.generalForm.value)); // this.toast.pdTriggerappmessage('Flag 2 Success'); } else{ @@ -1482,6 +1477,5 @@ console.log('1)',this.temp); console.log("Camera Error ",JSON.stringify(error)); }) } - // console.table('Overall',this.generalForm.value); } }