diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/initiate-additional-pd/initiate-additional-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/initiate-additional-pd/initiate-additional-pd.component.html new file mode 100644 index 000000000..070d4d392 --- /dev/null +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/initiate-additional-pd/initiate-additional-pd.component.html @@ -0,0 +1,29 @@ +
+ +

+
+ {{pageTitle}} +
+
+ +
+

+ + + Customer Segment + + + {{segment.abbr}} + + + + + +
+

Note : Do Carefully , After Save Can't be Change

+
+
+ +
+ + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/initiate-additional-pd/initiate-additional-pd.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/initiate-additional-pd/initiate-additional-pd.component.scss new file mode 100644 index 000000000..518a880e7 --- /dev/null +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/initiate-additional-pd/initiate-additional-pd.component.scss @@ -0,0 +1,7 @@ +.paragraph_change { + color: #fff !important; + background-color: #e00201 !important; + } + mat-form-field { + margin: 0 2%; + } \ No newline at end of file diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/initiate-additional-pd/initiate-additional-pd.component.spec.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/initiate-additional-pd/initiate-additional-pd.component.spec.ts new file mode 100644 index 000000000..40c516489 --- /dev/null +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/initiate-additional-pd/initiate-additional-pd.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { InitiateAdditionalPdComponent } from './initiate-additional-pd.component'; + +describe('InitiateAdditionalPdComponent', () => { + let component: InitiateAdditionalPdComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ InitiateAdditionalPdComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(InitiateAdditionalPdComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/initiate-additional-pd/initiate-additional-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/initiate-additional-pd/initiate-additional-pd.component.ts new file mode 100644 index 000000000..a39ab5aa8 --- /dev/null +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/initiate-additional-pd/initiate-additional-pd.component.ts @@ -0,0 +1,80 @@ +import { Component, OnInit, Inject } from '@angular/core'; +import { FormBuilder, FormGroup, Validators, FormControl, FormArray } from '@angular/forms'; +import { MatDialog, MatDialogRef, MAT_DIALOG_DATA , DialogPosition} from '@angular/material'; +import { PdTrigerService } from './../../../pd-service/pd-triger.service'; +import { NotifierService } from 'angular-notifier'; + +@Component({ + selector: 'app-initiate-additional-pd', + templateUrl: './initiate-additional-pd.component.html', + styleUrls: ['./initiate-additional-pd.component.scss'] +}) +export class InitiateAdditionalPdComponent implements OnInit { + pageTitle: string; + private notifier: NotifierService; + additionalPDForm:FormGroup; + customerSegmentList: any=[]; + constructor(notifier: NotifierService,private _fb: FormBuilder, private _pd: PdTrigerService, @Inject(MAT_DIALOG_DATA) public data: any, private dialogRef: MatDialogRef) { + this.notifier = notifier; + this.pageTitle="Initiate Address for PD Process" + } + + ngOnInit() { + this.initForm(); + this._pd.getCustomersDetails().subscribe( + data => { + if (data.status == 200) { + this.customerSegmentList = data.records + } + }); + this.data.type===false ? this.additionalPDForm.controls['fk_customer_segment'].disable():this.additionalPDForm.controls['fk_customer_segment'].enable(); + + } + initForm(){ + return this.additionalPDForm = this._fb.group({ + pd_id:[this.data.type===false ? this.data.pd_id : ''], + parent_pd_id: [this.data.type===true ? this.data.pd_id : ''], + fk_customer_segment: [this.data.type===false ? this.data.fk_customer_segment :'',Validators.required], + fk_address_id:[this.data.pd_address_id,Validators.required], + pd_status:[this.data.pd_status,Validators.required], + }); + } + // save details +submitDetails(values: any) { + if (this.additionalPDForm.invalid) { + this.validateAllFormFields(this.additionalPDForm); + this.notifier.notify('warning',"Please Check All Manatory Fields.."); + return; + } + let update_details: any; + if(this.data.type){ + update_details= {"pd_id":values.pd_id,"parent_pd_id":values.parent_pd_id,"fk_customer_segment":values.fk_customer_segment , "fk_address_id":values.fk_address_id,"pd_status":"TRIGGERED"}; + } + else{ + update_details={"pd_id":values.pd_id,"parent_pd_id":values.parent_pd_id,"fk_customer_segment":values.fk_customer_segment , "fk_primary_address_id":values.fk_address_id}; + } + + this._pd.initiateAddressPdProcess(update_details).subscribe(data => { + this.notifier.notify('success', 'Saved Successfully.'); + setTimeout(() =>{ + this.dialogRef.close({update_status:true}); + },3000); + }, error => { + this.notifier.notify('warning', 'Something Wents Wrong Try Again.!'); + }); +} +// validate all form group and form array fields +validateAllFormFields(formGroup: any) { + Object.keys(formGroup.controls).forEach(field => { + const control = formGroup.get(field); + if (control instanceof FormControl) { + control.markAsTouched({ onlySelf: true }); + } else if (control instanceof FormGroup) { + this.validateAllFormFields(control); + } else if (control instanceof FormArray) { + this.validateAllFormFields(control); + } + }); +} + +} diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/list-pd.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/list-pd.component.scss index fda61348d..8a4c29011 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/list-pd.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/list-pd.component.scss @@ -16,12 +16,12 @@ } .mat-ink-bar{ - background-color:red; + background-color:#e00201; } .mat-tab-label-active{ - color: red !important; + color: #e00201 !important; } .mat-fab.mat-accent{ - color:red !important; + color:#e00201 !important; background-color: #fff !important; } diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-status-change-dialogue/pd-status-change-dialogue.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-status-change-dialogue/pd-status-change-dialogue.component.html index d2d9b577d..3347c7eb8 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-status-change-dialogue/pd-status-change-dialogue.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-status-change-dialogue/pd-status-change-dialogue.component.html @@ -7,6 +7,7 @@ - + + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-status-change-dialogue/pd-status-change-dialogue.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-status-change-dialogue/pd-status-change-dialogue.component.ts index 9112c9c6b..1d92d9a6b 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-status-change-dialogue/pd-status-change-dialogue.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-status-change-dialogue/pd-status-change-dialogue.component.ts @@ -14,24 +14,36 @@ export class PdStatusChangeDialogueComponent implements OnInit { private notifier: NotifierService; dialoge_title_content: string; dialoge_content: string; + enableAddonPD : boolean; + addonStatus: string ="ADD_ON_PENDING"; constructor(notifier: NotifierService , private pd: PdTrigerService,private dialogRef: MatDialogRef,@Inject(MAT_DIALOG_DATA) public data: any) { this.notifier = notifier; this.dialoge_title_content = this.data.pd_status=='INPROGRESS' ? 'Start Discussion' : this.data.pd_status=='COMPLETED' ? 'Complete Discussion' : 'Change Discussion'; this.dialoge_content =this.data.pd_status=='INPROGRESS' ? 'Are you starting the Discussion ?' : this.data.pd_status=='COMPLETED' ? 'Please confirm you are completing the Discussion and forwarding for Quality Check ?' : 'Change Discussion'; + this.enableAddonPD = false; } ngOnInit() { + if(this.data.pd_status=='COMPLETED'){ + let params: any={}; + params.pd_id = this.data.pdid; + this.pd.getPDCompleteDetails(params).subscribe(result => { + if (result.dataStatus === true) { + this.enableAddonPD = result.records.address_count>0 ? true: false; + } + }); + } } - changePDStatus(): void { + changePDStatus(status: string): void { let update_status = { "pd_id":this.data.pdid, }; - this.pd.editPdMasterDetails(update_status, this.data.pd_status).subscribe(result => { + this.pd.editPdMasterDetails(update_status, status).subscribe(result => { if (result.status == 200) { this.dialogRef.close({update_status:true}); - this.notifier.notify('success', this.data.pd_status=='INPROGRESS' ? 'Discussions Started Successfully' : this.data.pd_status=='COMPLETED' ? 'Discussions Completed Successfully ?' : 'Discussions Updated Successfully'); + this.notifier.notify('success', this.data.pd_status=='INPROGRESS' ? 'Discussions Started Successfully' : this.data.pd_status=='COMPLETED' ? 'Discussions Completed Successfully' : 'Discussions Updated Successfully'); } else { this.dialogRef.close({update_status:false}); 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 9815d902d..b08e6f03c 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 @@ -31,6 +31,7 @@ export class AddressComponent implements OnInit { disableAfterSubmit: boolean = false; /**Declaration of FormField Variables */ //@Input() pdid: number; + parent_pdid: string; pdid: number; form_id: number; // pdAddress: string; @@ -80,6 +81,7 @@ export class AddressComponent implements OnInit { private dialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) public pd_all_details: any) { // console.log('pd_all_details',pd_all_details); + this.parent_pdid = this.pd_all_details.pdmaster_details.parent_pd_id; this.pdid = this.pd_all_details.pdmaster_details.pd_id; this.form_id = 5; @@ -107,6 +109,7 @@ export class AddressComponent implements OnInit { this.getMasterDetails('STATE', 6); let params: any = {}; + params.parent_pdid=this.parent_pdid; params.pd_id = this.pdid; params.pd_form_id = '5'; @@ -215,9 +218,7 @@ export class AddressComponent implements OnInit { this._pd.getAddressesDetails(this.pdid).subscribe( data => { if (data.status == 200) { - this.addressesList = data.records.filter(item => item.isactive == 1); - // console.log('this.addressesList',this.addressesList); - + this.addressesList = data.records.filter(item => item.assigned_pd==this.pdid && item.isactive == 1); if (this.addressesList.length > 0) { this.addressesList.forEach((val, index) => { let obj = { @@ -474,6 +475,7 @@ export class AddressComponent implements OnInit { // this.addressForm.controls.uom_others.value : ''; records.pdid = this.pdid; + records.parent_pdid= this.parent_pdid; records.formid = '5'; // records.fk_createdby = '250'; 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 index dcf758e43..9cb0d4d26 100755 --- 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 @@ -24,6 +24,7 @@ export class AssessedIncomeComponent implements OnInit { pageTitle: string ="Assessed Income Details"; // @Input() pdid: number; // @Input() form_id: number; + parent_pdid: number; pdid: number; form_id: number; company_id: number; @@ -55,6 +56,7 @@ public getCustomValues:any = { UOMList: this.UOMList,frequencyList: this.frequen private router: Router, private _pd: PdTrigerService, private dialog: MatDialog, @Inject(MAT_DIALOG_DATA) public pd_all_details: any, private dialogRef: MatDialogRef,) { + this.parent_pdid = this.pd_all_details.pdmaster_details.parent_pd_id this.pdid = this.pd_all_details.pdmaster_details.pd_id; this.company_id = this.pd_all_details.company_id; this.notifier = notifier; @@ -97,6 +99,7 @@ public viewerOptions: any = { loadAIDetails(): void{ this.salesMonthWiseExpandedItems=[] let params: any = {}; + params.parent_pdid = this.parent_pdid; params.pd_id = this.pdid; params.pd_form_id = this.form_id; params.company_id = this.company_id; 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 d33507767..2df9d286f 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 @@ -35,6 +35,7 @@ export class AssetsInfoComponent implements OnInit { main_applicant: any; pageTitle: string = "Other Assets Details"; //@Input() pdid: number; + parent_pdid: string; pdid: string; //businessProfessionName :string; @@ -72,6 +73,7 @@ export class AssetsInfoComponent implements OnInit { private pdTrigerService: PdTrigerService, private dialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) public pd_all_details: any) { + this.parent_pdid = this.pd_all_details.pdmaster_details.parent_pd_id; this.pdid = this.pd_all_details.pdmaster_details.pd_id; this.applicants = this.pd_all_details.pdapplicants_detials; this.applicants = this.applicants.filter(val => val.applicant_type == 0 || val.applicant_type == 1) @@ -239,7 +241,11 @@ export class AssetsInfoComponent implements OnInit { apiLoadFinish: boolean = false; getPdSupplierFormDetails() { - this.pdTrigerService.getPDFormDetailsWithID(this.pdid, '4').subscribe( + let params: any = {}; + params.parent_pdid=this.parent_pdid; + params.pd_id = this.pdid; + params.pd_form_id = '4'; + this.pdTrigerService.getPDFormDetailsWithID(params).subscribe( data => { if (data) { if (data.dataStatus) { @@ -259,6 +265,7 @@ export class AssetsInfoComponent implements OnInit { if (val !== null) { let value = val; this._assetsQuesFrom = this._formBuilder.group({ + parent_pdid: [this.parent_pdid], pdid: [this.pdid], formid: ['4'], assets_details: this._formBuilder.array([ @@ -271,6 +278,7 @@ export class AssetsInfoComponent implements OnInit { // this.addBusinessAssetsDetailsWithData(value.business_assets_details); } else { this._assetsQuesFrom = this._formBuilder.group({ + parent_pdid: [this.parent_pdid], pdid: [this.pdid], formid: ['4'], assets_details: this._formBuilder.array([ 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 f663f42bd..7bf321931 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 @@ -32,6 +32,7 @@ export class BankingDetailsComponent implements OnInit { subproduct_abbr: any; lender_applicant_id: any; main_applicant: any; + parent_pdid: number; pdid: number; pageTitle: string = "Banking Details of Individuals"; public bankingForm: FormGroup; @@ -54,6 +55,7 @@ export class BankingDetailsComponent implements OnInit { private _pd: PdTrigerService, private dialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) public pd_all_details: any) { + this.parent_pdid = this.pd_all_details.pdmaster_details.parent_pd_id; this.pdid = this.pd_all_details.pdmaster_details.pd_id; this.pd_cus_segment = this.pd_all_details.pdmaster_details.customer_segment_abbr.toUpperCase(); this.pd_cus_segment = this.pd_cus_segment.substring(0, 3); @@ -134,6 +136,7 @@ export class BankingDetailsComponent implements OnInit { // this.applicants = this.pd_all_details.pdapplicants_detials; let params: any = {}; + params.parent_pdid=this.parent_pdid params.pd_id = this.pdid; params.pd_form_id = '7'; this._pd.retriveForm(params).subscribe(data => { @@ -249,6 +252,7 @@ export class BankingDetailsComponent implements OnInit { bankSubmit() { let records: any = {}; + records.parent_pdid = this.parent_pdid; records.pdid = this.pdid; records.formid = '7'; records.banking_form_remark = this.bankingForm.controls.banking_form_remark.value; diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.ts index 865719bf9..0d1bc6b48 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.ts @@ -26,6 +26,7 @@ export class BusinessAssetsInfoComponent implements OnInit { pageTitle: string = "Assets used for Business"; /**Declaration of Form Fields Variables */ + parent_pdid: string; pdid: string; company_id: any; placeholderName: any = []; @@ -70,6 +71,7 @@ export class BusinessAssetsInfoComponent implements OnInit { private pdTrigerService: PdTrigerService, private dialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) public pd_all_details: any) { + this.parent_pdid = this.pd_all_details.pdmaster_details.parent_pd_id this.pdid = this.pd_all_details.pdmaster_details.pd_id; this.applicants = this.pd_all_details.pdapplicants_detials; this.applicants = this.applicants.filter(appt => appt.applicant_type != 2) @@ -176,7 +178,11 @@ console.clear(); //Get Data Based on PDID and FORMID apiLoadFinish: boolean = false; getPdSupplierFormDetails() { - this.pdTrigerService.getPDFormDetailsWithCompanyID(this.pdid, '22', this.company_id).subscribe( + let reqparams: any = {}; + reqparams.parent_pdid = this.parent_pdid; + reqparams.pd_id = this.pdid; + reqparams.pd_form_id = '22'; + this.pdTrigerService.retriveForm(reqparams).subscribe( data => { if (data) { @@ -196,6 +202,7 @@ console.clear(); loadaddresses() { let params: any = {}; + params.parent_pdid = this.parent_pdid; params.pd_id = this.pdid; params.pd_form_id = '5'; @@ -218,7 +225,6 @@ console.clear(); // console.log('cityArr',this.cityArr); // console.log('pinArr',this.pinArr); // console.log('flag',flag); - console.log('this.m_state_for_address',this.m_state_for_address); let selectedAddressType = this.m_address_type.filter(element => element.address_type_id == dataValue.address_type)[0]; let selectedState = this.m_state_for_address.filter(element => element.state_id == dataValue.state)[0]; let selectedCity = this.cityArr.filter(element => element.city_id == dataValue.city)[0]; @@ -227,7 +233,6 @@ console.clear(); // console.log(selectedPincode); // console.log(selectedCity[0].city_name); // console.log(selectedPincode[0].pincode); - console.log('selectedState',selectedState); let addressType = dataValue.address_type != 1 ? selectedAddressType.address_type : dataValue.address_type_others; let address = dataValue.address + ' , ' + selectedCity.city_name + ','+selectedState.name +'-' + (dataValue.pincode == 1 ? dataValue.pincode_others : selectedPincode.pincode); @@ -285,6 +290,7 @@ console.clear(); if (val !== null) { let value = val; this._businessAssetsQuesFrom = this._formBuilder.group({ + parent_pdid: [this.parent_pdid], pdid: [this.pdid], formid: ['22'], company_id: [this.company_id], @@ -305,6 +311,7 @@ console.clear(); this.addBusinessAssetsDetailsWithData(value.business_assets_details); } else { this._businessAssetsQuesFrom = this._formBuilder.group({ + parent_pdid: [this.parent_pdid], pdid: [this.pdid], formid: ['22'], company_id: [this.company_id], diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-banking-details/business-banking-details.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-banking-details/business-banking-details.component.ts index acd5e3bd6..17c01f945 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-banking-details/business-banking-details.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-banking-details/business-banking-details.component.ts @@ -33,7 +33,7 @@ export class BusinessBankingDetailsComponent implements OnInit { subproduct_abbr: any; lender_applicant_id: any; main_applicant: any; - + parent_pdid: number; pdid: number; pageTitle: string = "Banking Information"; public bankingForm: FormGroup; @@ -61,6 +61,7 @@ export class BusinessBankingDetailsComponent implements OnInit { private _pd: PdTrigerService, private dialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) public pd_all_details: any) { + this.parent_pdid = this.pd_all_details.pdmaster_details.parent_pd_id; this.pdid = this.pd_all_details.pdmaster_details.pd_id; this.pd_cus_segment = this.pd_all_details.pdmaster_details.customer_segment_abbr.toUpperCase(); this.pd_cus_segment = this.pd_cus_segment.substring(0, 3); @@ -129,6 +130,7 @@ export class BusinessBankingDetailsComponent implements OnInit { this.salaryField = this.pd_cus_segment.substring(0, 2) == 'SE' ? false : true; let params: any = {}; + params.parent_pdid = this.parent_pdid; params.pd_id = this.pdid; params.pd_form_id = '21'; params.company_id = this.company_id; @@ -231,6 +233,7 @@ export class BusinessBankingDetailsComponent implements OnInit { bankSubmit() { let records: any = {}; + records.parent_pdid = this.parent_pdid; records.pdid = this.pdid; records.formid = '21'; records.company_id = this.company_id; records.banking_form_remark = this.bankingForm.controls.banking_form_remark.value; 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 11d4fed09..2e98a7d55 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 @@ -35,6 +35,7 @@ export class BusinessInfoComponent implements OnInit { lender_applicant_id: any; main_applicant: any; pipe = new DatePipe('en-US'); + parent_pdid: number; pdid: number; company_id: String; company_name: String; @@ -96,6 +97,7 @@ export class BusinessInfoComponent implements OnInit { private _pd: PdTrigerService, @Inject(MAT_DIALOG_DATA) public pd_all_details: any, private dialog: MatDialog, private dialogRef: MatDialogRef) { //this.adapter.setLocale('fr'); + this.parent_pdid = this.pd_all_details.pdmaster_details.parent_pd_id; this.pdid = this.pd_all_details.pdmaster_details.pd_id; this.company_id = this.pd_all_details.company_id; this.company_name = this.pd_all_details.company_name; @@ -149,6 +151,7 @@ export class BusinessInfoComponent implements OnInit { // const Partnr = this.businessForm.controls['partners']; // const otherDoc = this.businessForm.controls['documents']; let params: any = {}; + params.parent_pdid = this.parent_pdid; params.pd_id = this.pdid; params.pd_form_id = this.form_id; params.company_id = this.company_id; @@ -619,6 +622,7 @@ export class BusinessInfoComponent implements OnInit { } public initBusinessForm(): void { this.businessForm = this.fb.group({ + parent_pdid: this.parent_pdid, pdid: this.pdid, formid: this.form_id, company_id: this.company_id, diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.ts index b45b6f52f..7eb8e8122 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.ts @@ -37,6 +37,7 @@ export class ClientInfoComponent implements OnInit { pageTitle: string = "Client Details"; //@Input() pdid: number; + parent_pdid: string; pdid: string; form_id: number; company_id: string; @@ -81,6 +82,7 @@ export class ClientInfoComponent implements OnInit { private _formBuilder: FormBuilder, private pdTrigerService: PdTrigerService, @Inject(MAT_DIALOG_DATA) public pd_all_details: any, private dialogRef: MatDialogRef) { + this.parent_pdid = this.pd_all_details.pdmaster_details.parent_pd_id; this.pdid = this.pd_all_details.pdmaster_details.pd_id; this.form_id = 2; this.company_id = this.pd_all_details.company_id; @@ -182,6 +184,7 @@ export class ClientInfoComponent implements OnInit { // retaildTradingForm: Boolean = false; initFormLoadDetails(record) { let params: any = {}; + params.parent_pdid = this.parent_pdid; params.pd_id = this.pdid; params.pd_form_id = this.form_id; params.company_id = this.company_id; @@ -192,6 +195,7 @@ export class ClientInfoComponent implements OnInit { // console.log(dataForm); if (dataForm !== undefined) { this._supplierQuesFrom = this._formBuilder.group({ + parent_pdid: [this.parent_pdid], pdid: [this.pdid], formid: ['2'], company_id: [this.company_id], @@ -263,6 +267,7 @@ export class ClientInfoComponent implements OnInit { this.noRecordsFound = true; } else { this._supplierQuesFrom = this._formBuilder.group({ + parent_pdid: [this.parent_pdid], pdid: [this.pdid], formid: ['2'], company_id: [this.company_id], @@ -299,6 +304,7 @@ export class ClientInfoComponent implements OnInit { } } else { this._supplierQuesFrom = this._formBuilder.group({ + parent_pdid: [this.parent_pdid], pdid: [this.pdid], formid: ['2'], company_id: [this.company_id], 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 8ff714826..5a1648547 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 @@ -24,6 +24,7 @@ export class CurrentLoanComponent implements OnInit { public currentLoanForm: FormGroup; private notifier: NotifierService; pageTitle: string = "Existing Loan Obligations"; + parent_pdid : number; pdid: number; form_id: number; applicant_details: any; @@ -47,6 +48,7 @@ export class CurrentLoanComponent implements OnInit { private _pd: PdTrigerService, private dialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) public pd_all_details: any) { + this.parent_pdid = this.pd_all_details.pdmaster_details.parent_pd_id; this.pdid = this.pd_all_details.pdmaster_details.pd_id; this.form_id = 8; this.notifier = notifier; @@ -77,7 +79,6 @@ export class CurrentLoanComponent implements OnInit { } }; ngOnInit() { - console.clear(); this.getMasterDetails('BTLENDERLIST', 1); this.getMasterDetails('FREQUENCY', 2); this.getMasterDetails('EXISTINGLOANTYPES', 3); @@ -111,6 +112,7 @@ export class CurrentLoanComponent implements OnInit { }) let params: any = {}; + params.parent_pdid = this.parent_pdid; params.pd_id = this.pdid; params.pd_form_id = this.form_id; @@ -502,6 +504,7 @@ export class CurrentLoanComponent implements OnInit { return; } let records: any = {}; + records.parent_pdid = this.parent_pdid; records.pdid = this.pdid; records.formid = this.form_id; records.fk_createdby = this.pdid; diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.ts index c185314f2..9a514a339 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.ts @@ -35,6 +35,7 @@ export class EmploymentInfoComponent implements OnInit { main_applicant: any; pageTitle: string = "Employement Information"; + parent_pdid: number; pdid: number; form_id: number; //pd_all_details:any; @@ -60,6 +61,7 @@ export class EmploymentInfoComponent implements OnInit { private _pd: PdTrigerService, private dialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) public pd_all_details: any) { + this.parent_pdid = this.pd_all_details.pdmaster_details.parent_pd_id; this.pdid = this.pd_all_details.pdmaster_details.pd_id; this.form_id = 12; this.notifier = notifier; @@ -90,15 +92,15 @@ export class EmploymentInfoComponent implements OnInit { } }; ngOnInit() { - - console.clear(); this.pd_cus_segment = this.pd_all_details.pdmaster_details.customer_segment_abbr.toUpperCase(); this.initemploymentForm(); let params: any = {}; + params.parent_pdid = this.parent_pdid; params.pd_id = this.pdid; params.pd_form_id = this.form_id; let param: any = {}; + param.parent_pdid = this.parent_pdid; param.pd_id = this.pdid; param.pd_form_id = '18'; this._pd.retriveForm(param).subscribe(data => { @@ -336,6 +338,7 @@ export class EmploymentInfoComponent implements OnInit { let records: any = {}; + records.parent_pdid = this.parent_pdid; records.pdid = this.pdid; records.formid = this.form_id; records.fk_createdby = this.pdid; 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 ac1802921..8447dbfe5 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 @@ -33,6 +33,7 @@ export class FamilyDetailsComponent implements OnInit { public familyForm: FormGroup; public selectPerson; public apiFamilyMembers: any = []; + parent_pdid: string; pdid: string; form_id: number; count: number; @@ -64,6 +65,7 @@ export class FamilyDetailsComponent implements OnInit { this.form_id = 6; this.notifier = notifier; this.selectPerson = this.pd_all_details.pdapplicants_detials; + this.parent_pdid = this.pd_all_details.pdmaster_details.parent_pd_id; this.pdid = this.pd_all_details.pdmaster_details.pd_id; this.main_applicant = this.pd_all_details.pdmaster_details.main_applicant; this.lender_applicant_id = this.pd_all_details.pdmaster_details.lender_applicant_id; @@ -131,6 +133,7 @@ export class FamilyDetailsComponent implements OnInit { this.initFamilyFormDetails(); let params: any = {}; + params.parent_pdid=this.parent_pdid; params.pd_id = this.pdid; params.pd_form_id = '6'; @@ -639,7 +642,7 @@ export class FamilyDetailsComponent implements OnInit { var records = this.familyForm.value; //To Remove The "Null" With Key also Object.keys(records).forEach((key) => (records[key] == null) && delete records[key]); - + records.parent_pdid=this.parent_pdid; records.pdid = this.pdid; records.formid = '6'; diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/final-remarks/final-remarks.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/final-remarks/final-remarks.component.ts index 8992943db..8911c1cc3 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/final-remarks/final-remarks.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/final-remarks/final-remarks.component.ts @@ -38,6 +38,7 @@ export class FinalRemarksComponent implements OnInit { pageTitle: string = "Final Remarks Details"; //@Input() pdid: number; + parent_pdid: string; pdid: string; form_id: number; @@ -54,6 +55,7 @@ export class FinalRemarksComponent implements OnInit { private pdTrigerService: PdTrigerService, private dialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) public pd_all_details: any) { + this.parent_pdid = this.pd_all_details.pdmaster_details.parent_pd_id; this.pdid = this.pd_all_details.pdmaster_details.pd_id; this.form_id = 20; this.notifier = notifier; @@ -62,6 +64,7 @@ export class FinalRemarksComponent implements OnInit { this.subproduct_abbr = this.pd_all_details.pdmaster_details.subproduct_abbr; this.customer_segment_abbr = this.pd_all_details.pdmaster_details.customer_segment_abbr; this._finalRemarkForm = this._formBuilder.group({ + parent_pdid: [this.parent_pdid], pdid: [this.pdid], formid: ['20'], final_custormer_remark_type: [], @@ -150,7 +153,11 @@ export class FinalRemarksComponent implements OnInit { noRecordsFound: Boolean = false; ngOnInit() { - this.pdTrigerService.getPDFormDetailsWithID(this.pdid, '20').subscribe(data => { + let params: any = {}; + params.parent_pdid=this.parent_pdid; + params.pd_id = this.pdid; + params.pd_form_id = '20'; + this.pdTrigerService.getPDFormDetailsWithID(params).subscribe(data => { if (data.dataStatus) { // console.log('data',data); // console.log('data',data.records); 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 3b04c3da8..c72842756 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 @@ -36,6 +36,7 @@ export class FinancialInfoComponent implements OnInit { main_applicant: any; //Common Declaration pageTitle: string ="Financial Information"; + parent_pdid: string; pdid: string; form_id: number; company_id: string; @@ -83,6 +84,7 @@ export class FinancialInfoComponent implements OnInit { private _pd: PdTrigerService, private dialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) public pd_all_details: any) { + this.parent_pdid = this.pd_all_details.pdmaster_details.parent_pd_id this.pdid = this.pd_all_details.pdmaster_details.pd_id; this.form_id = 14; this.company_id =this.pd_all_details.company_id; @@ -123,6 +125,7 @@ export class FinancialInfoComponent implements OnInit { this.initstockForm(); let params: any = {}; + params.parent_pdid = this.parent_pdid; params.pd_id = this.pdid; params.pd_form_id = this.form_id; params.company_id = this.company_id; @@ -186,6 +189,7 @@ export class FinancialInfoComponent implements OnInit { } else {retriveData.estimated_value = [];} + retriveData.parent_pdid = this.parent_pdid; retriveData.pdid = this.pdid; retriveData.formid = this.form_id; retriveData.company_id = this.company_id; @@ -201,6 +205,7 @@ export class FinancialInfoComponent implements OnInit { /** financial Form Controls */ public initstockForm(): void { this.financialForm = this.fb.group({ + parent_pdid: this.parent_pdid, pdid: this.pdid, formid: this.form_id, company_id: this.company_id, 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 ebc1d4fea..e26dfd062 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.html @@ -180,7 +180,7 @@ - + Relationship Between Individuals 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 91378b9e5..a613f16d2 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.ts @@ -28,7 +28,8 @@ export class GeneralInfoComponent implements OnInit { /* Declaration for Common Variables */ pipe = new DatePipe('en-US'); - + + parent_pdid: string; pdid: string; form_id: number; count: number = 1; @@ -65,6 +66,7 @@ export class GeneralInfoComponent implements OnInit { /** Constructor Section */ constructor(notifier: NotifierService, private _fb: FormBuilder, private _pd: PdTrigerService, private dialog: MatDialog, @Inject(MAT_DIALOG_DATA) public pd_all_details: any, private dialogRef: MatDialogRef) { this.pdid = this.pd_all_details.pdmaster_details.pd_id; + this.parent_pdid = this.pd_all_details.pdmaster_details.parent_pd_id; this.notifier = notifier; this.form_id = 18; this.pd_applicants_details = this.pd_all_details.pdapplicants_detials; @@ -78,8 +80,8 @@ export class GeneralInfoComponent implements OnInit { /** ng Oninit Section */ ngOnInit() { - let get_max_date = this.pd_all_details.pdmaster_details.pd_date_of_initiation.split('/').reverse().join("/"); - this.maxDate = new Date(get_max_date); + let get_max_date = this.pd_all_details.pdmaster_details.pd_date_of_initiation ? this.pd_all_details.pdmaster_details.pd_date_of_initiation.split('/').reverse().join("/") : ''; + this.maxDate = get_max_date ? new Date(get_max_date) : new Date(); this.initFormDetails(); this.getMasterDetails('RELATIONSHIPS', 1); this.getMasterDetails('COMPANYRELATIONSHIPS', 2); @@ -118,6 +120,7 @@ export class GeneralInfoComponent implements OnInit { /** init form */ initFormDetails() { this._generalForm = this._fb.group({ + parent_pdid: this.parent_pdid, pdid: this.pdid, formid: this.form_id, //applicant_relation: this._fb.array([]), @@ -167,6 +170,7 @@ export class GeneralInfoComponent implements OnInit { let params: any = {}; params.pd_id = this.pdid; params.pd_form_id = '18'; + params.parent_pdid = this.parent_pdid; let individualsControl = this._generalForm.controls['individuals']; let companyControl = this._generalForm.get('companies') as FormArray; //let relationControl = this._generalForm.controls['applicant_relation']; @@ -203,20 +207,16 @@ export class GeneralInfoComponent implements OnInit { exist_personsWithRelationships = Object.keys(data.records.persons_with_relationships).map(function (key) { return data.records.persons_with_relationships[key]; }); - if (exist_personsWithRelationships.length > 0) { exist_personsWithRelationships.forEach(element => { //individualsControl.push(this.createIndividulas(element)) personsWithRelationshipsControl.push(this.createPersonsWithRelationships(element)); }); } - - exist_companyWithRelationships = Object.keys(data.records.company_with_relationships).map(function (key) { - return data.records.company_with_relationships[key]; - }); - if (this.customer_segment_abbr != 'SE-RI') { - + exist_companyWithRelationships = Object.keys(data.records.company_with_relationships).map(function (key) { + return data.records.company_with_relationships[key]; + }); if (exist_companyWithRelationships.length > 0) { exist_companyWithRelationships.forEach(element => { //individualsControl.push(this.createIndividulas(element)) @@ -653,6 +653,7 @@ export class GeneralInfoComponent implements OnInit { } this.disableAfterSubmit = true; let saveRecords: any = {} + saveRecords.parent_pdid = formData.parent_pdid; saveRecords.pdid = formData.pdid; saveRecords.formid = formData.formid; saveRecords.individuals = formData.individuals; diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/lender-representative/lender-representative.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/lender-representative/lender-representative.component.ts index 84d76c942..7e8e045af 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/lender-representative/lender-representative.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/lender-representative/lender-representative.component.ts @@ -28,6 +28,7 @@ export class LenderRepresentativeComponent implements OnInit { public representativeForm: FormGroup; private notifier: NotifierService; pageTitle: string = "Lender Representative Details"; + parent_pdid: string; pdid: number; form_id: number; disableAfterSubmit: boolean = false; @@ -42,6 +43,7 @@ export class LenderRepresentativeComponent implements OnInit { private _pd: PdTrigerService, private dialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) public pd_all_details: any) { + this.parent_pdid = this.pd_all_details.pdmaster_details.parent_pd_id; this.pdid = this.pd_all_details.pdmaster_details.pd_id; this.main_applicant = this.pd_all_details.pdmaster_details.main_applicant; this.lender_applicant_id = this.pd_all_details.pdmaster_details.lender_applicant_id; @@ -88,6 +90,7 @@ export class LenderRepresentativeComponent implements OnInit { // this.message.lender_applicant_id = this.lender_applicant_id; this.initRepresentative(); let params: any = {}; + params.parent_pdid=this.parent_pdid; params.pd_id = this.pdid; params.pd_form_id = this.form_id; this._pd.retriveForm(params).subscribe(value => { @@ -147,6 +150,7 @@ export class LenderRepresentativeComponent implements OnInit { } this.disableAfterSubmit = true; let records: any = {}; + records.parent_pdid = this.parent_pdid; records.pdid = this.pdid; records.formid = this.form_id; records.fk_createdby = this.pdid; 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 d02a1833e..f230dc1de 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 @@ -37,6 +37,7 @@ export class LoanDetailsComponent implements OnInit { private notifier: NotifierService; public loanDetailsForm: FormGroup; + parent_pdid: number; pdid: number; form_id: number; exist_loan_amt: any; @@ -94,6 +95,7 @@ export class LoanDetailsComponent implements OnInit { this.exist_loan_amt = this.pd_all_details.pdmaster_details.loan_amount != '' ? this.pd_all_details.pdmaster_details.loan_amount : ''; // this.loanAmtInWords = this._pd.convertNumberToWords(this.exist_loan_amt); this.form_id = 10; + this.parent_pdid = this.pd_all_details.pdmaster_details.parent_pd_id; this.pdid = this.pd_all_details.pdmaster_details.pd_id; this.notifier = notifier; this.main_applicant = this.pd_all_details.pdmaster_details.main_applicant; @@ -146,6 +148,7 @@ export class LoanDetailsComponent implements OnInit { let params: any = {}; + params.parent_pdid = this.parent_pdid; params.pd_id = this.pdid; params.pd_form_id = this.form_id; this._pd.retriveForm(params).subscribe(value => { @@ -653,6 +656,7 @@ export class LoanDetailsComponent implements OnInit { } this.disableAfterSubmit = true; let records: any = {}; + records.parent_pdid = this.parent_pdid; records.pdid = this.pdid; records.formid = this.form_id; records.fk_createdby = this.pdid; diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.ts index da8a55c1c..8c95e23e0 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.ts @@ -20,6 +20,7 @@ export class NeighbourHoodComponent implements OnInit { isDisplay:any = []; isDisplay2:any = []; public _neighbourhoodForm: FormGroup; + parent_pdid: string; pdid : string; form_id:number; private notifier: NotifierService; @@ -42,6 +43,7 @@ export class NeighbourHoodComponent implements OnInit { // isOtherApplicant: any = []; constructor(notifier: NotifierService, private _pd: PdTrigerService ,private _fb: FormBuilder, @Inject(MAT_DIALOG_DATA) public data: any,private dialogRef: MatDialogRef) { + this.parent_pdid = this.data.pdmaster_details.parent_pd_id; this.pdid = this.data.pdmaster_details.pd_id; this.notifier = notifier; this.form_id = 19; @@ -108,6 +110,7 @@ export class NeighbourHoodComponent implements OnInit { // init form details initFormDetails() { this._neighbourhoodForm = this._fb.group({ + parent_pdid: this.parent_pdid, pdid:this.pdid, formid:this.form_id, // check_type:0, @@ -126,6 +129,7 @@ export class NeighbourHoodComponent implements OnInit { // load form data loadFormData(){ let params: any = {}; + params.parent_pdid = this.parent_pdid; params.pd_id = this.pdid; params.pd_form_id = '19'; let referencecheckControl = this._neighbourhoodForm.controls['referencecheck_list']; @@ -385,6 +389,7 @@ export class NeighbourHoodComponent implements OnInit { // } // saveRecords.check_type=formData.check_type; + saveRecords.parent_pdid=formData.parent_pdid; saveRecords.pdid=formData.pdid; saveRecords.formid=formData.formid; saveRecords.neighbourhood_status = formData.neighbourhood_status!='' ? formData.neighbourhood_status : ''; 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 379312724..63d3cc919 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 @@ -43,6 +43,7 @@ export class OtherIncomeComponent implements OnInit { // @Input() pdid: number; // @Input() form_id: number; + parent_pdid: string; pdid: string; form_id: number; @@ -66,6 +67,7 @@ export class OtherIncomeComponent implements OnInit { private dialog: MatDialog, private dialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) public pd_all_details: any) { + this.parent_pdid = this.pd_all_details.pdmaster_details.parent_pd_id; this.pdid = this.pd_all_details.pdmaster_details.pd_id; this.form_id = 9; this.notifier = notifier; @@ -134,6 +136,7 @@ export class OtherIncomeComponent implements OnInit { }); let params: any = {}; + params.parent_pdid = this.parent_pdid; params.pd_id = this.pdid; params.pd_form_id = this.form_id; this._pd.retriveForm(params).subscribe(value => { @@ -240,6 +243,7 @@ export class OtherIncomeComponent implements OnInit { return; } let records: any = {}; + records.parent_pdid = this.parent_pdid; records.pdid = this.pdid; records.formid = this.form_id; records.fk_createdby = this.pdid; diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/personal-info/personal-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/personal-info/personal-info.component.ts index e5a386855..15363f250 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/personal-info/personal-info.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/personal-info/personal-info.component.ts @@ -107,7 +107,11 @@ public viewerOptions: any = { // load form pd details loadPDDetails(){ - this._pd.getPDFormDetailsWithID(this.pdid,this.form_id).subscribe( + let params: any = {}; + //params.parent_pdid=this.parent_pdid; + params.pd_id = this.pdid; + params.pd_form_id = this.form_id; + this._pd.getPDFormDetailsWithID(params).subscribe( data => { const mainValue = this._personalForm.controls['main_applicant_details']; const coValue = this._personalForm.controls['co_applicant_details']; diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-verification/rental-verification.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-verification/rental-verification.component.ts index 8b191e58a..516eabd0b 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-verification/rental-verification.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-verification/rental-verification.component.ts @@ -20,6 +20,7 @@ export class RentalVerificationComponent implements OnInit { main_applicant: any; pageTitle: string = "Rental Information"; public _neighbourhoodForm: FormGroup; + parent_pdid: string; pdid : string; form_id:number; private notifier: NotifierService; @@ -61,6 +62,7 @@ export class RentalVerificationComponent implements OnInit { } }; constructor(notifier: NotifierService, private _pd: PdTrigerService ,private _fb: FormBuilder, @Inject(MAT_DIALOG_DATA) public data: any,private dialogRef: MatDialogRef) { + this.parent_pdid = this.data.pdmaster_details.parent_pd_id; this.pdid = this.data.pdmaster_details.pd_id; this.notifier = notifier; this.form_id = 17; @@ -197,6 +199,7 @@ export class RentalVerificationComponent implements OnInit { initRentalForm() { return this._rentalForm = this._fb.group({ + parent_pdid: this.parent_pdid, pdid: this.pdid, formid: this.form_id, address_property:['',Validators.required], @@ -263,6 +266,7 @@ getMasterDetails(table: string, type: number) { // load form data loadFormData(){ let params: any = {}; + params.parent_pdid =this.parent_pdid; params.pd_id = this.pdid; params.pd_form_id = this.form_id; this._pd.retriveForm(params).subscribe(data => { 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 7c77961a1..6e7260af3 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 @@ -36,7 +36,7 @@ export class StockComponent implements OnInit { subproduct_abbr: any; lender_applicant_id: any; main_applicant: any; - + parent_pdid: number; pdid: number; form_id: number; company_id: string; @@ -59,6 +59,7 @@ export class StockComponent implements OnInit { private dialogRef: MatDialogRef, private _pd: PdTrigerService, @Inject(MAT_DIALOG_DATA) public pd_all_details: any) { + this.parent_pdid = this.pd_all_details.pdmaster_details.parent_pd_id this.pdid = this.pd_all_details.pdmaster_details.pd_id; this.form_id = 11; this.company_id = this.pd_all_details.company_id; @@ -138,6 +139,7 @@ export class StockComponent implements OnInit { console.log(rm_api); let params: any = {}; + params.parent_pdid = this.parent_pdid; params.pd_id = this.pdid; params.pd_form_id = this.form_id; params.company_id = this.company_id; @@ -147,6 +149,7 @@ export class StockComponent implements OnInit { console.log(value.records); if (dataForm !== undefined) { this.stockForms = this.fb.group({ + parent_pdid: [this.parent_pdid], pdid: [this.pdid], formid: [this.form_id], company_id: [this.company_id], @@ -198,6 +201,7 @@ export class StockComponent implements OnInit { this.stockForms = this.fb.group({ + parent_pdid: [this.parent_pdid], pdid: [this.pdid], formid: [this.form_id], company_id: [this.company_id], @@ -247,6 +251,7 @@ export class StockComponent implements OnInit { } else { this.stockForms = this.fb.group({ + parent_pdid: [this.parent_pdid], pdid: [this.pdid], formid: [this.form_id], company_id: [this.company_id], diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.ts index 02f22273b..a0474b005 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.ts @@ -25,6 +25,7 @@ export class SupplierInfoComponent implements OnInit { pageTitle: string = "Supplier Details"; //@Input() pdid: number; + parent_pdid: string; pdid: string; form_id: number; @@ -45,6 +46,7 @@ export class SupplierInfoComponent implements OnInit { private _formBuilder: FormBuilder, private pdTrigerService: PdTrigerService, @Inject(MAT_DIALOG_DATA) public pd_all_details: any, private dialogRef: MatDialogRef) { + this.parent_pdid = this.pd_all_details.pdmaster_details.parent_pd_id this.pdid = this.pd_all_details.pdmaster_details.pd_id; this.form_id = 1; this.company_id = this.pd_all_details.company_id @@ -146,6 +148,7 @@ export class SupplierInfoComponent implements OnInit { serviceProviderForm: Boolean = false; initFormLoadDetails(record) { let params: any = {}; + params.parent_pdid = this.parent_pdid; params.pd_id = this.pdid; params.pd_form_id = this.form_id; params.company_id = this.company_id; @@ -156,6 +159,7 @@ export class SupplierInfoComponent implements OnInit { let dataForm = data.records; if (dataForm !== undefined) { this._supplierQuesFrom = this._formBuilder.group({ + parent_pdid: [this.parent_pdid], pdid: [this.pdid], formid: ['1'], company_id: [this.company_id], @@ -200,6 +204,7 @@ export class SupplierInfoComponent implements OnInit { this.noRecordsFound = true; } else { this._supplierQuesFrom = this._formBuilder.group({ + parent_pdid: [this.parent_pdid], pdid: [this.pdid], formid: ['1'], company_id: [this.company_id], @@ -226,6 +231,7 @@ export class SupplierInfoComponent implements OnInit { } } else { this._supplierQuesFrom = this._formBuilder.group({ + parent_pdid: [this.parent_pdid], pdid: [this.pdid], formid: ['1'], company_id: [this.company_id], 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 52ca499f2..f948ca618 100755 --- 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 @@ -30,7 +30,7 @@ - + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.ts index c01b31261..b789b255b 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.ts @@ -108,7 +108,7 @@ export class StartPdComponent implements OnInit, OnDestroy { this.pdMasterList=data.records.pdmaster_details; // this.categoryList=data.records.question_answers; let filterApplicantName= data.records.pdapplicants_detials.filter(item => item.applicant_type == 1); - this.mainApplicantName = filterApplicantName[0].applicant_name; + this.mainApplicantName = filterApplicantName.length > 0 ? filterApplicantName[0].applicant_name : ''; this.currentPDStatus = data.records.pdmaster_details.pd_status=='INPROGRESS' ? true : data.records.pdmaster_details.pd_status=='SCHEDULED' ? true :data.records.pdmaster_details.pd_status=='ALLOCATED' ? true : false; this.categoryFormButtons = Object.keys(data.records.template_forms).map((item)=>data.records.template_forms[item]).filter(item=>item.isAnswerable===true); // this.categoryFormButtons = this.categoryFormButtons.filter(item=>item.isAnswerable===true); @@ -117,7 +117,7 @@ export class StartPdComponent implements OnInit, OnDestroy { this.answeredQuestions = getAnsweredFormsCount.length; this.pdFullDetails = data.records; if(type==1 && (data.records.pdmaster_details.pd_status=='SCHEDULED' || data.records.pdmaster_details.pd_status=='ALLOCATED')) { - this.pdStatusDialogue(this.pdStatusCheck.INPROGRESS) + this.pdStatusDialogue(this.pdStatusCheck.INPROGRESS,1) } } else{ @@ -132,7 +132,7 @@ export class StartPdComponent implements OnInit, OnDestroy { } // load pd status change dialogue - pdStatusDialogue(status: string): void { + pdStatusDialogue(status: string, checkType: number): void { const dialogRef = this.dialog.open(PdStatusChangeDialogueComponent, { data: { pdid: this.startPD, pd_status: status }, disableClose: true, @@ -142,10 +142,10 @@ export class StartPdComponent implements OnInit, OnDestroy { dialogRef.afterClosed() .subscribe(dataresult => { if(dataresult.update_status==true){ - this.loadTemplates(this.startPD,2); + checkType==2 ? this.router.navigate(['../../viewpd', this.pdMasterList.parent_pd_id], {relativeTo: this.route}) : this.loadTemplates(this.startPD,2); } else { - this.router.navigate(['../../viewpd', this.startPD], {relativeTo: this.route}); + checkType==1 ? this.router.navigate(['../../viewpd', this.pdMasterList.parent_pd_id], {relativeTo: this.route}) : this.loadTemplates(this.startPD,2); } @@ -489,7 +489,7 @@ export class StartPdComponent implements OnInit, OnDestroy { } // load pd view component loadPdViewCompoent() { - this.router.navigate(['../../viewpd', this.startPD], {relativeTo: this.route}); + this.router.navigate(['../../viewpd', this.pdMasterList.parent_pd_id], {relativeTo: this.route}); } } 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 182b5f0d0..115cf64ff 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 @@ -1,167 +1,191 @@ - - -
-
- - -
-

{{master.lender_short_name}}

- {{master.branch_name}} -
- {{master.lender_applicant_id}}
- {{master.pd_date_of_initiation}}
-
-    - - -
- {{master.pd_allocated_to | titlecase}} - {{master.executive_name | titlecase}}/{{master.centralofficer | titlecase}} - {{master.centralofficer | titlecase}}
- - {{master.scheduled_on}} - -
-
- - -
-
-
- - -
-
- - - - - - - - - -
-
- -
- -
-
-
-
-
-
- -
-
- {{master.product_name}} / {{master.subproduct_name}} -
-
-
-
-
-
- -
-
- {{master.loan_amount}} -
-
-
-
-
-
- -
-
- {{master.pd_type_name}} -
-
-
- - - -
-
-
-
- - -
-
- - {{addresses.addressline1}},
{{addresses.city_name}},
{{addresses.state_name}}-{{addresses.pincode_id == 1 ? addresses.other_pincode : addresses.pincode }} -
-
-
-
- - -
-
-
-

Lender Contact Details

- -
-
-   {{master.pd_contact_person}} -
-
-
-
-   {{master.pd_contact_mobileno}} -
-
-
-
-
-
-

Remarks

+
+
+ + + + + {{master.lender_short_name}} + + + {{master.branch_name}} + + + {{master.lender_applicant_id}} + + + {{master.pd_date_of_initiation}} + - {{master.remarks}} -
-
-
-
- -
-
-
-
+ + {{master.product_name}} + + + {{master.subproduct_name}} + + + {{master.loan_amount}} + + + + {{master.pd_type_name}} + + + + + + + + + + + + +
+
+
+
+ + +
- -
-
-
- - + + +
+
+ + +
+
+ + +
+
+ + {{addresses.addressline1}},
{{addresses.city_name}},
{{addresses.state_name}}-{{addresses.pincode_id == 1 ? addresses.other_pincode : addresses.pincode }} +
+
+ + + +
+
+ + +
+
+ {{master.pd_status==pdStatusCheck.QC_COMPLETED ? 'QC Completed' : master.pd_status==pdStatusCheck.ADD_ON_PENDING ? 'Completed' : master.pd_status | titlecase}} +
+
+ + + + +
+
+
+
+
+ {{master.pd_allocated_to | titlecase}} +
+
+ {{master.executive_name | titlecase}} +
+
+ {{master.centralofficer | titlecase}} +
+
+
+ {{master.scheduled_on}} +
+
+ + +
+
+ + + + + + + + +
+
+ {{addresses.addtional_pd_data[0].pd_status==pdStatusCheck.QC_COMPLETED ? 'QC Completed' : addresses.addtional_pd_data[0].pd_status==pdStatusCheck.ADD_ON_PENDING ? 'Completed' : addresses.addtional_pd_data[0].pd_status | titlecase}} +
+
+ + + +
+
+
+
+
+ {{addresses.addtional_pd_data[0].pd_allocated_to | titlecase}} +
+
+ {{addresses.addtional_pd_data[0].executive_name | titlecase}} +
+
+ {{addresses.addtional_pd_data[0].centralofficer | titlecase}} +
+
+
+ {{addresses.addtional_pd_data[0].scheduled_on}} +
+
+ +
+ +
+ + +
+
+ + + Lender Contact Details + + + + + {{master.pd_contact_person}} + + + {{master.pd_contact_mobileno}} + + + + +
+
+ + + Remarks + + +

{{master.remarks}}

+ + + +
+ +
+ + + +

PD Details

diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.scss index 836b204de..ca365439f 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.scss @@ -1,5 +1,4 @@ .cardEdit { - display: inline; float:right; padding-top:3%; } @@ -35,3 +34,13 @@ text-align: center; } } + +.mat-list .mat-list-item.center .mat-list-item-content{ + justify-content: center; +// color: #fff +} +.mat-list .mat-list-item.center .mat-list-text>*{ +margin: 0 auto 0 0; +} + + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.ts index c4d1d4cd6..d60a8ff48 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.ts @@ -14,6 +14,7 @@ import { EditPdApplicantComponent } from '../edit-pd-applicant/edit-pd-applicant import { EditPdMasterComponent } from '../edit-pd-master/edit-pd-master.component'; import { PdRequirementComponent } from '../pd-requirement/pd-requirement.component'; import { PdStatusChangeDialogueComponent } from './../pd-status-change-dialogue/pd-status-change-dialogue.component'; +import { InitiateAdditionalPdComponent } from './../initiate-additional-pd/initiate-additional-pd.component'; /**sweet alert */ import Swal from 'sweetalert2'; @@ -71,6 +72,7 @@ export class ViewPdComponent implements OnInit, OnDestroy { "SCHEDULED": 'SCHEDULED', "INPROGRESS": 'INPROGRESS', "COMPLETED": 'COMPLETED', + "ADD_ON_PENDING": 'ADD_ON_PENDING', "QC_COMPLETED": 'QC_COMPLETED', }; @@ -263,7 +265,8 @@ export class ViewPdComponent implements OnInit, OnDestroy { }); } // pd allocation to - pdAllocationTo(pdData: any) { + pdAllocationTo(pdData: any,childData: any) { + pdData.pd_id = childData.assigned_pd; if (pdData.fk_pd_type == 1) { const dialogRef = this.dialog.open(PdAllocationComponent, { data: pdData, @@ -310,8 +313,8 @@ export class ViewPdComponent implements OnInit, OnDestroy { } // pd schedule details - scheduleDetails(pdData: any) { - + scheduleDetails(pdData: any,childData: any) { + pdData.pd_id = childData.assigned_pd; const dialogSchedule = this.dialog.open(SchedulePdComponent, { data: pdData, disableClose: true @@ -324,11 +327,11 @@ export class ViewPdComponent implements OnInit, OnDestroy { } // start pd - getPDStart(pdID: any, status: string) { + getPDStart(pdDetails: any, status: string) { this.destroyType = 3; if (status == this.pdStatusCheck.ALLOCATED || status == this.pdStatusCheck.SCHEDULED) { const dialogRef = this.dialog.open(PdStatusChangeDialogueComponent, { - data: { pdid: this.viewID, pd_status: this.pdStatusCheck.INPROGRESS }, + data: { pdid: pdDetails.assigned_pd, pd_status: this.pdStatusCheck.INPROGRESS }, disableClose: true, minWidth: '30%', maxWidth: '40%', @@ -336,12 +339,12 @@ export class ViewPdComponent implements OnInit, OnDestroy { dialogRef.afterClosed() .subscribe(dataresult => { if (dataresult.update_status == true) { - this.router.navigate(['../../startpd', pdID], { relativeTo: this.route }); + this.router.navigate(['../../startpd',pdDetails.assigned_pd], { relativeTo: this.route }); } }); } else { - this.router.navigate(['../../startpd', pdID], { relativeTo: this.route }); + this.router.navigate(['../../startpd', pdDetails.assigned_pd], { relativeTo: this.route }); } } @@ -415,6 +418,23 @@ export class ViewPdComponent implements OnInit, OnDestroy { } + // this is for initiate additional pd + initiateAddtionalPD(parentData: any, childData: any, type: boolean){ + const dialogRef = this.dialog.open(InitiateAdditionalPdComponent, { + data: { "type":type,"pd_id":parentData.pd_id,"fk_customer_segment":parentData.fk_customer_segment, "pd_status":parentData.pd_status, "pd_address_id": childData.pd_address_id}, + disableClose: true, + // position: { right: '0' }, + minWidth: '40%', + maxWidth: '60%', + }); + dialogRef.afterClosed() + .subscribe(dataresult => { + if (dataresult.update_status == true) { + this.viewPdDetails(this.viewID) + } + }); + } + // updateViewComponent(editBack:string) { 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 d7cc57299..57abf62a3 100755 --- 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 @@ -115,6 +115,7 @@ import { ViewLocationComponent } from './../pd-directive/view-location/view-loca import { GetAnswerableFormsPipe } from './../pd-pipes/get-answerable-forms.pipe'; import { ConfirmAiDetailsComponent } from './list-pd/start-pd/forms/assessed-income/confirm-ai-details/confirm-ai-details.component'; import { RentalVerificationComponent } from './list-pd/start-pd/forms/rental-verification/rental-verification.component'; +import { InitiateAdditionalPdComponent } from './list-pd/initiate-additional-pd/initiate-additional-pd.component'; /** * Custom angular notifier options @@ -161,7 +162,7 @@ const pdCustomNotifierOptions: NotifierOptions = { }; @NgModule({ - declarations: [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, AllocationViewMoreComponent, PdRequirementComponent, GeneralInfoComponent, ModelEditPdReportComponent, OtherApplicantDetailsComponent, NeighbourHoodComponent, DialogChangeCurrentVenrsion, FinalRemarksComponent, BusinessOtherFamilyMemberComponent, QcReviewComponent, BusinessInfoGroupComponent, SearchRelationPipe, RupeeCurrencyFormatPipe, NumberToWordsPipe, DeleteRecordsCountPipe, BusinessAssetsInfoComponent, BusinessBankingDetailsComponent, SalesDetailsComponent, DailySalesDetailsComponent, SalesCalculationComponent, ManageSalesComponent, PurchaseDetailsComponent, BusinessExpenseDetailsComponent, HouseHoldDetailsComponent, OtherBusinessIncomeDetailsComponent, ManagePurchaseComponent, ManageBusinesExpenseComponent, ManageHouseHoldComponent, ManageOtherBusinessIncomeComponent, GrossProfitCalculationComponent, ManageDailySalesComponent, PdStatusChangeDialogueComponent, PdLocatedMapViewDirective, ViewLocationComponent, GetAnswerableFormsPipe, ConfirmAiDetailsComponent, RentalVerificationComponent], + declarations: [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, AllocationViewMoreComponent, PdRequirementComponent, GeneralInfoComponent, ModelEditPdReportComponent, OtherApplicantDetailsComponent, NeighbourHoodComponent, DialogChangeCurrentVenrsion, FinalRemarksComponent, BusinessOtherFamilyMemberComponent, QcReviewComponent, BusinessInfoGroupComponent, SearchRelationPipe, RupeeCurrencyFormatPipe, NumberToWordsPipe, DeleteRecordsCountPipe, BusinessAssetsInfoComponent, BusinessBankingDetailsComponent, SalesDetailsComponent, DailySalesDetailsComponent, SalesCalculationComponent, ManageSalesComponent, PurchaseDetailsComponent, BusinessExpenseDetailsComponent, HouseHoldDetailsComponent, OtherBusinessIncomeDetailsComponent, ManagePurchaseComponent, ManageBusinesExpenseComponent, ManageHouseHoldComponent, ManageOtherBusinessIncomeComponent, GrossProfitCalculationComponent, ManageDailySalesComponent, PdStatusChangeDialogueComponent, PdLocatedMapViewDirective, ViewLocationComponent, GetAnswerableFormsPipe, ConfirmAiDetailsComponent, RentalVerificationComponent, InitiateAdditionalPdComponent], imports: [ CommonModule, ManagePdRoutingModule, @@ -194,13 +195,13 @@ const pdCustomNotifierOptions: NotifierOptions = { AgmCoreModule.forRoot({apiKey: 'AIzaSyCXsHTus6hyIB8jYvt9ZEIbZve-2vWeQRg'}),OwlDateTimeModule, OwlNativeDateTimeModule, ], - 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, AssessedIncomeComponent, AllocationViewMoreComponent, GeneralInfoComponent, PdRequirementComponent, OtherApplicantDetailsComponent, NeighbourHoodComponent, BusinessOtherFamilyMemberComponent, BusinessInfoGroupComponent,DailySalesDetailsComponent, SalesCalculationComponent, PurchaseDetailsComponent, BusinessExpenseDetailsComponent, HouseHoldDetailsComponent, OtherBusinessIncomeDetailsComponent, ManageSalesComponent, ManagePurchaseComponent, ManageBusinesExpenseComponent, ManageHouseHoldComponent, ManageOtherBusinessIncomeComponent, GrossProfitCalculationComponent, ManageDailySalesComponent, PdStatusChangeDialogueComponent, ViewLocationComponent, ConfirmAiDetailsComponent, RentalVerificationComponent], + exports: [PdLocatedMapViewDirective, PdAllocationComponent, SmartPdAllocationComponent, TelePdAllocationComponent, SchedulePdComponent, EditPdApplicantComponent, EditPdMasterComponent, StartPdComponent, CompletedPdComponent, QcCompletedPdComponent, ClientInfoComponent, SupplierInfoComponent, PersonalInfoComponent, CurrentLoanComponent, LoanDetailsComponent, OtherIncomeComponent, AssetsInfoComponent, AddressComponent, FamilyDetailsComponent, BankingDetailsComponent, StockComponent, EmploymentInfoComponent, BusinessInfoComponent, FinancialInfoComponent, LenderRepresentativeComponent, AssessedIncomeComponent, AllocationViewMoreComponent, GeneralInfoComponent, PdRequirementComponent, OtherApplicantDetailsComponent, NeighbourHoodComponent, BusinessOtherFamilyMemberComponent, BusinessInfoGroupComponent,DailySalesDetailsComponent, SalesCalculationComponent, PurchaseDetailsComponent, BusinessExpenseDetailsComponent, HouseHoldDetailsComponent, OtherBusinessIncomeDetailsComponent, ManageSalesComponent, ManagePurchaseComponent, ManageBusinesExpenseComponent, ManageHouseHoldComponent, ManageOtherBusinessIncomeComponent, GrossProfitCalculationComponent, ManageDailySalesComponent, PdStatusChangeDialogueComponent, ViewLocationComponent, ConfirmAiDetailsComponent, RentalVerificationComponent, InitiateAdditionalPdComponent], providers: [PdTrigerService, GetGeometricLocationService,{provide: MAT_DATE_LOCALE, useValue: 'en-GB'}, {provide: DateAdapter, useClass: MomentDateAdapter, deps: [MAT_DATE_LOCALE]}, {provide: MAT_DATE_FORMATS, useValue: MAT_MOMENT_DATE_FORMATS}, PdLocatedMapViewDirective], entryComponents: [PdAllocationComponent, SmartPdAllocationComponent, SchedulePdComponent, EditPdApplicantComponent, EditPdMasterComponent, TelePdAllocationComponent, AllocationViewMoreComponent, PersonalInfoComponent,BusinessAssetsInfoComponent, - ClientInfoComponent, SupplierInfoComponent, CurrentLoanComponent, LoanDetailsComponent, OtherIncomeComponent, AssetsInfoComponent, AddressComponent, FamilyDetailsComponent, BankingDetailsComponent, StockComponent, EmploymentInfoComponent, BusinessInfoComponent, FinancialInfoComponent, LenderRepresentativeComponent, AssessedIncomeComponent, GeneralInfoComponent, PdRequirementComponent, ModelEditPdReportComponent, OtherApplicantDetailsComponent, NeighbourHoodComponent, DialogChangeCurrentVenrsion, FinalRemarksComponent, BusinessOtherFamilyMemberComponent, QcReviewComponent, BusinessInfoGroupComponent,BusinessBankingDetailsComponent, ManageSalesComponent, ManagePurchaseComponent, ManageBusinesExpenseComponent, ManageHouseHoldComponent, ManageOtherBusinessIncomeComponent, ManageDailySalesComponent,PdStatusChangeDialogueComponent, ViewLocationComponent, ConfirmAiDetailsComponent, RentalVerificationComponent], + ClientInfoComponent, SupplierInfoComponent, CurrentLoanComponent, LoanDetailsComponent, OtherIncomeComponent, AssetsInfoComponent, AddressComponent, FamilyDetailsComponent, BankingDetailsComponent, StockComponent, EmploymentInfoComponent, BusinessInfoComponent, FinancialInfoComponent, LenderRepresentativeComponent, AssessedIncomeComponent, GeneralInfoComponent, PdRequirementComponent, ModelEditPdReportComponent, OtherApplicantDetailsComponent, NeighbourHoodComponent, DialogChangeCurrentVenrsion, FinalRemarksComponent, BusinessOtherFamilyMemberComponent, QcReviewComponent, BusinessInfoGroupComponent,BusinessBankingDetailsComponent, ManageSalesComponent, ManagePurchaseComponent, ManageBusinesExpenseComponent, ManageHouseHoldComponent, ManageOtherBusinessIncomeComponent, ManageDailySalesComponent,PdStatusChangeDialogueComponent, ViewLocationComponent, ConfirmAiDetailsComponent, RentalVerificationComponent, InitiateAdditionalPdComponent], }) export class ManagePdModule { 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 4220f0963..d093985ef 100755 --- 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 @@ -177,6 +177,16 @@ export class PdTrigerService { catchError(this.handleError('operation', [])) ) } + // initiate address for pd process + initiateAddressPdProcess(updateDate: any): Observable { + updateDate.fk_updatedby = this._aws.getlocale(); + // editData.updatedon = currentdate; + return this._http.post(this.apiUrl + "updatePDMaster", { records: updateDate }) + + .pipe( + catchError(this.handleError('operation', [])) + ) + } // update pd applicant updatePdApplicant(editData: any): Observable { @@ -267,8 +277,8 @@ export class PdTrigerService { }; } // common Pd form details get for the Pd Process - getPDFormDetailsWithID(pdID, formID): Observable { - return this._http.post(this.apiUrl + "getPDFormDetails", { "pd_id": pdID, "pd_form_id": formID }) + getPDFormDetailsWithID(params: any): Observable { + return this._http.post(this.apiUrl + "getPDFormDetails", params) .pipe( catchError(this.handleError('operation', [])) ) @@ -599,6 +609,13 @@ export class PdTrigerService { let response2 = this._http.get(this.apiUrl + "listLessPDDetails/get", secondStatus); return forkJoin([response1, response2]); } + // getPDCompleteDetails + getPDCompleteDetails(details: any): Observable { + return this._http.post(this.apiUrl + "getPDCompleteDetails",{ "records":details}) + .pipe( + catchError(this.handleError('operation', [])) + ) + } } diff --git a/ng6-seed/src/app/quality-check/qc-list/qc-view/qc-view.component.html b/ng6-seed/src/app/quality-check/qc-list/qc-view/qc-view.component.html index 29dffd228..4ec2323ff 100755 --- a/ng6-seed/src/app/quality-check/qc-list/qc-view/qc-view.component.html +++ b/ng6-seed/src/app/quality-check/qc-list/qc-view/qc-view.component.html @@ -1,151 +1,189 @@ - - -
-
- - -
-

{{master.lender_short_name}}

- {{master.branch_name}} -
- {{master.lender_applicant_id}}
- {{master.pd_date_of_initiation}}
-
-    - - -
- {{master.pd_allocated_to | titlecase}} - {{master.executive_name | titlecase}}/{{master.centralofficer | titlecase}} - {{master.centralofficer | titlecase}}
- - {{master.scheduled_on}} - -
-
- - -
-
-
- - -
-
- - - - - - - - - -
-
- -
- -
-
-
-
-
-
- -
-
- {{master.product_name}} / {{master.subproduct_name}} -
-
-
-
-
-
- -
-
- {{master.loan_amount}} -
-
-
-
-
-
- -
-
- {{master.pd_type_name}} -
-
-
-
-
-
- - -
-
- {{master.addressline1}},
{{master.city_name}},
{{master.state_name}}-{{master.pincode_id == 1 ? master.other_pincode : master.pincode }} -
-
-
- -
-
-
-

Lender Contact Details

- -
-
-   {{master.pd_contact_person}} -
-
-
-
-   {{master.pd_contact_mobileno}} -
-
-
-
-
-
-

Remarks

- - {{master.remarks}} -
-
-
-
- -
-
+
+
+ + + + + {{master.lender_short_name}} + + + {{master.branch_name}} + + + {{master.lender_applicant_id}} + + + {{master.pd_date_of_initiation}} + + + + {{master.product_name}} + + + {{master.subproduct_name}} + + + {{master.loan_amount}} + + + + {{master.pd_type_name}} + + + + + + + + + + + + +
+
+
+
+ + +
-
-
- -
-
+ + +
+
+ + +
+
+ + +
+
+ {{addresses.addressline1}},
{{addresses.city_name}},
{{addresses.state_name}}-{{addresses.pincode_id == 1 ? addresses.other_pincode : addresses.pincode }} +
+
+ + + +
+
+ + +
+
+ {{master.pd_status==pdStatusCheck.QC_COMPLETED ? 'QC Completed' : master.pd_status==pdStatusCheck.ADD_ON_PENDING ? 'Completed' : master.pd_status | titlecase}} +
+
+ + + +
+
+
+
+
+ {{master.pd_allocated_to | titlecase}} +
+
+ {{master.executive_name | titlecase}} +
+
+ {{master.centralofficer | titlecase}} +
+
+
+ {{master.scheduled_on}} +
+
+ + +
+
+ + + + + + + + +
+
+ {{addresses.addtional_pd_data[0].pd_status==pdStatusCheck.QC_COMPLETED ? 'QC Completed' : addresses.addtional_pd_data[0].pd_status==pdStatusCheck.ADD_ON_PENDING ? 'Completed' : addresses.addtional_pd_data[0].pd_status | titlecase}} +
+
+ + +
+
+
+
+
+ {{addresses.addtional_pd_data[0].pd_allocated_to | titlecase}} +
+
+ {{addresses.addtional_pd_data[0].executive_name | titlecase}} +
+
+ {{addresses.addtional_pd_data[0].centralofficer | titlecase}} +
+
+
+ {{addresses.addtional_pd_data[0].scheduled_on}} +
+
+ +
+ +
+ + +
+
+ + + Lender Contact Details + + + + + {{master.pd_contact_person}} + + + {{master.pd_contact_mobileno}} + + + + +
+
+ + + Remarks + + +

{{master.remarks}}

+ + + +
+ +
+ +
- - + +

PD Details

diff --git a/ng6-seed/src/app/quality-check/qc-list/qc-view/qc-view.component.scss b/ng6-seed/src/app/quality-check/qc-list/qc-view/qc-view.component.scss index 2924cf6a5..d2bc8d115 100755 --- a/ng6-seed/src/app/quality-check/qc-list/qc-view/qc-view.component.scss +++ b/ng6-seed/src/app/quality-check/qc-list/qc-view/qc-view.component.scss @@ -1,6 +1,44 @@ .cardEdit { - display: inline;float:right;padding-top:3%; + float:right; + padding-top:3%; } .minheight { min-height: 100%; +} +::ng-deep .body-container{ + padding: 0rem !important; +} + +.metaDataStyle{ + height:89px !important; +} + + +:host { + margin-left: -5px; + margin-right: -5px; + margin-top: -5px; + display: block; +} +.wrapper { + margin: 6px; +} + +.content-data{ + h2{ + font-size: 1.5rem; + } +} +@media(max-width:767px){ + .profile-center{ + text-align: center; + } +} + +.mat-list .mat-list-item.center .mat-list-item-content{ + justify-content: center; +// color: #fff +} +.mat-list .mat-list-item.center .mat-list-text>*{ +margin: 0 auto 0 0; } \ No newline at end of file diff --git a/ng6-seed/src/app/quality-check/qc-list/qc-view/qc-view.component.ts b/ng6-seed/src/app/quality-check/qc-list/qc-view/qc-view.component.ts index aeb57bd01..ba272484a 100755 --- a/ng6-seed/src/app/quality-check/qc-list/qc-view/qc-view.component.ts +++ b/ng6-seed/src/app/quality-check/qc-list/qc-view/qc-view.component.ts @@ -12,6 +12,8 @@ import { SchedulePdComponent } from './../../../personal-discussion/manage-pd/li import { EditPdApplicantComponent } from './../../../personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component'; import { EditPdMasterComponent } from './../../../personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component'; import { PdRequirementComponent } from './../../../personal-discussion/manage-pd/list-pd/pd-requirement/pd-requirement.component'; +import { InitiateAdditionalPdComponent } from './../../../personal-discussion/manage-pd/list-pd/initiate-additional-pd/initiate-additional-pd.component'; + import {DatePipe } from '@angular/common'; @Component({ selector: 'app-qc-view', @@ -43,6 +45,7 @@ export class QcViewComponent implements OnInit, OnDestroy { "SCHEDULED" :'SCHEDULED', "INPROGRESS" :'INPROGRESS', "COMPLETED" :'COMPLETED', + "ADD_ON_PENDING": 'ADD_ON_PENDING', "QC_COMPLETED" :'QC_COMPLETED', }; public _EditPDtriggerForm:FormGroup; @@ -73,6 +76,7 @@ export class QcViewComponent implements OnInit, OnDestroy { this.pdApplicantData = this.pdApplicantData.filter(appt => appt.applicant_type != 2); this.pdDocumentsData=data.records.pd_documnets; this.masterPdLogsData=data.records.pd_logs.master; + this.pdMasterData[0].addresses = data.records.pd_address.filter(item => item.isactive == 1); //this.applicantPDLogsData= data.records.pd_logs.master; this.currentPDStatus = data.records.pd_master_details[0].pd_status; this.pdAdditionalReqData = data.records.pd_additional_requirements; @@ -155,7 +159,8 @@ export class QcViewComponent implements OnInit, OnDestroy { }); } // pd allocation to - pdAllocationTo(pdData:any) { + pdAllocationTo(pdData:any,childData: any) { + pdData.pd_id = childData.assigned_pd; if(pdData.fk_pd_type == 1){ const dialogRef = this.dialog.open(PdAllocationComponent, { data: pdData, @@ -202,8 +207,8 @@ export class QcViewComponent implements OnInit, OnDestroy { } // pd schedule details - scheduleDetails(pdData:any){ - + scheduleDetails(pdData:any,childData: any){ + pdData.pd_id = childData.assigned_pd; const dialogSchedule = this.dialog.open(SchedulePdComponent, { data: pdData, disableClose: true @@ -215,6 +220,23 @@ export class QcViewComponent implements OnInit, OnDestroy { }); } + // this is for initiate additional pd + initiateAddtionalPD(parentData: any, childData: any, type: boolean){ + const dialogRef = this.dialog.open(InitiateAdditionalPdComponent, { + data: { "type":type,"pd_id":parentData.pd_id,"fk_customer_segment":parentData.fk_customer_segment, "pd_status":parentData.pd_status, "pd_address_id": childData.pd_address_id}, + disableClose: true, + // position: { right: '0' }, + minWidth: '40%', + maxWidth: '60%', + }); + dialogRef.afterClosed() + .subscribe(dataresult => { + if (dataresult.update_status == true) { + this.viewPdDetails(this.viewID) + } + }); + } + // start pd getPDStart(pdID:any){ this.destroyType=3; diff --git a/ng6-seed/src/app/quality-check/qc-service/qc.service.ts b/ng6-seed/src/app/quality-check/qc-service/qc.service.ts index add487f9e..3805f3c3f 100755 --- a/ng6-seed/src/app/quality-check/qc-service/qc.service.ts +++ b/ng6-seed/src/app/quality-check/qc-service/qc.service.ts @@ -161,6 +161,16 @@ export class QcService { catchError(this.handleError('operation', [])) ) } + // initiate address for pd process + initiateAddressPdProcess(updateDate: any): Observable { + updateDate.fk_updatedby = this._aws.getlocale(); + // editData.updatedon = currentdate; + return this._http.post(this.apiUrl + "updatePDMaster", { records: updateDate }) + + .pipe( + catchError(this.handleError('operation', [])) + ) + } // update pd applicant updatePdApplicant(editData: any): Observable { diff --git a/ng6-seed/src/app/quality-check/quality-check.module.ts b/ng6-seed/src/app/quality-check/quality-check.module.ts index f55a9a249..771bc58c9 100755 --- a/ng6-seed/src/app/quality-check/quality-check.module.ts +++ b/ng6-seed/src/app/quality-check/quality-check.module.ts @@ -40,6 +40,10 @@ import { QcStartComponent } from './qc-list/qc-start/qc-start.component'; import { QcPdReportComponent, DialogChangeCurrentVenrsion } from './qc-list/qc-pd-report/qc-pd-report.component'; import { QcReviewComponent } from './qc-list/qc-pd-report/qc-review/qc-review.component'; import { ModelEditPdReportComponent } from './qc-list/qc-pd-report/model-edit-pd-report/model-edit-pd-report.component'; +import { PdLocatedMapViewDirective } from './../personal-discussion/pd-directive/pd-located-map-view.directive'; +import { InitiateAdditionalPdComponent } from './../personal-discussion/manage-pd/list-pd/initiate-additional-pd/initiate-additional-pd.component'; + + /** * Custom angular notifier options @@ -112,9 +116,9 @@ const customNotifierOptions: NotifierOptions = { ManagePdModule, ], declarations: [QualityCheckComponent,QcListComponent, QcViewComponent, QcStartComponent, QcPdReportComponent,DialogChangeCurrentVenrsion, QcReviewComponent, ModelEditPdReportComponent], - entryComponents: [PdAllocationComponent, SmartPdAllocationComponent, SchedulePdComponent, EditPdApplicantComponent, EditPdMasterComponent,DialogChangeCurrentVenrsion, QcReviewComponent, ModelEditPdReportComponent], + entryComponents: [PdAllocationComponent, SmartPdAllocationComponent, SchedulePdComponent, EditPdApplicantComponent, EditPdMasterComponent,DialogChangeCurrentVenrsion, QcReviewComponent, ModelEditPdReportComponent, InitiateAdditionalPdComponent], providers : [QcService,{provide: MAT_DATE_LOCALE, useValue: 'en-GB'}, {provide: DateAdapter, useClass: MomentDateAdapter, deps: [MAT_DATE_LOCALE]}, - {provide: MAT_DATE_FORMATS, useValue: MAT_MOMENT_DATE_FORMATS}] + {provide: MAT_DATE_FORMATS, useValue: MAT_MOMENT_DATE_FORMATS},PdLocatedMapViewDirective] }) export class QualityCheckModule { }