From 594c467ebeed9c904a7a3ffb44f1f9e751cb34b4 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Fri, 11 Jan 2019 17:44:55 +0530 Subject: [PATCH 1/6] assets and general form changes --- .../assets-info/assets-info.component.html | 30 +++++++------- .../assets-info/assets-info.component.ts | 41 +++++++++++-------- .../general-info/general-info.component.html | 7 ++-- .../general-info/general-info.component.scss | 3 ++ .../general-info/general-info.component.ts | 10 +++-- 5 files changed, 54 insertions(+), 37 deletions(-) diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.html index d7ead5fd9..86544832e 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.html @@ -28,7 +28,7 @@
- {{ asset.name | titlecase }} + {{ asset.name | titlecase }}
@@ -55,26 +55,27 @@ - +
- +
- - + + +
-
- - +
+ +
@@ -321,19 +322,20 @@
- +
- + +
-
- - +
+ +
@@ -419,7 +421,7 @@ - {{"₹"}} {{OtherAmtInvestInwords[i]}} Only + {{"₹"}} {{OtherAmtInvestInwords[i]}} Only
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.ts index 9ed282974..a3aea72e1 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.ts @@ -225,7 +225,7 @@ public m_investmentType = []; // }); this.pdTrigerService.getCompaniesListsForBusiness(this.pdid).subscribe(data=>{ if(data.dataStatus){ - this.existCompanyList = data.records.filter(val =>val.is_active); + this.existCompanyList = data.records.filter(val =>val.is_active===true && val.is_company_applicant===true); } let modifyCompanyList : any=[]; @@ -234,9 +234,7 @@ public m_investmentType = []; return {id:element.company_order_id.toString(),name:element.company_name,group_id:1}; }); this.mergeCompanyApplicant.push({groupName:'COMPANIES',groupValues:modifyCompanyList}) - } - let modifyApplicantList: any=[]; if(this.applicants.length > 0){ modifyApplicantList = this.applicants.map(element => { @@ -448,7 +446,7 @@ public m_investmentType = []; case '3': { const control = (flag == 1) ? (this._assetsQuesFrom.controls['assets_details']).at(val).get('details') as FormArray : (this._assetsQuesFrom.controls['business_assets_details']).at(val).get('business_details') as FormArray ; - control.push(this.load_Two_Weeler()); + control.push(this.loadEquipmentManufacturingDescription()); break; } case '4': { @@ -512,6 +510,12 @@ public m_investmentType = []; }); } + loadEquipmentManufacturingDescription() { + return this._formBuilder.group({ + equipment_manufacturing_description: [''] + }); + } + otherAssetsDescription() { return this._formBuilder.group({ any_other_assets: [''], @@ -547,20 +551,20 @@ public m_investmentType = []; return this._formBuilder.group({ investments_type: [''], other_investments_type:[''], - amount_of_invest: [''], + amount_of_invest: [], bank_name: [''] }); } load_Four_Weeler() { return this._formBuilder.group({ - manufacturer_model_four_weeler: [''] + manufacturer_model_vehicle: [''] }); } load_Two_Weeler() { return this._formBuilder.group({ - manufacturer_model_two_weeler: [''] + manufacturer_model_vehicle: [''] }); } @@ -583,6 +587,11 @@ public m_investmentType = []; consumer_durable_description: [data.consumer_durable_description] }); } + loadEquipmentManufacturingDescriptionWithData(data) { + return this._formBuilder.group({ + equipment_manufacturing_description: [data.equipment_manufacturing_description] + }); + } otherAssetsDescriptionWithData(data) { return this._formBuilder.group({ @@ -627,13 +636,13 @@ public m_investmentType = []; load_Four_WeelerWithData(data) { return this._formBuilder.group({ - manufacturer_model_four_weeler: [data.manufacturer_model_four_weeler] + manufacturer_model_vehicle: [data.manufacturer_model_vehicle] }); } load_Two_WeelerWithData(data) { return this._formBuilder.group({ - manufacturer_model_two_weeler: [data.manufacturer_model_two_weeler] + manufacturer_model_vehicle: [data.manufacturer_model_vehicle] }); } @@ -758,7 +767,7 @@ public m_investmentType = []; case '2': { let array_data : any; data.forEach((datas,i) => { - array_data = { 'manufacturer_model_four_weeler': datas.manufacturer_model_four_weeler }; + array_data = { 'manufacturer_model_vehicle': datas.manufacturer_model_vehicle }; }); const control = (this._assetsQuesFrom.controls['assets_details']).at(val).get('details') as FormArray; control.push(this.load_Four_WeelerWithData(array_data)); @@ -767,10 +776,10 @@ public m_investmentType = []; case '3': { let array_data : any; data.forEach((datas,i) => { - array_data = { 'manufacturer_model_two_weeler': datas.manufacturer_model_two_weeler }; + array_data = { 'equipment_manufacturing_description': datas.equipment_manufacturing_description }; }); const control = (this._assetsQuesFrom.controls['assets_details']).at(val).get('details') as FormArray; - control.push(this.load_Two_WeelerWithData(array_data)); + control.push(this.loadEquipmentManufacturingDescriptionWithData(array_data)); break; } case '4': { @@ -860,19 +869,19 @@ public m_investmentType = []; case '2': { let business_Four_Weeler_datas : any; data.forEach((datas,i) => { - business_Four_Weeler_datas = { 'manufacturer_model_four_weeler': datas.manufacturer_model_four_weeler }; + business_Four_Weeler_datas = { 'manufacturer_model_vehicle': datas.manufacturer_model_vehicle }; }); const control = (this._assetsQuesFrom.controls['business_assets_details']).at(val).get('business_details') as FormArray ; control.push(this.load_Four_WeelerWithData(business_Four_Weeler_datas)); break; } case '3': { - let business_Two_Weeler_datas : any; + let equipment_manufacturing_description_datas : any; data.forEach((datas,i) => { - business_Two_Weeler_datas = { 'manufacturer_model_two_weeler': datas.manufacturer_model_two_weeler }; + equipment_manufacturing_description_datas= { 'equipment_manufacturing_description': datas.equipment_manufacturing_description }; }); const control = (this._assetsQuesFrom.controls['business_assets_details']).at(val).get('business_details') as FormArray ; - control.push(this.load_Two_WeelerWithData(business_Two_Weeler_datas)); + control.push(this.loadEquipmentManufacturingDescriptionWithData(equipment_manufacturing_description_datas)); break; } case '4': { diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.html index 7fe38bc59..b2a1c3961 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.html @@ -63,11 +63,12 @@
- + - - diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.scss index 806cd8105..8ef60e983 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.scss @@ -20,6 +20,9 @@ .table-checkbox { margin-left: 15% !important; } + .table-checkbox-com { + margin-left: 3% !important; + } .p-text { color:#e00201 !important; font-weight: bold; diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.ts index 207e995c3..f32997448 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.ts @@ -217,13 +217,13 @@ export class GeneralInfoComponent implements OnInit { // create companies if(element.company_name!='' && element.company_name!=null){ - let setCompanyValues: any = {company_order_id :companyControl.controls.length+1,company_name:element.company_name,is_active:true} + let setCompanyValues: any = {company_order_id :companyControl.controls.length+1,company_name:element.company_name,is_company_applicant:element.is_company_applicant,is_active:true} companyControl.push(this.createCompanies(setCompanyValues)) } }); // check company if null update one row if(companyControl.controls.length ==0){ - let setCompanyValues: any = {company_order_id :companyControl.controls.length+1,company_name:'',is_active:true} + let setCompanyValues: any = {company_order_id :companyControl.controls.length+1,company_name:'',is_company_applicant:false,is_active:true,is_new:false} companyControl.push(this.createCompanies(setCompanyValues)) } @@ -258,7 +258,9 @@ export class GeneralInfoComponent implements OnInit { company_order_id: [elementValue.company_order_id], company_name: [elementValue.company_name], company_messrs_name: ['M/s'], - is_active: [elementValue.is_active] + is_company_applicant:[elementValue.is_company_applicant], + is_active: [elementValue.is_active], + is_new:[elementValue.is_new] }); } @@ -305,7 +307,7 @@ export class GeneralInfoComponent implements OnInit { // add more companies addMoreCompanies() { let control: any = this._generalForm.get('companies') as FormArray; - let setValues: any = {company_order_id :control.controls.length+1,company_name:'',is_active:true} + let setValues: any = {company_order_id :control.controls.length+1,company_name:'',is_company_applicant:false,is_active:true,is_new: true} control.push(this.createCompanies(setValues)) } From 913fca64ae7fd29e7d0f2684860bd078f9016eb0 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Fri, 11 Jan 2019 17:45:25 +0530 Subject: [PATCH 2/6] merge : kms --- .../list-pd/add-pd/add-pd.component.html | 2 +- .../loan-details/loan-details.component.html | 26 +++++++------------ .../loan-details/loan-details.component.scss | 4 +++ .../list-pd/view-pd/view-pd.component.html | 2 +- 4 files changed, 16 insertions(+), 18 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 31e65ab1b..51af4f92d 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 @@ -122,7 +122,7 @@ - {{"₹"}} {{loanAmtInWords}} Only + {{"₹"}} {{loanAmtInWords}} Only Enter valid amount. diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.html index 68f5444b7..335130986 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.html @@ -20,14 +20,11 @@
-
- + - {{"₹"}} {{loanAmtInWords}} Only + {{"₹"}} {{loanAmtInWords}} Only -
-
- + {{ enduse.name }} @@ -43,12 +40,9 @@ Other purpose --> -
-
- + -
@@ -68,7 +62,7 @@
- {{"₹"}} {{balTxrfAmtInWords}} Only + {{"₹"}} {{balTxrfAmtInWords}} Only - {{"₹"}} {{topUpAmtInWords}} Only + {{"₹"}} {{topUpAmtInWords}} Only @@ -101,7 +95,7 @@ - {{"₹"}} {{ownContributionInWords}} Only + {{"₹"}} {{ownContributionInWords}} Only @@ -137,7 +131,7 @@ - {{"₹"}} {{emiAmtInWords}} Only + {{"₹"}} {{emiAmtInWords}} Only @@ -204,12 +198,12 @@ - {{"₹"}} {{emvAmtInWords}} Only + {{"₹"}} {{emvAmtInWords}} Only diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.scss index 194863bbc..a2381ffbc 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.scss @@ -10,6 +10,10 @@ .matcard > * { width: 80%; } +.mat-form-field-appearance-legacy .mat-hint{ + color:rgba(0, 0, 0, 0.8) !important; +} + .matcard mat-form-field { margin: 0 2%; width:26%; diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html index 61bcfab5e..3aa00fa09 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html @@ -20,7 +20,7 @@ {{master.pd_status | titlecase}} QC Completed    - +
{{master.pd_allocated_to | titlecase}} {{master.executive_name | titlecase}}/{{master.centralofficer | titlecase}} From b056937d0f03a587210f636746768a36ad18ef72 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Fri, 11 Jan 2019 18:24:13 +0530 Subject: [PATCH 3/6] loan details : ps --- .../business-info.component.html | 13 +- .../business-info/business-info.component.ts | 38 +++++ .../current-loan/current-loan.component.html | 4 +- .../current-loan/current-loan.component.scss | 2 +- .../loan-details/loan-details.component.html | 2 +- .../loan-details/loan-details.component.ts | 130 ++++++++++++------ .../list-pd/view-pd/view-pd.component.html | 2 +- .../pd-service/pd-triger.service.ts | 7 + 8 files changed, 145 insertions(+), 53 deletions(-) diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.html index da3344fdf..7120fd8aa 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.html @@ -117,10 +117,10 @@

No of Years in Current Business

- + - + - + + Please Enter Correct Year - + @@ -1173,11 +1174,11 @@ formControlName="employees_total" required> - - diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.ts index ca887a24f..c9ced44b8 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.ts @@ -1214,7 +1214,38 @@ export class BusinessInfoComponent implements OnInit { else { control.controls[key].removeControl('total_business_previous_experience') } + let total ; + if(control.length > 0){ + total = control.value.reduce((sum, val) => sum + +val.current_business_experiance_year, 0); + console.log(total); + this.businessForm.controls.business_years.setValidators([Validators.required, Validators.min(+total)]); + this.businessForm.controls.business_years.updateValueAndValidity(); + } + } + /** To Convert Month into Year */ + ConvertMonthintoYear(itemrow,e){ + + let year = itemrow.controls.current_business_experiance_year.value; + + let converted_month : number = e%12; + let converted_year : number = e/12; + + itemrow.controls.current_business_experiance_year.setValue(+year + +Math.floor(converted_year)); + itemrow.controls.current_business_experiance_month.setValue(Math.floor(converted_month)); + + } + + ConvertMonthintoYearforBusiness(e){ + + let business_year = this.businessForm.controls.business_years.value; + + let converted_month : number = e%12; + let converted_year : number = e/12; + + this.businessForm.controls.business_years.setValue(+business_year + +Math.floor(converted_year)); + this.businessForm.controls.business_month.setValue(Math.floor(converted_month)); + } /** @@ -1452,4 +1483,11 @@ export class BusinessInfoComponent implements OnInit { } }) } + + checkTotal(FormData){ + // console.log(FormData.value.employees_permanent); + // console.log(FormData.value.employees_temporary); + // console.log(FormData.value.employees_total); + this.businessForm.controls['employees_total'].setValue((+FormData.value.employees_permanent ||0)+(+FormData.value.employees_temporary||0)); + } } diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.html index 94009c7f8..d4170f910 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.html @@ -39,7 +39,7 @@ - {{"₹"}} {{amtInwords[i]}} Only + {{"₹"}} {{amtInwords[i]}} Only - {{"₹"}} {{emiAmtInwords[i]}} Only + {{"₹"}} {{emiAmtInwords[i]}} Only diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.scss index 6478f8ba9..758b41c0c 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.scss @@ -26,7 +26,7 @@ line-height: 1.2em; transform: translateY(10px); font-size: 75%; -} + } .mat-card-content { background-color: white; } diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.html index 68f5444b7..2963e0702 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.html @@ -29,7 +29,7 @@
- {{ enduse.name }} + {{ enduse.enduse_of_loan}} - - +91 - Enter Valid STD Code Number. - - - - - Enter Valid LandLine Number. - + git status From d02a6fddb79f9a796b9505ebf0b0b06cbc61cc13 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Fri, 11 Jan 2019 18:28:59 +0530 Subject: [PATCH 5/6] merge commit : ps --- .../list-pd/add-pd/add-pd.component.html | 2 +- .../assets-info/assets-info.component.html | 184 ++++++++--------- .../assets-info/assets-info.component.ts | 187 ++++++++---------- .../general-info/general-info.component.html | 7 +- .../general-info/general-info.component.scss | 3 + .../general-info/general-info.component.ts | 10 +- .../loan-details/loan-details.component.html | 26 +-- .../loan-details/loan-details.component.scss | 4 + .../list-pd/view-pd/view-pd.component.html | 2 +- 9 files changed, 186 insertions(+), 239 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 7098bb2c8..e8ad986a7 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 @@ -115,7 +115,7 @@ - {{"₹"}} {{loanAmtInWords}} Only + {{"₹"}} {{loanAmtInWords}} Only Enter valid amount. diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.html index ce552f7fd..86544832e 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.html @@ -28,7 +28,7 @@
- {{ asset.name | titlecase }} + {{ asset.name | titlecase }}
@@ -55,26 +55,27 @@
- +
- +
- - + + +
-
- - +
+ +
@@ -174,7 +175,7 @@ - + {{data.viewValue | titlecase}} @@ -186,24 +187,6 @@
- - -
@@ -238,40 +221,29 @@ - + + Vintage + + + + + + Purchase Year - - Invalid year format - + + +
- + Yes No - - - - {{"₹"}} {{emiAmtInwords[i]}} Only - - - - - - - - - - - - - -
@@ -305,7 +277,7 @@
- +
@@ -350,19 +322,20 @@
- +
- + +
-
- - +
+ +
@@ -448,7 +421,7 @@ - {{"₹"}} {{OtherAmtInvestInwords[i]}} Only + {{"₹"}} {{OtherAmtInvestInwords[i]}} Only
@@ -474,26 +447,34 @@
- - + + + + + {{val.name}} + + + - + - +
@@ -502,21 +483,11 @@ {{"₹"}} {{OtherAssetValueInwords[s]}} Only - - - + - + {{data.viewValue | titlecase}} - - - - - - - {{"₹"}} {{O_emiAmtInwords[s]}} Only -
@@ -530,63 +501,62 @@ {{"₹"}} {{OtherAppxMarketAmtInwords[i]}} Only - - + + + + + + {{val.name}} + + + - + - +
- - - Purchase Year - - Invalid year format - - + + + + Vintage + + + + + + + Purchase Year + + + +
- + Yes No - - - - {{"₹"}} {{OtherEmiAmtInwords[i]}} Only - - - - - - - - - - - - - - +
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.ts index 6a788532c..a3aea72e1 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.ts @@ -37,7 +37,7 @@ export class AssetsInfoComponent implements OnInit { public _assetsQuesFrom: FormGroup; public submitted = false; public m_assets_type = []; - public m_relation = []; + //public m_relation = []; public applicants: any; otherEmiamtFlag : boolean = false; businessEmiAmtFlag : boolean = false; @@ -186,7 +186,7 @@ public m_investmentType = []; private notifier: NotifierService; existCompanyList: any =[]; mergeCompanyApplicant: any=[]; - + currentYear:any=new Date().getFullYear(); constructor( notifier: NotifierService, private _formBuilder: FormBuilder, @@ -225,7 +225,7 @@ public m_investmentType = []; // }); this.pdTrigerService.getCompaniesListsForBusiness(this.pdid).subscribe(data=>{ if(data.dataStatus){ - this.existCompanyList = data.records.filter(val =>val.is_active); + this.existCompanyList = data.records.filter(val =>val.is_active===true && val.is_company_applicant===true); } let modifyCompanyList : any=[]; @@ -234,9 +234,7 @@ public m_investmentType = []; return {id:element.company_order_id.toString(),name:element.company_name,group_id:1}; }); this.mergeCompanyApplicant.push({groupName:'COMPANIES',groupValues:modifyCompanyList}) - } - let modifyApplicantList: any=[]; if(this.applicants.length > 0){ modifyApplicantList = this.applicants.map(element => { @@ -252,7 +250,7 @@ public m_investmentType = []; this.getM_PropertyType(); this.getM_InvestmentType(); this.getM_FreqOfPurchase(); - this.getM_Relation(); + //this.getM_Relation(); //this.getM_InsuranceType(); } @@ -295,16 +293,16 @@ public m_investmentType = []; ) } - getM_Relation() { - this.pdTrigerService.getAllMasterDatas('RELATIONSHIPS').subscribe( - data => { - this.m_relation = data.records.filter(data => data.isactive == 1); - }, - error => { - this.notifier.notify('warning', 'No Category Records Found.!'); - } - ) - } + // getM_Relation() { + // this.pdTrigerService.getAllMasterDatas('RELATIONSHIPS').subscribe( + // data => { + // this.m_relation = data.records.filter(data => data.isactive == 1); + // }, + // error => { + // this.notifier.notify('warning', 'No Category Records Found.!'); + // } + // ) + // } getM_FreqOfPurchase() { this.pdTrigerService.getAllMasterDatas('FREQUENCY').subscribe( @@ -395,14 +393,11 @@ public m_investmentType = []; approximate_market_value: [''], name_of_the_owner: [''], other_owner:[''], - relation: [''], - purchase_year: ['',Validators.compose([Validators.minLength(4),Validators.maxLength(4)])], + // relation: [''], + vintage_personal : [''], + purchase_year: ['',Validators.compose([Validators.pattern("[1-9]{1}[0-9]{3}")])], //purchase_month: [''], emi: [''], - emi_paid: [''], - original_loan_tenure: [''], - balance_tenure: [''], - elapsed_tenure: [''], }); } @@ -415,13 +410,10 @@ public m_investmentType = []; business_name_of_the_other_owner: [], //other_owner:[''], //relation:[''], - business_purchase_year: ['',Validators.compose([Validators.minLength(4),Validators.maxLength(4)])], + business_vintage: [''], + business_purchase_year: ['',Validators.compose([Validators.pattern("[1-9]{1}[0-9]{3}")])], //purchase_month: [''], business_emi: [''], - business_emi_paid: [''], - business_original_loan_tenure: [''], - business_balance_tenure: [''], - business_elapsed_tenure: [''], }); } @@ -454,7 +446,7 @@ public m_investmentType = []; case '3': { const control = (flag == 1) ? (this._assetsQuesFrom.controls['assets_details']).at(val).get('details') as FormArray : (this._assetsQuesFrom.controls['business_assets_details']).at(val).get('business_details') as FormArray ; - control.push(this.load_Two_Weeler()); + control.push(this.loadEquipmentManufacturingDescription()); break; } case '4': { @@ -518,15 +510,20 @@ public m_investmentType = []; }); } + loadEquipmentManufacturingDescription() { + return this._formBuilder.group({ + equipment_manufacturing_description: [''] + }); + } + otherAssetsDescription() { return this._formBuilder.group({ any_other_assets: [''], name_of_the_owner:[''], other_owner:[''], - relation:[''], + //relation:[''], any_other_asset_value : [''], any_other_asset_loan : [''], - other_asset_emi_amt : [''] }); } @@ -535,9 +532,7 @@ public m_investmentType = []; return this._formBuilder.group({ any_other_assets: [''], any_other_asset_value : [''], - any_other_asset_loan : [''], - other_asset_emi_amt : [''] - + any_other_asset_loan : [''], }); } @@ -556,20 +551,20 @@ public m_investmentType = []; return this._formBuilder.group({ investments_type: [''], other_investments_type:[''], - amount_of_invest: [''], + amount_of_invest: [], bank_name: [''] }); } load_Four_Weeler() { return this._formBuilder.group({ - manufacturer_model_four_weeler: [''] + manufacturer_model_vehicle: [''] }); } load_Two_Weeler() { return this._formBuilder.group({ - manufacturer_model_two_weeler: [''] + manufacturer_model_vehicle: [''] }); } @@ -592,16 +587,20 @@ public m_investmentType = []; consumer_durable_description: [data.consumer_durable_description] }); } + loadEquipmentManufacturingDescriptionWithData(data) { + return this._formBuilder.group({ + equipment_manufacturing_description: [data.equipment_manufacturing_description] + }); + } otherAssetsDescriptionWithData(data) { return this._formBuilder.group({ any_other_assets: [data.any_other_assets], name_of_the_owner:[data.name_of_the_owner], other_owner:[data.other_owner], - relation:[data.relation], + // relation:[data.relation], any_other_asset_value : [data.any_other_asset_value], any_other_asset_loan : [data.any_other_asset_loan], - other_asset_emi_amt : [data.other_asset_emi_amt] }); } @@ -610,7 +609,6 @@ public m_investmentType = []; any_other_assets: [data.any_other_assets], any_other_asset_value : [data.any_other_asset_value], any_other_asset_loan : [data.any_other_asset_loan], - other_asset_emi_amt : [data.other_asset_emi_amt] }); } @@ -638,13 +636,13 @@ public m_investmentType = []; load_Four_WeelerWithData(data) { return this._formBuilder.group({ - manufacturer_model_four_weeler: [data.manufacturer_model_four_weeler] + manufacturer_model_vehicle: [data.manufacturer_model_vehicle] }); } load_Two_WeelerWithData(data) { return this._formBuilder.group({ - manufacturer_model_two_weeler: [data.manufacturer_model_two_weeler] + manufacturer_model_vehicle: [data.manufacturer_model_vehicle] }); } @@ -657,34 +655,29 @@ public m_investmentType = []; approximate_market_value: [data.approximate_market_value], name_of_the_owner: [data.name_of_the_owner], other_owner:[data.other_owner || ''], - relation: [data.relation || ''], - purchase_year: [data.purchase_year], + //relation: [data.relation || ''], + vintage_personal : [data. vintage_personal], + purchase_year: [data. purchase_year,Validators.compose([Validators.pattern("[1-9]{1}[0-9]{3}")])], // purchase_month: [data.purchase_month], emi: [data.emi || 0], - emi_paid: [data.emi_paid || ''], - original_loan_tenure: [data.original_loan_tenure || ''], - balance_tenure: [data.balance_tenure || ''], - elapsed_tenure: [data.elapsed_tenure || ''] }); } initBusinessDetailsWithdata(data) { - return this._formBuilder.group({ + let formGroup= this._formBuilder.group({ business_assets_mode: [data.business_assets_mode], business_details: this._formBuilder.array([]), business_approximate_market_value: [data.business_approximate_market_value], business_name_of_the_owner: [data.business_name_of_the_owner], business_name_of_the_other_owner:[data.business_name_of_the_other_owner || ''], // relation: [data.relation || ''], - business_purchase_year: [data. business_purchase_year], + business_vintage: [data. business_vintage], + business_purchase_year: [data. business_purchase_year,Validators.compose([Validators.pattern("[1-9]{1}[0-9]{3}")])], // purchase_month: [data.purchase_month], business_emi: [data.business_emi || 0], - business_emi_paid: [data.business_emi_paid || ''], - business_original_loan_tenure: [data.business_original_loan_tenure || ''], - business_balance_tenure: [data.business_balance_tenure || ''], - business_elapsed_tenure: [data.business_elapsed_tenure || ''] }); + return formGroup; } loadDetails: boolean; @@ -695,7 +688,6 @@ public m_investmentType = []; result.forEach((datas,index) => { this.OtherAppxMarketAmtInwords[index] = this.pdTrigerService.convertNumberToWords(+datas.approximate_market_value); - this.OtherEmiAmtInwords[index] = this.pdTrigerService.convertNumberToWords(+datas.emi_paid); }); if (result.length > 0) { @@ -705,14 +697,11 @@ public m_investmentType = []; approximate_market_value: val.approximate_market_value, name_of_the_owner: val.name_of_the_owner, other_owner:val.other_owner, - relation: val.relation, + // relation: val.relation, + vintage_personal: val.vintage_personal, purchase_year: val.purchase_year, // purchase_month: val.purchase_month, emi: val.emi, - emi_paid: val.emi_paid, - original_loan_tenure: val.original_loan_tenure, - elapsed_tenure: val.elapsed_tenure, - balance_tenure: val.balance_tenure }; const control = this._assetsQuesFrom.controls['assets_details']; control.push(this.initDetailsWithdata(vals)); @@ -731,7 +720,6 @@ public m_investmentType = []; if (result.length > 0) { result.forEach((datas,index) => { this.appxMarketAmtInwords[index] = this.pdTrigerService.convertNumberToWords(+datas.business_approximate_market_value); - this.emiAmtInwords[index] = this.pdTrigerService.convertNumberToWords(+datas.business_emi_paid); }); for (let val of result) { @@ -742,12 +730,9 @@ public m_investmentType = []; business_name_of_the_other_owner: val.business_name_of_the_other_owner, // relation : val.relation, business_purchase_year: val. business_purchase_year, + business_vintage : val.business_vintage, // purchase_month: val.purchase_month, business_emi: val.business_emi, - business_emi_paid: val.business_emi_paid, - business_original_loan_tenure: val.business_original_loan_tenure, - business_elapsed_tenure: val.business_elapsed_tenure, - business_balance_tenure: val.business_balance_tenure }; const control = this._assetsQuesFrom.controls['business_assets_details']; @@ -782,7 +767,7 @@ public m_investmentType = []; case '2': { let array_data : any; data.forEach((datas,i) => { - array_data = { 'manufacturer_model_four_weeler': datas.manufacturer_model_four_weeler }; + array_data = { 'manufacturer_model_vehicle': datas.manufacturer_model_vehicle }; }); const control = (this._assetsQuesFrom.controls['assets_details']).at(val).get('details') as FormArray; control.push(this.load_Four_WeelerWithData(array_data)); @@ -791,10 +776,10 @@ public m_investmentType = []; case '3': { let array_data : any; data.forEach((datas,i) => { - array_data = { 'manufacturer_model_two_weeler': datas.manufacturer_model_two_weeler }; + array_data = { 'equipment_manufacturing_description': datas.equipment_manufacturing_description }; }); const control = (this._assetsQuesFrom.controls['assets_details']).at(val).get('details') as FormArray; - control.push(this.load_Two_WeelerWithData(array_data)); + control.push(this.loadEquipmentManufacturingDescriptionWithData(array_data)); break; } case '4': { @@ -847,13 +832,11 @@ public m_investmentType = []; array_data = { 'any_other_assets': datas.any_other_assets, 'name_of_the_owner':datas.name_of_the_owner, 'other_owner':datas.other_owner, - 'relation':datas.relation, + //'relation':datas.relation, 'any_other_asset_value' : datas.any_other_asset_value, 'any_other_asset_loan' : datas.any_other_asset_loan, - 'other_asset_emi_amt' : datas.other_asset_emi_amt }; this.OtherAssetValueInwords[i] = this.pdTrigerService.convertNumberToWords(+datas.any_other_asset_value); - this.O_emiAmtInwords[i] = this.pdTrigerService.convertNumberToWords(+datas.other_asset_emi_amt); }); const control = (this._assetsQuesFrom.controls['assets_details']).at(val).get('details') as FormArray; control.push(this.otherAssetsDescriptionWithData(array_data)); @@ -886,19 +869,19 @@ public m_investmentType = []; case '2': { let business_Four_Weeler_datas : any; data.forEach((datas,i) => { - business_Four_Weeler_datas = { 'manufacturer_model_four_weeler': datas.manufacturer_model_four_weeler }; + business_Four_Weeler_datas = { 'manufacturer_model_vehicle': datas.manufacturer_model_vehicle }; }); const control = (this._assetsQuesFrom.controls['business_assets_details']).at(val).get('business_details') as FormArray ; control.push(this.load_Four_WeelerWithData(business_Four_Weeler_datas)); break; } case '3': { - let business_Two_Weeler_datas : any; + let equipment_manufacturing_description_datas : any; data.forEach((datas,i) => { - business_Two_Weeler_datas = { 'manufacturer_model_two_weeler': datas.manufacturer_model_two_weeler }; + equipment_manufacturing_description_datas= { 'equipment_manufacturing_description': datas.equipment_manufacturing_description }; }); const control = (this._assetsQuesFrom.controls['business_assets_details']).at(val).get('business_details') as FormArray ; - control.push(this.load_Two_WeelerWithData(business_Two_Weeler_datas)); + control.push(this.loadEquipmentManufacturingDescriptionWithData(equipment_manufacturing_description_datas)); break; } case '4': { @@ -947,12 +930,10 @@ public m_investmentType = []; let array_datas : any; data.forEach((datas,i) => { this.AssetValueInwords[i] = this.pdTrigerService.convertNumberToWords(+data.any_other_asset_value); - this.B_emiAmtInwords[i] = this.pdTrigerService.convertNumberToWords(+datas.other_asset_emi_amt); array_datas = { 'any_other_assets': datas.any_other_assets, 'any_other_asset_value' : datas.any_other_asset_value, 'any_other_asset_loan' : datas.any_other_asset_loan, - 'other_asset_emi_amt' : datas.other_asset_emi_amt }; }); const control = (this._assetsQuesFrom.controls['business_assets_details']).at(val).get('business_details') as FormArray ; @@ -997,19 +978,6 @@ public m_investmentType = []; selectedFreqPurchase(e) { this.freqPurchaseTextBox = e.value; } - - /** Show/hide EMI amount Field using Flag Both "other Asset" and "business" - * REF = "Other Asset type at last Field" - **/ - selectedAssetLoanType(e: any,flag): void { - if(flag == 1){ - this.otherEmiamtFlag = (e == 'yes') ? true : false; - } - else if(flag == 2){ - this.businessEmiAmtFlag = (e == 'yes') ? true : false; - } - } - // compare objects for merge two master table details compareObjects(o1: any, o2: any) { if(o1.id == o2.id && o1.group_id == o2.group_id) @@ -1028,6 +996,29 @@ public m_investmentType = []; } + // calculate vintage and purchase {} + calculateVintagePurchase(value: any, controlKey: any,type: number){ + if(type==1){ + let control: any = this._assetsQuesFrom.controls['business_assets_details']; + control.controls[controlKey].controls['business_purchase_year'].setValue(value!='' ? parseInt(this.currentYear)-parseInt(value) : ''); + } + else if(type==2) { + let control: any = this._assetsQuesFrom.controls['business_assets_details']; + value!='' && value<=this.currentYear ? control.controls[controlKey].controls['business_purchase_year'].setValue(value) : control.controls[controlKey].controls['business_purchase_year'].setValue(''); + value!='' && value<=this.currentYear ? control.controls[controlKey].controls['business_vintage'].setValue(parseInt(this.currentYear)-parseInt(value)) : control.controls[controlKey].controls['business_vintage'].setValue('') + } + else if(type==3){ + let control: any = this._assetsQuesFrom.controls['assets_details']; + control.controls[controlKey].controls['purchase_year'].setValue(value!='' ? parseInt(this.currentYear)-parseInt(value) : ''); + } + else if(type==4) { + let control: any = this._assetsQuesFrom.controls['assets_details']; + value!='' && value<=this.currentYear ? control.controls[controlKey].controls['purchase_year'].setValue(value) : control.controls[controlKey].controls['purchase_year'].setValue(''); + value!='' && value<=this.currentYear ? control.controls[controlKey].controls['vintage_personal'].setValue(parseInt(this.currentYear)-parseInt(value)) : control.controls[controlKey].controls['vintage_personal'].setValue('') + } + + } + /** To Save/Edited Popup Data */ onSubmit() { this.submitted = true; @@ -1040,24 +1031,6 @@ public m_investmentType = []; //To Remove The "Null" With Key also Object.keys(answerFormValues).forEach((key) => (answerFormValues[key] == null) && delete answerFormValues[key]); - answerFormValues.assets_details.map(val => { - if (val.emi == '0') { - val.emi_paid = ''; - val.original_loan_tenure = ''; - val.balance_tenure = ''; - val.elapsed_tenure = ''; - } - }); - - //To Remove The "Null" With Key also - answerFormValues.business_assets_details.map(val => { - if (val.business_emi == '0') { - val.business_emi_paid = ''; - val.business_original_loan_tenure = ''; - val.business_balance_tenure = ''; - val.business_elapsed_tenure = ''; - } - }); // Save the data with help of Service this.pdTrigerService.savePDFormDetailsWithID(answerFormValues).subscribe( dataresult => { diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.html index 7fe38bc59..b2a1c3961 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.html @@ -63,11 +63,12 @@
- + - - diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.scss index 806cd8105..8ef60e983 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.scss @@ -20,6 +20,9 @@ .table-checkbox { margin-left: 15% !important; } + .table-checkbox-com { + margin-left: 3% !important; + } .p-text { color:#e00201 !important; font-weight: bold; diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.ts index 207e995c3..f32997448 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.ts @@ -217,13 +217,13 @@ export class GeneralInfoComponent implements OnInit { // create companies if(element.company_name!='' && element.company_name!=null){ - let setCompanyValues: any = {company_order_id :companyControl.controls.length+1,company_name:element.company_name,is_active:true} + let setCompanyValues: any = {company_order_id :companyControl.controls.length+1,company_name:element.company_name,is_company_applicant:element.is_company_applicant,is_active:true} companyControl.push(this.createCompanies(setCompanyValues)) } }); // check company if null update one row if(companyControl.controls.length ==0){ - let setCompanyValues: any = {company_order_id :companyControl.controls.length+1,company_name:'',is_active:true} + let setCompanyValues: any = {company_order_id :companyControl.controls.length+1,company_name:'',is_company_applicant:false,is_active:true,is_new:false} companyControl.push(this.createCompanies(setCompanyValues)) } @@ -258,7 +258,9 @@ export class GeneralInfoComponent implements OnInit { company_order_id: [elementValue.company_order_id], company_name: [elementValue.company_name], company_messrs_name: ['M/s'], - is_active: [elementValue.is_active] + is_company_applicant:[elementValue.is_company_applicant], + is_active: [elementValue.is_active], + is_new:[elementValue.is_new] }); } @@ -305,7 +307,7 @@ export class GeneralInfoComponent implements OnInit { // add more companies addMoreCompanies() { let control: any = this._generalForm.get('companies') as FormArray; - let setValues: any = {company_order_id :control.controls.length+1,company_name:'',is_active:true} + let setValues: any = {company_order_id :control.controls.length+1,company_name:'',is_company_applicant:false,is_active:true,is_new: true} control.push(this.createCompanies(setValues)) } diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.html index 2963e0702..51c117ff8 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.html @@ -20,14 +20,11 @@
-
- + - {{"₹"}} {{loanAmtInWords}} Only + {{"₹"}} {{loanAmtInWords}} Only -
-
- + {{ enduse.enduse_of_loan}} @@ -43,12 +40,9 @@ Other purpose --> -
-
- + -
@@ -68,7 +62,7 @@
- {{"₹"}} {{balTxrfAmtInWords}} Only + {{"₹"}} {{balTxrfAmtInWords}} Only - {{"₹"}} {{topUpAmtInWords}} Only + {{"₹"}} {{topUpAmtInWords}} Only @@ -101,7 +95,7 @@ - {{"₹"}} {{ownContributionInWords}} Only + {{"₹"}} {{ownContributionInWords}} Only @@ -137,7 +131,7 @@ - {{"₹"}} {{emiAmtInWords}} Only + {{"₹"}} {{emiAmtInWords}} Only @@ -204,12 +198,12 @@ - {{"₹"}} {{emvAmtInWords}} Only + {{"₹"}} {{emvAmtInWords}} Only diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.scss index 194863bbc..a2381ffbc 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.scss @@ -10,6 +10,10 @@ .matcard > * { width: 80%; } +.mat-form-field-appearance-legacy .mat-hint{ + color:rgba(0, 0, 0, 0.8) !important; +} + .matcard mat-form-field { margin: 0 2%; width:26%; diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html index ab1b8d8d9..9c43301da 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html @@ -20,7 +20,7 @@ {{master.pd_status | titlecase}} QC Completed    - +
{{master.pd_allocated_to | titlecase}} {{master.executive_name | titlecase}}/{{master.centralofficer | titlecase}} From c72e8d1a627494f36eec8c5d425d13b706705d8e Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Fri, 11 Jan 2019 18:43:01 +0530 Subject: [PATCH 6/6] git --- .../list-pd/add-pd/add-pd.component.html | 11 +++- .../list-pd/add-pd/add-pd.component.ts | 9 ++- .../edit-pd-applicant.component.html | 4 +- .../edit-pd-applicant.component.ts | 33 +++++----- .../edit-pd-master.component.html | 11 +++- .../edit-pd-master.component.ts | 64 +++++++++++++++++-- 6 files changed, 100 insertions(+), 32 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 e8ad986a7..31e65ab1b 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 @@ -58,7 +58,14 @@ --> - git status + + +91 + Enter Valid STD Code Number. + - + + + Enter Valid LandLine Number. + @@ -115,7 +122,7 @@ - {{"₹"}} {{loanAmtInWords}} Only + {{"₹"}} {{loanAmtInWords}} Only Enter valid amount. 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 9650dec5e..31892dc46 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 @@ -83,8 +83,10 @@ 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], - 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]*$')])], + lender_stdcode:[null, Validators.compose([Validators.minLength(3),Validators.maxLength(5),Validators.pattern('^[0-9]*$')])], + lender_landline:[null, Validators.compose([Validators.minLength(6),Validators.maxLength(8),Validators.pattern('^[0-9]*$')])], + applicant_stdcode:[null, Validators.compose([Validators.minLength(3),Validators.maxLength(5),Validators.pattern('^[0-9]*$')])], + applicant_landline:[null, Validators.compose([Validators.minLength(6),Validators.maxLength(8),Validators.pattern('^[0-9]*$')])], company_name: [null],   addressline1: [null], fk_city: [null], @@ -398,6 +400,7 @@ export class AddPdComponent implements OnInit, OnDestroy { "pd_branch_id":formValue.pd_branch_id, "pd_contact_person":formValue.lender_contact_person, "pd_contact_mobileno":formValue.lender_contact_mobile, + "pd_contact_landline":formValue.lender_stdcode +'-'+formValue.lender_landline, "fk_product_id":formValue.fk_product_id, "fk_subproduct_id":formValue.fk_subproduct_id, "fk_pd_type":formValue.fk_pd_type, @@ -418,7 +421,7 @@ export class AddPdComponent implements OnInit, OnDestroy { "applicant_title_name":formValue.applicant_title_name, "company_name":formValue.company_name, "mobile_no":formValue.mobile_no, - "landline":formValue.stdcode +'-'+formValue.landline, + "landline":formValue.applicant_stdcode +'-'+formValue.applicant_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 c3752a9d2..2916be92c 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 @@ -40,7 +40,7 @@ - +91 + Enter Valid STD Code.  -  @@ -81,7 +81,7 @@ --> - +91 + Enter Valid STD 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 ee60614e6..c751b7d7e 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 @@ -45,8 +45,8 @@ export class EditPdApplicantComponent implements OnInit { fk_applicant_primary_id: [null], applicant_name: [null, Validators.compose([Validators.required])], mobile_no: [null, Validators.compose([Validators.minLength(10),Validators.maxLength(12)])], - stdcode: [null, Validators.compose([Validators.minLength(2),Validators.maxLength(4)])], - landline: [null, Validators.compose([Validators.minLength(8),Validators.maxLength(12)])], + stdcode: [null, Validators.compose([Validators.minLength(3),Validators.maxLength(5)])], + landline: [null, Validators.compose([Validators.minLength(6),Validators.maxLength(8)])], company_name: [null], applicant_type: [1], coApplicantItems: this._fb.array([]), @@ -62,7 +62,7 @@ export class EditPdApplicantComponent implements OnInit { 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.minLength(10),Validators.maxLength(12)])], - stdcode: [stdcode, Validators.compose([Validators.minLength(2),Validators.maxLength(4)])], + stdcode: [stdcode, Validators.compose([Validators.minLength(3),Validators.maxLength(5)])], 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])], @@ -97,7 +97,7 @@ export class EditPdApplicantComponent implements OnInit { applicant_title_name: [listData.applicant_title_name, Validators.compose([Validators.required])], 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_stdcode: [stdcode, Validators.compose([Validators.minLength(2),Validators.maxLength(4)])], + coapplicant_stdcode: [stdcode, Validators.compose([Validators.minLength(3),Validators.maxLength(5)])], // landline: [landline, Validators.compose([Validators.minLength(6),Validators.maxLength(8)])], coapplicant_landline: [landline,Validators.compose([Validators.minLength(6),Validators.maxLength(8)])], relationship: [listData.relation], @@ -112,13 +112,12 @@ export class EditPdApplicantComponent implements OnInit { applicant_title_name: [null, Validators.compose([Validators.required])], coapplicantName: [null, Validators.compose([Validators.required])], coapplicant_mobile_no: [null, Validators.compose([Validators.minLength(10),Validators.maxLength(12),Validators.pattern('^[0-9]*$')])], - coapplicant_stdcode: [null, Validators.compose([Validators.minLength(2),Validators.maxLength(4)])], + coapplicant_stdcode: [null, Validators.compose([Validators.minLength(3),Validators.maxLength(5)])], 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], - }); } @@ -185,17 +184,17 @@ export class EditPdApplicantComponent implements OnInit { pd_applicant_details.push(obj1) }); - this._pd.updatePdApplicant(pd_applicant_details).subscribe(result => { - if (result.status == 200) { - this.notifier.notify('success', 'PD Details Updated.'); - this.dialogRef.close(); - } - else { - this.notifier.notify('warning', 'Something Wents Wrong Try Again.!'); - } - }, error => { - this.notifier.notify('warning', 'Something Wents Wrong Try Again.!'); - }); + // this._pd.updatePdApplicant(pd_applicant_details).subscribe(result => { + // if (result.status == 200) { + // this.notifier.notify('success', 'PD Details Updated.'); + // this.dialogRef.close(); + // } + // else { + // this.notifier.notify('warning', 'Something Wents Wrong Try Again.!'); + // } + // }, error => { + // this.notifier.notify('warning', 'Something Wents Wrong Try Again.!'); + // }); } } diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.html index 1a5b61117..d0492e4af 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.html @@ -39,7 +39,16 @@ Enter Valid Mobile Number. - + + + + + Enter Valid STD Code. +  -  + + + Enter Valid Landline Number. + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.ts index a94f9f4ee..f12954806 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.ts @@ -112,12 +112,27 @@ export class EditPdMasterComponent implements OnInit { } loadFormData() { - this._EditPDtriggerForm = this._fb.group({ + let stdcode; + let landline; + if(this.data.records.pd_contact_landline){ + if(this.data.records.pd_contact_landline != null){ + let stdcodesearch = this.data.records.pd_contact_landline.search("-"); + stdcode = this.data.records.pd_contact_landline.substr(0,stdcodesearch); + landline = this.data.records.pd_contact_landline.substr(+stdcodesearch + 1,8); + } + else{ + stdcode = null; + landline = null; + } + } + this._EditPDtriggerForm = this._fb.group({ pd_id: [this.data.records.pd_id], fk_lender_id: [this.data.records.fk_lender_id, Validators.compose([Validators.required])], lender_applicant_id: [this.data.records.lender_applicant_id, Validators.compose([Validators.required])], pd_contact_person: [this.data.records.pd_contact_person, Validators.compose([Validators.required])], pd_contact_mobileno: [this.data.records.pd_contact_mobileno, Validators.compose([Validators.required,Validators.minLength(10),Validators.maxLength(12),Validators.pattern('^[0-9]*$')])], + lender_stdcode: [stdcode, Validators.compose([Validators.minLength(3),Validators.maxLength(5)])], + lender_landline: [landline,Validators.compose([Validators.minLength(6),Validators.maxLength(8)])], fk_product_id: [this.data.records.fk_product_id], fk_subproduct_id: [this.data.records.fk_subproduct_id], fk_pd_type: [this.data.records.fk_pd_type], @@ -235,19 +250,55 @@ export class EditPdMasterComponent implements OnInit { } else{ let my_array = this._EditPDtriggerForm.value; - Object.keys(my_array).forEach((key) => ( my_array[key] == null) && delete my_array[key]); - this._pd.editPdMasterDetails(my_array, updateStatus).subscribe(result => { + + let concat_landline + + if(my_array.lender_stdcode != null && my_array.lender_landline != null){ + if(my_array.lender_stdcode == '' && my_array.lender_landline == ''){ + concat_landline = null; + }else{ + let std = my_array.lender_stdcode == '' ? '' : my_array.lender_stdcode; + let landline = my_array.lender_landerline == '' ? '' : my_array.lender_landerline; + concat_landline = std+'-'+landline; + } + }else if(my_array.lender_stdcode == '' && my_array.lender_landerline == ''){ + concat_landline = null; + }else{ + concat_landline = null; + } + + let lenderMasterArray = { + "pd_id": my_array.pd_id, + "fk_lender_id": my_array.fk_lender_id, + "lender_applicant_id": my_array.lender_applicant_id, + "pd_contact_person": my_array.pd_contact_person, + "pd_contact_mobileno": my_array.pd_contact_mobileno, + "pd_Contant_landline": concat_landline, + "fk_product_id": my_array.fk_product_id, + "fk_subproduct_id": my_array.fk_subproduct_id, + "fk_pd_type": my_array.fk_pd_type, + "fk_customer_segment": my_array.fk_customer_segment, + "loan_amount": my_array.loan_amount, +   "addressline1": my_array.addressline1, + "fk_city": my_array.fk_city, + "fk_state": my_array.fk_state, +   "pincode": my_array.pincode, + "remarks": my_array.remarks, + } + + console.log(lenderMasterArray); + this._pd.editPdMasterDetails(lenderMasterArray, updateStatus).subscribe(result => { if (result.status == 200) { this.notifier.notify('success', 'PD Details Updated.'); this.dialogRef.close(); } else { this.notifier.notify('warning', 'Something Wents Wrong Try Again.!'); - } + }//else }, error => { this.notifier.notify('warning', 'Something Wents Wrong Try Again.!'); - }); - } + });//error closed + }//else closed } /** To Reset Popup Data */ onReset() { @@ -282,7 +333,6 @@ validateAllFormFields(formGroup: any) { } }); } - /** To Convert Amount into Words */ inWords(e,flag:number){ switch(flag){