From fc0126f635c346944beaa6b01c5f2029aa2e6058 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Mon, 7 Jan 2019 15:55:55 +0530 Subject: [PATCH] required removed : ps --- .../assets-info/assets-info.component.html | 27 ++++++++++-- .../assets-info/assets-info.component.ts | 12 +++--- .../banking-details.component.html | 22 +++++----- .../banking-details.component.ts | 25 +++++------ .../business-info-group.component.ts | 2 +- .../business-info.component.html | 2 +- .../business-info/business-info.component.ts | 24 +++++------ .../final-remarks.component.html | 2 +- .../final-remarks/final-remarks.component.ts | 2 +- .../general-info/general-info.component.html | 2 +- .../general-info/general-info.component.ts | 4 +- .../lender-representative.component.ts | 8 ++-- .../loan-details/loan-details.component.html | 28 ++++++------- .../loan-details/loan-details.component.ts | 22 +++++----- .../neighbour-hood.component.html | 2 +- .../neighbour-hood.component.ts | 20 ++++----- .../other-income/other-income.component.html | 8 ++-- .../other-income/other-income.component.ts | 10 ++--- .../rental-info/rental-info.component.html | 2 +- .../rental-info/rental-info.component.ts | 42 +++++++++---------- .../start-pd/forms/stock/stock.component.ts | 10 ++--- 21 files changed, 146 insertions(+), 130 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 35a61dc4e..6df10da6f 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 @@ -13,7 +13,7 @@ - +
@@ -220,7 +220,7 @@ - {{company.company_name | titlecase}} @@ -229,7 +229,16 @@
- + + + + + Purchase Year + + Invalid year format + + +
@@ -290,7 +299,7 @@
- +
@@ -536,6 +545,16 @@
+ + + + Purchase Year + + Invalid year format + + + +
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 d5b07223c..cd9c51767 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 @@ -378,7 +378,7 @@ public m_investmentType = []; name_of_the_owner: [''], other_owner:[''], relation: [''], - //purchase_year: [''], + purchase_year: ['',Validators.compose([Validators.minLength(4),Validators.maxLength(4)])], //purchase_month: [''], emi: [''], emi_paid: [''], @@ -396,7 +396,7 @@ public m_investmentType = []; business_name_of_the_owner: [], //other_owner:[''], //relation:[''], - //purchase_year: [''], + business_purchase_year: ['',Validators.compose([Validators.minLength(4),Validators.maxLength(4)])], //purchase_month: [''], business_emi: [''], business_emi_paid: [''], @@ -639,7 +639,7 @@ public m_investmentType = []; name_of_the_owner: [data.name_of_the_owner], other_owner:[data.other_owner || ''], relation: [data.relation || ''], - // purchase_year: [data.purchase_year], + purchase_year: [data.purchase_year], // purchase_month: [data.purchase_month], emi: [data.emi || 0], emi_paid: [data.emi_paid || ''], @@ -658,7 +658,7 @@ public m_investmentType = []; business_name_of_the_owner: [data.business_name_of_the_owner], // other_owner:[data.other_owner || ''], // relation: [data.relation || ''], - // purchase_year: [data.purchase_year], + business_purchase_year: [data. business_purchase_year], // purchase_month: [data.purchase_month], business_emi: [data.business_emi || 0], business_emi_paid: [data.business_emi_paid || ''], @@ -688,7 +688,7 @@ public m_investmentType = []; name_of_the_owner: val.name_of_the_owner, other_owner:val.other_owner, relation: val.relation, - // purchase_year: val.purchase_year, + purchase_year: val.purchase_year, // purchase_month: val.purchase_month, emi: val.emi, emi_paid: val.emi_paid, @@ -723,7 +723,7 @@ public m_investmentType = []; business_name_of_the_owner: val.business_name_of_the_owner, // other_owner: val.other_owner, // relation : val.relation, - // purchase_year: val.purchase_year, + business_purchase_year: val. business_purchase_year, // purchase_month: val.purchase_month, business_emi: val.business_emi, business_emi_paid: val.business_emi_paid, diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.html index 5f49171f5..40ddb996e 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.html @@ -95,7 +95,7 @@ - + {{owner.applicant_name}} @@ -106,14 +106,14 @@ - + {{ btLen.lender_name }} @@ -124,7 +124,7 @@ - + {{ prop.name }}

