From f26e1d5c4786db64b42f75759bf16b213d186f18 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Mon, 3 Dec 2018 17:48:55 +0530 Subject: [PATCH] review changes : ps --- .../app/dashboard/dashboard.component.html | 11 +++-- .../app/dashboard/dashboard.component.scss | 13 +++--- .../src/app/dashboard/dashboard.component.ts | 23 ++++++++--- .../assets-info/assets-info.component.html | 33 +++++++++++++-- .../assets-info/assets-info.component.ts | 14 ++++++- .../current-loan/current-loan.component.html | 4 +- .../current-loan/current-loan.component.ts | 28 ++++++------- .../family-details.component.ts | 12 +++--- .../loan-details/loan-details.component.html | 9 ++-- .../loan-details/loan-details.component.ts | 12 +++++- .../other-income/other-income.component.html | 9 ++-- .../other-income/other-income.component.ts | 13 ++++++ .../start-pd/forms/stock/stock.component.html | 20 ++++++++- .../start-pd/forms/stock/stock.component.ts | 41 ++++++++++++++++++- 14 files changed, 187 insertions(+), 55 deletions(-) diff --git a/ng6-seed/src/app/dashboard/dashboard.component.html b/ng6-seed/src/app/dashboard/dashboard.component.html index af25828e4..bf8a36785 100755 --- a/ng6-seed/src/app/dashboard/dashboard.component.html +++ b/ng6-seed/src/app/dashboard/dashboard.component.html @@ -7,8 +7,7 @@
- - +
@@ -46,7 +45,7 @@
-
+
Full - {{total1}}
-
+
Smart - {{total2}}
-
+
Tele - {{total3}}
-
+
  •        Draft
    • diff --git a/ng6-seed/src/app/dashboard/dashboard.component.scss b/ng6-seed/src/app/dashboard/dashboard.component.scss index 28e26b986..b365b992d 100755 --- a/ng6-seed/src/app/dashboard/dashboard.component.scss +++ b/ng6-seed/src/app/dashboard/dashboard.component.scss @@ -2,10 +2,14 @@ $red: #f5515f; $blue: #05abe0; $grey: #343434; $p: 12px; + +::ng-deep .ngx-mat-drp-date-input{text-overflow:ellipsis !important;color:#fff !important;} + mat-card-title{ background-color:#E00201 !important; color:#fff; } + .mat-input-wrapper { background: #fff; } @@ -25,10 +29,10 @@ li border-radius: 50%; } -.ngx-mat-drp-date-input[_ngcontent-c17] { - text-overflow: ellipsis; - color: #fff; -} +// .ngx-mat-drp-date-input[_ngcontent-c17] { +// text-overflow: ellipsis; +// color: #fff; +// } //.lengend-list { // list-style-type: none; @@ -57,7 +61,6 @@ li .donut-inner span{ font-size:1rems; } - mat-card-content{ min-height: 400px; diff --git a/ng6-seed/src/app/dashboard/dashboard.component.ts b/ng6-seed/src/app/dashboard/dashboard.component.ts index c773c9964..d95b2c1e6 100755 --- a/ng6-seed/src/app/dashboard/dashboard.component.ts +++ b/ng6-seed/src/app/dashboard/dashboard.component.ts @@ -48,6 +48,7 @@ export class DashboardComponent { total2: number = 0; total3: number = 0; flag : number = 0; + evt:Range // doughnutChartColors: any[] = [{ // backgroundColor: ['#f44336', '#3f51b5', '#ffeb3b', '#4caf50', '#2196f3','#673ab7'] @@ -134,7 +135,7 @@ export class DashboardComponent { this.options = { presets: this.presets, format: 'mediumDate', - range: {fromDate:FirstDateForPreMonth, toDate: fromMax}, + range: {fromDate: today, toDate: today}, applyLabel: "Submit", calendarOverlayConfig: { shouldCloseOnBackdropClick: false, @@ -150,7 +151,17 @@ export class DashboardComponent { updateRange(range: Range){ this.range = range; - this.onChange(this.range,1); + + if(range.fromDate != range.toDate){ + // console.log('if from Date',range.fromDate); + // console.log('if to date',range.toDate); + this.onChange(this.range,1); + } + else{ + // console.log('else from Date',range.fromDate); + // console.log('else to date',range.toDate); + // console.log('same'); + } } setupPresets() { @@ -507,15 +518,15 @@ doughnutOptions: any = Object.assign({ // } -onChange(e :any,flag: any) { +onChange(e: any,flag: any) { let fromdate; let todate; if(flag == 1){ - - fromdate = new Date(e.fromDate); - todate = new Date(e.toDate); + this.evt = e + fromdate = new Date(this.evt.fromDate); + todate = new Date(this.evt.toDate); } 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 92481ac0c..c6fdcb566 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 @@ -31,6 +31,11 @@
