Sineedge/pd_officer
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

issues fixes : ps

Browse Source
This commit is contained in:
saravanakumarkandasami 2019-07-08 19:57:54 +05:30
parent 4acdc4e5d0
commit ced6d1ba83
15 changed files with 88 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.sourcemaps/0.js.map
View File

@ -1 +1 @@
{"version":3,"sources":[],"names":[],"mappings":"","sourcesContent":[]} {"version":3,"sources":["../../@angular/common/http (ignored)"],"names":[],"mappings":";;;;;AAAA,e","file":"0.js","sourcesContent":["/* (ignored) */\n\n\n//////////////////\n// WEBPACK FOOTER\n// @angular/common/http (ignored)\n// module id = 712\n// module chunks = 0"],"sourceRoot":""}

2
.sourcemaps/1.js.map
View File

File diff suppressed because one or more lines are too long

1
.sourcemaps/main.js.map
View File

File diff suppressed because one or more lines are too long

5
src/pages/pd-question/pd-question-business-group/pd-question-client-info/pd-question-client-info.html
View File

@ -329,7 +329,7 @@
</div> </div>
</mat-card> </mat-card>
<mat-card *ngIf="serviceProviderForm"> <mat-card *ngIf="serviceProviderForm">
<mat-card-title><h5>Service Provider Product Details</h5></mat-card-title> <mat-card-title><h5>Service Provider Details</h5></mat-card-title>
<!--<h5 style="margin: 12px;padding:10px !important;">Service Provider Product Details</h5>--> <!--<h5 style="margin: 12px;padding:10px !important;">Service Provider Product Details</h5>-->
<div formArrayName="service_provider_details"> <div formArrayName="service_provider_details">
<div *ngFor="let item of clientInfoForm.controls.service_provider_details['controls']; let i=index" <div *ngFor="let item of clientInfoForm.controls.service_provider_details['controls']; let i=index"
@ -345,11 +345,12 @@
<button mini ion-fab color="optblue" slot="fixed" (click)="captureTheClientPics('Service Provider',l,items.get('service_provider_client_name').value)"><ion-icon name="md-camera" style="font-size: 24px"></ion-icon></button> <button mini ion-fab color="optblue" slot="fixed" (click)="captureTheClientPics('Service Provider',l,items.get('service_provider_client_name').value)"><ion-icon name="md-camera" style="font-size: 24px"></ion-icon></button>
</div> </div>
</ion-row> </ion-row>
<mat-card-content> <mat-card-content>
<div fxLayout="row wrap" fxLayoutGap="2px" fxLayoutAlign="start none"> <div fxLayout="row wrap" fxLayoutGap="2px" fxLayoutAlign="start none">
<mat-form-field style="width: 100%"> <mat-form-field style="width: 100%">
<mat-option>Select</mat-option>
<mat-select placeholder="Select the Service Provided" formControlName="service_provider_product_name"> <mat-select placeholder="Select the Service Provided" formControlName="service_provider_product_name">
<mat-option>Select</mat-option>
<mat-option *ngFor="let pm of m_suplierProducts[0]" [value]="pm.name">{{ <mat-option *ngFor="let pm of m_suplierProducts[0]" [value]="pm.name">{{
pm.name }}</mat-option> pm.name }}</mat-option>
</mat-select> </mat-select>

16
src/pages/pd-question/pd-question-business-group/pd-question-financial-info/pd-question-financial-info.ts
View File

