From 1061d03edda114d0038ee41a2c9ddcd41542c8b1 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Fri, 11 Jan 2019 12:30:20 +0530 Subject: [PATCH 1/6] assets changes --- .../assets-info/assets-info.component.html | 154 +++++++----------- .../assets-info/assets-info.component.ts | 146 +++++++---------- 2 files changed, 116 insertions(+), 184 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 ce552f7fd..d7ead5fd9 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 @@ -174,7 +174,7 @@ - + {{data.viewValue | titlecase}} @@ -186,24 +186,6 @@ - - - @@ -238,40 +220,29 @@ - + + Vintage + + + + + + Purchase Year - - Invalid year format - + + +
- + Yes No - - - - {{"₹"}} {{emiAmtInwords[i]}} Only - - - - - - - - - - - - - -
@@ -305,7 +276,7 @@ - +
@@ -474,26 +445,34 @@
- - + + + + + {{val.name}} + + + - + - +
@@ -502,21 +481,11 @@ {{"₹"}} {{OtherAssetValueInwords[s]}} Only - - - + - + {{data.viewValue | titlecase}} - - - - - - - {{"₹"}} {{O_emiAmtInwords[s]}} Only -
@@ -530,63 +499,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..9ed282974 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, @@ -252,7 +252,7 @@ public m_investmentType = []; this.getM_PropertyType(); this.getM_InvestmentType(); this.getM_FreqOfPurchase(); - this.getM_Relation(); + //this.getM_Relation(); //this.getM_InsuranceType(); } @@ -295,16 +295,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 +395,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 +412,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: [''], }); } @@ -523,10 +517,9 @@ public m_investmentType = []; 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 +528,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 : [''], }); } @@ -598,10 +589,9 @@ public m_investmentType = []; 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 +600,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] }); } @@ -657,34 +646,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 +679,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 +688,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 +711,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 +721,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']; @@ -847,13 +823,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)); @@ -947,12 +921,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 +969,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 +987,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 +1022,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 => { From 04f5f882b214a6a5f66719b48a103cf01420815c Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Fri, 11 Jan 2019 12:31:03 +0530 Subject: [PATCH 2/6] merge : kms --- .../src/app/dashboard/dashboard.component.ts | 22 +- .../src/app/dashboard/dashboard.service.ts | 4 +- .../layouts/admin/admin-layout.component.ts | 13 +- .../list-pd/add-pd/add-pd.component.html | 6 +- .../forms/address/address.component.ts | 6 +- .../banking-details.component.html | 21 +- .../banking-details.component.ts | 72 +++++-- .../business-info/business-info.component.ts | 4 +- .../current-loan/current-loan.component.html | 26 ++- .../current-loan/current-loan.component.scss | 19 +- .../current-loan/current-loan.component.ts | 113 ++++++++-- .../financial-info.component.html | 197 +++++++++--------- .../financial-info.component.ts | 4 +- .../general-info/general-info.component.html | 5 +- .../general-info/general-info.component.ts | 4 +- .../other-income/other-income.component.ts | 10 +- .../start-pd/forms/stock/stock.component.ts | 2 +- .../list-pd/view-pd/view-pd.component.html | 2 +- .../product-list/product-list.component.ts | 2 +- .../uom/uom-dialog/uom-dialog.component.ts | 2 +- .../pd-team-list/pd-team-list.component.ts | 2 +- .../pd-team-manage.component.ts | 12 +- .../users/register/register.component.ts | 22 +- .../users/user-list/user-list.component.ts | 4 +- 24 files changed, 362 insertions(+), 212 deletions(-) diff --git a/ng6-seed/src/app/dashboard/dashboard.component.ts b/ng6-seed/src/app/dashboard/dashboard.component.ts index 22489aa1b..4817ce7a2 100755 --- a/ng6-seed/src/app/dashboard/dashboard.component.ts +++ b/ng6-seed/src/app/dashboard/dashboard.component.ts @@ -108,7 +108,7 @@ export class DashboardComponent { ngOnInit(){ - + // console.clear(); this.getDoughnutChartData(); @@ -203,7 +203,7 @@ getDoughnutChartData(){ this._dashboardService.getPDDetailForDoughnut(fromdate,todate,cityarr,lenderarr).subscribe(data => { this.flag = 1; - console.log(' ***** Doughnut Chart Data *****',data); + // console.log(' ***** Doughnut Chart Data *****',data); let DraftIndexvalue = this.doughnutChartLabels.indexOf('Draft'); let TriggedIndexvalue = this.doughnutChartLabels.indexOf('Triggered'); @@ -215,7 +215,7 @@ getDoughnutChartData(){ if(data.records.current_month.length != 0){ //console.log('If Condition monthLY'); - console.log('Monthly Status',data.records.current_month); + // console.log('Monthly Status',data.records.current_month); let MonthlyFullPDArr = data.records.current_month.filter(arr=>arr.PDTYPE == 'FULL' ); let MonthlySmartPDArr = data.records.current_month.filter(arr=>arr.PDTYPE == 'SMART' ); @@ -496,9 +496,9 @@ getDoughnutChartData(){ this.total2 = this.tempDataSmartPD.reduce((a, b) => a + b, 0); this.total3 = this.tempDataTelePD.reduce((a, b) => a + b, 0); - console.log('Final Full Data '+ this.doughnutChartDataForFullPD+'Temp Data'+this.tempDataFullPD+'Full Total '+this.total1); - console.log('Final Smart Data '+ this.doughnutChartDataForSmartPD+' Temp Data '+this.tempDataSmartPD+'Smart Total '+this.total2); - console.log('Final Tele Data '+ this.doughnutChartDataForTelePD+' Temp Data'+this.tempDataTelePD+'Tele Total '+this.total3); + // console.log('Final Full Data '+ this.doughnutChartDataForFullPD+'Temp Data'+this.tempDataFullPD+'Full Total '+this.total1); + // console.log('Final Smart Data '+ this.doughnutChartDataForSmartPD+' Temp Data '+this.tempDataSmartPD+'Smart Total '+this.total2); + // console.log('Final Tele Data '+ this.doughnutChartDataForTelePD+' Temp Data'+this.tempDataTelePD+'Tele Total '+this.total3); }) } @@ -552,7 +552,7 @@ onChange(e: any,flag: any) { this._dashboardService.getPDDetailForDoughnut(fromdate,todate,this.selectedCity,this.selectedLender).subscribe(data => { - console.log(' *****Updated Date Doughnut Chart Data *****',data); + // console.log(' *****Updated Date Doughnut Chart Data *****',data); if(data.records.current_month.length != 0){ this.total1 = 0; @@ -578,7 +578,7 @@ onChange(e: any,flag: any) { if(data.records.current_month.length != 0){ //console.log('If Condition monthLY'); - console.log('Monthly Status',data.records.current_month); + // console.log('Monthly Status',data.records.current_month); let MonthlyFullPDArr = data.records.current_month.filter(arr=>arr.PDTYPE == 'FULL' ); let MonthlySmartPDArr = data.records.current_month.filter(arr=>arr.PDTYPE == 'SMART' ); @@ -866,9 +866,9 @@ onChange(e: any,flag: any) { this.SmartCanvas.chart.update(); this.TeleCanvas.chart.update(); - console.log('Final Full Data '+ this.doughnutChartDataForFullPD+'Temp Data'+this.tempDataFullPD+'Full Total '+this.total1); - console.log('Final Smart Data '+ this.doughnutChartDataForSmartPD+' Temp Data '+this.tempDataSmartPD+'Smart Total '+this.total2); - console.log('Final Tele Data '+ this.doughnutChartDataForTelePD+' Temp Data'+this.tempDataTelePD+'Tele Total '+this.total3); + // console.log('Final Full Data '+ this.doughnutChartDataForFullPD+'Temp Data'+this.tempDataFullPD+'Full Total '+this.total1); + // console.log('Final Smart Data '+ this.doughnutChartDataForSmartPD+' Temp Data '+this.tempDataSmartPD+'Smart Total '+this.total2); + // console.log('Final Tele Data '+ this.doughnutChartDataForTelePD+' Temp Data'+this.tempDataTelePD+'Tele Total '+this.total3); }) diff --git a/ng6-seed/src/app/dashboard/dashboard.service.ts b/ng6-seed/src/app/dashboard/dashboard.service.ts index 282adb26d..3e2258180 100755 --- a/ng6-seed/src/app/dashboard/dashboard.service.ts +++ b/ng6-seed/src/app/dashboard/dashboard.service.ts @@ -53,9 +53,9 @@ export class DashboardService { getPDDetailForDoughnut(fromdate,todate,cityarr,lenderarr): Observable { -console.log(' From : ' + fromdate + ' To : ' + todate + ' Lender Array : ' + lenderarr + ' City Array : ' + cityarr); +// console.log(' From : ' + fromdate + ' To : ' + todate + ' Lender Array : ' + lenderarr + ' City Array : ' + cityarr); - return this._http.post(this.apiUrl+'getDashBoardMaster', { +return this._http.post(this.apiUrl+'getDashBoardMaster', { "fromdate":fromdate != '' && fromdate != null && fromdate != undefined ? fromdate : '', "todate": todate != '' && todate != null && todate != undefined ? todate : '', "cityarr":cityarr,"lenderarr": lenderarr}) diff --git a/ng6-seed/src/app/layouts/admin/admin-layout.component.ts b/ng6-seed/src/app/layouts/admin/admin-layout.component.ts index fbd00a204..32c4dc27b 100755 --- a/ng6-seed/src/app/layouts/admin/admin-layout.component.ts +++ b/ng6-seed/src/app/layouts/admin/admin-layout.component.ts @@ -87,21 +87,22 @@ export class AdminLayoutComponent implements OnInit, OnDestroy { /** 3) Getting PD Details For Alert Message */ this._dashboardService.getAlertDetail().subscribe(data => { - console.log(' *****Layout Alert Message *****'); - console.log('Layout Alert Message Whole Data',data); + // console.log(' *****Layout Alert Message *****'); + // console.log('Layout Alert Message Whole Data',data); this.alertCount = data.records.length; this.alertMsgTriggerType = data.records.filter(trigger=>trigger.pd_status == "TRIGGERED" ); this.alertMsgAllocateType = data.records.filter(allocate=>allocate.pd_status == "ALLOCATED" ); - console.log('Layout Alert Message',this.alertMsgTriggerType); - console.log('Layout Alert Message',this.alertMsgAllocateType); - console.log('Layout Alert Count',this.alertCount); + // console.log('Layout Alert Message',this.alertMsgTriggerType); + // console.log('Layout Alert Message',this.alertMsgAllocateType); + // console.log('Layout Alert Count',this.alertCount); }); } ngOnInit(): void { + // console.clear(); const elemSidebar = document.querySelector('.sidebar-container '); if (window.matchMedia(`(min-width: 960px)`).matches && !this.isMac() && !this.compactSidebar && this.layoutDir != 'rtl') { @@ -185,7 +186,7 @@ export class AdminLayoutComponent implements OnInit, OnDestroy { changeMenuLayout(value) { - console.log(value) + // console.log(value) if(value) { this.menuLayout = 'top-menu'; 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 5408692d6..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 @@ -48,14 +48,14 @@ - + - + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.ts index 393a3dbad..e20af726d 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.ts @@ -97,8 +97,8 @@ export class AddressComponent implements OnInit { } ngOnInit() { - console.clear(); - console.log('this.address',this.pdAddress); + // console.clear(); + // console.log('this.address',this.pdAddress); this.getMasterDetails('PDLOCATIONAPPROACH',1); this.getMasterDetails('COMMENTSONLOCALITY',2); //this.getMasterDetails('CUSTOMERBEHAVIOUR',3);review doc s.no 3.e @@ -113,7 +113,7 @@ export class AddressComponent implements OnInit { params.pd_form_id = '5'; this._pd.retriveForm(params).subscribe(data => { - console.log('data', data); + // console.log('data', data); //const control = this.addressForm.controls['neighbourhood']; const control = this.addressForm.controls['additional_address_units']; //const additionalPremisesControl = this.addressForm.controls['additional_premises']; 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 5a3c580b0..4eb5a0372 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 @@ -90,17 +90,26 @@ -

