final form issues : ps

This commit is contained in:
saravanakumarkandasami 2019-06-15 14:34:54 +05:30
parent 5dd3425a79
commit 33a18592c7
5 changed files with 90 additions and 51 deletions

View File

@ -299,7 +299,7 @@ changeOfStartedBusiness(members,i,e){
// country_sale.push(this.createCountrySale());
//const max_sale_state:any=<FormArray> 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));
})

View File

@ -269,7 +269,7 @@
<!-- // -->
</mat-form-field>
<mat-form-field *ngIf="lender_short_name == 'CLIX' || product_abbr == 'LAEP'">
<mat-form-field *ngIf="product_abbr == 'LAEP'">
<input matInput autocomplete="off" placeholder="Annual Sales through Credit Card / POS machines" formControlName="estimate_posmachine_or_cc_annual_sales" type="number" (keyup)="inWords($event,i,13)">
<mat-hint align="end" style="font-size:11px" *ngIf="details.get('estimate_posmachine_or_cc_annual_sales').value != ''">{{"&#8377;"}} {{AV_CCAnnualSalesAmtInwords[i]}} Only </mat-hint>
</mat-form-field>

View File

@ -204,11 +204,11 @@
<mat-select placeholder="Comment on Footfall in the market where the B2C outlet is located…" formControlName="outlet_location"
required>
<mat-option>Select</mat-option>
<mat-option value="heavy_footfall"> Heavy Footfall (lots of customers in the locality / marketplace).</mat-option>
<mat-option value="medium_footfall"> Medium Footfall (Medium no of customers in the locality / marketplace).</mat-option>
<mat-option value="low_footfall"> Low Footfall (Few customers seen in the locality / marketplace).</mat-option>
<mat-option value="heavy_footfall"> <span class="DropdownOptions">Heavy Footfall ( lots of customers in the locality / marketplace ). </span> </mat-option>
<mat-option value="medium_footfall"> <span class="DropdownOptions">Medium Footfall ( Medium no of customers in the locality / marketplace ).</span> </mat-option>
<mat-option value="low_footfall"> <span class="DropdownOptions">Low Footfall ( Few customers seen in the locality / marketplace ).</span> </mat-option>
</mat-select>
<mat-error style="color:red;font-size:12px;margin:0;padding:0;font-weight: normal;float:right" *ngIf="_finalRemarkForm.controls['outlet_location'].hasError('required')">Comment on Footfall in the market where the B2C outlet is located Required</mat-error>
<mat-error style="color:red;font-size:12px;margin:0;padding:0;font-weight: normal;float:right" *ngIf="_finalRemarkForm.controls['outlet_location'].hasError('required')">Comment Required</mat-error>
</mat-form-field>
<div class="toggle" *ngIf="_finalRemarkForm.controls['is_competition']">
@ -219,9 +219,9 @@
<mat-form-field *ngIf="_finalRemarkForm.controls['appx_outlet_or_stores']">
<input matInput autocomplete="off"
placeholder="Approximate No of similar outlets / stores seen by PD officer during the visit to that location"
formControlName="appx_outlet_or_stores" required OnlyNumber
type="text">
<mat-error *ngIf="_finalRemarkForm.controls['appx_outlet_or_stores'].hasError('required')">Approximate No of similar outlets / stores seen by PD officer during the visit to that location Required</mat-error>
formControlName="appx_outlet_or_stores" required
type="number">
<mat-error *ngIf="_finalRemarkForm.controls['appx_outlet_or_stores'].hasError('required')">Approximate Number is Required</mat-error>
</mat-form-field>
@ -230,53 +230,61 @@
<mat-checkbox color="primary" formControlName="demolition_activity" (change)="clixChange($event.checked,2)">
Any demolition activity seen in the locality by PD officer <strong>( {{ _finalRemarkForm.value.demolition_activity ===true ? 'Yes' : 'No'}} )</strong></mat-checkbox>
</div>
<ion-row>
<ion-col>
<mat-form-field *ngIf="_finalRemarkForm.controls['comment_of_demolition_activity']">
<ion-row *ngIf="_finalRemarkForm.controls['comment_of_demolition_activity']">
<ion-col>
<mat-form-field *ngIf="_finalRemarkForm.controls['comment_of_demolition_activity']">
<input matInput autocomplete="off" type="text" placeholder="Specify The Demolition Activity Comment" formControlName="comment_of_demolition_activity" required>
<mat-error *ngIf="_finalRemarkForm.controls['comment_of_demolition_activity'].hasError('required')">Specify The Demolition Activity Comment Required</mat-error>
<mat-error *ngIf="_finalRemarkForm.controls['comment_of_demolition_activity'].hasError('required')"> Comment Required</mat-error>
</mat-form-field>
</ion-col>
<ion-col float-right *ngIf="_finalRemarkForm.controls['demolition_activity_pic']">
<div *ngIf="_finalRemarkForm.controls['demolition_activity_pic'].value !== ''" >
<img src="{{_finalRemarkForm.controls['demolition_activity_pic'].value}}" imageViewer style ="width: 40px;height: 35px;">
</div>
<div *ngIf="_finalRemarkForm.controls['demolition_activity_pic'].value === ''" >
<label style="display: block; text-align: center !important;"> Demolition Activity Locality
Image </label>
</div>
<div style="text-align: -webkit-center;" >
<ion-icon title="Click Here For Demolition Activity Locality Image" name="md-camera" (click)="ImageUpload(1)"></ion-icon>
</div>
</ion-col>
</ion-row>
<div *ngIf="_finalRemarkForm.controls['sealing_activity']">
<ion-col>
<div float-center *ngIf="_finalRemarkForm.controls['demolition_activity_pic']">
<br>
<div float-center *ngIf="_finalRemarkForm.controls['demolition_activity_pic']" >
<div *ngIf="_finalRemarkForm.controls['demolition_activity_pic'].value !== ''" >
<img src="{{_finalRemarkForm.controls['demolition_activity_pic'].value}}" imageViewer class="imgcenter">
</div>
<div *ngIf="_finalRemarkForm.controls['demolition_activity_pic'].value === ''" >
<label style="display: block; text-align: center !important;"> Demolition Activity Locality
Image </label>
</div>
<div style="text-align: -webkit-center;" >
<ion-icon title="Click Here For Demolition Activity Locality Image" name="md-camera" (click)="ImageUpload(1)"></ion-icon>
</div>
</div>
</div>
</ion-col>
</ion-row>
<div *ngIf="_finalRemarkForm.controls['sealing_activity']">
<mat-checkbox color="primary" formControlName="sealing_activity" (change)="clixChange($event.checked,3)">
Any sealing activity observed in the locality by PD office <strong>( {{ _finalRemarkForm.value.sealing_activity ===true ? 'Yes' : 'No'}} )</strong></mat-checkbox>
</div>
<ion-row>
<ion-col>
<mat-form-field *ngIf="_finalRemarkForm.controls['comment_of_sealing_activity']">
<input matInput autocomplete="off" type="text" placeholder="Specify The Sealing Activity Comment " formControlName="comment_of_sealing_activity" required>
<mat-error *ngIf="_finalRemarkForm.controls['comment_of_sealing_activity'].hasError('required')">Specify The Sealing Activity Comment Required</mat-error>
</mat-form-field>
</ion-col>
<ion-col float-right *ngIf="_finalRemarkForm.controls['sealing_activity_pic']">
<div *ngIf="_finalRemarkForm.controls['sealing_activity_pic'].value !== ''" >
<img src="{{_finalRemarkForm.controls['sealing_activity_pic'].value}}" imageViewer style ="width: 40px;height: 35px;">
<ion-row *ngIf="_finalRemarkForm.controls['comment_of_sealing_activity']">
<ion-col>
<mat-form-field *ngIf="_finalRemarkForm.controls['comment_of_sealing_activity']">
<input matInput autocomplete="off" type="text" placeholder="Specify The Sealing Activity Comment " formControlName="comment_of_sealing_activity" required>
<mat-error *ngIf="_finalRemarkForm.controls['comment_of_sealing_activity'].hasError('required')"> Comment Required</mat-error>
</mat-form-field>
</ion-col>
<ion-col>
<div *ngIf="_finalRemarkForm.controls['sealing_activity_pic']">
<br>
<div *ngIf="_finalRemarkForm.controls['sealing_activity_pic']" >
<div *ngIf="_finalRemarkForm.controls['sealing_activity_pic'].value !== ''" >
<img src="{{_finalRemarkForm.controls['sealing_activity_pic'].value}}" imageViewer class="imgcenter">
</div>
<div *ngIf="_finalRemarkForm.controls['sealing_activity_pic'].value === ''" >
<label style="display: block; text-align: center !important;">Sealing Activity Locality
Image </label>
</div>
<div style="text-align: -webkit-center;" >
<ion-icon title="Click Here For Sealing Activity Locality Image" name="md-camera" (click)="ImageUpload(2)"></ion-icon>
</div>
</div>
</div>
<div *ngIf="_finalRemarkForm.controls['sealing_activity_pic'].value === ''" >
<label style="display: block; text-align: center !important;"> Sealing Activity Locality
Image </label>
</div>
<div style="text-align: -webkit-center;" >
<ion-icon title="Click Here For Sealing Activity Locality Image" name="md-camera" (click)="ImageUpload(2)"></ion-icon>
</div>
</ion-col>
</ion-row>
</ion-col>
</ion-row>
</mat-card-content>
</mat-card>
<mat-card>

View File

@ -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;

View File

@ -111,7 +111,7 @@
formControlName="is_there_total_fund">
<mat-option>Select</mat-option>
<mat-option value="yes disclose">Yes, Disclosed</mat-option>
<mat-option value="no not disclosed">No, not Disclosed</mat-option>
<mat-option value="no not disclosed">No, Not Disclosed</mat-option>
</mat-select>
</mat-form-field>
<span *ngIf="loanDetailsForm.controls['is_there_total_fund'].value == 'yes disclose'">