@ -156,17 +156,19 @@ this.complete_status = this.pdDetails.pd_status == 'COMPLETED' ? true : false;
this.isDisplay = false; this.isDisplay = false;
this.financialForm.controls['is_financial_customer'].setValue('no'); this.financialForm.controls['is_financial_customer'].setValue('no');
// this.selectedFinancialCustomer('no');
const statementControl = <FormArray>this.financialForm.controls['date_per_financial']; const statementControl = <FormArray>this.financialForm.controls['date_per_financial'];
this.financialForm.controls['financial_starting_year'].setValue('');
this.financialForm.controls['financial_no_of_year'].setValue('');
while (statementControl.length !== 0) { while (statementControl.length !== 0) {
statementControl.removeAt(0); statementControl.removeAt(0);
} }
const control = <FormArray>this.financialForm.controls['estimated_value']; const control = <FormArray>this.financialForm.controls['estimated_value'];
control.push(this.createValue('')); if(control.length == 0 ){
this.financialForm.controls['financial_starting_year'].setValue(''); control.push(this.createValue('')); }
this.financialForm.controls['financial_no_of_year'].setValue('');
// alert((new Date()).getFullYear()); // alert((new Date()).getFullYear());
// let year1 = (new Date()).getFullYear(); // let year1 = (new Date()).getFullYear();
@ -178,15 +180,13 @@ this.complete_status = this.pdDetails.pd_status == 'COMPLETED' ? true : false;
} }
/** fin customer data from Fin statement*/ /** fin customer data from Fin statement*/
selectedFinancialCustomer(e: any): void { selectedFinancialCustomer(e: any): void {
if(e == 'yes'){
const control = <FormArray>this.financialForm.controls['estimated_value']; const control = <FormArray>this.financialForm.controls['estimated_value'];
if(e == 'yes'){
while (control.length !== 0) { while (control.length !== 0) {
control.removeAt(0); control.removeAt(0);
} }
} }
else if (e == 'no'){ else if (e == 'no' && control.length == 0){
const control = <FormArray>this.financialForm.controls['estimated_value'];
control.push(this.createValue('')); control.push(this.createValue(''));
} }
} }

3
src/pages/pd-question/pd-question-business-group/pd-question-future-plans-and-business-environment/pd-question-future-plans-and-business-environment.html
View File

@ -112,8 +112,9 @@
</mat-form-field> </mat-form-field>
<mat-form-field > <mat-form-field >
<p> Succession plan - who will look after the business after applicants retire / are unable to run the business due to any reason? </p>
<input matInput autocomplete="off" <input matInput autocomplete="off"
placeholder="Succession plan - who will look after the business after applicants retire / are unable to run the business due to any reason?" placeholder=""
formControlName="succession_plan"> formControlName="succession_plan">
<mat-error *ngIf="_futurePlansForm.controls['succession_plan'].hasError('required')">Succession plan <mat-error *ngIf="_futurePlansForm.controls['succession_plan'].hasError('required')">Succession plan
Required</mat-error> Required</mat-error>

5
src/pages/pd-question/pd-question-business-group/pd-question-supplier-info/pd-question-supplier-info.html
View File

@ -331,9 +331,10 @@
<mat-card-content> <mat-card-content>
<div fxLayout="row nowrap" fxLayoutGap="2px" fxLayoutAlign="start none"> <div fxLayout="row nowrap" fxLayoutGap="2px" fxLayoutAlign="start none">
<mat-form-field style="width: 100%"> <mat-form-field style="width: 100%">
<mat-select placeholder="service provider Name" formControlName="service_provider_name"> <mat-select placeholder="Service Provider Name" formControlName="service_provider_name">
<mat-option>Select</mat-option> <mat-option>Select</mat-option>
<mat-option *ngFor="let msp of m_serviceProvider" [value]="msp.name">{{ msp.name }}</mat-option> <mat-option *ngFor="let msp of m_serviceProvider[0]" [value]="msp.name">{{
msp.name }}</mat-option>
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
<mat-form-field style="width: 100%"> <mat-form-field style="width: 100%">

5
src/pages/pd-question/pd-question-business-group/pd-question-supplier-info/pd-question-supplier-info.ts
View File

