+
+
+
+
+
+
+
+
+ Individual
+ Non-Individual
+
+
-
-
-
-
+
+
+
+
+
+
+
+
+ Co Applicant
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Individual
+ Non-Individual
+
+
+
+
+
+
+ Enter Valid Age.
+
+
+
+
+
+
+ {{NE.non_individual_entity_name}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{earning.earning_member_status}}
+
+
+
+
+
+
+ Enter Valid Vintage.
+
+
+
+
+
+
+
+ {{education.qualification_name}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{rel.name}}
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
- Co Applicant
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Remarks
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pages/pd-question/pd-question-personal-info/pd-question-personal-info.scss b/src/pages/pd-question/pd-question-personal-info/pd-question-personal-info.scss
old mode 100644
new mode 100755
diff --git a/src/pages/pd-question/pd-question-personal-info/pd-question-personal-info.ts b/src/pages/pd-question/pd-question-personal-info/pd-question-personal-info.ts
old mode 100644
new mode 100755
index 76acbfcf..321ba551
--- a/src/pages/pd-question/pd-question-personal-info/pd-question-personal-info.ts
+++ b/src/pages/pd-question/pd-question-personal-info/pd-question-personal-info.ts
@@ -19,6 +19,7 @@ import { FormArray, FormGroup, FormControl, Validators, FormBuilder } from '@ang
})
export class PdQuestionPersonalInfoPage implements OnInit{
+ nonindividualentities: any;
questionDetails: any;
pdDetails: any;
users: any;
@@ -32,10 +33,34 @@ export class PdQuestionPersonalInfoPage implements OnInit{
public mainApplicantQuestions : any = ["Name","Age","Entity","Educational Qualification","Earning Status"];
public coApplicantQuestions : any = ["Name","Age","Entity","Educational Qualification","Earning Status","Relationship"];
-
+ public const_main_applicant : any = {
+ "name_ans": '',
+ "age_ans":'',
+ "vintage_ans":'',
+ "non_individual_entity_ans":'',
+ "other_non_individual_entity_ans":'',
+ "earning_ans": '',
+ "entity_ans": '',
+ "qualification_ans": '',
+ "edu_level_ans":'',
+ "current_added_status":1
+ };
+ public const_co_applicant : any = {
+ "name_ans": '',
+ "age_ans":'',
+ "vintage_ans":'',
+ "non_individual_entity_ans":'',
+ "other_non_individual_entity_ans":'',
+ "earning_ans": '',
+ "entity_ans": '',
+ "qualification_ans": '',
+ "edu_level_ans":'',
+ "relation_ans": '',
+ "current_added_status":1
+ };
public mainApplicantDetails :any=[];
public coApplicantDetails :any=[];
-
+ loadDataStatus:boolean;
errorMessage:any;
//coItem:any;
//mainItem:any;
@@ -58,259 +83,438 @@ export class PdQuestionPersonalInfoPage implements OnInit{
}
ngOnInit() {
-
+ this.initFormDetails();
this.loadPDDetails();
- this.getRelationMaster();
+ // this.getRelationMaster();
this.mainApplicantDetails = this.pdDetails.applicat_details
.filter(item => item.applicant_type == 1);
- // console.log(this.mainApplicantDetails)
+ console.log(this.mainApplicantDetails)
this.coApplicantDetails = this.pdDetails.applicat_details
.filter(item => item.applicant_type == 0);
+ this.getMasterDetails('RELATIONSHIPS',1);
+ this.getMasterDetails('EARNINGMEMBERSSTATUS',2);
+ this.getMasterDetails('EDUQUALIFICATION',3);
+ this.getMasterDetails('NONINDIVIDUALENTITIES',4);
}
// load form pd details
loadPDDetails(){
- let records = {'pd_id':this.pdDetails.pd_id,'pd_form_id':this.FormId.form_id};
-
+ let records = {'pd_id':this.pdDetails.pd_id,'pd_form_id':this.FormId.form_id};
+
this.qustCat.retiverForm(records).subscribe(
data => {
- if (data['status'] == 200) {
- this.loadFormWithIDData(data['records']);
+ const mainValue =
this._personalForm.controls['main_applicant_details'];
+ const coValue = this._personalForm.controls['co_applicant_details'];
+ mainValue.controls = [];
+ coValue.controls = [];
+ this.loadDataStatus = true;
+ if (data['dataStatus'] == true) {
+
+ let retriveData = data['records'];
+ this._personalForm.controls['personal_info_form_remark'].setValue(data['records'].personal_info_form_remark ? data['records'].personal_info_form_remark : '');
+ let pullMainApplicant = Object.keys(data['records'].main_applicant_details).map(function(key) {
+ return data['records'].main_applicant_details[key];
+ });
+
+ if (pullMainApplicant.length > 0) {
+ pullMainApplicant.forEach(val => {
+ val.current_added_status=0
+ mainValue.push(this.loadMainApplicant(val));
+ });
+ // retriveData.main_applicant_details = pullMainApplicant;
+ } else {
+ mainValue.push(this.loadMainApplicant(this.const_main_applicant));
+ }
+
+ if(data['records'].co_applicant_details){
+ let pullCoApplicant = Object.keys(data['records'].co_applicant_details).map(function(key) {
+ return data['records'].co_applicant_details[key];
+ });
+ if (pullCoApplicant.length > 0) {
+ pullCoApplicant.forEach(val => {
+ val.current_added_status=0
+ coValue.push(this.loadCoApplicant(val));
+ });
+ // retriveData.co_applicant_details = pullCoApplicant;
+ } else {
+ coValue.push(this.loadCoApplicant(this.const_co_applicant));
+ }
+ }
+ else {
+ coValue.push(this.loadCoApplicant(this.const_co_applicant));
+ }
}
- else{
- let defaultMainApp=[];
- let defaultCoApp=[];
- // generate default main applicant form details
- if(this.mainApplicantDetails.length>0){
- for(let j=0;j {
+ item.current_added_status=0
+ mainValue.push(this.loadDefaultMainApplicant(item))
+ });
+ console.log(mainValue);
+ this.loadDataStatus = true;
+ // check co applicant
+ if(this.coApplicantDetails.length > 0){
+ this.coApplicantDetails.forEach(coItem => {
+ coItem.current_added_status=0
+ coValue.push(this.loadDefaultCoApplicant(coItem)
+ )
+ });
}
+ else {
+ coValue.push(this.loadCoApplicant(this.const_co_applicant))
}
- this.loadFormData(defaultMainApp,this.coApplicantDetails);
-
-
- }
+
+ }
}, error => this.errorMessage = error);
}
-loadDataStatus: boolean = false;
-
-loadFormWithIDData(data) {
- var main_result = Object.keys(data.main_applicant_details).map(function(key) {
- return data.main_applicant_details[key];
-});
-let co_result;
- if(data.co_applicant_details !==undefined && data.co_applicant_details !='' && data.co_applicant_details !=null){
-co_result = Object.keys(data.co_applicant_details).map(function(key) {
- return data.co_applicant_details[key];
-});
-}else
-{
- co_result = '';
-}
-
- // main applicant
- let mainApplicantGroup = new FormArray(main_result.map((item,key) => new FormGroup({
- name_ans:new FormControl(item.name_ans, Validators.required),
- age_ans:new FormControl(item.age_ans, Validators.required),
- entity_ans:new FormControl(item.entity_ans, Validators.required),
- qualification_ans:new FormControl(item.qualification_ans, Validators.required),
- earning_ans:new FormControl(item.earning_ans, Validators.required),
- })));
- // co applicant
- let iterateCoApp=[];
- let coApplicantGroup
- if(co_result !=''){
- coApplicantGroup = new FormArray(co_result.map((item,key) => new FormGroup({
- name_ans:new FormControl(item.name_ans, Validators.required),
- age_ans:new FormControl(item.age_ans, Validators.required),
- entity_ans:new FormControl(item.entity_ans, Validators.required),
- qualification_ans:new FormControl(item.qualification_ans, Validators.required),
- earning_ans:new FormControl(item.earning_ans, Validators.required),
- relation_ans:new FormControl(item.relation_ans, Validators.required),
-
- })));
- }else
- {
- coApplicantGroup = '';
- }
- let form_remarks ;
- if(form_remarks!=null){
- form_remarks = data.personal_info_form_remark;
- }else
- {
- form_remarks = '';
- }
- this._personalForm = this._fb.group({
- pdid:null,
- form_id:null,
- mainItem: mainApplicantGroup,
- coItem: coApplicantGroup,
- personal_info_form_remark: [form_remarks]
- });
- //console.log(this._personalForm);
- this.loadDataStatus = true;
-}
-
- loadFormData(mainApp,coApp){
- // main applicant
- let mainApplicantGroup = new FormArray(this.mainApplicantDetails.map((item,key) => new FormGroup({
- name_ques:new FormControl(this.mainApplicantQuestions[0]),
- name_ans:new FormControl(item.applicant_name, Validators.required),
- name_id:new FormControl(0),
- age_ques:new FormControl(this.mainApplicantQuestions[1]),
- age_id:new FormControl(1),
- age_ans:new FormControl(null, Validators.required),
- entity_ques: new FormControl(this.mainApplicantQuestions[2]),
- entity_id: new FormControl(2),
- entity_ans:new FormControl(this.pdDetails.customer_segment_abbr.substring(0,3).toUpperCase()==='SAL' ? 'Individual' : '', Validators.required),
- qualification_ques: new FormControl(this.mainApplicantQuestions[3]),
- qualification_id: new FormControl(3),
- qualification_ans:new FormControl(null, Validators.required),
- earningStatus_ques:new FormControl(this.mainApplicantQuestions[4]),
- earning_id: new FormControl(4),
- earning_ans:new FormControl(null, Validators.required),
-
- })));
- // co applicant
- let iterateCoApp=[];
-
- let coApplicantGroup = new FormArray(this.coApplicantDetails.map((item,key) => new FormGroup({
- name_ques:new FormControl(this.coApplicantQuestions[0]),
- name_ans:new FormControl(item.applicant_name, Validators.required),
- name_id:new FormControl(0),
- age_ques:new FormControl(this.coApplicantQuestions[1]),
- age_id:new FormControl(1),
- age_ans:new FormControl(null, Validators.required),
- entity_ques: new FormControl(this.coApplicantQuestions[2]),
- entity_id: new FormControl(2),
- entity_ans:new FormControl(this.pdDetails.customer_segment_abbr.substring(0,3).toUpperCase()==='SAL' ? 'Individual' : '', Validators.required),
- qualification_ques: new FormControl(this.coApplicantQuestions[3]),
- qualification_id: new FormControl(3),
- qualification_ans:new FormControl(null, Validators.required),
- earningStatus_ques:new FormControl(this.coApplicantQuestions[4]),
- earning_id: new FormControl(4),
- earning_ans:new FormControl(null, Validators.required),
- relationShip_ques:new FormControl(this.coApplicantQuestions[5]),
- relation_id:new FormControl(5),
- relation_ans:new FormControl(null, Validators.required),
-
- })));
-
- this._personalForm = this._fb.group({
- pdid:null,
- form_id:null,
- mainItem: mainApplicantGroup,
- coItem: coApplicantGroup,
- personal_info_form_remark:null
- });
- //console.log(this._personalForm);
-this.loadDataStatus = true;
- }
-
- //get pd main applicant array values
- get pdMainapplicant() { return this._personalForm.get('mainItem') as FormArray; }
-
- // get pd co applicant array values
- get pdCoapplicant() {return this._personalForm.get('coItem') as FormArray;}
-
- // get relation master details
- getRelationMaster(){
- let relation ="RELATIONSHIPS";
- this.qustCat.getcommondrop(relation).subscribe(
+ // get all master details
+ getMasterDetails(table:string,type:number){
+ console.log('function in');
+ this.qustCat.getcommondrop(table).subscribe(
data => {
- if (data['status'] == 200) {
- this.relationShipList=data['records'];
-
+ console.log(data);
+ if (data['dataStaus'] == 200) {
+ if(type==1){
+ this.relationShipList=data['records'].filter(item => item.isactive == 1);
+ }
+ else if(type==2){
+ this.earningStatus=data['records'].filter(item => item.isactive == 1);
+ }
+ else if(type==3){
+ this.qualifications=data['records'].filter(item => item.isactive == 1);
+ }
+ else if(type==4){
+ this.nonindividualentities=data['records'].filter(item => item.isactive == 1);
+ }
+
}
}, error => this.errorMessage = error);
- this.qustCat.getcommondrop('EARNINGMEMBERSSTATUS').subscribe(res=>
- {
- if(res['dataStatus']==true)
- {
- this.earningStatus = res['records'].filter(ear=>ear.isactive==1);
- }
- });
- this.qustCat.getcommondrop('EDUQUALIFICATION').subscribe(res=>
- {
- if(res['dataStatus']==true)
- {
- this.qualifications = res['records'].filter(qul=>qul.isactive==1);
- }
- })
+}
+
+
+/** On Key Press Event For Mobile Number */
+keyPress(event: any) {
+ const pattern = /[0-9]/;
+
+ let inputChar = String.fromCharCode(event.charCode);
+ if (event.keyCode != 8 && !pattern.test(inputChar)) {
+ event.preventDefault();
+ }
}
-// submit forms details
+// init form details
+public initFormDetails(): void {
+ this._personalForm = this._fb.group({
+ pdid:this.pdDetails.pd_id,
+ formid:this.FormId.form_id,
+ main_applicant_details: this._fb.array([]),
+ co_applicant_details: this._fb.array([]),
+ personal_info_form_remark:null
+ });
+}
+
+// add more co applicant details
+addCoApplicant() {
+ const control = this._personalForm.controls['co_applicant_details'];
+ control.push(this.loadCoApplicant(this.const_co_applicant));
+
+}
+
+// remove co applicant details
+removeCoApplicant(renoveIndex) {
+ const remove_control = this._personalForm.controls['co_applicant_details'];
+ remove_control.removeAt(renoveIndex)
+}
+
+// load main applicant
+loadMainApplicant(applicant:any) {
+ return this._fb.group({
+ name_ans: [applicant.name_ans, Validators.required],
+ age_ans: [applicant.age_ans, Validators.compose([Validators.minLength(1),Validators.maxLength(3),Validators.pattern('^[0-9]*$')])],
+ vintage_ans: [applicant.vintage_ans, Validators.compose([Validators.minLength(1),Validators.maxLength(3),Validators.pattern('^[0-9]*$')])],
+ non_individual_entity_ans: [applicant.non_individual_entity_ans],
+ other_non_individual_entity_ans:[applicant.other_non_individual_entity_ans],
+ entity_ans: [applicant.entity_ans, Validators.required],
+ qualification_ans: [applicant.qualification_ans],
+ earning_ans: [applicant.earning_ans],
+ edu_level_ans: [applicant.edu_level_ans],
+ current_added_status: [applicant.current_added_status],
+});
+
+}
+// load co applicant
+loadCoApplicant(applicant:any) {
+ return this._fb.group({
+ name_ans: [applicant.name_ans, Validators.required],
+ age_ans: [applicant.age_ans, Validators.compose([Validators.minLength(1),Validators.maxLength(3),Validators.pattern('^[0-9]*$')])],
+ entity_ans: [applicant.entity_ans, Validators.required],
+ qualification_ans: [applicant.qualification_ans],
+ vintage_ans: [applicant.vintage_ans, Validators.compose([Validators.minLength(1),Validators.maxLength(3),Validators.pattern('^[0-9]*$')])],
+ non_individual_entity_ans: [applicant.non_individual_entity_ans],
+ other_non_individual_entity_ans:[applicant.other_non_individual_entity_ans],
+ earning_ans: [applicant.earning_ans],
+ relation_ans: [applicant.relation_ans, Validators.required],
+ edu_level_ans: [applicant.edu_level_ans],
+ current_added_status: [applicant.current_added_status],
+});
+
+}
+// load default main applicant form data
+loadDefaultMainApplicant(applicant:any){
+ // console.log('function in');
+ return this._fb.group({
+ name_ans: [applicant.applicant_name, Validators.required],
+ age_ans: ['', Validators.compose([Validators.minLength(1),Validators.maxLength(3),Validators.pattern('^[0-9]*$')])],
+ vintage_ans:['', Validators.compose([Validators.minLength(1),Validators.maxLength(3),Validators.pattern('^[0-9]*$')])],
+ non_individual_entity_ans:[''],
+ other_non_individual_entity_ans:[''],
+ entity_ans: [this.pdDetails.customer_segment_abbr.substring(0,3).toUpperCase()==='SAL' ? 'individual' : '', Validators.required],
+ qualification_ans: [''],
+ earning_ans: [''],
+ edu_level_ans:[''],
+ current_added_status: [applicant.current_added_status],
+ });
+ }
+
+ // load co applicant details
+ loadDefaultCoApplicant(applicant:any){
+ return this._fb.group({
+ name_ans: [applicant.applicant_name, Validators.required],
+ age_ans: ['', Validators.compose([Validators.minLength(1),Validators.maxLength(3),Validators.pattern('^[0-9]*$')])],
+ vintage_ans:['', Validators.compose([Validators.minLength(1),Validators.maxLength(3),Validators.pattern('^[0-9]*$')])],
+ non_individual_entity_ans:[''],
+ other_non_individual_entity_ans:[''],
+ entity_ans: [this.pdDetails.customer_segment_abbr.substring(0,3).toUpperCase()==='SAL' ? 'individual' : '', Validators.required],
+ edu_level_ans:[''],
+ qualification_ans: [''],
+ earning_ans: [''],
+ relation_ans: ['', Validators.required],
+ current_added_status: [applicant.current_added_status],
+ });
+ }
+ // submit forms details
submitPersonalForm(formData:any) {
- if(this._personalForm.valid){
+ // if (this._personalForm.invalid) {
+ // this.validateAllFormFields(this._personalForm);
+
+ // //this.notifier.notify('warning', 'All Fields Are Required.!');
+
+ // return;
+ // }
+ // else{
+ //this.notifier.notify('warning', 'Fields Are Required.!');
let main_applicantDetails:any=[];
let co_applicantDetails:any=[];
-
- formData.mainItem.forEach((element,key) => {
+ let new_co_applicant:any=[];
+ formData.main_applicant_details.forEach((element,key) => {
if(key==0){
main_applicantDetails.push({
"name_ans":element.name_ans,
"age_ans":element.age_ans,
+ "vintage_ans":element.vintage_ans,
+ "non_individual_entity_ans":element.non_individual_entity_ans,
+ "other_non_individual_entity_ans":element.other_non_individual_entity_ans,
"entity_ans":element.entity_ans,
"qualification_ans":element.qualification_ans,
+ "edu_level_ans":element.edu_level_ans,
"earning_ans":element.earning_ans,
})
}
});
- if(formData.coItem !=''){
- formData.coItem.forEach((Coelement,Cokey) => {
+ formData.co_applicant_details.forEach((Coelement,Cokey) => {
co_applicantDetails.push({
-
"name_ans":Coelement.name_ans,
"age_ans":Coelement.age_ans,
"qualification_ans":Coelement.qualification_ans,
"entity_ans":Coelement.entity_ans,
"earning_ans":Coelement.earning_ans,
+ "vintage_ans":Coelement.vintage_ans,
+ "non_individual_entity_ans":Coelement.non_individual_entity_ans,
+ "other_non_individual_entity_ans":Coelement.other_non_individual_entity_ans,
+ "edu_level_ans":Coelement.edu_level_ans,
"relation_ans":Coelement.relation_ans,
})
+ // get new co applicant list for applicant table
+ if(Coelement.current_added_status==1){
+ new_co_applicant.push({
+ "fk_pd_id": this.pdDetails.pd_id,
+ "pd_co_applicant_id": '',
+ "applicant_name":Coelement.name_ans,
+ "relation":Coelement.relation_ans,
+ "email":'',
+ "mobile_no":'',
+ "landline":'',
+ "applicant_type":0,
+ "isactive":1
+ });
+ }
});
- }
- let save_details:any={
- "pdid" : this.pdDetails.pd_id,
- "formid" : this.FormId.form_id,
- "fk_createdby":this.users,
- "main_applicant_details":main_applicantDetails,
- "co_applicant_details":co_applicantDetails,
- "personal_info_form_remark": this._personalForm.get('personal_info_form_remark').value
- };
- console.log(save_details);
- this.qustCat.saveForm(save_details).subscribe(result => {
- if (result['dataStatus']==true) {
- this.navCtrl.pop();
- this.toast.pdTriggerappmessage('Record Saved Successfully.!');
- // this.notifier.notify('success', 'Success.');
- }
- else {
- // this.notifier.notify('warning', 'Something Wents Wrong Try Again.!');
- }
- }, error => {
- // this.notifier.notify('warning', 'Something Wents Wrong Try Again.!');
- });
- }
+ let save_details:any={
+ "pdid": this.pdDetails.pd_id,
+ "formid": this.FormId.form_id,
+ "main_applicant_details":main_applicantDetails,
+ "co_applicant_details":co_applicantDetails,
+ "personal_info_form_remark": this._personalForm.get('personal_info_form_remark').value
+ };
+ if(new_co_applicant.length > 0){
+ this.qustCat.updatePdApplicant(new_co_applicant).subscribe(result => {
+ if (result.status == 200) {
+ this.questionsSubmitCheck(save_details);
+ }
+ else {
+
+ }
+ }, error => {
+
+ });
+ }
+ else{
+ this.questionsSubmitCheck(save_details);
+ }
+
+ //}
}
+
+// submit and check all questions
+ questionsSubmitCheck(questionAns: any) {
+ this.qustCat.saveForm(questionAns).subscribe(result => {
+ if (result['dataStatus'] == true) {
+ this.navCtrl.pop();
+ this.toast.pdTriggerappmessage('Record Saved Successfully.!');
+ }
+ else {
+ // this.notifier.notify('warning', 'Something Wents Wrong Try Again.!');
+ }
+ });
+
+ }
+
+// validate all form group and form array fields
+validateAllFormFields(formGroup: any) {
+ Object.keys(formGroup.controls).forEach(field => {
+ const control = formGroup.get(field);
+
+ if (control instanceof FormControl) {
+ control.markAsTouched({ onlySelf: true });
+ } else if (control instanceof FormGroup) {
+ this.validateAllFormFields(control);
+ } else if (control instanceof FormArray) {
+ this.validateAllFormFields(control);
+ }
+ });
+}
+
+
+// selectedAccTypeChanges(event: any){
+// console.log('First Time',event);
+// console.log('First Time Value',event.value);
+// if(event.value == 2) {
+// const control = this.bankingForm.controls['itemRows'];
+// console.log('Inside If Condition');
+// console.log(control);
+// console.log(control.controls);
+
+// control.controls[0].get('limit').clearValidators();
+// control.controls[0].get('limit').updateValueAndValidity();
+
+// //this.loanDetailsForm.controls['is_topup'].setValidators([Validators.required]);
+// // this.bankingForm.controls['itemRows'].
+// // this.bankingForm.controls.get('limit').clearValidators();
+// // this.bankingForm.controls.itemRows['controls'].get('limit').updateValueAndValidity();
+// // const control = this.bankingForm.controls['itemRows'];
+// // console.log(control.controls['limit'].value);
+
+// }
+// else{
+// //alert('sd');
+// }}
+
+ selectedEntityChanges(event: any){
+ const control = this._personalForm.controls['main_applicant_details'];
+ if(event.value == 'individual') {
+
+ control.controls[0].get('vintage_ans').clearValidators();
+ control.controls[0].get('vintage_ans').updateValueAndValidity();
+
+ control.controls[0].get('age_ans').setValidators([Validators.required]);
+ control.controls[0].get('age_ans').updateValueAndValidity();
+
+ control.controls[0].get('earning_ans').setValidators([Validators.required]);
+ control.controls[0].get('earning_ans').updateValueAndValidity();
+
+ control.controls[0].get('qualification_ans').setValidators([Validators.required]);
+ control.controls[0].get('qualification_ans').updateValueAndValidity();
+
+ control.controls[0].get('non_individual_entity_ans').clearValidators();
+ control.controls[0].get('non_individual_entity_ans').updateValueAndValidity();
+
+ }
+ else if(event.value == 'non-individual'){
+
+ control.controls[0].get('vintage_ans').setValidators([Validators.required]);
+ control.controls[0].get('vintage_ans').updateValueAndValidity();
+
+ control.controls[0].get('age_ans').clearValidators();
+ control.controls[0].get('age_ans').updateValueAndValidity();
+
+ control.controls[0].get('earning_ans').clearValidators();
+ control.controls[0].get('earning_ans').updateValueAndValidity();
+
+ control.controls[0].get('qualification_ans').clearValidators();
+ control.controls[0].get('qualification_ans').updateValueAndValidity();
+
+ control.controls[0].get('non_individual_entity_ans').setValidators([Validators.required]);
+ control.controls[0].get('non_individual_entity_ans').updateValueAndValidity();
+
+ }
+
+}
+
+selectedCoApplicantEntityChanges(event: any,c){
+
+ const control = this._personalForm.controls['co_applicant_details'];
+
+ if(event.value == 'individual') {
+
+ control.controls[0].get('vintage_ans').clearValidators();
+ control.controls[0].get('vintage_ans').updateValueAndValidity();
+
+ control.controls[0].get('age_ans').setValidators([Validators.required]);
+ control.controls[0].get('age_ans').updateValueAndValidity();
+
+ control.controls[0].get('earning_ans').setValidators([Validators.required]);
+ control.controls[0].get('earning_ans').updateValueAndValidity();
+
+ control.controls[0].get('qualification_ans').setValidators([Validators.required]);
+ control.controls[0].get('qualification_ans').updateValueAndValidity();
+
+ control.controls[0].get('non_individual_entity_ans').clearValidators();
+ control.controls[0].get('non_individual_entity_ans').updateValueAndValidity();
+
+ }
+ else if(event.value == 'non-individual'){
+
+ control.controls[0].get('vintage_ans').setValidators([Validators.required]);
+ control.controls[0].get('vintage_ans').updateValueAndValidity();
+
+ control.controls[0].get('age_ans').clearValidators();
+ control.controls[0].get('age_ans').updateValueAndValidity();
+
+ control.controls[0].get('earning_ans').clearValidators();
+ control.controls[0].get('earning_ans').updateValueAndValidity();
+
+ control.controls[0].get('qualification_ans').clearValidators();
+ control.controls[0].get('qualification_ans').updateValueAndValidity();
+
+ control.controls[0].get('non_individual_entity_ans').setValidators([Validators.required]);
+ control.controls[0].get('non_individual_entity_ans').updateValueAndValidity();
+
+ }
+
+}
+
}
diff --git a/src/pages/pd-question/pd-question-rental-info/pd-question-rental-info.html b/src/pages/pd-question/pd-question-rental-info/pd-question-rental-info.html
old mode 100644
new mode 100755
diff --git a/src/pages/pd-question/pd-question-rental-info/pd-question-rental-info.scss b/src/pages/pd-question/pd-question-rental-info/pd-question-rental-info.scss
old mode 100644
new mode 100755
diff --git a/src/pages/pd-question/pd-question-rental-info/pd-question-rental-info.ts b/src/pages/pd-question/pd-question-rental-info/pd-question-rental-info.ts
old mode 100644
new mode 100755
index cf6511e2..3ce89ffa
--- a/src/pages/pd-question/pd-question-rental-info/pd-question-rental-info.ts
+++ b/src/pages/pd-question/pd-question-rental-info/pd-question-rental-info.ts
@@ -126,7 +126,7 @@ export class PdQuestionRentalInfoPage {
console.log(this.rentalForms.value);
-if(this.rentalForms.valid){
+// if(this.rentalForms.valid){
records.pdid = this.pdDetails.pd_id;
records.formid = this.FormId.form_id;
records.fk_createdby = this.users;
@@ -149,10 +149,10 @@ if(this.rentalForms.valid){
this.navCtrl.pop();
}
})
- }else
- {
- this.toast.pdTriggerappmessage('Enter All Field');
- }
+ // }else
+ // {
+ // this.toast.pdTriggerappmessage('Enter All Field');
+ // }
}
getRentalDetails()
diff --git a/src/pages/pd-question/pd-question-stock-info/pd-question-stock-info.html b/src/pages/pd-question/pd-question-stock-info/pd-question-stock-info.html
old mode 100644
new mode 100755
index 4c0509e8..3c824573
--- a/src/pages/pd-question/pd-question-stock-info/pd-question-stock-info.html
+++ b/src/pages/pd-question/pd-question-stock-info/pd-question-stock-info.html
@@ -31,17 +31,35 @@
-
-
-
-
-
-
-
-
-
-
-
+
+ Yes
+ No
+
+
+
+
+
+
+
+
+ {{uom.name}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/pd-question/pd-question-stock-info/pd-question-stock-info.scss b/src/pages/pd-question/pd-question-stock-info/pd-question-stock-info.scss
old mode 100644
new mode 100755
diff --git a/src/pages/pd-question/pd-question-stock-info/pd-question-stock-info.ts b/src/pages/pd-question/pd-question-stock-info/pd-question-stock-info.ts
old mode 100644
new mode 100755
index 297b0f9a..8dc30cb7
--- a/src/pages/pd-question/pd-question-stock-info/pd-question-stock-info.ts
+++ b/src/pages/pd-question/pd-question-stock-info/pd-question-stock-info.ts
@@ -19,6 +19,8 @@ import { FormArray, FormGroup, FormBuilder } from '@angular/forms';
})
export class PdQuestionStockInfoPage {
+ uomData: any;
+ rawmaterial: any;
users: any;
FormId: any;
pdDetails: any;
@@ -33,6 +35,22 @@ export class PdQuestionStockInfoPage {
finished_goods: this.fb.array([])
});
this.getStockDetails();
+
+ this.qustCat.retiverForm({pd_id:this.pdDetails.pd_id,pd_form_id:'1'}).subscribe(value => {
+ // console.log('Raw material Name',value.records.main_raw_materials);
+
+
+ // const faControl = (this.stockForm.controls['raw_materials']).at(1);
+
+ const control = (this.stockForm.controls['raw_materials']).at(0);
+ console.log(control);
+
+ // this.stockForm.controls['raw_materials'].setValue(value.records.main_raw_materials);
+ if (value['dataStatus'] == true) {
+ this.rawmaterial = value['records'].main_raw_materials;
+ }else{ this.rawmaterial = ''; }
+ })
+ this.getdropdown();
}
@@ -41,10 +59,24 @@ export class PdQuestionStockInfoPage {
}
+ getdropdown()
+ {
+ this.qustCat.getcommondrop('UOM').subscribe(data => {
+
+ if(data['dataStatus']==true){
+
+ this.uomData = data['records'].filter(uom=>uom.isactive==1);
+
+ }
+ });
+ }
createRawmaterial() {
return this.fb.group({
raw_name: [''],
+ stock_observed:[''],
raw_quantity: [''],
+ raw_uom: [''],
+ other_uom : [''],
raw_value: [''],
rawmaterial_value: [''],
is_sufficiant_raw: [''],
diff --git a/src/pages/pd-question/pd-question-supplier-info/pd-question-supplier-info.html b/src/pages/pd-question/pd-question-supplier-info/pd-question-supplier-info.html
old mode 100644
new mode 100755
index 260594e0..9100a0eb
--- a/src/pages/pd-question/pd-question-supplier-info/pd-question-supplier-info.html
+++ b/src/pages/pd-question/pd-question-supplier-info/pd-question-supplier-info.html
@@ -43,9 +43,13 @@