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

Merge

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2019-11-01 20:20:20 +05:30
commit 64beed58d5
2 changed files with 32 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/pages/pd-question/pd-question-general-info/pd-question-general-info.html
View File

@ -102,7 +102,7 @@
</ion-row>
</ion-label>
<!--<p><ion-icon name="school"></ion-icon> {{item.get('qualification').value}}</p>-->
<button ion-button align="end" item-end small clear (click)="editIndividuals(i)" >
<button ion-button align="end" *ngIf="i > 0" item-end small clear (click)="editIndividuals(i)" >
<ion-icon name="md-create"></ion-icon>
</button>
</ion-item>
@ -270,7 +270,21 @@
</mat-form-field>
</mat-card>
<mat-card>
<mat-form-field style="width:100%" class="mt-1">
<mat-select placeholder="KYC"
formControlName="is_kyc" (selectionChange)="kycchange($event.value)" required>
<mat-option>Select</mat-option>
<mat-option *ngFor="let val of KYC" [value]="val.value" >
{{val.isdisplayvalue}}
</mat-option> </mat-select>
<mat-error *ngIf="generalForm.controls['is_kyc'].hasError('required')">KYC Required</mat-error>
</mat-form-field>
<mat-form-field class="mt-1" style="width: 100%" *ngIf="generalForm.controls.is_kyc.value == 'no'">
<input matInput placeholder="Name as per KYC and capture the name." formControlName="kyc_and_captur_the_name"
type="text">
</mat-form-field>
</mat-card>
<!--Company Value Display Field-->
<mat-card style="padding: 0px 10px !important;" *ngIf="customer_segment_abbr != 'SE-RI'">

17
src/pages/pd-question/pd-question-general-info/pd-question-general-info.ts
View File

@ -3,7 +3,7 @@ import { IonicPage, NavController, NavParams, ModalController, CardTitle, Conten
import { AwsServiceProvider } from '../../../providers/aws-service/aws-service';
import { QuestionCategoryProvider } from '../../../providers/question-category/question-category';
import { ToastProvider } from '../../../providers/common-provider/toast';
import { FormGroup, FormBuilder,FormArray,Validator, Validators } from '@angular/forms';
import { FormGroup, FormBuilder,FormArray,Validator, Validators, FormControl } from '@angular/forms';
import { PdQuestionGeneralOtherApplicantPage } from './pd-question-general-other-applicant/pd-question-general-other-applicant';
import { DatePipe} from '@angular/common';
import { SearchRelationPipe } from '../../../pipes/search-relation/search-relation';
@ -87,10 +87,14 @@ export class PdQuestionGeneralInfoPage {
imageBucket: any=[];
tab: any='0';
<<<<<<< HEAD
pd_value_params:any;
@ViewChild('childComp') child: PdGeneralImagesPage
@ViewChild('individualPersonScroll') individualPersonScroll:ElementRef
@ViewChild('companyScroll') companyScroll:ElementRef
=======
public KYC: any = [{value:"yes",isdisplayvalue:"Yes"},{value:"no",isdisplayvalue:"No"}];
>>>>>>> c7fef7d1b46ea9a66ff81084eb86ae62ad411496
constructor(public navCtrl: NavController, public navParams: NavParams,
public aws:AwsServiceProvider,public qustCat:QuestionCategoryProvider,
@ -126,6 +130,8 @@ export class PdQuestionGeneralInfoPage {
company_with_relationships:this.fb.array([]),
rental_income_rcv_in_years:[''],
rental_income_rcv_in_month:[''],
is_kyc: '',
kyc_and_captur_the_name: '',
general_remark:''
});
@ -1202,6 +1208,8 @@ console.log('1)',this.temp);
saveRecords.persons_with_relationships=answerData.persons_with_relationships;
// saveRecords.company_with_relationships=answerData.company_with_relationships
saveRecords.general_remark=answerData.general_remark;
saveRecords.is_kyc=answerData.is_kyc;
saveRecords.kyc_and_captur_the_name=answerData.kyc_and_captur_the_name;
this.spinner_access=true;
this.cons.getGeoTag().then(res=>{
// console.log("Geo Coords",res)
@ -1289,6 +1297,8 @@ console.log('1)',this.temp);
this.generalForm.controls['general_remark'].setValue(this.data_all.general_remark);
this.generalForm.controls['is_kyc'].setValue(this.data_all.is_kyc);
this.generalForm.controls['kyc_and_captur_the_name'].setValue(this.data_all.kyc_and_captur_the_name);
//
var arrlist_indi:any=[]
@ -1627,4 +1637,9 @@ console.log('1)',this.temp);
})
}
}
kycchange(event){
// console.log(event);
if(event === 'yes') {event.value =='yes' ? this.generalForm.addControl('kyc_and_captur_the_name', new FormControl('')) : this.generalForm.removeControl('kyc_and_captur_the_name');}
}
}