diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-report/pd-report.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-report/pd-report.component.html index 366f2a5f3..174555bf2 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-report/pd-report.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-report/pd-report.component.html @@ -9,31 +9,35 @@
- {{pdReportRecords.billing_name}} + {{pdReportRecords?.billing_name}}
- {{pdReportRecords.product_name}} + {{pdReportRecords?.product_name}}
- {{pdReportRecords.customer_segment_name}} + {{pdReportRecords?.customer_segment_name}}
- {{pdReportRecords.pd_type_name}} + {{pdReportRecords?.pd_type_name}}
- {{pdReportRecords.pd_status}} + {{pdReportRecords?.pd_status}}
- {{applicants.applicant_name}} , + + {{applicants.applicant_name}} ,
-

{{data.Name}}

-
-
{{dataQA.question}}
-
{{dataQA.answer}}
-
+ +
+

{{data.name}}

+
+
{{dataQA.question}}
+
{{dataQA.answer}}
+
+
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-report/pd-report.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-report/pd-report.component.ts index 94f65d910..2793bbc28 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-report/pd-report.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-report/pd-report.component.ts @@ -33,223 +33,7 @@ export class PdReportComponent implements OnInit { if (data.status == 200) { // this.pdReportRecords = data.records.question_answers; - let Records = { - "dataStatus": true, - "status": 200, - "records": { - "pd_id": "1", - "fk_lender_id": "7", - "lender_full_name": "check", - "lender_short_name": "check", - "fk_entity_billing_id": "1", - "billing_name": "ICICI- CHENNAI", - "lender_applicant_id": "Le123", - "pd_date_of_initiation": "06\/10\/2018", - "fk_product_id": "8", - "product_name": "Land Loan", - "product_abbr": "LL", - "fk_subproduct_id": "1", - "subproduct_name": "Purchase (Resale) Loan. ", - "subproduct_abbr": "HL PUR-RESALE", - "fk_pd_type": "1", - "pd_type_name": "Full PD ", - "pd_status": "COMPLETED", - "pd_status_name": null, - "pd_specific_clarification": null, - "createdon": "06\/10\/2018 05:43:58", - "fk_createdby": "1", - "updatedon": "16\/11\/2018 11:11:00", - "fk_updatedby": "1", - "createdby": "Krishna kumar", - "updatedby": "Krishna kumar", - "fk_pd_allocation_type": "1", - "pd_allocation_type_name": "AUTO", - "fk_pd_allocated_to": "128", - "pd_allocated_to": "VinothKumar S", - "executive_id": null, - "executive_name": null, - "central_pd_officer_id": null, - "centralofficer": null, - "fk_pd_template_id": "11", - "template_name": "TMB", - "fk_customer_segment": "2", - "customer_segment_name": "Salary Cheque", - "customer_segment_abbr": "SAL-CHQ", - "pd_officier_final_judgement": null, - "pd_agency_id": null, - "agency_name": null, - "loan_amount": "60000", - "addressline1": "MGR Street,Vengaivasal Main Road", - "addressline2": "Santhoshpuram", - "addressline3": "chennai", - "fk_city": "2", - "city_name": "Chennai", - "fk_state": "2", - "state_name": "Tamil Nadu", - "pincode": "600100", - "pd_contact_person": "Ram", - "pd_contact_mobileno": "32131233", - "scheduled_on": "31\/12\/2018 12:59 PM", - "completed_on": null, - "remarks": null, - "pd_applicant_details": [ - { - "pd_co_applicant_id": "1", - "fk_pd_id": "1", - "applicant_name": "Karthi Raj", - "applicant_type": "1", - "mobile_no": "4234234155", - "email": "sivak@gmail.com", - "addressline1": null, - "addressline2": null, - "addressline3": null, - "fk_city": null, - "fk_state": null, - "pincode": null, - "relation": "brother", - "relation_name": null, - "landline": null - }, - { - "pd_co_applicant_id": "2", - "fk_pd_id": "1", - "applicant_name": "ramesh", - "applicant_type": "0", - "mobile_no": "3123123213", - "email": "", - "addressline1": null, - "addressline2": null, - "addressline3": null, - "fk_city": null, - "fk_state": null, - "pincode": null, - "relation": "brother", - "relation_name": null, - "landline": null - } - ], - "question_answers": { - "form_details": [ - { - "Name": "Supplied Details", - "Details": [ - { - "question": "What are the main raw materials?(MEG Only)", - "answer": "check checkcheck" - }, - { - "question": "Supplier Name", - "answer": "Resico" - }, - { - "question": "Contact Person Name", - "answer": "Karthick" - }, - { - "question": "Contact Mobile Number", - "answer": "9874115221" - }, - { - "question": "Payment Mode", - "answer": "Immediate Or Advanced Payment" - }, - { - "question": "% of immediate \/ Advance Payment Purchase to Total Purchase?", - "answer": "212" - }, - { - "question": "Credit Period", - "answer": "" - }, - { - "question": "Frequency of Purchase", - "answer": "Monthly" - }, - { - "question": "Others Details", - "answer": "" - } - ]}, - { - "Name": "Client Details", - "Details": [ - { - "question": "Client Name", - "answer": "Venba" - }, - { - "question": "Contact Person Name", - "answer": "test" - }, - { - "question": "Contact Mobile Number", - "answer": "9685471122" - }, - { - "question": "Payment Mode", - "answer": "Combination of Both" - }, - { - "question": "% of immediate \/ Advance Payment Purchase to Total Purchase?", - "answer": "12" - }, - { - "question": "Credit Period", - "answer": "10" - }, - { - "question": "Frequency of Purchase", - "answer": "Weekly" - }, - { - "question": "Others Details", - "answer": "" - } - ]}, - { "Name": "Personal Details", - "Details": [ - { - "question": "Name", - "answer": "Karthi Raj" - }, - { - "question": "Age", - "answer": "50" - }, - { - "question": "Entity", - "answer": "Individual" - }, - { - "question": "Name", - "answer": "ramesh" - }, - { - "question": "Age", - "answer": "45" - }, - { - "question": "Entity", - "answer": "Individual" - }, - { - "question": "Relationship With Main Applicant", - "answer": "Brother" - }, - { - "question": "Remarks", - "answer": "good" - } - ]} - ], - "general_questions": [ - ] - } - } - } - - this.pdReportRecords = Records.records; - + this.pdReportRecords = data.records; // this.pdReportRecords = data.records.qu; } }, err=> { @@ -264,3 +48,219 @@ export class PdReportComponent implements OnInit { } } + + + // let Records = { + // "dataStatus": true, + // "status": 200, + // "records": { + // "pd_id": "1", + // "fk_lender_id": "7", + // "lender_full_name": "check", + // "lender_short_name": "check", + // "fk_entity_billing_id": "1", + // "billing_name": "ICICI- CHENNAI", + // "lender_applicant_id": "Le123", + // "pd_date_of_initiation": "06\/10\/2018", + // "fk_product_id": "8", + // "product_name": "Land Loan", + // "product_abbr": "LL", + // "fk_subproduct_id": "1", + // "subproduct_name": "Purchase (Resale) Loan. ", + // "subproduct_abbr": "HL PUR-RESALE", + // "fk_pd_type": "1", + // "pd_type_name": "Full PD ", + // "pd_status": "COMPLETED", + // "pd_status_name": null, + // "pd_specific_clarification": null, + // "createdon": "06\/10\/2018 05:43:58", + // "fk_createdby": "1", + // "updatedon": "16\/11\/2018 11:11:00", + // "fk_updatedby": "1", + // "createdby": "Krishna kumar", + // "updatedby": "Krishna kumar", + // "fk_pd_allocation_type": "1", + // "pd_allocation_type_name": "AUTO", + // "fk_pd_allocated_to": "128", + // "pd_allocated_to": "VinothKumar S", + // "executive_id": null, + // "executive_name": null, + // "central_pd_officer_id": null, + // "centralofficer": null, + // "fk_pd_template_id": "11", + // "template_name": "TMB", + // "fk_customer_segment": "2", + // "customer_segment_name": "Salary Cheque", + // "customer_segment_abbr": "SAL-CHQ", + // "pd_officier_final_judgement": null, + // "pd_agency_id": null, + // "agency_name": null, + // "loan_amount": "60000", + // "addressline1": "MGR Street,Vengaivasal Main Road", + // "addressline2": "Santhoshpuram", + // "addressline3": "chennai", + // "fk_city": "2", + // "city_name": "Chennai", + // "fk_state": "2", + // "state_name": "Tamil Nadu", + // "pincode": "600100", + // "pd_contact_person": "Ram", + // "pd_contact_mobileno": "32131233", + // "scheduled_on": "31\/12\/2018 12:59 PM", + // "completed_on": null, + // "remarks": null, + // "pd_applicant_details": [ + // { + // "pd_co_applicant_id": "1", + // "fk_pd_id": "1", + // "applicant_name": "Karthi Raj", + // "applicant_type": "1", + // "mobile_no": "4234234155", + // "email": "sivak@gmail.com", + // "addressline1": null, + // "addressline2": null, + // "addressline3": null, + // "fk_city": null, + // "fk_state": null, + // "pincode": null, + // "relation": "brother", + // "relation_name": null, + // "landline": null + // }, + // { + // "pd_co_applicant_id": "2", + // "fk_pd_id": "1", + // "applicant_name": "ramesh", + // "applicant_type": "0", + // "mobile_no": "3123123213", + // "email": "", + // "addressline1": null, + // "addressline2": null, + // "addressline3": null, + // "fk_city": null, + // "fk_state": null, + // "pincode": null, + // "relation": "brother", + // "relation_name": null, + // "landline": null + // } + // ], + // "question_answers": { + // "form_details": [ + // { + // "Name": "Supplied Details", + // "Details": [ + // { + // "question": "What are the main raw materials?(MEG Only)", + // "answer": "check checkcheck" + // }, + // { + // "question": "Supplier Name", + // "answer": "Resico" + // }, + // { + // "question": "Contact Person Name", + // "answer": "Karthick" + // }, + // { + // "question": "Contact Mobile Number", + // "answer": "9874115221" + // }, + // { + // "question": "Payment Mode", + // "answer": "Immediate Or Advanced Payment" + // }, + // { + // "question": "% of immediate \/ Advance Payment Purchase to Total Purchase?", + // "answer": "212" + // }, + // { + // "question": "Credit Period", + // "answer": "" + // }, + // { + // "question": "Frequency of Purchase", + // "answer": "Monthly" + // }, + // { + // "question": "Others Details", + // "answer": "" + // } + // ]}, + // { + // "Name": "Client Details", + // "Details": [ + // { + // "question": "Client Name", + // "answer": "Venba" + // }, + // { + // "question": "Contact Person Name", + // "answer": "test" + // }, + // { + // "question": "Contact Mobile Number", + // "answer": "9685471122" + // }, + // { + // "question": "Payment Mode", + // "answer": "Combination of Both" + // }, + // { + // "question": "% of immediate \/ Advance Payment Purchase to Total Purchase?", + // "answer": "12" + // }, + // { + // "question": "Credit Period", + // "answer": "10" + // }, + // { + // "question": "Frequency of Purchase", + // "answer": "Weekly" + // }, + // { + // "question": "Others Details", + // "answer": "" + // } + // ]}, + // { "Name": "Personal Details", + // "Details": [ + // { + // "question": "Name", + // "answer": "Karthi Raj" + // }, + // { + // "question": "Age", + // "answer": "50" + // }, + // { + // "question": "Entity", + // "answer": "Individual" + // }, + // { + // "question": "Name", + // "answer": "ramesh" + // }, + // { + // "question": "Age", + // "answer": "45" + // }, + // { + // "question": "Entity", + // "answer": "Individual" + // }, + // { + // "question": "Relationship With Main Applicant", + // "answer": "Brother" + // }, + // { + // "question": "Remarks", + // "answer": "good" + // } + // ]} + // ], + // "general_questions": [ + // ] + // } + // } + // } diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/assessed-income.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/assessed-income.component.html new file mode 100644 index 000000000..e94b46460 --- /dev/null +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/assessed-income.component.html @@ -0,0 +1,309 @@ +
+ + + + + + + + + + + + + + + Sales Calculate Item Wise + + + {{salesCaluatedItem.length}}  Items + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Item{{salesItem.sales_item}} Qty/UOM{{salesItem.sales_qty }}/{{salesItem.uom_name }} Rate/Unit {{salesItem.rate_per_unit }} Frequency {{salesItem.frequency_name}} Annual Sale Value {{salesItem.annual_sale_value}}
+
+ + + + + + Sales Calculate Month Wise + + + {{salesMonthWiseExpandedItems.length}}  Items + + + + + + + {{expandDetails.salesItem}} + +
+ {{footer.month_message}}   {{footer.year_message}} +
+ + + + + + +
+ +

{{eachItem.header}}

+ + + + + + + + + + + + + + + + +
Date{{itemValue.sales_date | date: 'dd-MM-yyyy'}} Total Amount{{itemValue.sales_value}} {{getTotalCost(eachItem.value)}}
+
+ + + + + + + + + + + + Purchase Details + + + {{purchaseDetails.length}}  Items + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Item{{purchaseItem.purchase_item}} Qty/UOM{{purchaseItem.purchase_qty }}/{{purchaseItem.uom_name }} Rate/Unit {{purchaseItem.rate_per_unit }} Frequency {{purchaseItem.frequency_name}} Annual Purchase Value {{purchaseItem.annual_purchase_value}}
+
+ + + + + + Business Expenses + + + {{businessExpenses.length}}  Items + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + +
Item {{businessEx.expense_item}} Value {{businessEx.expense_value }} Frequency {{businessEx.frequency_name}} Annual Expenses Value {{businessEx.annual_expenses_value}}
+
+ + + + + + House Hold Expenses + + + {{houseHoldExpenses.length}}  Items + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + +
Item{{householdItem.expense_item}} Value{{householdItem.expense_value }}Frequency {{householdItem.frequency_name}} Annual Expenses Value {{householdItem.annual_expense_value}}
+
+ + + + + + +
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/assessed-income.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/assessed-income.component.scss new file mode 100644 index 000000000..340230c9f --- /dev/null +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/assessed-income.component.scss @@ -0,0 +1,54 @@ +.example-container { + max-height: 500px; + overflow: auto; +} + +table { + width: 100%; +} + +tr.mat-footer-row { + font-weight: bold; +} + +.mat-table-sticky { + border-top: 1px solid #e0e0e0; +} + + .mat-form-field { + width: 100%; + } + .expan_footer{ + font-size: 18px; + direction: rtl; + } + .expan_table_header { + font-size: 18px; + text-align: center; + } + .h4_font { + font-size: 18px; + } + .subtitle_message { + color:#e00201 !important; + } + +// table, th, td { +// border: 1px solid rgba(0, 0, 0, 0.12); +// border-collapse: collapse; +// } +// td { +// padding: 5px; +// text-align: left; +// } +// th { +// padding: 5px; +// text-align: center; +// } + +.row_border { + display: flex; + border:1px solid rgba(0, 0, 0, 0.12); +} + + \ No newline at end of file diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/assessed-income.component.spec.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/assessed-income.component.spec.ts new file mode 100644 index 000000000..0e5f1ba73 --- /dev/null +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/assessed-income.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { AssessedIncomeComponent } from './assessed-income.component'; + +describe('AssessedIncomeComponent', () => { + let component: AssessedIncomeComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ AssessedIncomeComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(AssessedIncomeComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/assessed-income.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/assessed-income.component.ts new file mode 100644 index 000000000..87470a02e --- /dev/null +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/assessed-income.component.ts @@ -0,0 +1,150 @@ +import {Component,OnInit,Inject,Input, ViewChild } from '@angular/core'; +import {FormBuilder,FormGroup,Validators,FormArray, FormControl,} from '@angular/forms'; +import { NotifierService } from 'angular-notifier'; +/** Service */ +import { PdTrigerService } from '../../../../../pd-service/pd-triger.service'; +import { ActivatedRoute, Router } from "@angular/router"; + +@Component({ + selector: 'app-assessed-income', + templateUrl: './assessed-income.component.html', + styleUrls: ['./assessed-income.component.scss'] +}) +export class AssessedIncomeComponent implements OnInit { + public _assessedIncomeFormFrom: FormGroup; + private notifier: NotifierService; + @Input() pdid: number; + @Input() form_id: number; + salesCaluatedItemColumns: string[] = ['Item', 'Qty/UOM','Rate/Unit','Frequency','Annual Sale Value']; + public salesCaluatedItem:any= []; + salesItemMonthWiseColumns: string[] = ['Item', 'Value','Frequency','Annual Expenses Value']; + public salesItemMonthWise:any= []; + purchaseDetailsColumns: string[] = ['Item', 'Qty/UOM','Rate/Unit','Frequency','Annual Purchase Value']; + public purchaseDetails:any= []; + businessExpensesColumns: string[] = ['Item', 'Value','Frequency','Annual Expenses Value']; + public businessExpenses:any= []; + houseHoldExpensesColumns: string[] = ['Item', 'Value','Frequency','Annual Expenses Value']; + public houseHoldExpenses:any= []; + + public salesMonthItemColumns = ['Date','Amount']; + + +// Sales Item MonthWise declare table header,body andd footer elements +salesMonthWiseTable:any=[]; +salesItemMonthWiseBody: any[]; +salesItemMonthWiseFooter: any[]; + +salesMonthWiseExpandedItems: any=[] + + + constructor(notifier: NotifierService, private fb: FormBuilder, private route: ActivatedRoute, + private router: Router, + private _pd: PdTrigerService) { + + } + + ngOnInit() { + + this.initAssessedIncomeForm(); + let params: any = {}; + params.pd_id = this.pdid; + params.pd_form_id = this.form_id; + this._pd.getAssessedIncomeFormDetails(params).subscribe(value => { + if (value.status == 200) { + if(value.records.sales_declared_by_customer){ + this._assessedIncomeFormFrom.controls['sales_declared_by_customer'].setValue(value.records.sales_declared_by_customer[0].sales_declared_by_customer); + } + else{ + this._assessedIncomeFormFrom.controls['sales_declared_by_customer'].setValue(''); + + } + if(value.records.sales_calculated_by_itemwise){ + this.salesCaluatedItem = value.records.sales_calculated_by_itemwise; + } + if(value.records.sales_items_by_monthwise){ + this.salesItemMonthWise = value.records.sales_items_by_monthwise; + // hide table format start + + // this.salesItemMonthWise.forEach((itemElement, itemIndex) => { + // this.salesItemMonthWiseBody= Object.keys(itemElement.items).map(key => ({ header:key, value: itemElement.items[key] })); + // let combineTableColumn = Object.keys(itemElement.items).map(key => (itemElement.items[key])); + // let sumItems: any=[]; + // combineTableColumn.forEach((sumValue, sumIndex) => { + // let calculateItems = sumValue.reduce((acc, calculate) => acc + Number(calculate.sales_value), 0); + // sumItems.push({bodyElement:sumValue, bodyElementTotal:calculateItems}); + // }) + // let calculateAllItemsTotal:number=sumItems.reduce((racc, rcalculate) => racc + Number(rcalculate.bodyElementTotal), 0); + // let convertYear : number = 12 / sumItems.length; + // let tableFooterMessage: any=[]; + // tableFooterMessage.push({ + // message: sumItems.length + ' Months ' + itemElement.sales_item + ' Sales ', + // value:calculateAllItemsTotal, + // cols_span_length:sumItems.length * 2 -1, + // }) + // tableFooterMessage.push({ + // message: ' Yearly ' + itemElement.sales_item + ' Sales Arrived', + // value: calculateAllItemsTotal * convertYear, + // cols_span_length:sumItems.length * 2 -1 , + // }) + // this.salesMonthWiseTable.push({salesItem:itemElement.sales_item,headerElement:this.salesItemMonthWiseBody, bodyElements:sumItems, parentTableFooter:tableFooterMessage}); + // //console.log(this.salesMonthWiseTable) + // }); + // hide table format end + + + this.salesItemMonthWise.forEach((itemElement, itemIndex) => { + let expandBodyContent= Object.keys(itemElement.items).map(key => ({ header:key, value: itemElement.items[key] })); + let listItems: any=[]; + expandBodyContent.forEach((expnadElement, expnadIndex) => { + let calculateItems = expnadElement.value.reduce((acc, calculate) => acc + Number(calculate.sales_value), 0); + listItems.push({items:expnadElement, itemsTotal:calculateItems}) + }) + let calculateAllItemsTotal:number=listItems.reduce((racc, rcalculate) => racc + Number(rcalculate.itemsTotal), 0); + + let convertYear : number = 12 / listItems.length; + let footerMessage: any=[]; + footerMessage.push({ + month_message: listItems.length + ' Month Sales : '+ calculateAllItemsTotal, + month_value:calculateAllItemsTotal, + year_message: ' Yearly Sales Arrived : '+ calculateAllItemsTotal * convertYear, + year_value: calculateAllItemsTotal * convertYear, + }) + // footerMessage.push({ + // message: ' Yearly ' + itemElement.sales_item + ' Sales Arrived', + // value: calculateAllItemsTotal * convertYear, + // }) + this.salesMonthWiseExpandedItems.push({salesItem:itemElement.sales_item, expandElements:expandBodyContent, footerMessage: footerMessage}); + }); + + + } + if(value.records.purchase_details){ + this.purchaseDetails = value.records.purchase_details; + } + if(value.records.business_expenses){ + this.businessExpenses=value.records.business_expenses; + } + if(value.records.house_hold_expenses){ + this.houseHoldExpenses = value.records.house_hold_expenses; + } + } + + }) + } + + // get total cost + getTotalCost(getItems:any) { + return getItems.map(t => t.sales_value).reduce((acc, value) => acc + Number(value), 0); + } + + + // Dynamic Form field creation + + public initAssessedIncomeForm(): void { + this._assessedIncomeFormFrom = this.fb.group({ + sales_declared_by_customer: ['', Validators.compose([Validators.required])], + // lender_representative_details: this.fb.array([]), + }); +} + +} diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.html index b426f5d57..d843ac592 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.html @@ -436,6 +436,9 @@ + + + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/manage-pd.module.ts b/ng6-seed/src/app/personal-discussion/manage-pd/manage-pd.module.ts index 7c88cf7cc..a23a13efa 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/manage-pd.module.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/manage-pd.module.ts @@ -60,7 +60,7 @@ import {EmploymentInfoComponent} from "./list-pd/start-pd/forms/employment-info/ import {BusinessInfoComponent} from "./list-pd/start-pd/forms/business-info/business-info.component"; import {FinancialInfoComponent} from "./list-pd/start-pd/forms/financial-info/financial-info.component"; import { LenderRepresentativeComponent } from './list-pd/start-pd/forms/lender-representative/lender-representative.component'; - +import { AssessedIncomeComponent } from './list-pd/start-pd/forms/assessed-income/assessed-income.component'; import { TelePdAllocationComponent } from './list-pd/tele-pd-allocation/tele-pd-allocation.component'; import { PdReportComponent } from './list-pd/pd-report/pd-report.component'; @@ -140,7 +140,7 @@ const pdCustomNotifierOptions: NotifierOptions = { // AgmCoreModule.forRoot({apiKey: 'AIzaSyBtdO5k6CRntAMJCF-H5uZjTCoSGX95cdk'}), OwlDateTimeModule, // OwlNativeDateTimeModule, // ], - declarations: [RentalInfoComponent, TelePdAllocationComponent, FinancialInfoComponent, BusinessInfoComponent, EmploymentInfoComponent, StockComponent, BankingDetailsComponent, ListPdComponent, FamilyDetailsComponent, AddressComponent, ManagePdComponent, MapPdViewComponent, AddPdComponent, ViewPdComponent, PdAllocationComponent, SmartPdAllocationComponent, SchedulePdComponent, EditPdApplicantComponent, EditPdMasterComponent, StartPdComponent, InprogressPdComponent, AllPdComponent, ScheduledPdComponent, CompletedPdComponent, QcCompletedPdComponent, ClientInfoComponent, CurrentLoanComponent, AssetsInfoComponent, LoanDetailsComponent, OtherIncomeComponent, SupplierInfoComponent, PersonalInfoComponent, LenderRepresentativeComponent, PdReportComponent], + declarations: [RentalInfoComponent, TelePdAllocationComponent, FinancialInfoComponent, BusinessInfoComponent, EmploymentInfoComponent, StockComponent, BankingDetailsComponent, ListPdComponent, FamilyDetailsComponent, AddressComponent, ManagePdComponent, MapPdViewComponent, AddPdComponent, ViewPdComponent, PdAllocationComponent, SmartPdAllocationComponent, SchedulePdComponent, EditPdApplicantComponent, EditPdMasterComponent, StartPdComponent, InprogressPdComponent, AllPdComponent, ScheduledPdComponent, CompletedPdComponent, QcCompletedPdComponent, ClientInfoComponent, CurrentLoanComponent, AssetsInfoComponent, LoanDetailsComponent, OtherIncomeComponent, SupplierInfoComponent, PersonalInfoComponent, LenderRepresentativeComponent, PdReportComponent, AssessedIncomeComponent], // exports: [PdAllocationComponent, SmartPdAllocationComponent, SchedulePdComponent, EditPdApplicantComponent, EditPdMasterComponent, StartPdComponent, CompletedPdComponent, QcCompletedPdComponent], // providers: [PdTrigerService, GetGeometricLocationService], @@ -172,7 +172,7 @@ const pdCustomNotifierOptions: NotifierOptions = { OwlNativeDateTimeModule, ], // declarations: [ListPdComponent, ManagePdComponent, MapPdViewComponent, AddPdComponent, ViewPdComponent, PdAllocationComponent, SmartPdAllocationComponent, SchedulePdComponent, EditPdApplicantComponent, EditPdMasterComponent, StartPdComponent, InprogressPdComponent, AllPdComponent, ScheduledPdComponent, CompletedPdComponent, QcCompletedPdComponent, ClientInfoComponent, SupplierInfoComponent, PersonalInfoComponent, AssetsInfoComponent], - exports: [PdAllocationComponent, SmartPdAllocationComponent, TelePdAllocationComponent, SchedulePdComponent, EditPdApplicantComponent, EditPdMasterComponent, StartPdComponent, CompletedPdComponent, QcCompletedPdComponent, ClientInfoComponent, SupplierInfoComponent, PersonalInfoComponent, CurrentLoanComponent, LoanDetailsComponent, OtherIncomeComponent, AssetsInfoComponent, AddressComponent, FamilyDetailsComponent, BankingDetailsComponent, StockComponent, EmploymentInfoComponent, BusinessInfoComponent, FinancialInfoComponent, LenderRepresentativeComponent], + exports: [PdAllocationComponent, SmartPdAllocationComponent, TelePdAllocationComponent, SchedulePdComponent, EditPdApplicantComponent, EditPdMasterComponent, StartPdComponent, CompletedPdComponent, QcCompletedPdComponent, ClientInfoComponent, SupplierInfoComponent, PersonalInfoComponent, CurrentLoanComponent, LoanDetailsComponent, OtherIncomeComponent, AssetsInfoComponent, AddressComponent, FamilyDetailsComponent, BankingDetailsComponent, StockComponent, EmploymentInfoComponent, BusinessInfoComponent, FinancialInfoComponent, LenderRepresentativeComponent,RentalInfoComponent, AssessedIncomeComponent], providers: [PdTrigerService, GetGeometricLocationService], entryComponents: [PdAllocationComponent, SmartPdAllocationComponent, SchedulePdComponent, EditPdApplicantComponent, EditPdMasterComponent, TelePdAllocationComponent] }) diff --git a/ng6-seed/src/app/personal-discussion/pd-service/pd-triger.service.ts b/ng6-seed/src/app/personal-discussion/pd-service/pd-triger.service.ts index 8828b9706..97ab9f238 100644 --- a/ng6-seed/src/app/personal-discussion/pd-service/pd-triger.service.ts +++ b/ng6-seed/src/app/personal-discussion/pd-service/pd-triger.service.ts @@ -233,6 +233,13 @@ export class PdTrigerService { // catchError(this.handleError('operation', [])) // ) // } + // get assessed income form details + getAssessedIncomeFormDetails(formDetails):Observable { + return this._http.post(this.apiUrl+"getAssessedIncome",formDetails) + .pipe( + catchError(this.handleError('operation', [])) + ) + } private handleError(operation = 'operation', result?: T) { return (error: any): Observable => { diff --git a/ng6-seed/src/app/quality-check/qc-list/qc-start/qc-start.component.html b/ng6-seed/src/app/quality-check/qc-list/qc-start/qc-start.component.html index 441604b3f..c5f78c18a 100644 --- a/ng6-seed/src/app/quality-check/qc-list/qc-start/qc-start.component.html +++ b/ng6-seed/src/app/quality-check/qc-list/qc-start/qc-start.component.html @@ -429,6 +429,12 @@ + + + + + +