Fairoj : Ui changes and question added

This commit is contained in:
venbatechnologies@gmail.com 2020-09-30 13:18:07 +05:30
parent 49bc10f2f4
commit 85f6f20885
4 changed files with 20 additions and 9 deletions

View File

@ -5,7 +5,9 @@
<div fxFlex="70" align="left" style="padding: 10px !important;"> <div fxFlex="70" align="left" style="padding: 10px !important;">
<span>{{main_applicant}} {{lender_applicant_id ? '('+lender_applicant_id+')' : ''}}, {{customer_segment_abbr}} <span <span>{{main_applicant}} {{lender_applicant_id ? '('+lender_applicant_id+')' : ''}}, {{customer_segment_abbr}} <span
*ngIf="subproduct_abbr">- *ngIf="subproduct_abbr">-
{{subproduct_abbr}} </span><span *ngIf="fk_pd_type == '2'" class="smartPd" style="color: #fff !important;">(Vendor Answer)</span></span><br> {{subproduct_abbr}} </span>
<!-- <span *ngIf="fk_pd_type == '2'" class="smartPd" style="color: #fff !important;">(Vendor Answer)</span> -->
</span><br>
{{pageTitle}} {{pageTitle}}
</div> </div>
<div fxFlex="30" align="end" style="padding: 10px !important;"> <div fxFlex="30" align="end" style="padding: 10px !important;">
@ -20,11 +22,11 @@
<mat-tab-group> <mat-tab-group>
<mat-tab label="Questions"> <mat-tab label="Questions">
<ng-template matTabContent> <ng-template matTabContent>
<mat-card style="min-height: 550px;"> <mat-card style="min-height: 550px;background-color: #b9e9f1 !important">
<mat-card-title> <mat-card-title>
<p>Address Details</p> <p>Address Details</p>
</mat-card-title> </mat-card-title>
<mat-card-content> <mat-card-content style="background-color: #b9e9f1 !important">
<div fxLayout="row wrap"> <div fxLayout="row wrap">
<div fxFlex="100"> <div fxFlex="100">
<div formArrayName="addresses"> <div formArrayName="addresses">

View File

@ -31,7 +31,7 @@
<mat-card> <mat-card>
<mat-card-content> <mat-card-content>
<mat-card-subtitle>Location</mat-card-subtitle> <mat-card-subtitle>Location</mat-card-subtitle>
<mat-form-field style="width:94%;" *ngIf="fk_pd_type != '3' && fk_pd_type != '2'"> <mat-form-field style="width:94%;" *ngIf="fk_pd_type != '3'">
<mat-select placeholder="Is the location of the business / profession suited to the nature of business / service provided? " <mat-select placeholder="Is the location of the business / profession suited to the nature of business / service provided? "
formControlName="is_service_provided" > formControlName="is_service_provided" >
<mat-option>Select</mat-option> <mat-option>Select</mat-option>

View File