{{i+1}} , Banking Details +

Banking Details #{{i+1}}

- - {{owner.applicant_name}} - + + + + {{val.name}} + + + - - + + 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 94b6b7488..a0a15ba4d 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 @@ -42,6 +42,9 @@ export class BankingDetailsComponent implements OnInit { limitCaseFlag : any = []; amtInwords : any = []; emiAmtInwords : any = []; + + existCompanyList: any =[]; + mergeCompanyApplicant: any=[]; constructor(notifier: NotifierService, private fb: FormBuilder, private route: ActivatedRoute, private router: Router, @@ -79,6 +82,30 @@ export class BankingDetailsComponent implements OnInit { ngOnInit() { this.step = 0; this.initBankingForm(); + this._pd.getCompaniesListsForBusiness(this.pdid).subscribe(data=>{ + if(data.dataStatus){ + this.existCompanyList = data.records.filter(val =>val.is_active); + } + + let modifyCompanyList : any=[]; + if(this.existCompanyList.length>0){ + modifyCompanyList = this.existCompanyList.map(element => { + 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 => { + return {id:element.pd_co_applicant_id,name:element.applicant_name,group_id:2}; + }); + this.mergeCompanyApplicant.push({groupName:'APPLICANTS',groupValues:modifyApplicantList}) + + } + }) + this.getM_AccountType(); this.getM_BTLenderList(); @@ -89,11 +116,12 @@ export class BankingDetailsComponent implements OnInit { // // console.log(this.pd_cus_segment); // this.pd_cus_segment = this.pd_cus_segment.substring(0,3); // this.applicants = this.pd_all_details.pdapplicants_detials; + let params: any = {}; params.pd_id = this.pdid; params.pd_form_id = '7'; this._pd.retriveForm(params).subscribe(data => { - console.log('data', data); + // console.log('data', data); const control = this.bankingForm.controls['itemRows']; if (data.status == 200) { this.bankingForm.controls.banking_form_remark.setValue(data.records.banking_form_remark); @@ -105,7 +133,7 @@ export class BankingDetailsComponent implements OnInit { } else { result.forEach((datas,index) => { this.amtInwords[index] = this._pd.convertNumberToWords(+datas.limit); - this.selectedBorrower(datas.applicant_name,index); + // this.selectedBorrower(datas.applicant_name,index); this.selectedAccTypeChanges(+datas.account_type,index) // this.emiAmtInwords[index] = this._pd.convertNumberToWords(val.emi); @@ -180,7 +208,7 @@ export class BankingDetailsComponent implements OnInit { } deleteBankdetails(index: number) { - console.log('index value -', index); + // console.log('index value -', index); const control = this.bankingForm.controls['itemRows']; control.removeAt(index); } @@ -196,9 +224,9 @@ export class BankingDetailsComponent implements OnInit { records.banking_form_remark = this.bankingForm.controls.banking_form_remark.value; // records.fk_createdby = '252'; records.banking_details = this.bankingForm.controls['itemRows'].value; - console.log('data', records); + // console.log('data', records); this._pd.saveForm(records).subscribe(data => { - console.log('data', data); + // console.log('data', data); this.notifier.notify('success', 'Saved Successfully.'); }, error => { this.notifier.notify('warning', 'Something Wents Wrong Try Again.!'); @@ -216,14 +244,34 @@ export class BankingDetailsComponent implements OnInit { }); } - selectedBorrower(e,i){ - if(e == 0){ - this.OtherFlag[i] = true; - } - else{ - this.OtherFlag[i] = false; - } + // selectedBorrower(e,i){ + // if(e == 0){ + // this.OtherFlag[i] = true; + // } + // else{ + // this.OtherFlag[i] = 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) + return true; + else return false + } + + + // check others + checkOthers(values){ + if(values!=null) { + return values.id==0 ? true : false; } + else { + return false; + } + + } selectedAccTypeChanges(event: any,i){ 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 c496e8002..ca887a24f 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 @@ -1118,7 +1118,7 @@ export class BusinessInfoComponent implements OnInit { data.records.forEach(val => { if (val.isactive == 1) { this.countryDataList.push(val); - console.log(this.countryDataList); + // console.log(this.countryDataList); } }) }); @@ -1232,7 +1232,7 @@ export class BusinessInfoComponent implements OnInit { submitDetails() { // let family: any = []; - console.log(this.businessForm.value); + // console.log(this.businessForm.value); if (!this.businessForm.valid) { //console.log(' Requried validation error'); 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 6687cb32d..94009c7f8 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 @@ -42,16 +42,17 @@ {{"₹"}} {{amtInwords[i]}} Only - {{freq.name}} - + + {{"₹"}} {{emiAmtInwords[i]}} Only @@ -64,14 +65,21 @@ - + - + + + + + {{val.name}} + + + - + @@ -87,10 +95,12 @@ -->
- + - + + Invalid Balance Tenure. +
--> - + -
- - + + + - - - + + + +
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.ts index 0904b395e..af31668e9 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.ts @@ -90,6 +90,7 @@ export class FinancialInfoComponent implements OnInit { this._pd.retriveForm(params).subscribe(value => { const financial_date = this.financialForm.controls['date_per_financial']; const estimated_val = this.financialForm.controls['estimated_value']; + if (value.status == 200) { let retriveData = value.records; this.isReadOnly = true; @@ -145,6 +146,7 @@ export class FinancialInfoComponent implements OnInit { financial_remarks: [''], staring_financial_year : ['',Validators.compose([Validators.minLength(4),Validators.maxLength(4)])], total_financial_year : [''], + financial_reason: [''], same_as_financial_statements:[''], date_per_financial: this.fb.array([]), estimated_value: this.fb.array([]) @@ -171,7 +173,7 @@ export class FinancialInfoComponent implements OnInit { financial_margin_of_loss: [''], financial_variation: [''], financial_annualsales_variation : [''], - financial_reason: [''], + }); } createValue(date) { 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 1f1139127..7fe38bc59 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 @@ -62,15 +62,16 @@
-
+
- + +
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 fd0dbb93e..207e995c3 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 @@ -312,7 +312,7 @@ export class GeneralInfoComponent implements OnInit { // remove companies removeCompanies(indexValues) { this.count = this.count-1; - console.log('removed Count',this.count); + // console.log('removed Count',this.count); let control: any = this._generalForm.get('companies') as FormArray; control.controls[indexValues].controls.is_active.setValue(false); control.controls[indexValues].controls.company_name.clearValidators(); @@ -444,7 +444,7 @@ export class GeneralInfoComponent implements OnInit { // submit form details submitGeneralForm(formData:any) { if (this._generalForm.invalid) { - console.log('if',this._generalForm.value); + // console.log('if',this._generalForm.value); this.validateAllFormFields(this._generalForm); return; } diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.ts index f9d71fff0..d4ba70d4a 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.ts @@ -84,7 +84,7 @@ public viewerOptions: any = { params.pd_id = this.pdid; params.pd_form_id = this.form_id; this._pd.retriveForm(params).subscribe(value => { - console.log('value', value); + // console.log('value', value); const control = this.otherIncomeForm.controls['income_details']; if (value.status == 200) { @@ -140,7 +140,7 @@ public viewerOptions: any = { getFrequency() { let master_name = 'FREQUENCY'; this._pd.getAllMasterDatas(master_name).subscribe(data => { - console.log('data', data); + // console.log('data', data); data.records.forEach(val => { if (val.isactive == 1) { this.frequencyData.push(val); @@ -151,7 +151,7 @@ public viewerOptions: any = { getSourceOtherIncome() { let master_name = 'SOURCEOFOTHERINCOME'; this._pd.getAllMasterDatas(master_name).subscribe(data => { - console.log('data', data); + // console.log('data', data); data.records.forEach(val => { if (val.isactive == 1) { this.sourceData.push(val); @@ -182,9 +182,9 @@ public viewerOptions: any = { records.income_details = this.otherIncomeForm.controls['income_details'].value; } - console.log('data', records); + // console.log('data', records); this._pd.saveForm(records).subscribe(data => { - console.log('data', data); + // console.log('data', data); this.notifier.notify('success', 'Saved Successfully.'); }, error => { 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/stock/stock.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.ts index cbd3a7e76..f6e7da0a2 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 @@ -142,7 +142,7 @@ export class StockComponent implements OnInit { let arr = record.filter(data => data.type_of_activity_id == 1); if(arr.length > 0) { this._pd.retriveForm({pd_id:this.pdid,pd_form_id:1}).subscribe(value => { - console.log('136',value); + // console.log('136',value); if(value.status == 200){ this.suppliers_raw_materials = value.records.manufacturing_details[0].main_raw_materials; let manufacturing_temparr = []; 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 444ea4dba..61bcfab5e 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 @@ -24,7 +24,7 @@
{{master.pd_allocated_to | titlecase}} {{master.executive_name | titlecase}}/{{master.centralofficer | titlecase}} - {{master.centralofficer | titlecase}}
 + {{master.centralofficer | titlecase}}
{{master.scheduled_on}} diff --git a/ng6-seed/src/app/settings/masters/component/product/product-list/product-list.component.ts b/ng6-seed/src/app/settings/masters/component/product/product-list/product-list.component.ts index fc7819b9e..41ddfeef9 100755 --- a/ng6-seed/src/app/settings/masters/component/product/product-list/product-list.component.ts +++ b/ng6-seed/src/app/settings/masters/component/product/product-list/product-list.component.ts @@ -69,7 +69,7 @@ export class ProductListComponent implements OnInit { //To open dialog for edit the data editProductMaster(arr: any[]) { //alert(arr); - console.log(arr); + // console.log(arr); this.isPopupOpened = true; //const contact = this._ProductService.getAllProductMaster().find(c => c.ID === id); // let contact = this._ProductService.getProd().map(res=>res.filter(data =>data.product_id == id))[0]; diff --git a/ng6-seed/src/app/settings/masters/component/uom/uom-dialog/uom-dialog.component.ts b/ng6-seed/src/app/settings/masters/component/uom/uom-dialog/uom-dialog.component.ts index 63c0090fc..71c061bdc 100755 --- a/ng6-seed/src/app/settings/masters/component/uom/uom-dialog/uom-dialog.component.ts +++ b/ng6-seed/src/app/settings/masters/component/uom/uom-dialog/uom-dialog.component.ts @@ -67,7 +67,7 @@ export class UomDialogComponent implements OnInit { if(isNaN(this.data.uom_id)) { Object.keys(UOMFormValues).forEach((key) => ( UOMFormValues[key] == null) && delete UOMFormValues[key]); - console.log(UOMFormValues); + // console.log(UOMFormValues); this._mastersService.addMasterDetails(UOMFormValues,'UOM').subscribe( dataresult=>{ diff --git a/ng6-seed/src/app/settings/pd-team/pd-team-list/pd-team-list.component.ts b/ng6-seed/src/app/settings/pd-team/pd-team-list/pd-team-list.component.ts index 7cb76a8eb..3626b5f64 100755 --- a/ng6-seed/src/app/settings/pd-team/pd-team-list/pd-team-list.component.ts +++ b/ng6-seed/src/app/settings/pd-team/pd-team-list/pd-team-list.component.ts @@ -59,7 +59,7 @@ export class PdTeamListComponent implements OnInit { /** To edit data */ toEditPdTeam(pdteam_id){ //this.router.navigate(['/setting/pdteam/editpdteam',pdteam_id]); - console.log(btoa(pdteam_id)); + // console.log(btoa(pdteam_id)); this.router.navigate(['/setting/pdteam/editpdteam',btoa(pdteam_id)]); } diff --git a/ng6-seed/src/app/settings/pd-team/pd-team-manage/pd-team-manage.component.ts b/ng6-seed/src/app/settings/pd-team/pd-team-manage/pd-team-manage.component.ts index 03cc9fc5c..ef240da11 100755 --- a/ng6-seed/src/app/settings/pd-team/pd-team-manage/pd-team-manage.component.ts +++ b/ng6-seed/src/app/settings/pd-team/pd-team-manage/pd-team-manage.component.ts @@ -47,7 +47,7 @@ onNoClick(): void { this.viewpage = true; this.pdTeamManageData = this.pdTeamManageData.records; - console.log(this.pdTeamManageData); + // console.log(this.pdTeamManageData); }else { @@ -65,10 +65,10 @@ onNoClick(): void { let [bagName, el, target, source] = args; //console.log(el); - console.log(this.bag1.nativeElement); - console.log(this.bag1.nativeElement === target); + // console.log(this.bag1.nativeElement); + // console.log(this.bag1.nativeElement === target); if(this.bag1.nativeElement){ // needed since dropModel triggers for all bags, not only on the dropped bag - console.log(this.bag1.nativeElement); + // console.log(this.bag1.nativeElement); let transferData:any = { userid: el.dataset.id, @@ -76,7 +76,7 @@ onNoClick(): void { newTeamName: target.dataset.id, oldIndex: el.dataset.index } - console.log(el); + // console.log(el); for(let i = 0; i < that.pdTeamManageData.length; i++){ let users = that.pdTeamManageData[i].USERPROFILE; for(let us of users){ @@ -85,7 +85,7 @@ onNoClick(): void { //console.log(transferData); this.pdTeamNewList.push(transferData); //console.log(that.transferData); - console.log(this.pdTeamNewList); + // console.log(this.pdTeamNewList); this.btnsave = false; break; } diff --git a/ng6-seed/src/app/settings/users/register/register.component.ts b/ng6-seed/src/app/settings/users/register/register.component.ts index 372df5901..d04a52e1c 100755 --- a/ng6-seed/src/app/settings/users/register/register.component.ts +++ b/ng6-seed/src/app/settings/users/register/register.component.ts @@ -101,7 +101,7 @@ export class RegisterComponent implements OnInit { //console.log(this.types); this.regForm.controls['type'].setValue(this.types[0]); this.users.roles().subscribe(res=>{ - console.log(res); + // console.log(res); this.roleload = false; //console.log(roleload); this.role = res; @@ -156,7 +156,7 @@ export class RegisterComponent implements OnInit { var reader = new FileReader(); //if($event.target.files[0] < 0 ){ this.files = $event.target.files[0]; - console.log(this.files); + // console.log(this.files); reader.onload = ($event: ProgressEvent) => { // console.log(($event.target).result); @@ -170,7 +170,7 @@ export class RegisterComponent implements OnInit { register(userData) { - console.log(userData); + // console.log(userData); let data:any; // console.log(this.files); @@ -199,7 +199,7 @@ this.loader = true; if (data.status == 200) { this.AWS.adminUpdateuser(userData, data.record).subscribe(res => { this.loader =false; - console.log(res); + // console.log(res); Swal('User Created'); this.router.navigate(['setting/users/userlist']); }); @@ -227,7 +227,7 @@ this.loader = true; } toggleAllSelection(e,enitiyid) { - console.log(enitiyid); + // console.log(enitiyid); // if(e.value){ // if(e.value.role_name == pdoff && enitiyid.entity_type_id == 1){ @@ -255,8 +255,8 @@ this.loader = true; } getcity(e){ - console.log(e); - console.log(this.Cities); + // console.log(e); + // console.log(this.Cities); this.City = this.Cities.filter(city=>city.fk_state_id == e.value.state_id); @@ -296,7 +296,7 @@ this.loader = true; let role = this.role.filter(role=>role.role_type == this.usersData.fk_entity_type_id && role.role_id == this.usersData.user_role)[0]; this.regForm.controls['role'].setValue(role); - console.log(role); + // console.log(role); this.toggleAllSelection(role,this.types[0]); // this.regForm.controls['role'].setValue(role); @@ -313,7 +313,7 @@ this.loader = true; if (this.State.status == 200) { this.State = this.State.records.filter(ent=>ent.isactive ==1); let states = this.State.filter(state => state.state_id == this.usersData.fk_state)[0]; - console.log(states); + // console.log(states); this.regForm.controls['state'].setValue(states); this.users.City().subscribe(res => { this.Cities = res; @@ -388,7 +388,7 @@ this.loader = true; checktype(e){ - console.log(e); + // console.log(e); this.roleAccess= false; let userRole:any; if(e !== undefined){ @@ -396,7 +396,7 @@ this.loader = true; //console.log(roleload); this.roles = this.role.filter(role=>role.role_type == e.entity_type_id); - console.log(this.roles); + // console.log(this.roles); // let role = this.roles.filter(role=>role.role_id == this.usersData.user_role_id); // console.log(role); // this.regForm.controls['role'].setValue(role); diff --git a/ng6-seed/src/app/settings/users/user-list/user-list.component.ts b/ng6-seed/src/app/settings/users/user-list/user-list.component.ts index 0c423572b..cb163b838 100755 --- a/ng6-seed/src/app/settings/users/user-list/user-list.component.ts +++ b/ng6-seed/src/app/settings/users/user-list/user-list.component.ts @@ -65,11 +65,11 @@ export class UserListComponent implements OnInit { let data:any; this.users.getuserdata().subscribe(res => { this.loader = false; - console.log(res); + // console.log(res); data = res; if (data.status == 200) { this.userdata = data.records; - console.log(data.records.length); + // console.log(data.records.length); this.dataLength = data.records.length; this.dataSource.data = this.userdata; if(data.records.length >= 1){ From 1ad1838366009c24140e180270107b9b2d924883 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Fri, 11 Jan 2019 15:00:01 +0530 Subject: [PATCH 3/6] UI Changes --- .../manage-pd/list-pd/add-pd/add-pd.component.html | 2 +- .../manage-pd/list-pd/view-pd/view-pd.component.html | 2 +- 2 files changed, 2 insertions(+), 2 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/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 7f31639c5154203f8ecc83939eb401403566f100 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Fri, 11 Jan 2019 17:36:17 +0530 Subject: [PATCH 4/6] UI Changes --- .../loan-details/loan-details.component.html | 26 +++++++------------ .../loan-details/loan-details.component.scss | 4 +++ 2 files changed, 14 insertions(+), 16 deletions(-) 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%; From 594c467ebeed9c904a7a3ffb44f1f9e751cb34b4 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Fri, 11 Jan 2019 17:44:55 +0530 Subject: [PATCH 5/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 6/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}}