From 33a18592c7bd69af1660b774185a3e2f9ad1de21 Mon Sep 17 00:00:00 2001 From: saravanakumarkandasami Date: Sat, 15 Jun 2019 14:34:54 +0530 Subject: [PATCH] final form issues : ps --- .../pd-question-business-info.ts | 5 +- .../pd-question-financial-info.html | 2 +- .../pd-question-final-remark.html | 102 ++++++++++-------- .../pd-question-final-remark.scss | 30 ++++++ .../pd-question-loans/pd-question-loans.html | 2 +- 5 files changed, 90 insertions(+), 51 deletions(-) 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 cb09db64..2ded7fc1 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 @@ -299,7 +299,7 @@ changeOfStartedBusiness(members,i,e){ // country_sale.push(this.createCountrySale()); //const max_sale_state:any= this.businessForm.controls['manufacturing_activity_details']['controls'][0].controls.max_sale_state_name; //max_sale_state.push(this.maxSaleState()) - this.lender_short_name == 'CLIX' || this.product_abbr == 'LAEP' ? this.businessForm.addControl('fire_noc', new FormControl('', Validators.required)) : this.businessForm.removeControl('fire_noc'); + this.product_abbr == 'LAEP' ? this.businessForm.addControl('fire_noc', new FormControl('', Validators.required)) : this.businessForm.removeControl('fire_noc'); if(data['status']==200){ @@ -1088,7 +1088,7 @@ changeBusinessActivity(event: any){ this.businessForm.value.service_provider_activity_details.length > 0 || this.businessForm.value.retail_trading_activity_details.length > 0 || this.businessForm.value.wholesale_trading_activity_details.length > 0 ? this.businessForm.addControl('applicant_use_pos_machines', new FormControl(this.businessForm.value.applicant_use_pos_machines)) : this.businessForm.removeControl('applicant_use_pos_machines'); if (this.businessForm.value.service_provider_activity_details.length > 0 || this.businessForm.value.retail_trading_activity_details.length > 0 || this.businessForm.value.wholesale_trading_activity_details.length > 0) { - if(this.businessForm.controls['applicant_use_pos_machines'] && (this.lender_short_name == 'CLIX' || this.product_abbr == 'LAEP' )){ + if(this.businessForm.controls['applicant_use_pos_machines'] && this.product_abbr == 'LAEP' ){ this.businessForm.controls['applicant_use_pos_machines'].setValue('yes'); } this.changePOSMachinesAvailablity(this.businessForm.value.applicant_use_pos_machines, 2); @@ -2383,6 +2383,7 @@ toGetPOSMachinesDetails(e,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);} + if(Flag == 8 ){ this.businessForm.controls.fire_noc_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-business-group/pd-question-financial-info/pd-question-financial-info.html b/src/pages/pd-question/pd-question-business-group/pd-question-financial-info/pd-question-financial-info.html index 55b26d9d..6d0f6f1d 100755 --- a/src/pages/pd-question/pd-question-business-group/pd-question-financial-info/pd-question-financial-info.html +++ b/src/pages/pd-question/pd-question-business-group/pd-question-financial-info/pd-question-financial-info.html @@ -269,7 +269,7 @@ - + {{"₹"}} {{AV_CCAnnualSalesAmtInwords[i]}} Only diff --git a/src/pages/pd-question/pd-question-final-remark/pd-question-final-remark.html b/src/pages/pd-question/pd-question-final-remark/pd-question-final-remark.html index b7af318c..84243348 100755 --- a/src/pages/pd-question/pd-question-final-remark/pd-question-final-remark.html +++ b/src/pages/pd-question/pd-question-final-remark/pd-question-final-remark.html @@ -204,11 +204,11 @@ Select - Heavy Footfall (lots of customers in the locality / marketplace). - Medium Footfall (Medium no of customers in the locality / marketplace). - Low Footfall (Few customers seen in the locality / marketplace). + Heavy Footfall ( lots of customers in the locality / marketplace ). + Medium Footfall ( Medium no of customers in the locality / marketplace ). + Low Footfall ( Few customers seen in the locality / marketplace ). - Comment on Footfall in the market where the B2C outlet is located Required + Comment Required
@@ -219,9 +219,9 @@ - Approximate No of similar outlets / stores seen by PD officer during the visit to that location Required + formControlName="appx_outlet_or_stores" required + type="number"> + Approximate Number is Required @@ -230,53 +230,61 @@ Any demolition activity seen in the locality by PD officer ( {{ _finalRemarkForm.value.demolition_activity ===true ? 'Yes' : 'No'}} )
- - - - + + + - Specify The Demolition Activity Comment Required + Comment Required - -
- -
-
- -
-
- -
- - - -
+ +
+
+
+
+ +
+
+ +
+
+ +
+
+
+ + + +
Any sealing activity observed in the locality by PD office ( {{ _finalRemarkForm.value.sealing_activity ===true ? 'Yes' : 'No'}} )
- - - - - Specify The Sealing Activity Comment Required - - - -
- + + + + + Comment Required + + + +
+
+
+
+ +
+
+ +
+
+ +
+
-
- -
-
- -
- - - + + diff --git a/src/pages/pd-question/pd-question-final-remark/pd-question-final-remark.scss b/src/pages/pd-question/pd-question-final-remark/pd-question-final-remark.scss index 023a4621..31029259 100755 --- a/src/pages/pd-question/pd-question-final-remark/pd-question-final-remark.scss +++ b/src/pages/pd-question/pd-question-final-remark/pd-question-final-remark.scss @@ -25,6 +25,19 @@ page-pd-question-final-remark { white-space: normal; //height: 120%; } + + .mat-select-panel mat-option.mat-option { + margin: 1rem 0; + overflow: visible; + line-height: initial; + word-wrap: break-word; + white-space: pre-wrap; + } + + .mat-option-text.mat-option-text { + white-space: normal; + } + mat-placeholder{ font-size:15px; } @@ -40,6 +53,23 @@ page-pd-question-final-remark { white-space: normal !important; } + .mat-option-text > .DropdownOptions{ + margin: 1rem 0 !important; + overflow: visible !important; + line-height: initial !important; + word-wrap: break-word !important; + white-space: normal !important; + } + + .imgcenter{ + display: block; + margin-left: auto; + margin-right: auto; + width: 40px;height: 35px; + } + // + + /*FOR IMAGES*/ img{ padding:0 5px 0 0; diff --git a/src/pages/pd-question/pd-question-loans/pd-question-loans.html b/src/pages/pd-question/pd-question-loans/pd-question-loans.html index 3b3d6c77..30a723cf 100755 --- a/src/pages/pd-question/pd-question-loans/pd-question-loans.html +++ b/src/pages/pd-question/pd-question-loans/pd-question-loans.html @@ -111,7 +111,7 @@ formControlName="is_there_total_fund"> Select Yes, Disclosed - No, not Disclosed + No, Not Disclosed