From 5abd9473c273800f1e2da9827aa53e53399d1466 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Wed, 12 Jun 2019 19:28:11 +0530 Subject: [PATCH] clix changes in form : ps --- ng6-seed/src/app/app.module.ts | 2 + .../layouts/admin/admin-layout.component.html | 2 +- .../list-pd/add-pd/add-pd.component.html | 1 - .../list-pd/add-pd/add-pd.component.ts | 85 +++++-- .../edit-pd-master.component.ts | 66 +++++- .../business-info.component.html | 20 ++ .../business-info/business-info.component.ts | 14 +- .../final-remarks.component.html | 62 +++++ .../final-remarks/final-remarks.component.ts | 51 +++++ .../financial-info.component.html | 9 + .../financial-info.component.ts | 7 + ...ns-and-business-environment.component.html | 126 +++++++++++ ...ns-and-business-environment.component.scss | 16 ++ ...and-business-environment.component.spec.ts | 25 ++ ...lans-and-business-environment.component.ts | 213 ++++++++++++++++++ .../loan-details/loan-details.component.html | 26 ++- .../loan-details/loan-details.component.ts | 28 ++- .../supplier-info.component.html | 2 + .../list-pd/start-pd/start-pd.component.ts | 26 ++- .../list-pd/view-pd/view-pd.component.html | 4 +- .../manage-pd/manage-pd.module.ts | 5 +- .../qc-list/qc-start/qc-start.component.ts | 20 +- .../app/quality-check/quality-check.module.ts | 4 +- ng6-seed/src/environments/environment.ts | 2 +- 24 files changed, 772 insertions(+), 44 deletions(-) create mode 100644 ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/future-plans-and-business-environment/future-plans-and-business-environment.component.html create mode 100644 ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/future-plans-and-business-environment/future-plans-and-business-environment.component.scss create mode 100644 ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/future-plans-and-business-environment/future-plans-and-business-environment.component.spec.ts create mode 100644 ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/future-plans-and-business-environment/future-plans-and-business-environment.component.ts diff --git a/ng6-seed/src/app/app.module.ts b/ng6-seed/src/app/app.module.ts index 7dacc9dfa..74befe77a 100755 --- a/ng6-seed/src/app/app.module.ts +++ b/ng6-seed/src/app/app.module.ts @@ -32,6 +32,7 @@ import {MatProgressBarModule} from '@angular/material/progress-bar'; // import {MatProgressSpinnerModule} from '@angular/material/progress-spinner'; import {MatSelectModule} from '@angular/material/select'; import {MatCardModule} from '@angular/material/card'; +import {MatBadgeModule} from '@angular/material/badge'; import {ChangePasswordDialog} from './settings/users/user-profile/user-profile.component'; import { MatFormFieldModule,MatProgressSpinnerModule } from '@angular/material'; import { AppRoutes } from './app.routing'; @@ -81,6 +82,7 @@ const DEFAULT_PERFECT_SCROLLBAR_CONFIG: PerfectScrollbarConfigInterface = { MatProgressBarModule,MatProgressSpinnerModule, MatSelectModule, MatCardModule, + MatBadgeModule, DemoMaterialModule, MatFormFieldModule, HttpClientModule, diff --git a/ng6-seed/src/app/layouts/admin/admin-layout.component.html b/ng6-seed/src/app/layouts/admin/admin-layout.component.html index d9ce4be35..0fb390162 100755 --- a/ng6-seed/src/app/layouts/admin/admin-layout.component.html +++ b/ng6-seed/src/app/layouts/admin/admin-layout.component.html @@ -213,7 +213,7 @@ + + + + + + + + + + USP of the + business Required + + + + + + Future plans for business expansion Required + + + + + Impact + of GST on the business Required + + + + + Key Competitors + Required + + + + + Succession plan + Required + + + + + + Brief of Other Group Concerns / Businesses run by the applicants Required + + + + + + +
+
+
+
+
+
+
{{doc.document_name}} +
+
+
+
+
+
+
+
+
+
+ + picture_as_pdf + {{doc.document_title}} + +
+
+
+
+
+
+
+ + +

