From 55b5ce616f80390b1e234fb401a1a9277c9ecc87 Mon Sep 17 00:00:00 2001 From: Jose Alberto Hernandez Date: Thu, 4 Jul 2024 00:05:39 -0600 Subject: [PATCH] fix: Loan Product using global configurations for repayments --- src/app/directives/format-amount.directive.ts | 2 +- .../edit-loan-product/edit-loan-product.component.ts | 5 ++++- .../loan-product-settings-step.component.ts | 6 ++++++ .../cob-workflow/loan-locked/loan-locked.component.ts | 2 +- .../error-log-popover/error-log-popover.component.ts | 2 +- .../manage-jobs/workflow-jobs/workflow-jobs.component.ts | 4 ++-- .../manage-reports/create-report/create-report.component.ts | 2 +- .../roles-and-permissions/view-role/view-role.component.ts | 2 +- 8 files changed, 17 insertions(+), 8 deletions(-) diff --git a/src/app/directives/format-amount.directive.ts b/src/app/directives/format-amount.directive.ts index 3378bc643..adba25708 100644 --- a/src/app/directives/format-amount.directive.ts +++ b/src/app/directives/format-amount.directive.ts @@ -24,7 +24,7 @@ export class FormatAmountDirective implements OnInit { target.value = this.parse(target.value); } @HostListener('focus', ['$event.target']) focus(target: any) { - if (typeof this.control.value == 'undefined') { + if (typeof this.control.value === 'undefined') { target.value = ''; } else { target.value = this.control.value; diff --git a/src/app/products/loan-products/edit-loan-product/edit-loan-product.component.ts b/src/app/products/loan-products/edit-loan-product/edit-loan-product.component.ts index d94cd2901..ae890b0c9 100644 --- a/src/app/products/loan-products/edit-loan-product/edit-loan-product.component.ts +++ b/src/app/products/loan-products/edit-loan-product/edit-loan-product.component.ts @@ -57,13 +57,16 @@ export class EditLoanProductComponent implements OnInit { private advancedPaymentStrategy: AdvancedPaymentStrategy) { this.route.data.subscribe((data: { loanProductAndTemplate: any, configurations: any }) => { this.loanProductAndTemplate = data.loanProductAndTemplate; + console.log(this.loanProductAndTemplate); const assetAccountData = this.loanProductAndTemplate.accountingMappingOptions.assetAccountOptions || []; const liabilityAccountData = this.loanProductAndTemplate.accountingMappingOptions.liabilityAccountOptions || []; this.loanProductAndTemplate.accountingMappingOptions.assetAndLiabilityAccountOptions = assetAccountData.concat(liabilityAccountData); this.itemsByDefault = loanProducts.setItemsByDefault(data.configurations); this.loanProductAndTemplate['itemsByDefault'] = this.itemsByDefault; - this.loanProductAndTemplate = loanProducts.updateLoanProductDefaults(this.loanProductAndTemplate, true); + // this.loanProductAndTemplate = loanProducts.updateLoanProductDefaults(this.loanProductAndTemplate, true); + + console.log(this.loanProductAndTemplate); }); } diff --git a/src/app/products/loan-products/loan-product-stepper/loan-product-settings-step/loan-product-settings-step.component.ts b/src/app/products/loan-products/loan-product-stepper/loan-product-settings-step/loan-product-settings-step.component.ts index 21086bb5d..c6a096021 100644 --- a/src/app/products/loan-products/loan-product-stepper/loan-product-settings-step/loan-product-settings-step.component.ts +++ b/src/app/products/loan-products/loan-product-stepper/loan-product-settings-step/loan-product-settings-step.component.ts @@ -43,6 +43,7 @@ export class LoanProductSettingsStepComponent implements OnInit { loanScheduleProcessingTypeData: OptionData[] = []; isAdvancedTransactionProcessingStrategy = false; advancedTransactionProcessingStrategyDisabled = true; + useDueForRepaymentsConfigurations = false; /** Values to Days for Repayments */ defaultConfigValues: GlobalConfiguration[] = []; @@ -82,6 +83,8 @@ export class LoanProductSettingsStepComponent implements OnInit { this.loanScheduleTypeData = this.loanProductsTemplate.loanScheduleTypeOptions; this.loanScheduleProcessingTypeData = this.loanProductsTemplate.loanScheduleProcessingTypeOptions; + // this.useDueForRepaymentsConfigurations = (!this.loanProduct.dueDaysForRepaymentEvent && !this.loanProduct.overDueDaysForRepaymentEvent); + const transactionProcessingStrategyCode: string = this.loanProductsTemplate.transactionProcessingStrategyCode || this.transactionProcessingStrategyData[0].code; this.loanProductSettingsForm.patchValue({ 'amortizationType': this.loanProductsTemplate.amortizationType.id, @@ -122,6 +125,9 @@ export class LoanProductSettingsStepComponent implements OnInit { this.processingStrategyService.initialize(this.isAdvancedTransactionProcessingStrategy); this.validateAdvancedPaymentStrategyControls(); + console.log(this.loanProductsTemplate.dueDaysForRepaymentEvent); + console.log(this.loanProductsTemplate.overDueDaysForRepaymentEvent); + if (this.loanProductsTemplate.dueDaysForRepaymentEvent != null && this.loanProductsTemplate.overDueDaysForRepaymentEvent != null) { this.loanProductSettingsForm.patchValue({ diff --git a/src/app/system/manage-jobs/cob-workflow/loan-locked/loan-locked.component.ts b/src/app/system/manage-jobs/cob-workflow/loan-locked/loan-locked.component.ts index 9de305103..e91dac4fc 100644 --- a/src/app/system/manage-jobs/cob-workflow/loan-locked/loan-locked.component.ts +++ b/src/app/system/manage-jobs/cob-workflow/loan-locked/loan-locked.component.ts @@ -58,7 +58,7 @@ export class LoanLockedComponent implements OnInit { private systemService: SystemService, private tasksService: TasksService, private dialog: MatDialog, - private translateService:TranslateService) { + private translateService: TranslateService) { } ngOnInit(): void { diff --git a/src/app/system/manage-jobs/scheduler-jobs/error-log-popover/error-log-popover.component.ts b/src/app/system/manage-jobs/scheduler-jobs/error-log-popover/error-log-popover.component.ts index 4354d5ef2..5ecfa454d 100644 --- a/src/app/system/manage-jobs/scheduler-jobs/error-log-popover/error-log-popover.component.ts +++ b/src/app/system/manage-jobs/scheduler-jobs/error-log-popover/error-log-popover.component.ts @@ -27,7 +27,7 @@ export class ErrorLogPopoverComponent implements OnInit { } buttonLabel(): string { - const label: string = this.show ? this.translateService.instant('labels.buttons.Show less'): this.translateService.instant('labels.buttons.Show more'); + const label: string = this.show ? this.translateService.instant('labels.buttons.Show less') : this.translateService.instant('labels.buttons.Show more'); return this.translateService.instant('labels.buttons.' + label); } diff --git a/src/app/system/manage-jobs/workflow-jobs/workflow-jobs.component.ts b/src/app/system/manage-jobs/workflow-jobs/workflow-jobs.component.ts index 9136ff787..a4cecb2d5 100644 --- a/src/app/system/manage-jobs/workflow-jobs/workflow-jobs.component.ts +++ b/src/app/system/manage-jobs/workflow-jobs/workflow-jobs.component.ts @@ -34,7 +34,7 @@ export class WorkflowJobsComponent implements OnInit { constructor(private systemService: SystemService, public dialog: MatDialog, - private translateService:TranslateService) {} + private translateService: TranslateService) {} ngOnInit(): void { this.systemService.getWorkflowJobNames().toPromise() @@ -111,7 +111,7 @@ export class WorkflowJobsComponent implements OnInit { if (this.jobAvailableStepsData.length > 0) { for (let index = 0; index < this.jobAvailableStepsData.length; index++) { - this.jobAvailableStepsData[index].stepDescription = this.translateService.instant(`labels.catalogs.${this.jobAvailableStepsData[index].stepDescription}`) + this.jobAvailableStepsData[index].stepDescription = this.translateService.instant(`labels.catalogs.${this.jobAvailableStepsData[index].stepDescription}`); } const frmFields: FormfieldBase[] = [ new SelectBase({ diff --git a/src/app/system/manage-reports/create-report/create-report.component.ts b/src/app/system/manage-reports/create-report/create-report.component.ts index 76e47616d..c0b0a988b 100644 --- a/src/app/system/manage-reports/create-report/create-report.component.ts +++ b/src/app/system/manage-reports/create-report/create-report.component.ts @@ -63,7 +63,7 @@ export class CreateReportComponent implements OnInit { private route: ActivatedRoute, private router: Router, private dialog: MatDialog, - private translateServices:TranslateService) { + private translateServices: TranslateService) { this.route.data.subscribe((data: { reportTemplate: any }) => { this.reportTemplateData = data.reportTemplate; this.dataForDialog.allowedParameters = this.reportTemplateData.allowedParameters; diff --git a/src/app/system/roles-and-permissions/view-role/view-role.component.ts b/src/app/system/roles-and-permissions/view-role/view-role.component.ts index 489f148f3..b332b344d 100644 --- a/src/app/system/roles-and-permissions/view-role/view-role.component.ts +++ b/src/app/system/roles-and-permissions/view-role/view-role.component.ts @@ -66,7 +66,7 @@ export class ViewRoleComponent implements OnInit { private systemService: SystemService, private router: Router, private formBuilder: UntypedFormBuilder, - private translateService:TranslateService, + private translateService: TranslateService, public dialog: MatDialog) { this.route.data.subscribe((data: { roledetails: any }) => { this.rolePermissionService = data.roledetails;