- + - +
@@ -294,7 +294,7 @@
Remarks - +
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.ts index 6eba35463..3238505df 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.ts @@ -149,20 +149,20 @@ export class BankingDetailsComponent implements OnInit { createBankarray() { return this.fb.group({ - applicant_name: ['', Validators.compose([Validators.required])], + applicant_name: [''], other_applicant : [''], - bank_name: ['', Validators.compose([Validators.required])], + bank_name: [''], other_bank: [''], - account_type: ['', Validators.compose([Validators.required])], - //salary: ['', Validators.compose([Validators.required])], - salary: this.pd_cus_segment.substring(0,2) == 'SE' ? [''] : ['', Validators.compose([Validators.required])], - limit: ['', Validators.compose([Validators.required])], - //is_main: ['', Validators.compose([Validators.required])], - //is_main: [this.pd_cus_segment == 'SAL' ? '' : '', Validators.compose([Validators.required])], + account_type: [''], + //salary: [''], + salary: this.pd_cus_segment.substring(0,2) == 'SE' ? [''] : [''], + limit: [''], + //is_main: [''], + //is_main: [this.pd_cus_segment == 'SAL' ? '' : ''], //is_main:[''], - is_main: this.pd_cus_segment == 'SAL' ? [''] : ['', Validators.compose([Validators.required])], - vintage_year: ['', Validators.compose([Validators.required])], - vintage_month: ['', Validators.compose([Validators.required])], + is_main: this.pd_cus_segment == 'SAL' ? [''] : [''], + vintage_year: [''], + vintage_month: [''], }); } @@ -190,9 +190,6 @@ export class BankingDetailsComponent implements OnInit { } bankSubmit() { - if (!this.bankingForm.valid) { - return; - } let records: any = {}; records.pdid = this.pdid; records.formid = '7'; diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info-group/business-info-group.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info-group/business-info-group.component.ts index 8e3afd45b..30ecde6c7 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info-group/business-info-group.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info-group/business-info-group.component.ts @@ -16,7 +16,7 @@ import {BusinessInfoComponent} from './../../forms/business-info/business-info.c styleUrls: ['./business-info-group.component.scss'] }) export class BusinessInfoGroupComponent implements OnInit { - pageTitle: string ="Business Informations"; + pageTitle: string ="Business Information"; existCompanyList: any = []; pdid: number; form_id: number; 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 1e2149147..60b6fbffb 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 @@ -1454,7 +1454,7 @@
Remarks - +
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 e3b18498e..fdc457dc4 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 @@ -611,7 +611,7 @@ export class BusinessInfoComponent implements OnInit { esic_regn: ['', Validators.compose([Validators.required])], other_documents: ['', Validators.compose([Validators.required])], documents: this.fb.array([]), - business_remarks: ['', Validators.compose([Validators.required])], + business_remarks: [''], //any_delays: ['', Validators.compose([Validators.required])], persons_with_relationships:this.fb.array([]), select_business_activity_type: this.fb.array([]), @@ -1116,6 +1116,7 @@ export class BusinessInfoComponent implements OnInit { data.records.forEach(val => { if (val.isactive == 1) { this.countryDataList.push(val); + console.log(this.countryDataList); } }) }); @@ -1227,6 +1228,7 @@ export class BusinessInfoComponent implements OnInit { // } submitDetails() { + // let family: any = []; console.log(this.businessForm.value); @@ -1256,9 +1258,8 @@ export class BusinessInfoComponent implements OnInit { //type 1: Checking manufacturing_activity_details if(records.manufacturing_activity_details.length > 0){ - records.manufacturing_activity_details.forEach((val,index) => { - if(records.manufacturing_activity_details.area_of_sale != "Within India"){ + if(val.area_of_sale!= "Within India"){ let ManufacturingArray = Object.keys(val.countries_where_export_done).map(function (key) { return val.countries_where_export_done[key]; }); @@ -1266,7 +1267,7 @@ export class BusinessInfoComponent implements OnInit { if(total > 100 || total < 100){ validationFlag++; } - } + } }); @@ -1275,9 +1276,8 @@ export class BusinessInfoComponent implements OnInit { //type 3 checking wholesale_trading_activity_details if(records.wholesale_trading_activity_details.length > 0){ - records.wholesale_trading_activity_details.forEach((val,index) => { - if(records.wholesale_trading_activity_details.area_of_sale != "Within India"){ + if(val.area_of_sale != "Within India"){ let WholesaleTradingArray = Object.keys(val.countries_where_export_done).map(function (key) { return val.countries_where_export_done[key]; }); @@ -1294,7 +1294,7 @@ export class BusinessInfoComponent implements OnInit { if(records.retail_trading_activity_details.length > 0){ records.retail_trading_activity_details.forEach((val,index) => { - if(records.retail_trading_activity_details.area_of_sale != "Within India"){ + if(val.area_of_sale != "Within India"){ let RetailTradingArray = Object.keys(val.countries_where_export_done).map(function (key) { return val.countries_where_export_done[key]; }); @@ -1312,7 +1312,7 @@ export class BusinessInfoComponent implements OnInit { if(records.service_provider_activity_details.length > 0){ records.service_provider_activity_details.forEach((val,index) => { - if(records.service_provider_activity_details.area_of_sale != "Within India"){ + if(val.area_of_sale != "Within India"){ let ServiceProviderArray = Object.keys(val.countries_where_export_done).map(function (key) { return val.countries_where_export_done[key]; @@ -1400,12 +1400,12 @@ export class BusinessInfoComponent implements OnInit { } filterMaxSaleCities(datasource: any,filterValues:any) { - console.log('Whole State data',datasource); // Whole State data - console.log('Filtered state id',filterValues); // Filtered state id + // console.log('Whole State data',datasource); // Whole State data + // console.log('Filtered state id',filterValues); // Filtered state id if(filterValues){ let getOriginalStateList = datasource.map(dval => dval.state_id); - console.log('Whole State id from Datasources',getOriginalStateList)//Whole State id from Datasources + // console.log('Whole State id from Datasources',getOriginalStateList)//Whole State id from Datasources let setCityFilter = filterValues.map(x => { let findIndex = getOriginalStateList.indexOf(x); @@ -1425,7 +1425,7 @@ export class BusinessInfoComponent implements OnInit { Filter = getFilteredCityValues.map(x => { let findIndex = getOriginalCityList.indexOf(x); findIndex = merged[findIndex]; - console.log('findIndex',findIndex); + // console.log('findIndex',findIndex); //return findIndex.filter(x => x !== undefined); }); diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/final-remarks/final-remarks.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/final-remarks/final-remarks.component.html index ac1751e44..1adb8ff8b 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/final-remarks/final-remarks.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/final-remarks/final-remarks.component.html @@ -20,7 +20,7 @@
Remarks - +
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/final-remarks/final-remarks.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/final-remarks/final-remarks.component.ts index 870138844..236cb9d79 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/final-remarks/final-remarks.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/final-remarks/final-remarks.component.ts @@ -55,7 +55,7 @@ export class FinalRemarksComponent implements OnInit { pdid: [this.pdid], formid: ['20'], final_custormer_remark_type : [], - final_form_remarks: [] + final_form_remarks: ['',Validators.required] }); this.getM_Type(); } 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 e6e6f6e03..22ae6aeb9 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 @@ -274,7 +274,7 @@
Remarks - +
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 59f119594..41408795e 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 @@ -251,7 +251,7 @@ export class GeneralInfoComponent implements OnInit { createCompanies(elementValue:any) { return this._fb.group({ company_order_id: [elementValue.company_order_id], - company_name: [elementValue.company_name,Validators.required], + company_name: [elementValue.company_name], is_active: [elementValue.is_active] }); } @@ -361,7 +361,7 @@ export class GeneralInfoComponent implements OnInit { // create multiple company relation createMultipleCompanyRelation(elementValue: any) { return this._fb.group({ - company_name: [elementValue.company_name,Validators.required], + company_name: [elementValue.company_name], company_relationship: [elementValue.company_relationship], company_other_relationship:[elementValue.company_other_relationship] }); diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/lender-representative/lender-representative.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/lender-representative/lender-representative.component.ts index 8530de8d8..6ff4bfdc8 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/lender-representative/lender-representative.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/lender-representative/lender-representative.component.ts @@ -82,8 +82,8 @@ export class LenderRepresentativeComponent implements OnInit { } public initRepresentative(): void { this.representativeForm = this.fb.group({ - lender_representative_accompany: ['', Validators.compose([Validators.required])], - representative_remarks: ['', Validators.compose([Validators.required])], + lender_representative_accompany: [''], + representative_remarks: [''], lender_representative_details: this.fb.array([]), }); } @@ -99,8 +99,8 @@ export class LenderRepresentativeComponent implements OnInit { } createLRDetail() { return this.fb.group({ - lender_representative_who_accompanies : ['', Validators.compose([Validators.required])], - lender_representative_carry_loan_files: ['', Validators.compose([Validators.required])], + lender_representative_who_accompanies : [''], + lender_representative_carry_loan_files: [''], }); } 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 be93ee4b2..02c4e8e7b 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,13 +20,13 @@
- + {{"₹"}} {{loanAmtInWords}} Only
- + {{ enduse.name }} @@ -142,7 +142,7 @@

Details of Property being Mortgaged

 - + {{ typeprop.property_name }} @@ -169,7 +169,7 @@ + formControlName="owner_name" (selectionChange)="ownerNameChange($event)" > {{owner.applicant_name}} Others (Please Specify) @@ -180,7 +180,7 @@ - + {{ status.name }} @@ -199,12 +199,12 @@ + formControlName="emv_per_customer" (keypress)="keyPress($event)" (keyup)="inWords($event,7)" autocomplete="off"> {{"₹"}} {{emvAmtInWords}} Only @@ -319,7 +319,7 @@ Remarks - +
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.ts index 4aad78fb4..015cce3a0 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.ts @@ -339,11 +339,11 @@ getM_sourceofamount() { public initloanDetailsForm(): void { this.loanDetailsForm = this.fb.group({ - loan_amount: [this.exist_loan_amt, Validators.compose([Validators.required])], - end_use: ['', Validators.compose([Validators.required])], + loan_amount: [this.exist_loan_amt], + end_use: [''], end_use_other: [''], - is_transfer: ['', Validators.compose([Validators.required])], - //is_topup: ['', Validators.compose([Validators.required])], + is_transfer: [''], + //is_topup: [''], is_topup: [''], balance_transfer_amount: [''], topup_amount: [''], @@ -355,16 +355,16 @@ getM_sourceofamount() { other_source:[''], personal_loan_source:[''], //lender_name_type: [''], - emi_level: ['', Validators.compose([Validators.required])], - property_type: ['', Validators.compose([Validators.required])], + emi_level: [''], + property_type: [''], property_type_others:[''], - owner_name: ['', Validators.compose([Validators.required])], + owner_name: [''], other_owners_name :[''], - construction_status: ['', Validators.compose([Validators.required])], + construction_status: [''], //percentage_of_construction : [''], - emv_per_customer: ['', Validators.compose([Validators.required])], - //value_per_agreement: ['', Validators.compose([Validators.required])], - loandetails_remarks: ['', Validators.compose([Validators.required])], + emv_per_customer: [''], + //value_per_agreement: [''], + loandetails_remarks: [''], }); } // endUserChange(event) { diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.html index 528d8679f..07da3fb2a 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.html @@ -142,7 +142,7 @@
Remarks - +
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.ts index 77e17bc98..20d8ddad3 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.ts @@ -137,17 +137,17 @@ export class NeighbourHoodComponent implements OnInit { let stdcode = elementValue.landline.substr(0,stdcodesearch); let landline = elementValue.landline.substr(+stdcodesearch + 1,8); return this._fb.group({ - reference_name: [elementValue.reference_name, Validators.required], - mobile: [elementValue.mobile,Validators.compose([Validators.required,Validators.minLength(10),Validators.maxLength(10)])], + reference_name: [elementValue.reference_name], + mobile: [elementValue.mobile,Validators.compose([Validators.minLength(10),Validators.maxLength(10)])], std_code: [stdcode,Validators.compose([Validators.minLength(2),Validators.maxLength(4)])], landline: [landline,Validators.compose([Validators.minLength(6),Validators.maxLength(8)])], - location:[elementValue.location,Validators.required], - relationship_with:[elementValue.relationship_with,Validators.required], + location:[elementValue.location], + relationship_with:[elementValue.relationship_with], others: [elementValue.others], - year_relation_applicant:[elementValue.year_relation_applicant,Validators.required], - months_relation_applicant:[elementValue.months_relation_applicant,Validators.required], - business_volume_amount:[elementValue.business_volume_amount,Validators.required], - business_volume_unit:[elementValue.business_volume_unit, Validators.required], + year_relation_applicant:[elementValue.year_relation_applicant], + months_relation_applicant:[elementValue.months_relation_applicant], + business_volume_amount:[elementValue.business_volume_amount], + business_volume_unit:[elementValue.business_volume_unit], others_unit : [elementValue.others_unit], reference_final_remarks:[elementValue.reference_final_remarks], specify_final_remark : [elementValue.specify_final_remark], @@ -173,8 +173,8 @@ export class NeighbourHoodComponent implements OnInit { // create neighbourhood form array createNeighbourhood(elementValue:any){ return this._fb.group({ - neighbourhood_name: [elementValue.neighbourhood_name, Validators.required], - do_know: [elementValue.do_know,Validators.required], + neighbourhood_name: [elementValue.neighbourhood_name], + do_know: [elementValue.do_know], how_long_do_know: [elementValue.how_long_do_know], is_applicant_owner: [elementValue.is_applicant_owner], }); diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.html index 71273a104..90b38fce9 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.html @@ -38,7 +38,7 @@ + formControlName="source"> {{src.name}}
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-info/rental-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-info/rental-info.component.ts index 72ba6052e..57dfaafdc 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-info/rental-info.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-info/rental-info.component.ts @@ -108,32 +108,32 @@ export class RentalInfoComponent implements OnInit { pdid: this.pdid, formid: this.form_id, fk_createdby: this.pdid, - person_met: ['', Validators.compose([Validators.required])], - property_own: ['', Validators.compose([Validators.required])], - nature_property: ['', Validators.compose([Validators.required])], + person_met: [''], + property_own: [''], + nature_property: [''], rental_home: this._fb.array([]) }); } createpropertyArray() { this.propertyList = this._fb.group({ - complete_add: ['', Validators.compose([Validators.required])], - area_of_property: ['', Validators.compose([Validators.required])], - structure_property: ['', Validators.compose([Validators.required])], - total_room: ['', Validators.compose([Validators.required])], - is_rent: ['', Validators.compose([Validators.required])], + complete_add: [''], + area_of_property: [''], + structure_property: [''], + total_room: [''], + is_rent: [''], date_agreement: [''], date_validity: [''], rent_agreement: [''], actual_rent: [''], photo_areegment: [''], - bank: ['', Validators.compose([Validators.required])], - cash: ['', Validators.compose([Validators.required])], - rent_each_floor: ['', Validators.compose([Validators.required])], - total_rent: ['', Validators.compose([Validators.required])], - related_doc_owner: ['', Validators.compose([Validators.required])], - property_photographs: ['', Validators.compose([Validators.required])], - third_party_check: ['', Validators.compose([Validators.required])], + bank: [''], + cash: [''], + rent_each_floor: [''], + total_rent: [''], + related_doc_owner: [''], + property_photographs: [''], + third_party_check: [''], details_tenants: this._fb.array([this.createTenatsArray()]), }); return this.propertyList; @@ -141,12 +141,12 @@ export class RentalInfoComponent implements OnInit { createTenatsArray() { return this._fb.group({ - name: ['', Validators.compose([Validators.required])], - mobile_no: ['', Validators.compose([Validators.required])], - tenants_seen: ['', Validators.compose([Validators.required])], - tenants_con_owner: ['', Validators.compose([Validators.required])], - staying_since: ['', Validators.compose([Validators.required])], - rent_paid: ['', Validators.compose([Validators.required])], + name: [''], + mobile_no: [''], + tenants_seen: [''], + tenants_con_owner: [''], + staying_since: [''], + rent_paid: [''], }); } diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.ts index a21ee4ad0..cbd3a7e76 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.ts @@ -349,7 +349,7 @@ export class StockComponent implements OnInit { }) // this.stockForms = this.fb.group({ - // stock_remarks: ['', Validators.compose([Validators.required])], + // stock_remarks: [''], // raw_materials: this.fb.array([]), // finished_goods: this.fb.array([]), // traded_goods: this.fb.array([]) @@ -563,8 +563,8 @@ tradingFormCreation(val) { createGoods2() { return this.fb.group({ - goods_name: ['', Validators.compose([Validators.required])], - goods_observed: ['', Validators.compose([Validators.required])], + goods_name: [''], + goods_observed: [''], goods_quantity: [''], goods_value: [''], finished_goods_value: [''], @@ -601,8 +601,8 @@ tradingFormCreation(val) { createTradedGoods2() { return this.fb.group({ - traded_goods_name: ['', Validators.compose([Validators.required])], - traded_goods_observed: ['', Validators.compose([Validators.required])], + traded_goods_name: [''], + traded_goods_observed: [''], traded_goods_quantity: [''], estimated_traded_goods_value: [''], traded_goods_value: [''],