No Files

+ + + + + + + + + +
+ + Other Remarks + + +
+
+ +
+ + + \ No newline at end of file diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/future-plans-and-business-environment/future-plans-and-business-environment.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/future-plans-and-business-environment/future-plans-and-business-environment.component.scss new file mode 100644 index 000000000..b60245ae3 --- /dev/null +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/future-plans-and-business-environment/future-plans-and-business-environment.component.scss @@ -0,0 +1,16 @@ +.paragraph_change { + color: #fff !important; + background-color: #e00201 !important; +} + +.mat-card-content { + background-color: white; +} + +.mat-card-actions { + background-color: white; +} + +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/start-pd/forms/future-plans-and-business-environment/future-plans-and-business-environment.component.spec.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/future-plans-and-business-environment/future-plans-and-business-environment.component.spec.ts new file mode 100644 index 000000000..a9980df34 --- /dev/null +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/future-plans-and-business-environment/future-plans-and-business-environment.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { FuturePlansAndBusinessEnvironmentComponent } from './future-plans-and-business-environment.component'; + +describe('FuturePlansAndBusinessEnvironmentComponent', () => { + let component: FuturePlansAndBusinessEnvironmentComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ FuturePlansAndBusinessEnvironmentComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(FuturePlansAndBusinessEnvironmentComponent); + 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/future-plans-and-business-environment/future-plans-and-business-environment.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/future-plans-and-business-environment/future-plans-and-business-environment.component.ts new file mode 100644 index 000000000..322c6bc2d --- /dev/null +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/future-plans-and-business-environment/future-plans-and-business-environment.component.ts @@ -0,0 +1,213 @@ +import { + Component, + OnInit, + Inject, + Input + } from '@angular/core'; + + import { + FormBuilder, + FormGroup, + Validators, + FormArray, FormControl, + } from '@angular/forms'; + + import { NotifierService } from 'angular-notifier'; + + import { + MatDialog, + MatDialogRef, + MAT_DIALOG_DATA + } from '@angular/material'; + /** Service */ + import { PdTrigerService } from '../../../../../pd-service/pd-triger.service'; + import { ActivatedRoute, Router } from '@angular/router'; + import { analyzeAndValidateNgModules } from '@angular/compiler'; + + +@Component({ + selector: 'app-future-plans-and-business-environment', + templateUrl: './future-plans-and-business-environment.component.html', + styleUrls: ['./future-plans-and-business-environment.component.scss'] +}) +export class FuturePlansAndBusinessEnvironmentComponent implements OnInit { + customer_segment_abbr: any; + subproduct_abbr: any; + main_applicant: any; + lender_applicant_id: any; + product_abbr: any; + lender_short_name : any; + + pageTitle: string = "Future Plans And Business Environment "; + + //@Input() pdid: number; + parent_pdid: string; + pdid: string; + form_id: number; + + public _futurePlansForm: FormGroup; + public submitted = false; + + public m_remarkTypeCustomerBehaviour = []; + public m_recommendationList = []; + public documentsAndFilesList = []; + private notifier: NotifierService; + + constructor( + notifier: NotifierService, + private _formBuilder: FormBuilder, + 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 = 23; + this.notifier = notifier; + + this.main_applicant = this.pd_all_details.pdmaster_details.main_applicant; + this.lender_applicant_id = this.pd_all_details.pdmaster_details.lender_applicant_id; + this.subproduct_abbr = this.pd_all_details.pdmaster_details.subproduct_abbr; + this.customer_segment_abbr = this.pd_all_details.pdmaster_details.customer_segment_abbr; + this.lender_short_name = this.pd_all_details.pdmaster_details.lender_short_name; + this.product_abbr = this.pd_all_details.pdmaster_details.product_abbr; + + this._futurePlansForm = this._formBuilder.group({ + parent_pdid: [this.parent_pdid], + pdid: [this.pdid], + formid: ['23'], + usp_of_the_business: [''], + future_plans_for_business_expansion:[''], + impact_of_gst_on_the_business:[''], + key_competitors:[''], + succession_plan:[''], + brief_of_other_group_concerns_or_businesses_run_by_the_applicants:[''], + remarks: [''] + }); + + if(this.lender_short_name == 'CLIX' || this.product_abbr == 'LAEP'){ } + else{ } + + } + + + public viewerOptions: any = { + navbar: false, + toolbar: { + zoomIn: 4, + zoomOut: 4, + oneToOne: 4, + reset: 4, + prev: 4, + play: { + show: 4, + size: 'large', + }, + next: 4, + rotateLeft: 4, + rotateRight: 4, + flipHorizontal: 4, + flipVertical: 4, + } + }; + + noRecordsFound: Boolean = false; + + ngOnInit() { + let params: any = {}; + params.parent_pdid=this.parent_pdid; + params.pd_id = this.pdid; + params.pd_form_id = '23'; + this.pdTrigerService.getPDFormDetailsWithID(params).subscribe(data => { + if (data.dataStatus) { + this._futurePlansForm.controls.usp_of_the_business.setValue(data.records.usp_of_the_business); + this._futurePlansForm.controls.future_plans_for_business_expansion.setValue(data.records.future_plans_for_business_expansion); + this._futurePlansForm.controls.impact_of_gst_on_the_business.setValue(data.records.impact_of_gst_on_the_business); + this._futurePlansForm.controls.key_competitors.setValue(data.records.key_competitors); + this._futurePlansForm.controls.succession_plan.setValue(data.records.succession_plan); + this._futurePlansForm.controls.brief_of_other_group_concerns_or_businesses_run_by_the_applicants.setValue(data.records.brief_of_other_group_concerns_or_businesses_run_by_the_applicants); + this._futurePlansForm.controls.remarks.setValue(data.records.remarks); + + this.noRecordsFound = true; + + } else { + this.noRecordsFound = true; + } + }, err => { + + }) + + this.pdTrigerService.retriveFile(this.pdid,params.pd_form_id,null).subscribe(data => { + if (data.status == 230) { + if(data.records.length>0){ + data.records.forEach((val, index) => { + let splitted = val.pd_document_name.split("."); + let DocumentsAndFiles = { + 'document_name': val.pd_document_name, + 'document_title': val.pd_document_title, + 'document': val.doc_url, + 'document_type' : splitted[1] == 'pdf'?'pdf':'image' + } + this.documentsAndFilesList.push(DocumentsAndFiles); + }); + } + } + else{ + this.documentsAndFilesList = []; + } + }); + } + + /** To Save/Edited Popup Data */ + onSubmit() { + // console.log('this._futurePlansForm.value',this._futurePlansForm.value); + this.submitted = true; + // stop here if form is invalid + if (this._futurePlansForm.invalid) { + this.notifier.notify('warning', 'Please Fill All Mandatory Fields.!'); + this.validateAllFormFields(this._futurePlansForm); + return; + } else { + var answerFormValues = this._futurePlansForm.value; + + //To Remove The "Null" With Key also + // Object.keys(answerFormValues).forEach((key) => (answerFormValues[key] == null) && delete answerFormValues[key]); + + this.pdTrigerService.savePDFormDetailsWithID(answerFormValues).subscribe( + dataresult => { + if (dataresult.status == 200) { + this.notifier.notify('success', 'Saved Successfully.'); + setTimeout(() => { + this.dialogRef.close(); + }, 3000); + } + else { + this.notifier.notify('warning', 'Something Wents Wrong Try Again.!'); + } + }, error => { + this.notifier.notify('warning', 'Something Wents Wrong Try Again.!' + '-' + error.error_text + ' occur'); + + // this.dialogRef.close(); + }); + + } + } + + /** To Reset Popup Data */ + onReset() { + // this._addQuesFrom.reset(); + } + + /** To validate All Form 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); + } + }); + } + } + \ No newline at end of file diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.html index 5177fe605..3e16c3771 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.html @@ -57,8 +57,27 @@ autocomplete="off"> End Use Required + + + + Select + Yes, Disclosed + No,not disclosed + + + + + + + + {{"₹"}} {{ loanDetailsForm.controls['fund_amt'].value | numberToWords }} Only + + + - Select Yes @@ -69,7 +88,7 @@ - {{"₹"}} {{ loanDetailsForm.controls['balance_transfer_amount'].value | numberToWords }} Only @@ -99,7 +118,7 @@ - + Select @@ -114,6 +133,7 @@ End Use of Top Up Required + 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 0d4606c92..68d705b80 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 @@ -47,6 +47,7 @@ export class LoanDetailsComponent implements OnInit { productID: any; subProductName: any; propertyType: any; + lenderShortName :any; mortageCardAccess: boolean; mortageAccess: boolean = false; @@ -103,17 +104,19 @@ export class LoanDetailsComponent implements OnInit { this.lender_applicant_id = this.pd_all_details.pdmaster_details.lender_applicant_id; this.subproduct_abbr = this.pd_all_details.pdmaster_details.subproduct_abbr; this.customer_segment_abbr = this.pd_all_details.pdmaster_details.customer_segment_abbr; + this.lenderShortName = this.pd_all_details.pdmaster_details.lender_short_name; if (this.productAbbr == 'PL' || this.productAbbr == 'BL' || this.productAbbr == 'LAP') { this.isContribution = true; } + } documentsAndFilesList: any = []; /** init Fns */ ngOnInit() { this.initloanDetailsForm(); this.getM_EndUseofLoad(); - this.getM_EndUseForLoan(this.pdid, this.pd_all_details.pdmaster_details.fk_subproduct_id); + this.getM_EndUseForLoan(this.pdid,this.pd_all_details.pdmaster_details.fk_subproduct_id); this.getM_sourceofamount(); this.getM_MortageTypeProperty(); this.getM_StatusofCunstruction(); @@ -157,9 +160,6 @@ export class LoanDetailsComponent implements OnInit { } }); - - - }) @@ -210,6 +210,8 @@ export class LoanDetailsComponent implements OnInit { this.loanDetailsForm.controls['end_use_other'].setValue(value.records.end_use_other); } this.loanDetailsForm.controls['is_transfer'].setValue(value.records.is_transfer); + this.loanDetailsForm.controls['is_there_total_fund'].setValue(value.records.is_there_total_fund); + this.loanDetailsForm.controls['fund_amt'].setValue(value.records.fund_amt); if (value.records.balance_transfer_amount) { this.loanDetailsForm.controls['balance_transfer_amount'].setValue(value.records.balance_transfer_amount); @@ -295,6 +297,11 @@ export class LoanDetailsComponent implements OnInit { if (this.pd_all_details.pdmaster_details.fk_subproduct_id) { this.loanDetailsForm.controls['sub_product'].setValue(this.pd_all_details.pdmaster_details.fk_subproduct_id); } + if(this.lenderShortName == 'CLIX'){ + console.log(this.lenderShortName); + this.loanDetailsForm.controls['is_transfer'].setValue("no"); + this.selectedBalancesTransferChanges("no") + } } }) @@ -339,6 +346,7 @@ export class LoanDetailsComponent implements OnInit { } getM_EndUseForLoan(pdid, subproductid) { + console.log(pdid, subproductid) this._pd.getEndUseForLoan(pdid, subproductid).subscribe( data => { this.m_endUseForLoan = data.records.filter(data => data.isactive == 1); @@ -424,6 +432,8 @@ export class LoanDetailsComponent implements OnInit { end_use: [''], end_use_other: [''], is_transfer: [''], + is_there_total_fund:[''], + fund_amt:[''], balance_transfer_amount: [''], topup_amount: [''], end_use_topup: [''], @@ -550,8 +560,10 @@ export class LoanDetailsComponent implements OnInit { /**For Setting Validations */ selectedBalancesTransferChanges(event: any) { - - if (event.value == 'no') { + console.log(this.lenderShortName); + console.log(event); + if (event == 'no') { + console.log('on 2 time -', event); this.loanDetailsForm.controls['source'].setValidators([Validators.required]); this.loanDetailsForm.controls['source'].updateValueAndValidity(); @@ -566,7 +578,7 @@ export class LoanDetailsComponent implements OnInit { this.loanDetailsForm.controls['other_end_use_topup'].setValue(''); } - else if (event.value == 'yes') { + else if (event == 'yes') { this.loanDetailsForm.controls['source'].setValue(''); @@ -799,6 +811,8 @@ export class LoanDetailsComponent implements OnInit { records.end_use_other = this.isOtherPurpose ? this.loanDetailsForm.controls['end_use_other'].value : null; records.is_transfer = this.loanDetailsForm.controls['is_transfer'].value; + records.is_there_total_fund = this.loanDetailsForm.controls['is_there_total_fund'].value; + records.fund_amt = this.loanDetailsForm.controls['fund_amt'].value; if (this.loanDetailsForm.controls['is_transfer'].value == 'yes') { records.balance_transfer_amount = this.loanDetailsForm.controls['balance_transfer_amount'].value; diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.html index 7c241da27..5edc21461 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.html @@ -101,6 +101,7 @@ Payment made in Cash. Payment made through Banking channels. + Payment made through Cash and Banking Channels. @@ -237,6 +238,7 @@ Payment made in Cash. Payment made through Banking channels. + Payment made through Cash and Banking Channels. 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 b789b255b..c07f2b9e1 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 @@ -25,10 +25,11 @@ import {LoanDetailsComponent} from './forms/loan-details/loan-details.component' import {GeneralInfoComponent} from './forms/general-info/general-info.component'; import {NeighbourHoodComponent} from './forms/neighbour-hood/neighbour-hood.component'; import {FinalRemarksComponent} from './forms/final-remarks/final-remarks.component'; -import { BusinessInfoGroupComponent } from './forms/business-info-group/business-info-group.component'; -import { BusinessAssetsInfoComponent } from './forms/business-assets-info/business-assets-info.component'; -import { PdStatusChangeDialogueComponent } from './../pd-status-change-dialogue/pd-status-change-dialogue.component'; +import {BusinessInfoGroupComponent } from './forms/business-info-group/business-info-group.component'; +import {BusinessAssetsInfoComponent } from './forms/business-assets-info/business-assets-info.component'; +import {PdStatusChangeDialogueComponent } from './../pd-status-change-dialogue/pd-status-change-dialogue.component'; import {RentalVerificationComponent} from './forms/rental-verification/rental-verification.component'; +import {FuturePlansAndBusinessEnvironmentComponent} from './forms/future-plans-and-business-environment/future-plans-and-business-environment.component'; @Component({ selector: 'app-start-pd', @@ -44,7 +45,8 @@ export class StartPdComponent implements OnInit, OnDestroy { categoryList: any = []; pdMasterList: any = []; pdFullDetails:any=[]; - + lender_short_name :any; + product_abbr :any; // category static form buttons categoryFormButtons: any; formsCategoryEnable: boolean = false; @@ -106,6 +108,8 @@ export class StartPdComponent implements OnInit, OnDestroy { data => { if (data.status == 200) { this.pdMasterList=data.records.pdmaster_details; + this.lender_short_name = data.records.pdmaster_details.lender_short_name; + this.product_abbr = data.records.pdmaster_details.product_abbr; // this.categoryList=data.records.question_answers; let filterApplicantName= data.records.pdapplicants_detials.filter(item => item.applicant_type == 1); this.mainApplicantName = filterApplicantName.length > 0 ? filterApplicantName[0].applicant_name : ''; @@ -479,6 +483,20 @@ export class StartPdComponent implements OnInit, OnDestroy { // this.notifier.notify('success', 'Successfully allocated.!'); this.loadTemplates(this.startPD,2); }); + }else + if((this.lender_short_name == 'CLIX' || this.product_abbr == 'LAEP') && this.selectedFormsCategory.form_id==23){ + const dialogRef = this.dialog.open(FuturePlansAndBusinessEnvironmentComponent, { + data: this.pdFullDetails, + maxWidth: '100vw', + maxHeight: '100vh', + height: '100%', + width: '100%', + disableClose: true + }); + dialogRef.afterClosed() + .subscribe(dataresult => { + this.loadTemplates(this.startPD,2); + }); } 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 250dec2c2..d2af9307a 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 @@ -55,7 +55,7 @@ - +
@@ -68,7 +68,7 @@
- +
{{master.loan_amount | numberToWords}} Only
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 e11920926..fee4fd573 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 @@ -118,6 +118,7 @@ import { InitiateAdditionalPdComponent } from './list-pd/initiate-additional-pd/ import { ManageDailyPurchaseComponent } from './list-pd/start-pd/forms/assessed-income/AI-diologue/manage-daily-purchase/manage-daily-purchase.component'; import { DailyPurchaseDetailsComponent } from './list-pd/start-pd/forms/assessed-income/daily-purchase-details/daily-purchase-details.component'; import { ManageRentalVerificationComponent } from './list-pd/start-pd/forms/rental-verification/manage-rental-verification/manage-rental-verification.component'; +import { FuturePlansAndBusinessEnvironmentComponent } from './list-pd/start-pd/forms/future-plans-and-business-environment/future-plans-and-business-environment.component'; /** * Custom angular notifier options @@ -164,7 +165,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, InitiateAdditionalPdComponent ,ManageDailyPurchaseComponent, DailyPurchaseDetailsComponent, ManageRentalVerificationComponent], + 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 ,ManageDailyPurchaseComponent, DailyPurchaseDetailsComponent, ManageRentalVerificationComponent, FuturePlansAndBusinessEnvironmentComponent], imports: [ CommonModule, ManagePdRoutingModule, @@ -203,7 +204,7 @@ const pdCustomNotifierOptions: NotifierOptions = { {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, InitiateAdditionalPdComponent, ManageDailyPurchaseComponent,ManageRentalVerificationComponent], + 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, ManageDailyPurchaseComponent,ManageRentalVerificationComponent,FuturePlansAndBusinessEnvironmentComponent], }) export class ManagePdModule { } diff --git a/ng6-seed/src/app/quality-check/qc-list/qc-start/qc-start.component.ts b/ng6-seed/src/app/quality-check/qc-list/qc-start/qc-start.component.ts index df92095e5..d67598b70 100755 --- a/ng6-seed/src/app/quality-check/qc-list/qc-start/qc-start.component.ts +++ b/ng6-seed/src/app/quality-check/qc-list/qc-start/qc-start.component.ts @@ -29,6 +29,7 @@ import { BusinessInfoGroupComponent } from './../../../personal-discussion/manag import { BusinessAssetsInfoComponent } from './../../../personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component'; import { PdStatusChangeDialogueComponent } from './../../../personal-discussion/manage-pd/list-pd/pd-status-change-dialogue/pd-status-change-dialogue.component'; import {RentalVerificationComponent} from './../../../personal-discussion/manage-pd/list-pd/start-pd/forms/rental-verification/rental-verification.component'; +import {FuturePlansAndBusinessEnvironmentComponent} from './../../../personal-discussion/manage-pd/list-pd/start-pd/forms/future-plans-and-business-environment/future-plans-and-business-environment.component'; @Component({ selector: 'app-qc-start', @@ -45,7 +46,8 @@ export class QcStartComponent implements OnInit, OnDestroy { categoryList: any = []; pdMasterList: any = []; pdFullDetails:any=[]; - + lender_short_name :any; + product_abbr :any; // category static form buttons categoryFormButtons: any; formsCategoryEnable: boolean = false; @@ -112,6 +114,8 @@ export class QcStartComponent implements OnInit, OnDestroy { this.mainApplicantName = filterApplicantName[0].applicant_name; this.currentPDStatus = data.records.pdmaster_details.pd_status=='INPROGRESS' ? false : data.records.pdmaster_details.pd_status=='false' ? true :data.records.pdmaster_details.pd_status=='ALLOCATED' ? false : data.records.pdmaster_details.pd_status=='COMPLETED' ? true : false; this.categoryFormButtons = Object.keys(data.records.template_forms).map((item)=>data.records.template_forms[item]).filter(item=>item.isAnswerable===true); + this.lender_short_name = data.records.pdmaster_details.lender_short_name; + this.product_abbr = data.records.pdmaster_details.product_abbr; // this.categoryFormButtons = this.categoryFormButtons.filter(item=>item.isAnswerable===true); this.actualQuestions = this.categoryFormButtons.length; let getAnsweredFormsCount = this.categoryFormButtons.filter(item=>item.isAnswered===true); @@ -438,6 +442,20 @@ export class QcStartComponent implements OnInit, OnDestroy { .subscribe(dataresult => { this.loadTemplates(this.startPD,2); }); + }else + if((this.lender_short_name == 'CLIX' || this.product_abbr == 'LAEP') && this.selectedFormsCategory.form_id==23){ + const dialogRef = this.dialog.open(FuturePlansAndBusinessEnvironmentComponent, { + data: this.pdFullDetails, + maxWidth: '100vw', + maxHeight: '100vh', + height: '100%', + width: '100%', + disableClose: true + }); + dialogRef.afterClosed() + .subscribe(dataresult => { + this.loadTemplates(this.startPD,2); + }); } 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 74ab07401..c0ef4d22a 100755 --- a/ng6-seed/src/app/quality-check/quality-check.module.ts +++ b/ng6-seed/src/app/quality-check/quality-check.module.ts @@ -100,6 +100,7 @@ import { QcCompletedPdComponent } from 'app/personal-discussion/manage-pd/list-p import { PersonalInfoComponent } from 'app/personal-discussion/manage-pd/list-pd/start-pd/forms/personal-info/personal-info.component'; import { AllocationViewMoreComponent } from 'app/personal-discussion/manage-pd/list-pd/allocation-view-more/allocation-view-more.component'; import { PdRequirementComponent } from 'app/personal-discussion/manage-pd/list-pd/pd-requirement/pd-requirement.component'; +import { FuturePlansAndBusinessEnvironmentComponent } from 'app/personal-discussion/manage-pd/list-pd/start-pd/forms/future-plans-and-business-environment/future-plans-and-business-environment.component'; /** @@ -207,7 +208,8 @@ const customNotifierOptions: NotifierOptions = { ViewLocationComponent, RentalVerificationComponent, ManageDailyPurchaseComponent, - ManageRentalVerificationComponent], + ManageRentalVerificationComponent, + FuturePlansAndBusinessEnvironmentComponent], 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},PdLocatedMapViewDirective], diff --git a/ng6-seed/src/environments/environment.ts b/ng6-seed/src/environments/environment.ts index af7a9fb85..67aab72f9 100755 --- a/ng6-seed/src/environments/environment.ts +++ b/ng6-seed/src/environments/environment.ts @@ -25,5 +25,5 @@ export const environment = { s3_endpoint: '', accessToken:'', //apiUrl:'http://localhost/sparqapi/api/' - apiEndpoint: 'https://ssa.sineedge.com/sparqtest/api/' + apiEndpoint: 'https://ssa.sineedge.com/sparqapi/api/' };