+
+ + + +
@@ -146,14 +151,19 @@
-
+ + + + + +
- +
@@ -170,6 +180,23 @@ + + + + + + + + + Yes + No + NAN + + + + + .00 + @@ -222,7 +249,7 @@
- +
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 c357bb07f..517054410 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 @@ -365,7 +365,8 @@ public m_investmentType = []; loadProperty() { return this._formBuilder.group({ - property_type: ['', Validators.compose([Validators.required])] + property_type: ['', Validators.compose([Validators.required])], + other_property_type: [''] }); } @@ -383,7 +384,11 @@ public m_investmentType = []; otherAssetsDescription() { return this._formBuilder.group({ - any_other_assets: ['', Validators.compose([Validators.required])] + any_other_assets: ['', Validators.compose([Validators.required])], + any_other_asset_value : [''], + any_other_asset_loan : [''], + other_asset_emi_amt : [''] + }); } @@ -400,6 +405,7 @@ public m_investmentType = []; loadInvestDescription() { return this._formBuilder.group({ investments_type: ['', Validators.compose([Validators.required])], + other_investment_type:[''], amount_of_invest: ['', Validators.compose([Validators.required])], bank_name: ['', Validators.compose([Validators.required])] }); @@ -440,6 +446,9 @@ public m_investmentType = []; otherAssetsDescriptionWithData(data) { return this._formBuilder.group({ any_other_assets: [data.any_other_assets, Validators.compose([Validators.required])], + 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] }); } @@ -456,6 +465,7 @@ public m_investmentType = []; loadInvestDescriptionWithData(data) { return this._formBuilder.group({ investments_type: [data.investments_type, Validators.compose([Validators.required])], + other_investment_type : [data.other_investment_type], amount_of_invest: [data.amount_of_invest, Validators.compose([Validators.required])], bank_name: [data.bank_name, Validators.compose([Validators.required])] }); 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 20416eb11..0c4442a89 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 @@ -28,13 +28,13 @@ - {{freq.name}} - + 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 e493001ef..d4cffafc9 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 @@ -37,7 +37,7 @@ export class CurrentLoanComponent implements OnInit { lenderData: any = []; frequencyData: any = []; applicants: any; - placeholderName : any; + placeholderName : any = []; holder: any = 'amount'; IDXval : any; @@ -68,8 +68,9 @@ export class CurrentLoanComponent implements OnInit { return value.records.loan_details[key]; }); if (result.length > 0) { - result.forEach(val => { + result.forEach((val,index) => { control.push(this.createLoanDetail()); + this.selectedfrequency(val.frequency,index); }); this.currentLoanForm.controls['loan_details'].setValue(result); } else { @@ -100,21 +101,16 @@ export class CurrentLoanComponent implements OnInit { } selectedfrequency(e,i){ - // console.log(+e.value); - // console.log(i); - - this.IDXval = i; - - switch(+e.value){ - case 1: this.placeholderName = 'Weekly Installment Amount'; break; - case 2: this.placeholderName = 'Daily Installment Amount'; break; - case 3: this.placeholderName = 'Annual Installment Amount'; break; - case 4: this.placeholderName = 'Hourly Installment Amount'; break; - case 5: this.placeholderName = 'EMI Amount'; break; - case 6: this.placeholderName = 'Quarterly Installment Amount'; break; - case 7: this.placeholderName = 'HalfYearly Installment Amount'; break; - default : this.placeholderName = ''; break; + switch(+e){ + case 1: this.placeholderName[i] = 'Weekly Instalment Amount'; break; + case 2: this.placeholderName[i] = 'Daily Instalment Amount'; break; + case 3: this.placeholderName[i] = 'Annual Instalment Amount'; break; + case 4: this.placeholderName[i] = 'Hourly Instalment Amount'; break; + case 5: this.placeholderName[i] = 'EMI Amount'; break; + case 6: this.placeholderName[i] = 'Quarterly Instalment Amount'; break; + case 7: this.placeholderName[i] = 'Halfyearly Instalment Amount'; break; + default : this.placeholderName[i] = ''; break; } } diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.ts index 932040e87..a4697dd3b 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.ts @@ -51,6 +51,7 @@ export class FamilyDetailsComponent implements OnInit { customerSegData: any = []; // earnMemberArrCount :any ; // nonEarnMemberArrCount :any ; + count : number; constructor(notifier: NotifierService, private fb: FormBuilder, private route: ActivatedRoute, private router: Router, private _pd: PdTrigerService) { @@ -174,15 +175,16 @@ export class FamilyDetailsComponent implements OnInit { } addMembers() { const control = this.familyForm.controls['nonEarningMembers']; + this.count++; // this.nonEarnMemberArrCount = control.length; // console.log(this.earnMemberArrCount); // console.log(this.nonEarnMemberArrCount); - if(control.length == this.familyForm.controls['members'].value) - { + // if(control.length == this.familyForm.controls['members'].value) + // { - }else{ - control.push(this.createNonMembers()); - } + // }else{ + // control.push(this.createNonMembers()); + // } } 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 e67d73036..bbef40e0a 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 @@ -80,15 +80,17 @@ + - +

Mortgage

+ - {{ typeprop.name }} + {{ typeprop.property_name }} - + @@ -149,6 +151,7 @@ --> +

diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.ts index 39a681d7f..77d16fe25 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.ts @@ -35,8 +35,10 @@ export class LoanDetailsComponent implements OnInit { @Input() form_id: number; @Input() applicant_details: any; applicants: any; + productAbbr: any; isOtherPurpose: boolean = false; isSource: boolean = false; + mortageCheck : boolean = true; endUserList: any = []; ownerNames: any = []; m_endUseofLoad = []; @@ -62,6 +64,7 @@ export class LoanDetailsComponent implements OnInit { console.log(this.applicant_details.pdapplicants_detials); console.log(this.applicant_details); this.applicants = this.applicant_details.pdapplicants_detials; + this.productAbbr = this.applicant_details.pdmaster_details.product_abbr; this.initloanDetailsForm(); this.getM_EndUseofLoad(); @@ -73,6 +76,7 @@ export class LoanDetailsComponent implements OnInit { params.pd_id = this.pdid; params.pd_form_id = this.form_id; this._pd.retriveForm(params).subscribe(value => { + // *ngIf="productAbbr === 'HL' || productAbbr === 'LL' || productAbbr === 'LAP' " console.log('value', value); if (value.status == 200) { let result = Object.keys(value.records.end_use_group).map(function(key) { @@ -169,9 +173,13 @@ getM_sourceofamount() { } getM_MortageTypeProperty() { - this._pd.getAllMasterDatas('MORTAGEPROPERTYTYPE').subscribe( + // this._pd.getAllMasterDatas('MORTAGEPROPERTYTYPE').subscribe( + this._pd.getAllMasterDatas('MORTAGEPROPERTIES').subscribe( data => { + console.log('sadfdfads',this.productAbbr); this.m_mortageTypeProperty = data.records.filter(data => data.isactive == 1); + this.m_mortageTypeProperty = data.records.filter(data => data.group == this.productAbbr); + }, error => { // this.notifier.notify('warning', 'No Category Records Found.!'); @@ -203,7 +211,7 @@ getM_sourceofamount() { // ================== public initloanDetailsForm(): void { this.loanDetailsForm = this.fb.group({ - loan_amount: ['', Validators.compose([Validators.required])], + loan_amount: [this.applicant_details.loan_amount, Validators.compose([Validators.required])], end_use: ['', Validators.compose([Validators.required])], end_use_other: [''], is_transfer: ['', Validators.compose([Validators.required])], diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.html index a80002002..e0f533de5 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.html @@ -66,14 +66,17 @@ - Rental Income + + {{src.name}} + + - + 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 4e5c50d57..edce1547b 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 @@ -34,6 +34,7 @@ export class OtherIncomeComponent implements OnInit { public otherIncomeForm: FormGroup; private notifier: NotifierService; frequencyData: any = []; + sourceData : any = []; constructor(notifier: NotifierService, private fb: FormBuilder, private route: ActivatedRoute, private router: Router, @@ -42,6 +43,7 @@ export class OtherIncomeComponent implements OnInit { } ngOnInit() { this.getFrequency(); + this.getSourceOtherIncome(); this.initOtherincomeForm(); let params: any = {}; params.pd_id = this.pdid; @@ -110,6 +112,17 @@ export class OtherIncomeComponent implements OnInit { }) }); } + getSourceOtherIncome() { + let master_name = 'SOURCEOFOTHERINCOME'; + this._pd.getAllMasterDatas(master_name).subscribe(data => { + console.log('data', data); + data.records.forEach(val => { + if (val.isactive == 1) { + this.sourceData.push(val); + } + }) + }); + } addIncomeDetails() { const control = this.otherIncomeForm.controls['income_details']; control.push(this.createDetail()); diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.html index 45285438b..2dfac9422 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.html @@ -1,7 +1,7 @@

Stock Details

- +

Raw Materials

@@ -13,9 +13,26 @@ + + + Yes + No + + +

+ + + {{uom.name}} + + + + + @@ -25,6 +42,7 @@ +