From 9457aef3171510c9bb440dcd96abb75d689603bd Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Wed, 12 Dec 2018 11:27:46 +0530 Subject: [PATCH] edit coapplicant landline no Changes : ps --- .../list-pd/add-pd/add-pd.component.html | 8 +++--- .../list-pd/add-pd/add-pd.component.ts | 8 +++--- .../edit-pd-applicant.component.html | 18 +++++++++---- .../edit-pd-applicant.component.ts | 25 ++++++++++++------- .../list-pd/view-pd/view-pd.component.ts | 1 + 5 files changed, 38 insertions(+), 22 deletions(-) diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.html index 76ea36cb7..fdccd4b38 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.html @@ -176,12 +176,12 @@ - - Enter Valid LandLine Number. + + Enter Valid STD Code Number.   -   - - Enter Valid statuscode Number. + + Enter Valid LandLine Number. diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.ts index e5fe36a5b..26eef3002 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.ts @@ -75,8 +75,8 @@ export class AddPdComponent implements OnInit, OnDestroy { mobile_no: [null,Validators.compose([Validators.minLength(10),Validators.maxLength(10)])], // landline : [null,Validators.compose([Validators.minLength(12),Validators.maxLength(13)])], // email: [null], - statecode:[null, Validators.compose([Validators.required,Validators.minLength(2),Validators.maxLength(4),Validators.required,Validators.pattern('^[0-9]*$')])], - landline : [null, Validators.compose([Validators.required,Validators.minLength(6),Validators.maxLength(8),Validators.required,Validators.pattern('^[0-9]*$')])], + stdcode:[null, Validators.compose([Validators.minLength(2),Validators.maxLength(4),Validators.pattern('^[0-9]*$')])], + landline : [null, Validators.compose([Validators.minLength(6),Validators.maxLength(8),Validators.pattern('^[0-9]*$')])], company_name: [null],   addressline1: [null], @@ -218,7 +218,7 @@ export class AddPdComponent implements OnInit, OnDestroy { createRequiremnt(): FormGroup { return this._fb.group({ add_req_id:[null], - add_requirement: [null, Validators.compose([Validators.required])], + add_requirement: [null], isactive: [1], }); }; @@ -379,7 +379,7 @@ export class AddPdComponent implements OnInit, OnDestroy { "applicant_name":formValue.applicant_name, "company_name":formValue.company_name, "mobile_no":formValue.mobile_no, - "landline":formValue.statecode +'-'+formValue.landline, + "landline":formValue.stdcode +'-'+formValue.landline, "applicant_type":1, "relation":"", }); diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component.html index a89939c41..67687b695 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component.html @@ -32,12 +32,12 @@ Enter Valid Mobile Number. - - Enter Valid Phone Number. + + Enter Valid STD Code.  -  - Enter Valid Phone Number. + Enter Valid Landline Number. @@ -60,10 +60,18 @@ Enter Valid Mobile Number. - + + + + Enter Valid STD Number. +  -  + + + Enter Valid Landline Number. + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component.ts index 6123d338c..0cceec89d 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component.ts @@ -52,15 +52,15 @@ export class EditPdApplicantComponent implements OnInit { } loadApplicantFormData() { - let statecodesearch = this.mainApplicantData[0].landline.search("-"); - let statecode = this.mainApplicantData[0].landline.substr(0,statecodesearch); - console.log(statecode); - let landline = this.mainApplicantData[0].landline.substr(+statecodesearch + 1,8); + let stdcodesearch = this.mainApplicantData[0].landline.search("-"); + let stdcode = this.mainApplicantData[0].landline.substr(0,stdcodesearch); + console.log(stdcode); + let landline = this.mainApplicantData[0].landline.substr(+stdcodesearch + 1,8); this._EditApplicantForm = this._fb.group({ fk_applicant_primary_id: [this.mainApplicantData[0].pd_co_applicant_id], applicant_name: [this.mainApplicantData[0].applicant_name, Validators.compose([Validators.required])], mobile_no: [this.mainApplicantData[0].mobile_no, Validators.compose([Validators.required,Validators.required,Validators.minLength(10),Validators.maxLength(12)])], - statecode: [statecode, Validators.compose([Validators.minLength(2),Validators.maxLength(4)])], + stdcode: [stdcode, Validators.compose([Validators.minLength(2),Validators.maxLength(4)])], landline: [landline, Validators.compose([Validators.minLength(6),Validators.maxLength(8)])], company_name: [this.mainApplicantData[0].company_name], applicant_type: [this.mainApplicantData[0].applicant_type, Validators.compose([Validators.required])], @@ -76,12 +76,17 @@ export class EditPdApplicantComponent implements OnInit { } createItem(listData): FormGroup { if(listData){ + let stdcodesearch = listData.landline.search("-"); + let stdcode = listData.landline.substr(0,stdcodesearch); + let landline = listData.landline.substr(+stdcodesearch + 1,8); return this._fb.group({ label: ['Co Applicant'], fk_applicant_primary_id: [listData.pd_co_applicant_id], coapplicantName: [listData.applicant_name, Validators.compose([Validators.required])], coapplicant_mobile_no: [listData.mobile_no,Validators.compose([Validators.minLength(10),Validators.maxLength(12),Validators.pattern('^[0-9]*$')])], - coapplicant_landline: [listData.landline,Validators.compose([Validators.minLength(8),Validators.maxLength(12)])], + coapplicant_stdcode: [stdcode, Validators.compose([Validators.minLength(2),Validators.maxLength(4)])], + // landline: [landline, Validators.compose([Validators.minLength(6),Validators.maxLength(8)])], + coapplicant_landline: [landline,Validators.compose([Validators.minLength(6),Validators.maxLength(8)])], relationship: [listData.relation], applicant_type: [listData.applicant_type, Validators.compose([Validators.required])], company_name: [listData.company_name], @@ -93,7 +98,9 @@ export class EditPdApplicantComponent implements OnInit { fk_applicant_primary_id: [null], coapplicantName: [null, Validators.compose([Validators.required])], coapplicant_mobile_no: [null, Validators.compose([Validators.minLength(10),Validators.maxLength(12),Validators.pattern('^[0-9]*$')])], - coapplicant_landline: [null, Validators.compose([Validators.minLength(8),Validators.maxLength(12)])], + coapplicant_stdcode: [null, Validators.compose([Validators.minLength(2),Validators.maxLength(4)])], + coapplicant_landline: [null,Validators.compose([Validators.minLength(6),Validators.maxLength(8)])], + //coapplicant_landline: [null, Validators.compose([Validators.minLength(8),Validators.maxLength(12)])], relationship: [null], applicant_type: [0], company_name: [null], @@ -123,7 +130,7 @@ export class EditPdApplicantComponent implements OnInit { "applicant_name":formValue.applicant_name, "company_name":formValue.company_name, "mobile_no":formValue.mobile_no, - "landline":formValue.statecode+'-'+formValue.landline, + "landline":formValue.stdcode+'-'+formValue.landline, "applicant_type":formValue.applicant_type, "relation":formValue.relationship, "isactive":1 @@ -135,7 +142,7 @@ export class EditPdApplicantComponent implements OnInit { "applicant_name":itemElement.coapplicantName, "relation":itemElement.relationship, "mobile_no":itemElement.coapplicant_mobile_no, - "landline":itemElement.coapplicant_landline, + "landline":itemElement.coapplicant_stdcode+'-'+itemElement.coapplicant_landline, "applicant_type":itemElement.applicant_type, "company_name":itemElement.company_name, "isactive":1 diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.ts index ddeb2d637..bcf27d053 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.ts @@ -56,6 +56,7 @@ export class ViewPdComponent implements OnInit, OnDestroy { } ngOnInit() { + this.ListPdComponent.showListView(false); this.route.params.subscribe(params => { this.viewID = params['pdid']; });