@ -108,7 +108,7 @@ export class FinalRemarksComponent implements OnInit {
final_form_remarks: [''] final_form_remarks: ['']
}); });
if(this.fk_pd_type == '3' || this.fk_pd_type == '2'){ if(this.fk_pd_type == '3'){
this._finalRemarkForm.controls['is_service_provided'].clearValidators(); this._finalRemarkForm.controls['is_service_provided'].clearValidators();
this._finalRemarkForm.controls['is_service_provided'].updateValueAndValidity(); this._finalRemarkForm.controls['is_service_provided'].updateValueAndValidity();
@ -116,6 +116,11 @@ export class FinalRemarksComponent implements OnInit {
this._finalRemarkForm.controls['mode_of_transport_during_visit'].updateValueAndValidity(); this._finalRemarkForm.controls['mode_of_transport_during_visit'].updateValueAndValidity();
} }
if(this.fk_pd_type == "2") {
this._finalRemarkForm.controls['mode_of_transport_during_visit'].clearValidators();
this._finalRemarkForm.controls['mode_of_transport_during_visit'].updateValueAndValidity();
}
if((this.fk_pd_type != '3') && (this.lender_short_name == 'CLIX' || this.lender_short_name == 'MWISE' || this.prod_catagory == 'LAEP')){ if((this.fk_pd_type != '3') && (this.lender_short_name == 'CLIX' || this.lender_short_name == 'MWISE' || this.prod_catagory == 'LAEP')){
this.prod_catagory == 'LAEP' ? this._finalRemarkForm.addControl('outlet_location', new FormControl('', Validators.required)) : this._finalRemarkForm.removeControl('outlet_location'); this.prod_catagory == 'LAEP' ? this._finalRemarkForm.addControl('outlet_location', new FormControl('', Validators.required)) : this._finalRemarkForm.removeControl('outlet_location');
this._finalRemarkForm.addControl('is_competition', new FormControl('')); this._finalRemarkForm.addControl('is_competition', new FormControl(''));

View File

@ -5,7 +5,9 @@
<div fxLayout="row wrap"> <div fxLayout="row wrap">
<div fxFlex.xs="100" fxFlex.sm="100" fxFlex.md="100" fxFlex.lg="100" fxFlex.xl="100"> <div fxFlex.xs="100" fxFlex.sm="100" fxFlex.md="100" fxFlex.lg="100" fxFlex.xl="100">
<span>{{main_applicant}} {{lender_applicant_id ? '('+lender_applicant_id+')' : ''}}, {{customer_segment_abbr}} <span *ngIf="subproduct_abbr">- <span>{{main_applicant}} {{lender_applicant_id ? '('+lender_applicant_id+')' : ''}}, {{customer_segment_abbr}} <span *ngIf="subproduct_abbr">-
{{subproduct_abbr}} </span><span *ngIf="fk_pd_type == '2'" class="smartPd" style="color: #fff !important;">(Vendor Answer)</span></span><br> {{subproduct_abbr}} </span>
<!-- <span *ngIf="fk_pd_type == '2'" class="smartPd" style="color: #fff !important;">(Vendor Answer)</span> -->
</span><br>
{{pageTitle}} {{pageTitle}}
</div> </div>
@ -28,7 +30,7 @@
<div formArrayName="neighbourhood_list"> <div formArrayName="neighbourhood_list">
<mat-card *ngFor="let neighbourhood of _neighbourhoodForm.controls.neighbourhood_list['controls']; let n = index; let last = last" <mat-card *ngFor="let neighbourhood of _neighbourhoodForm.controls.neighbourhood_list['controls']; let n = index; let last = last"
[formGroupName]="n"> [formGroupName]="n">
<mat-card-content> <mat-card-content style="background-color: #b9e9f1 !important">
<mat-form-field style="width: 42%" *ngIf="fk_pd_type != '3'"> <mat-form-field style="width: 42%" *ngIf="fk_pd_type != '3'">
<input matInput autocomplete="off" placeholder="Neighbour Name" formControlName="neighbourhood_name" appCustomTitleCase <input matInput autocomplete="off" placeholder="Neighbour Name" formControlName="neighbourhood_name" appCustomTitleCase
[value]="neighbourhood.get('neighbourhood_name').value" type="text"> [value]="neighbourhood.get('neighbourhood_name').value" type="text">
@ -108,7 +110,8 @@
</mat-card-actions> </mat-card-actions>
</mat-card> </mat-card>
</div> </div>
<mat-form-field style="width: 40%"> <mat-card-content style="background-color: #b9e9f1 !important">
<mat-form-field style="width: 40%;background-color: #b9e9f1 !important">
<mat-select placeholder="Status of the check as per PD officer?" formControlName="neighbourhood_status"> <mat-select placeholder="Status of the check as per PD officer?" formControlName="neighbourhood_status">
<mat-option>Select</mat-option> <mat-option>Select</mat-option>
<mat-option value="Positive">Positive</mat-option> <mat-option value="Positive">Positive</mat-option>
@ -117,6 +120,7 @@
</mat-select> </mat-select>
<mat-error *ngIf="_neighbourhoodForm.controls['neighbourhood_status'].hasError('required')">Status Required</mat-error> <mat-error *ngIf="_neighbourhoodForm.controls['neighbourhood_status'].hasError('required')">Status Required</mat-error>
</mat-form-field> </mat-form-field>
</mat-card-content>
</div> </div>
<div *ngIf="types.id==1"> <div *ngIf="types.id==1">
<mat-card-content formArrayName="referencecheck_list"> <mat-card-content formArrayName="referencecheck_list">