@ -42,12 +42,13 @@ export class PdQuestionSupplierInfoPage {
imageDisplay: any[]; imageDisplay: any[];
imageBucket: any = []; imageBucket: any = [];
tab: string = '0'; tab: string = '0';
complete_status: boolean = false;
constructor(public navCtrl: NavController, public navParams: NavParams, public fb: FormBuilder, constructor(public navCtrl: NavController, public navParams: NavParams, public fb: FormBuilder,
public aws: AwsServiceProvider, public qustCat: QuestionCategoryProvider, public aws: AwsServiceProvider, public qustCat: QuestionCategoryProvider,
public toast: ToastProvider, private cameraProvider: CameraProvider, private loading: LoadingProvider, public toast: ToastProvider, private cameraProvider: CameraProvider, private loading: LoadingProvider,
private constantProvider: ConstantsProvider) { private constantProvider: ConstantsProvider) {
this.complete_status = this.pdDetails.pd_status == 'COMPLETED' ? true : false;
this.questionDetails = this.navParams.get('questionDetails'); this.questionDetails = this.navParams.get('questionDetails');
this.pdDetails = this.navParams.get('pdDetails'); this.pdDetails = this.navParams.get('pdDetails');
this.formDetails = this.navParams.get('formDetails'); this.formDetails = this.navParams.get('formDetails');
@ -65,7 +66,7 @@ export class PdQuestionSupplierInfoPage {
this.initFormLoadDetails(datas.type_of_activity); this.initFormLoadDetails(datas.type_of_activity);
this.business_manufacturingProducts = datas.type_of_activity.filter(data=>{if(data.type_of_activity_id == 2 ){return data}}).map(data=> [...data.prodcuts]); this.business_manufacturingProducts = datas.type_of_activity.filter(data=>{if(data.type_of_activity_id == 2 ){return data}}).map(data=> [...data.prodcuts]);
// this.business_tradingProducts = datas.type_of_activity.filter(data=>{if(data.type_of_activity_id == 3){return data}}).map(data=> [...data.prodcuts]); // this.business_tradingProducts = datas.type_of_activity.filter(data=>{if(data.type_of_activity_id == 3){return data}}).map(data=> [...data.prodcuts]);
this.m_serviceProvider = datas.type_of_activity.filter(data=>{if(data.type_of_activity_id == 5){return data}}).map(data=> [...data.prodcuts]); this.m_serviceProvider = datas.type_of_activity.filter(data => { if (data.type_of_activity_id == 5) { return data } }).map(data => [...data.prodcuts]);
let api = Object.keys(datas.type_of_activity).map(function (key) { let api = Object.keys(datas.type_of_activity).map(function (key) {
return datas.type_of_activity[key]; return datas.type_of_activity[key];
}); });

7
src/pages/pd-question/pd-question-family/pd-question-family.ts
View File

@ -707,7 +707,7 @@ selectedPerson(e,inx){
// this.isReadOnly[inx] = false; // this.isReadOnly[inx] = false;
// } // }
arraydata = { arraydata = {
'family_member_salutation':'', 'family_member_salutation':val.title,
'family_member_name' : val.name, 'family_member_name' : val.name,
'family_member_relationship' : val.relationship, 'family_member_relationship' : val.relationship,
'family_member_age' : val.age, 'family_member_age' : val.age,
@ -785,7 +785,9 @@ resValue:any;
return res.record.from_general_form[key] return res.record.from_general_form[key]
}); });
let datas=familyMembersGeneralForm.map(element=>{ let datas=familyMembersGeneralForm.map(element=>{
return {id:element.pd_co_applicant_id.toString(), return {
id:element.pd_co_applicant_id.toString(),
title:element.applicant_title_name ? element.applicant_title_name : '',
name:element.applicant_name, name:element.applicant_name,
relationship:element.relationship, relationship:element.relationship,
relation_to:element.relation_to, relation_to:element.relation_to,
@ -805,6 +807,7 @@ resValue:any;
}); });
let datas=familyMembersBusinessForm.map(element=>{ let datas=familyMembersBusinessForm.map(element=>{
return {id:element.other_family_relationship_id, return {id:element.other_family_relationship_id,
title:element.family_member_salutation,
name:element.family_member_name, name:element.family_member_name,
relationship:element.other_family_relationship_id, relationship:element.other_family_relationship_id,
relation_to:element.relation_to_id, relation_to:element.relation_to_id,

52
src/pages/pd-question/pd-question-final-remark/pd-question-final-remark.html
View File

@ -199,7 +199,7 @@
</mat-card> </mat-card>
<mat-card *ngIf="lender_short_name == 'CLIX' || product_abbr == 'LAEP'"> <mat-card *ngIf="lender_short_name == 'CLIX' || product_abbr == 'LAEP'">
<mat-card-content> <mat-card-content>
<mat-card-subtitle>CLIX</mat-card-subtitle> <mat-card-subtitle *ngIf="lender_short_name == 'CLIX'">CLIX</mat-card-subtitle>
<!-- <mat-form-field *ngIf="_finalRemarkForm.controls['outlet_location']"> <!-- <mat-form-field *ngIf="_finalRemarkForm.controls['outlet_location']">
<mat-select placeholder="Comment on Footfall in the market where the B2C outlet is located…" formControlName="outlet_location" <mat-select placeholder="Comment on Footfall in the market where the B2C outlet is located…" formControlName="outlet_location"
required> required>
@ -210,6 +210,8 @@
</mat-select> </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 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> --> </mat-form-field> -->
<div *ngIf="product_abbr == 'LAEP' && _finalRemarkForm.controls['outlet_location']">
<p>Comment on Footfall in the market where the B2C outlet is located…</p>
<mat-radio-group formControlName="outlet_location"> <mat-radio-group formControlName="outlet_location">
<mat-radio-button class="outlet" value="heavy_footfall"></mat-radio-button><span>Heavy Footfall ( lots of customers in the locality / marketplace ).</span><br/> <mat-radio-button class="outlet" value="heavy_footfall"></mat-radio-button><span>Heavy Footfall ( lots of customers in the locality / marketplace ).</span><br/>
@ -217,12 +219,22 @@
<mat-radio-button class="outlet" value="low_footfall"></mat-radio-button><span>Low Footfall ( Few customers seen in the locality / marketplace ).</span><br/> <mat-radio-button class="outlet" value="low_footfall"></mat-radio-button><span>Low Footfall ( Few customers seen in the locality / marketplace ).</span><br/>
</mat-radio-group><br/> </mat-radio-group><br/>
</div>
<div class="toggle" *ngIf="_finalRemarkForm.controls['is_competition']"> <!-- <div class="toggle" *ngIf="_finalRemarkForm.controls['is_competition']">
<mat-checkbox color="primary" formControlName="is_competition" (change)="clixChange($event.checked,1)"> <mat-checkbox color="primary" formControlName="is_competition" (change)="clixChange($event.checked,1)">
Is there Competition to the applicant’s business in the location <strong>( {{ _finalRemarkForm.value.is_competition ===true ? 'Yes' : 'No'}} )</strong> Is there Competition to the applicant’s business in the location <strong>( {{ _finalRemarkForm.value.is_competition ===true ? 'Yes' : 'No'}} )</strong>
</mat-checkbox> </mat-checkbox>
</div> </div> -->
<mat-form-field *ngIf="_finalRemarkForm.controls['is_competition']">
<mat-select placeholder="Is there Competition to the applicant’s business in the location" formControlName="is_competition"
required (SelectionChange)="clixChange($event.value,1)">
<mat-option>Select</mat-option>
<mat-option value="yes"> <span class="DropdownOptions">Yes </span> </mat-option>
<mat-option value="no"> <span class="DropdownOptions">No</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['is_competition'].hasError('required')">Is there Competition to the applicant’s business in the location Required</mat-error>
</mat-form-field>
<mat-form-field *ngIf="_finalRemarkForm.controls['appx_outlet_or_stores']"> <mat-form-field *ngIf="_finalRemarkForm.controls['appx_outlet_or_stores']">
<input matInput autocomplete="off" <input matInput autocomplete="off"
placeholder="Approximate No of similar outlets / stores seen by PD officer during the visit to that location" placeholder="Approximate No of similar outlets / stores seen by PD officer during the visit to that location"
@ -233,15 +245,24 @@
<div class="toggle" *ngIf="_finalRemarkForm.controls['demolition_activity']"> <!-- <div class="toggle" *ngIf="_finalRemarkForm.controls['demolition_activity']">
<mat-checkbox color="primary" formControlName="demolition_activity" (change)="clixChange($event.checked,2)"> <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> Any demolition activity seen in the locality by PD officer <strong>( {{ _finalRemarkForm.value.demolition_activity ===true ? 'Yes' : 'No'}} )</strong></mat-checkbox>
</div> </div> -->
<mat-form-field *ngIf="_finalRemarkForm.controls['demolition_activity']">
<mat-select placeholder="Any demolition activity seen in the locality by PD officer" formControlName="demolition_activity"
required (SelectionChange)="clixChange($event.value,3)">
<mat-option>Select</mat-option>
<mat-option value="yes"> <span class="DropdownOptions">Yes </span> </mat-option>
<mat-option value="no"> <span class="DropdownOptions">No</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['demolition_activity'].hasError('required')">Any demolition activity seen in the locality by PD officer Required</mat-error>
</mat-form-field>
<ion-row *ngIf="_finalRemarkForm.controls['comment_of_demolition_activity']"> <ion-row *ngIf="_finalRemarkForm.controls['comment_of_demolition_activity']">
<ion-col> <ion-col>
<mat-form-field *ngIf="_finalRemarkForm.controls['comment_of_demolition_activity']"> <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> <input matInput autocomplete="off" type="text" placeholder="Comment on any demolition activity observed" formControlName="comment_of_demolition_activity" required>
<mat-error *ngIf="_finalRemarkForm.controls['comment_of_demolition_activity'].hasError('required')"> Comment Required</mat-error> <mat-error *ngIf="_finalRemarkForm.controls['comment_of_demolition_activity'].hasError('required')"> Comment on any demolition activity observed Required</mat-error>
</mat-form-field> </mat-form-field>
</ion-col> </ion-col>
<ion-col> <ion-col>
@ -263,15 +284,24 @@
</ion-col> </ion-col>
</ion-row> </ion-row>
<div *ngIf="_finalRemarkForm.controls['sealing_activity']"> <!-- <div *ngIf="_finalRemarkForm.controls['sealing_activity']">
<mat-checkbox color="primary" formControlName="sealing_activity" (change)="clixChange($event.checked,3)"> <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> Any sealing activity observed in the locality by PD office <strong>( {{ _finalRemarkForm.value.sealing_activity ===true ? 'Yes' : 'No'}} )</strong></mat-checkbox>
</div> </div> -->
<mat-form-field *ngIf="_finalRemarkForm.controls['sealing_activity']">
<mat-select placeholder="Any sealing activity observed in the locality by PD officer" formControlName="sealing_activity"
required (SelectionChange)="clixChange($event.value,3)">
<mat-option>Select</mat-option>
<mat-option value="yes"> <span class="DropdownOptions">Yes </span> </mat-option>
<mat-option value="no"> <span class="DropdownOptions">No</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['sealing_activity'].hasError('required')">Any sealing activity observed in the locality by PD officer Required</mat-error>
</mat-form-field>
<ion-row *ngIf="_finalRemarkForm.controls['comment_of_sealing_activity']"> <ion-row *ngIf="_finalRemarkForm.controls['comment_of_sealing_activity']">
<ion-col> <ion-col>
<mat-form-field *ngIf="_finalRemarkForm.controls['comment_of_sealing_activity']"> <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> <input matInput autocomplete="off" type="text" placeholder="Comment on any sealing activity observed in area " formControlName="comment_of_sealing_activity" required>
<mat-error *ngIf="_finalRemarkForm.controls['comment_of_sealing_activity'].hasError('required')"> Comment Required</mat-error> <mat-error *ngIf="_finalRemarkForm.controls['comment_of_sealing_activity'].hasError('required')"> Comment on any sealing activity observed in area Required</mat-error>
</mat-form-field> </mat-form-field>
</ion-col> </ion-col>
<ion-col> <ion-col>

20
src/pages/pd-question/pd-question-final-remark/pd-question-final-remark.ts
View File

@ -76,7 +76,7 @@ export class PdQuestionFinalRemarkPage {
}) })
if(this.lender_short_name == 'CLIX' || this.product_abbr == 'LAEP'){ if(this.lender_short_name == 'CLIX' || this.product_abbr == 'LAEP'){
this._finalRemarkForm.addControl('outlet_location', new FormControl('', Validators.required)) ; this.product_abbr == '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(''));
this._finalRemarkForm.addControl('sealing_activity', new FormControl('')); this._finalRemarkForm.addControl('sealing_activity', new FormControl(''));
this._finalRemarkForm.addControl('demolition_activity', new FormControl('')); this._finalRemarkForm.addControl('demolition_activity', new FormControl(''));
@ -441,7 +441,7 @@ RecommendationChange(e) {
if(this.lender_short_name == 'CLIX' || this.product_abbr == 'LAEP'){ if(this.lender_short_name == 'CLIX' || this.product_abbr == 'LAEP'){
this._finalRemarkForm.controls.outlet_location.setValue(data['records'].outlet_location); if(this.product_abbr == 'LAEP'){this._finalRemarkForm.controls.outlet_location.setValue(this.product_abbr == 'LAEP' ? data['records'].outlet_location : '')}
this._finalRemarkForm.controls.is_competition.setValue(data['records'].is_competition); this._finalRemarkForm.controls.is_competition.setValue(data['records'].is_competition);
this._finalRemarkForm.controls.sealing_activity.setValue(data['records'].sealing_activity); this._finalRemarkForm.controls.sealing_activity.setValue(data['records'].sealing_activity);
this._finalRemarkForm.controls.demolition_activity.setValue(data['records'].demolition_activity); this._finalRemarkForm.controls.demolition_activity.setValue(data['records'].demolition_activity);
@ -449,10 +449,10 @@ RecommendationChange(e) {
this.clixChange(data['records'].sealing_activity,2); this.clixChange(data['records'].sealing_activity,2);
this.clixChange(data['records'].demolition_activity,3); this.clixChange(data['records'].demolition_activity,3);
if(data['records'].is_competition ==true){ this._finalRemarkForm.controls.appx_outlet_or_stores.setValue(data['records'].appx_outlet_or_stores);} if(data['records'].is_competition =='yes'){ this._finalRemarkForm.controls.appx_outlet_or_stores.setValue(data['records'].appx_outlet_or_stores);}
if(data['records'].sealing_activity ==true){ this._finalRemarkForm.controls.comment_of_demolition_activity.setValue(data['records'].comment_of_demolition_activity); if(data['records'].sealing_activity =='yes'){ this._finalRemarkForm.controls.comment_of_demolition_activity.setValue(data['records'].comment_of_demolition_activity);
this._finalRemarkForm.controls.demolition_activity_pic.setValue(data['records'].demolition_activity_pic); } this._finalRemarkForm.controls.demolition_activity_pic.setValue(data['records'].demolition_activity_pic); }
if(data['records'].demolition_activity ==true) {this._finalRemarkForm.controls.comment_of_sealing_activity.setValue(data['records'].comment_of_sealing_activity); if(data['records'].demolition_activity =='yes') {this._finalRemarkForm.controls.comment_of_sealing_activity.setValue(data['records'].comment_of_sealing_activity);
this._finalRemarkForm.controls.sealing_activity_pic.setValue(data['records'].sealing_activity_pic); } this._finalRemarkForm.controls.sealing_activity_pic.setValue(data['records'].sealing_activity_pic); }
} }
@ -472,17 +472,17 @@ RecommendationChange(e) {
clixChange(e,flag){ clixChange(e,flag){
if(flag == 1){ if(flag == 1){
console.log(e,flag); console.log(e,flag);
e==true ? this._finalRemarkForm.addControl('appx_outlet_or_stores', new FormControl('', Validators.required)) : this._finalRemarkForm.removeControl('appx_outlet_or_stores'); e=='yes' ? this._finalRemarkForm.addControl('appx_outlet_or_stores', new FormControl('', Validators.required)) : this._finalRemarkForm.removeControl('appx_outlet_or_stores');
} }
if(flag == 2){ if(flag == 2){
console.log(e,flag); console.log(e,flag);
e==true ? this._finalRemarkForm.addControl('comment_of_demolition_activity', new FormControl('', Validators.required)) : this._finalRemarkForm.removeControl('comment_of_demolition_activity'); e=='yes' ? this._finalRemarkForm.addControl('comment_of_demolition_activity', new FormControl('', Validators.required)) : this._finalRemarkForm.removeControl('comment_of_demolition_activity');
e==true ? this._finalRemarkForm.addControl('demolition_activity_pic', new FormControl('')) : this._finalRemarkForm.removeControl('demolition_activity_pic'); e=='yes' ? this._finalRemarkForm.addControl('demolition_activity_pic', new FormControl('')) : this._finalRemarkForm.removeControl('demolition_activity_pic');
} }
if(flag == 3){ if(flag == 3){
console.log(e,flag); console.log(e,flag);
e==true ? this._finalRemarkForm.addControl('comment_of_sealing_activity', new FormControl('', Validators.required)) : this._finalRemarkForm.removeControl('comment_of_sealing_activity'); e=='yes' ? this._finalRemarkForm.addControl('comment_of_sealing_activity', new FormControl('', Validators.required)) : this._finalRemarkForm.removeControl('comment_of_sealing_activity');
e==true ? this._finalRemarkForm.addControl('sealing_activity_pic', new FormControl('')) : this._finalRemarkForm.removeControl('sealing_activity_pic'); e=='yes' ? this._finalRemarkForm.addControl('sealing_activity_pic', new FormControl('')) : this._finalRemarkForm.removeControl('sealing_activity_pic');
} }
} }

BIN
www/assets/fonts/roboto-bold.ttf
View File

Binary file not shown.

BIN
www/assets/fonts/roboto-light.ttf
View File

Binary file not shown.

BIN
www/assets/fonts/roboto-medium.ttf
View File

Binary file not shown.

BIN
www/assets/fonts/roboto-regular.ttf
View File

Binary file not shown.