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 98a62fead..1e1b622f6 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 @@ -131,7 +131,7 @@
- + 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 0356cf288..7bd0368f0 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 @@ -268,7 +268,7 @@ export class AddPdComponent implements OnInit, OnDestroy { get pdAddresses() { return this._PDtriggerForm.get('addresses') as FormArray; } createAddresses(): FormGroup { return this._fb.group({ - addressline: [null], + addressline1: [null], fk_city: [null], fk_state: [null], pincode: [null],/** ,Validators.compose([Validators.minLength(6),Validators.maxLength(6)]) */ @@ -477,7 +477,7 @@ export class AddPdComponent implements OnInit, OnDestroy { "fk_pd_type": formValue.fk_pd_type, "fk_customer_segment": formValue.fk_customer_segment, "loan_amount": formValue.loan_amount, - "addressline1": formValue.addresses[0].addressline.toUpperCase(), + "addressline1": formValue.addresses[0].addressline1.toUpperCase(), "fk_city": formValue.addresses[0].fk_city, "fk_state": formValue.addresses[0].fk_state, "pincode": formValue.addresses[0].pincode, 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 183850d9c..0fb502f71 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 @@ -15,7 +15,7 @@ - Main Applicant + Applicant 1 @@ -51,9 +51,9 @@ - + + Applicant {{i+2}} + 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 267f274f1..9efd602f8 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 @@ -138,13 +138,13 @@
- Address Details #{{i+1}} Deactivited + Address Details #{{i+1}} Deactivited + formControlName="addressline1" style="text-transform: uppercase"> @@ -186,11 +186,16 @@ - + + +   
+
+ + + + + + +
+
+ + + + + + Select + {{ uom.name }} + + + + + +
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 703b67ace..824a70a1b 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 @@ -70,6 +70,8 @@ export class AssetsInfoComponent implements OnInit { public m_freqOfPurchase = []; public m_vehicle_type = []; + + public m_uom_type = []; private notifier: NotifierService; existCompanyList: any =[]; @@ -149,6 +151,7 @@ export class AssetsInfoComponent implements OnInit { //this.getM_Relation(); //this.getM_InsuranceType(); this.getM_Vehicle_Type(); + this.getM_UOM_Type(); } // ====================== @@ -221,6 +224,15 @@ export class AssetsInfoComponent implements OnInit { }) } + getM_UOM_Type() { + this.pdTrigerService.getAllMasterDatas('UOM').subscribe( + data => { + this.m_uom_type = data.records.filter(data => data.isactive == 1 && data. is_land_uom == 1 || data. is_land_uom == 2); + // console.log('this.m_uom_type',data.records,this.m_uom_type); + // + }) + } + // getM_InsuranceType() { // this.pdTrigerService.getAllMasterDatas('INSURANCETYPE').subscribe( // data => { @@ -372,7 +384,12 @@ export class AssetsInfoComponent implements OnInit { loadProperty() { return this._formBuilder.group({ property_type: [''], - other_property_type: [''] + other_property_type: [''], + address_of_the_property :[''], + describe_of_the_property_asset :[''], + area_covered_by_this_property :[''], + uom_of_the_property:[''], + other_uom:[''] }); } @@ -452,7 +469,12 @@ export class AssetsInfoComponent implements OnInit { loadPropertyWithData(data) { return this._formBuilder.group({ property_type: [data.property_type], - other_property_type: [data.other_property_type] + other_property_type: [data.other_property_type], + address_of_the_property :[data.address_of_the_property], + describe_of_the_property_asset :[data.describe_of_the_property_asset], + area_covered_by_this_property :[data.area_covered_by_this_property], + uom_of_the_property:[data.uom_of_the_property], + other_uom : [data.other_uom] //property_type:[''] }); } @@ -626,7 +648,10 @@ export class AssetsInfoComponent implements OnInit { case '2': { let array_data : any; data.forEach((datas,i) => { - array_data = { 'property_type':datas.property_type,'other_property_type':datas.other_property_type }; + array_data = { 'property_type':datas.property_type,'other_property_type':datas.other_property_type, + 'address_of_the_property' :datas.address_of_the_property,'describe_of_the_property_asset' :datas.describe_of_the_property_asset, + 'uom_of_the_property':datas.uom_of_the_property, + 'area_covered_by_this_property' :datas.area_covered_by_this_property,'other_uom':datas.other_uom }; }); const control = (this._assetsQuesFrom.controls['assets_details']).at(val).get('details') as FormArray; control.push(this.loadPropertyWithData(array_data)); @@ -861,6 +886,12 @@ export class AssetsInfoComponent implements OnInit { : item.controls.other_vehicle_type.clearValidators(); item.controls.other_vehicle_type.updateValueAndValidity(); } +if(flag == 6){ + value==1 + ? item.controls.other_uom.setValidators([Validators.required]) + : item.controls.other_uom.clearValidators(); + item.controls.other_uom.updateValueAndValidity(); +} } diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.html index 46415f365..bc077b578 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.html @@ -23,7 +23,7 @@ -

Address Details {{itemrow.get('address_label').value | titlecase}}

+

Address Details {{ " : " + itemrow.get('address_label').value | titlecase}}

 diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.ts index 0b746e9d6..cf23bd025 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.ts @@ -211,7 +211,7 @@ export class BusinessAssetsInfoComponent implements OnInit { let addressType = data.address_type != 1 ? selectedAddressType.address_type : data.address_type_others; this.placeholderName[inx] = 'Was any business activity seen at the ' + addressType + ' during PD visit?'; - let addressLabel = " : " + address + ' / ' + addressType; + let addressLabel = address + ' / ' + addressType; let vals = { address_label:addressLabel, diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.ts index ece128c1e..aa788540f 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.ts @@ -207,25 +207,14 @@ export class ClientInfoComponent implements OnInit { // let api_main_raw_materials = Object.keys(dataForm.main_raw_materials).map(function (key) { // return dataForm.main_raw_materials[key]; // }); - // let api_main_raw_materials = dataForm.manufacturing_details[0].main_raw_materials; - - // this.initManufacturingProductsDetails(api_main_raw_materials); - // this._supplierQuesFrom.controls['manufacturing_details']['controls'][0].controls['main_raw_materials_total_payments_percent_on_credit'].setValue(dataForm.manufacturing_details[0].main_raw_materials_total_payments_percent_on_credit || null); - if(dataForm.manufacturing_details[0] !== null){ - alert('not null manu'); - let api_main_raw_materials = Object.keys(dataForm.manufacturing_details).map(function (key) { - return dataForm.manufacturing_details[key]; - }); - - this.initManufacturingProductsDetails(api_main_raw_materials[0]['main_raw_materials']); - this._supplierQuesFrom.controls['manufacturing_details']['controls'][0].controls['main_raw_materials_total_payments_percent_on_credit'].setValue(api_main_raw_materials[0]['main_raw_materials_total_payments_percent_on_credit'] || null); - + if(dataForm.manufacturing_details){ + let api_main_raw_materials = dataForm.manufacturing_details[0].main_raw_materials; + this.initManufacturingProductsDetails(api_main_raw_materials); + this._supplierQuesFrom.controls['manufacturing_details']['controls'][0].controls['main_raw_materials_total_payments_percent_on_credit'].setValue(dataForm.manufacturing_details[0].main_raw_materials_total_payments_percent_on_credit || null); } else{ - alert('null manu'); this.initManufacturingProductsDetails(null); this._supplierQuesFrom.controls['manufacturing_details']['controls'][0].controls['main_raw_materials_total_payments_percent_on_credit'].setValue(null); - } } @@ -235,26 +224,16 @@ export class ClientInfoComponent implements OnInit { // let api_trading_products = Object.keys(dataForm.trading_products).map(function (key) { // return dataForm.trading_products[key]; // }); - // let api_trading_products = dataForm.trade_details[0].trading_products; - - // this.initTradingProductsDetails(api_trading_products); - // this._supplierQuesFrom.controls['trade_details']['controls'][0].controls['trading_products_total_payments_percent_on_credit'].setValue(dataForm.trade_details[0].trading_products_total_payments_percent_on_credit || null); - if(dataForm.trade_details[0] !== null){ - // alert('not null manu'); - let api_trading_products = Object.keys(dataForm.trade_details).map(function (key) { - return dataForm.trade_details[key]; - }); - - this.initTradingProductsDetails(api_trading_products[0]['trading_products']); - this._supplierQuesFrom.controls['trade_details']['controls'][0].controls['trading_products_total_payments_percent_on_credit'].setValue(dataForm.trade_details[0]['trading_products_total_payments_percent_on_credit'] || null); - + if(dataForm.trade_details){ + let api_trading_products = dataForm.trade_details[0].trading_products; + this.initTradingProductsDetails(api_trading_products); + this._supplierQuesFrom.controls['trade_details']['controls'][0].controls['trading_products_total_payments_percent_on_credit'].setValue(dataForm.trade_details[0].trading_products_total_payments_percent_on_credit || null); } else{ - // alert('null manu'); - this.initTradingProductsDetails(null);- - this._supplierQuesFrom.controls['trade_details']['controls'][0].controls['trading_products_total_payments_percent_on_credit'].setValue(null); - + this.initTradingProductsDetails(null);- + this._supplierQuesFrom.controls['trade_details']['controls'][0].controls['trading_products_total_payments_percent_on_credit'].setValue(null); } + } // Load form details for the service provider prduct details @@ -266,24 +245,14 @@ export class ClientInfoComponent implements OnInit { // let api_service_provider_products = dataForm.service_provider_details[0].service_products; // this.initServiceProviderProductsDetails(api_service_provider_products); // this._supplierQuesFrom.controls['service_provider_details']['controls'][0].controls['service_products_total_payments_percent_on_credit'].setValue(dataForm.service_provider_details[0].service_products_total_payments_percent_on_credit || null); - if(dataForm.service_provider_details[0] !== null){ - // alert('not null manu'); - let api_service_provider_products = Object.keys(dataForm.manufacturing_details).map(function (key) { - return dataForm.manufacturing_details[key]; - }); - - this.initServiceProviderProductsDetails(api_service_provider_products[0]['service_products']); - // this._supplierQuesFrom.controls['service_provider_details']['controls'][0].controls['service_products_total_payments_percent_on_credit'].setValue(dataForm.service_provider_details[0].service_products_total_payments_percent_on_credit || null); - this._supplierQuesFrom.controls['service_provider_details']['controls'][0].controls['service_products_total_payments_percent_on_credit'].setValue(api_service_provider_products[0]['service_products_total_payments_percent_on_credit'] || null); - + if(dataForm.service_provider_details){ + let api_service_provider_products = dataForm.service_provider_details[0].service_products; + this.initServiceProviderProductsDetails(api_service_provider_products); + this._supplierQuesFrom.controls['service_provider_details']['controls'][0].controls['service_products_total_payments_percent_on_credit'].setValue(dataForm.service_provider_details[0].service_products_total_payments_percent_on_credit || null); } else{ - // alert('null manu'); - this.initServiceProviderProductsDetails(null); - // this._supplierQuesFrom.controls['service_provider_details']['controls'][0].controls['service_products_total_payments_percent_on_credit'].setValue(dataForm.service_provider_details[0].service_products_total_payments_percent_on_credit || null); - this._supplierQuesFrom.controls['manufacturing_details']['controls'][0].controls['main_raw_materials_total_payments_percent_on_credit'].setValue(null); - + this._supplierQuesFrom.controls['service_provider_details']['controls'][0].controls['service_products_total_payments_percent_on_credit'].setValue(null); } } // Load form details for the retail trading details diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.ts index 6842b6a5f..f76db5061 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.ts @@ -157,7 +157,7 @@ export class CurrentLoanComponent implements OnInit { //this.selectedLoanTakenBy(val.loan_taken_by,index); let objs = { - 'label': val.loan_amount, + 'label': val.label, 'loan_amount': val.loan_amount, 'frequency':val.frequency, 'other_frequency':val.other_frequency, @@ -234,12 +234,12 @@ export class CurrentLoanComponent implements OnInit { let labelarray : any = []; this.dataFromAssets.forEach((val,index) => { - if(val.mode == 0){ let owner = val.owner_name.map((e => { return e.name.split(',') })); - labelarray[index] = val.mode_name +' - '+owner ; + // labelarray[index] = ' : '+owner +' - '+ val.mode_name.split("/")[0] + ' ( ' + val.mode_name.split("/")[1] + ' )'; + labelarray[index] = ' : '+owner +' - '+ val.mode_name; } if(val.mode == 1){ 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 51f52ce09..1f7f9c71e 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 @@ -42,14 +42,17 @@ {{ list.pdofficer_recommendation }} - - - - + + + + + + + - + @@ -57,7 +60,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 bcd34d4ec..ed805499b 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 @@ -69,9 +69,10 @@ export class FinalRemarksComponent implements OnInit { is_service_provided: ['', Validators.required], pd_officers_recommendation:['', Validators.required], others_pd_officers_recommendation:[''], - enter_reason_for_negative:[''], - enter_reason_for_refer_to_credit:[''], - final_form_remarks: ['',Validators.required] + reason_for_positive:[''], + reason_for_negative:[''], + reason_for_refer_to_credit:[''], + final_form_remarks: [''] }); this.getM_Type(); this.getM_Recommendation(); @@ -106,8 +107,9 @@ export class FinalRemarksComponent implements OnInit { this._finalRemarkForm.controls.final_other_customer_behaviour.setValue(data.records.final_other_customer_behaviour); this._finalRemarkForm.controls.pd_officers_recommendation.setValue(data.records.pd_officers_recommendation); this._finalRemarkForm.controls.others_pd_officers_recommendation.setValue(data.records.others_pd_officers_recommendation); - this._finalRemarkForm.controls.enter_reason_for_negative.setValue(data.records.enter_reason_for_negative); - this._finalRemarkForm.controls.enter_reason_for_refer_to_credit.setValue(data.records.enter_reason_for_refer_to_credit); + this._finalRemarkForm.controls.reason_for_positive.setValue(data.records.reason_for_positive); + this._finalRemarkForm.controls.reason_for_negative.setValue(data.records.reason_for_negative); + this._finalRemarkForm.controls.reason_for_refer_to_credit.setValue(data.records.reason_for_refer_to_credit); this._finalRemarkForm.controls.is_service_provided.setValue(data.records.is_service_provided); this._finalRemarkForm.controls.final_form_remarks.setValue(data.records.final_form_remarks); @@ -215,61 +217,65 @@ export class FinalRemarksComponent implements OnInit { if(e==1){ - this._finalRemarkForm.controls['others_pd_officers_recommendation'].setValidators([Validators.required]); - this._finalRemarkForm.controls['others_pd_officers_recommendation'].updateValueAndValidity(); + this._finalRemarkForm.controls['others_pd_officers_recommendation'].setValidators([Validators.required]); - this._finalRemarkForm.controls['enter_reason_for_negative'].clearValidators(); - this._finalRemarkForm.controls['enter_reason_for_negative'].updateValueAndValidity(); - this._finalRemarkForm.controls['enter_reason_for_negative'].setValue(''); + this._finalRemarkForm.controls['reason_for_refer_to_credit'].clearValidators(); + this._finalRemarkForm.controls['reason_for_refer_to_credit'].setValue(''); + + this._finalRemarkForm.controls['reason_for_positive'].clearValidators(); + this._finalRemarkForm.controls['reason_for_positive'].setValue(''); + + this._finalRemarkForm.controls['reason_for_negative'].clearValidators(); + this._finalRemarkForm.controls['reason_for_negative'].setValue(''); - this._finalRemarkForm.controls['enter_reason_for_refer_to_credit'].clearValidators(); - this._finalRemarkForm.controls['enter_reason_for_refer_to_credit'].updateValueAndValidity(); - this._finalRemarkForm.controls['enter_reason_for_refer_to_credit'].setValue(''); } if(e==2){ - + this._finalRemarkForm.controls['others_pd_officers_recommendation'].clearValidators(); - this._finalRemarkForm.controls['others_pd_officers_recommendation'].updateValueAndValidity(); this._finalRemarkForm.controls['others_pd_officers_recommendation'].setValue(''); - - this._finalRemarkForm.controls['enter_reason_for_negative'].clearValidators(); - this._finalRemarkForm.controls['enter_reason_for_negative'].updateValueAndValidity(); - this._finalRemarkForm.controls['enter_reason_for_negative'].setValue(''); + + this._finalRemarkForm.controls['reason_for_refer_to_credit'].clearValidators(); + this._finalRemarkForm.controls['reason_for_refer_to_credit'].setValue(''); + + this._finalRemarkForm.controls['reason_for_positive'].setValidators([Validators.required]); + + this._finalRemarkForm.controls['reason_for_negative'].clearValidators(); + this._finalRemarkForm.controls['reason_for_negative'].setValue(''); - this._finalRemarkForm.controls['enter_reason_for_refer_to_credit'].clearValidators(); - this._finalRemarkForm.controls['enter_reason_for_refer_to_credit'].updateValueAndValidity(); - this._finalRemarkForm.controls['enter_reason_for_refer_to_credit'].setValue(''); } if(e==3){ - - this._finalRemarkForm.controls['enter_reason_for_negative'].setValidators([Validators.required]); - this._finalRemarkForm.controls['enter_reason_for_negative'].updateValueAndValidity(); this._finalRemarkForm.controls['others_pd_officers_recommendation'].setValue(''); - this._finalRemarkForm.controls['others_pd_officers_recommendation'].clearValidators(); this._finalRemarkForm.controls['others_pd_officers_recommendation'].updateValueAndValidity(); - this._finalRemarkForm.controls['enter_reason_for_refer_to_credit'].setValue(''); - this._finalRemarkForm.controls['enter_reason_for_refer_to_credit'].clearValidators(); - this._finalRemarkForm.controls['enter_reason_for_refer_to_credit'].updateValueAndValidity(); + this._finalRemarkForm.controls['reason_for_refer_to_credit'].setValue(''); + this._finalRemarkForm.controls['reason_for_refer_to_credit'].clearValidators(); + this._finalRemarkForm.controls['reason_for_positive'].clearValidators(); + this._finalRemarkForm.controls['reason_for_positive'].setValue(''); + + this._finalRemarkForm.controls['reason_for_negative'].setValidators([Validators.required]); + } if(e==4){ - this._finalRemarkForm.controls['enter_reason_for_refer_to_credit'].setValidators([Validators.required]); - this._finalRemarkForm.controls['enter_reason_for_refer_to_credit'].updateValueAndValidity(); - this._finalRemarkForm.controls['others_pd_officers_recommendation'].setValue(''); this._finalRemarkForm.controls['others_pd_officers_recommendation'].clearValidators(); - this._finalRemarkForm.controls['others_pd_officers_recommendation'].updateValueAndValidity(); - this._finalRemarkForm.controls['enter_reason_for_negative'].setValue(''); - this._finalRemarkForm.controls['enter_reason_for_negative'].clearValidators(); - this._finalRemarkForm.controls['enter_reason_for_negative'].updateValueAndValidity(); + this._finalRemarkForm.controls['reason_for_refer_to_credit'].setValidators([Validators.required]); + + this._finalRemarkForm.controls['reason_for_positive'].clearValidators(); + this._finalRemarkForm.controls['reason_for_positive'].setValue(''); + + this._finalRemarkForm.controls['reason_for_negative'].setValue(''); + this._finalRemarkForm.controls['reason_for_negative'].clearValidators(); + } + this._finalRemarkForm.controls['others_pd_officers_recommendation'].updateValueAndValidity(); + this._finalRemarkForm.controls['reason_for_refer_to_credit'].updateValueAndValidity(); + this._finalRemarkForm.controls['reason_for_positive'].updateValueAndValidity(); + this._finalRemarkForm.controls['reason_for_negative'].updateValueAndValidity(); } - - } diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.html index 066c7a06d..080e1b084 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.html @@ -64,7 +64,7 @@ @@ -137,12 +137,11 @@
- - + No difference in Profit in FY {{details.get('financial_year').value}} over @@ -170,13 +169,13 @@ + - - + No difference in Profit sales % in FY {{details.get('financial_year').value}} over 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 6baca4b47..cba606396 100755 --- 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 @@ -164,12 +164,12 @@ - + Relationship Between Individuals - Name @@ -377,7 +377,7 @@
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 43ef3ef61..b838ebc35 100755 --- 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 @@ -34,6 +34,8 @@ export class GeneralInfoComponent implements OnInit { count: number = 1; errorMessage: any; maxDate: any; + + disableAfterSubmit : boolean; public pd_applicants_details: any; public _generalForm: FormGroup; @@ -70,6 +72,7 @@ export class GeneralInfoComponent implements OnInit { this.lender_applicant_id = this.pd_all_details.pdmaster_details.lender_applicant_id; this.subproduct_abbr = this.pd_all_details.pdmaster_details.subproduct_abbr; this.customer_segment_abbr = this.pd_all_details.pdmaster_details.customer_segment_abbr; + this.disableAfterSubmit = false; } /********************** Constructor Section Ends Here ****************/ @@ -587,7 +590,7 @@ export class GeneralInfoComponent implements OnInit { // submit form details submitGeneralForm(formData: any) { if (this._generalForm.invalid) { - + this.disableAfterSubmit = false; this.validateAllFormFields(this._generalForm); this.notifier.notify('warning', 'Please Fill All Mandatory Fields.!'); return; @@ -597,6 +600,7 @@ export class GeneralInfoComponent implements OnInit { // this.notifier.notify('warning', 'Please Choose Name of Person Met.!'); // } else { + this.disableAfterSubmit = true; let saveRecords: any = {} saveRecords.pdid = formData.pdid; saveRecords.formid = formData.formid; @@ -613,8 +617,8 @@ export class GeneralInfoComponent implements OnInit { this.notifier.notify('success', 'Saved Successfully.'); setTimeout(() => { this.dialogRef.close(); + this.disableAfterSubmit = false; }, 3000); - } else { this.notifier.notify('warning', 'Something Wents Wrong Try Again.!'); diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.ts index b28db9ad2..abf5bb447 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.ts @@ -65,9 +65,9 @@ export class SupplierInfoComponent implements OnInit { this.notifier = notifier; this.pageTitle = this.pd_all_details.company_name + ' - ' +this.pageTitle ; this.main_applicant = this.pd_all_details.pdmaster_details.main_applicant; - this.lender_applicant_id = this.pd_all_details.pdmaster_details.lender_applicant_id; - this.subproduct_abbr = this.pd_all_details.pdmaster_details.subproduct_abbr; - this.customer_segment_abbr = this.pd_all_details.pdmaster_details.customer_segment_abbr; + this.lender_applicant_id = this.pd_all_details.pdmaster_details.lender_applicant_id; + this.subproduct_abbr = this.pd_all_details.pdmaster_details.subproduct_abbr; + this.customer_segment_abbr = this.pd_all_details.pdmaster_details.customer_segment_abbr; } public viewerOptions: any = { @@ -183,53 +183,33 @@ export class SupplierInfoComponent implements OnInit { // let api_main_raw_materials = Object.keys(dataForm.main_raw_materials).map(function (key) { // return dataForm.main_raw_materials[key]; // }); - // let api_main_raw_materials = dataForm.manufacturing_details[0].main_raw_materials; - - // this.initManufacturingProductsDetails(api_main_raw_materials); - // this._supplierQuesFrom.controls['manufacturing_details']['controls'][0].controls['main_raw_materials_total_payments_percent_on_credit'].setValue(dataForm.manufacturing_details[0].main_raw_materials_total_payments_percent_on_credit || null); if(dataForm.manufacturing_details[0] !== null){ - // alert('not null manu'); - let api_main_raw_materials = Object.keys(dataForm.manufacturing_details).map(function (key) { - return dataForm.manufacturing_details[key]; - }); - - this.initManufacturingProductsDetails(api_main_raw_materials[0]['main_raw_materials']); - this._supplierQuesFrom.controls['manufacturing_details']['controls'][0].controls['main_raw_materials_total_payments_percent_on_credit'].setValue(api_main_raw_materials[0]['main_raw_materials_total_payments_percent_on_credit'] || null); - + let api_main_raw_materials = dataForm.manufacturing_details[0].main_raw_materials; + + this.initManufacturingProductsDetails(api_main_raw_materials); + this._supplierQuesFrom.controls['manufacturing_details']['controls'][0].controls['main_raw_materials_total_payments_percent_on_credit'].setValue(dataForm.manufacturing_details[0].main_raw_materials_total_payments_percent_on_credit || null); } else{ - // alert('null manu'); this.initManufacturingProductsDetails(null); - this._supplierQuesFrom.controls['manufacturing_details']['controls'][0].controls['main_raw_materials_total_payments_percent_on_credit'].setValue(null); - + this._supplierQuesFrom.controls['manufacturing_details']['controls'][0].controls['main_raw_materials_total_payments_percent_on_credit'].setValue(null); } + } let arr1 = record.filter(data => data.type_of_activity_id == 3 || data.type_of_activity_id ==4); + if(arr1.length > 0) { - console.log('saas'); + if(dataForm.trade_details[0] !== null){ // let api_trading_products = Object.keys(dataForm.trading_products).map(function (key) { // return dataForm.trading_products[key]; // }); - // let api_trading_products = dataForm.trade_details[0].trading_products; - // this.initTradingProductsDetails(api_trading_products); - // this._supplierQuesFrom.controls['trade_details']['controls'][0].controls['trading_products_total_payments_percent_on_credit'].setValue(dataForm.trade_details[0].trading_products_total_payments_percent_on_credit || null); - if(dataForm.trade_details[0] !== null){ - alert('not null trade'); - let api_trading_products = Object.keys(dataForm.trade_details).map(function (key) { - return dataForm.trade_details[key]; - }); - console.log(api_trading_products[0]['trading_products']); - this.initTradingProductsDetails(api_trading_products[0]['trading_products']); - // this.initTradingProductsDetails(api_trading_products['trading_products']); - this._supplierQuesFrom.controls['trade_details']['controls'][0].controls['trading_products_total_payments_percent_on_credit'].setValue(api_trading_products[0]['trading_products_total_payments_percent_on_credit'] || null); - } - else{ - alert('null trade'); + let api_trading_products = dataForm.trade_details[0].trading_products; + this.initTradingProductsDetails(api_trading_products); + this._supplierQuesFrom.controls['trade_details']['controls'][0].controls['trading_products_total_payments_percent_on_credit'].setValue(dataForm.trade_details[0].trading_products_total_payments_percent_on_credit || null); + } + else{ this.initTradingProductsDetails(null); - this._supplierQuesFrom.controls['trade_details']['controls'][0].controls['trading_products_total_payments_percent_on_credit'].setValue(null); - - } - } + this._supplierQuesFrom.controls['trade_details']['controls'][0].controls['trading_products_total_payments_percent_on_credit'].setValue(null); + } } this.noRecordsFound = true; } else { @@ -247,7 +227,7 @@ export class SupplierInfoComponent implements OnInit { this.initManufacturingProductsDetails(null); this._supplierQuesFrom.controls['manufacturing_details']['controls'][0].controls['main_raw_materials_total_payments_percent_on_credit'].setValue(null); } - let arr1 = record.filter(data => data.type_of_activity_id == 3 || data.type_of_activity_id == 4); + let arr1 = record.filter(data => data.type_of_activity_id == 3 || 4); if(arr1.length > 0) { this.initTradingProductsDetails(null); this._supplierQuesFrom.controls['trade_details']['controls'][0].controls['trading_products_total_payments_percent_on_credit'].setValue(dataForm.trading_products_total_payments_percent_on_credit || null); 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 570a1eac6..182b5f0d0 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 @@ -112,7 +112,8 @@
- {{addresses.addressline}},
{{addresses.city_name}},
{{addresses.state_name}}-{{addresses.pincode == 1 ? addresses.other_pincode : addresses.pincode_display }} + + {{addresses.addressline1}},
{{addresses.city_name}},
{{addresses.state_name}}-{{addresses.pincode_id == 1 ? addresses.other_pincode : addresses.pincode }}
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 a98bac63c..4de326f2e 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 @@ -182,11 +182,11 @@ export class ViewPdComponent implements OnInit, OnDestroy { // }) // } - Maponclick(master: any) { - let url = "https://www.google.com/maps/place/" - let concat_url = url + master.addressline1 + '/' + master.city_name + ',' + master.pincode + ',' + master.state_name; - window.open(concat_url, '_blank'); - } + // Maponclick(master: any) { + // let url = "https://www.google.com/maps/place/" + // let concat_url = url + master.addressline1 + '/' + master.city_name + ',' + master.pincode + ',' + master.state_name; + // window.open(concat_url, '_blank'); + // } editPdMaster(masterData: any, flag) { let record = {