Skip to content

Commit a2db1ea

Browse files
author
Jose Alberto Hernandez
committed
WEB-265: Loan deferred income data rounding issue
1 parent a29cda7 commit a2db1ea

File tree

3 files changed

+20
-21
lines changed

3 files changed

+20
-21
lines changed

src/app/loans/loans-view/loan-deferred-income-tab/loan-deferred-income-tab.component.html

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,30 +3,30 @@ <h3>{{ 'labels.inputs.Deferred income' | translate }} - {{ 'labels.menus.Capital
33

44
<table mat-table [dataSource]="capitalizedIncomeData" *ngIf="capitalizedIncomeData.length > 0">
55
<ng-container matColumnDef="amount">
6-
<th mat-header-cell *matHeaderCellDef>{{ 'labels.inputs.Amount' | translate }}</th>
7-
<td mat-cell *matCellDef="let item">
6+
<th mat-header-cell class="center" *matHeaderCellDef>{{ 'labels.inputs.Amount' | translate }}</th>
7+
<td mat-cell class="r-amount" *matCellDef="let item">
88
{{ item.amount | formatNumber }}
99
</td>
1010
</ng-container>
1111

1212
<ng-container matColumnDef="amortizedAmount">
13-
<th mat-header-cell *matHeaderCellDef>{{ 'labels.inputs.Amortized Amount' | translate }}</th>
14-
<td mat-cell *matCellDef="let item">
15-
{{ item.amortizedAmount | formatNumber: '0.00' }}
13+
<th mat-header-cell class="center" *matHeaderCellDef>{{ 'labels.inputs.Amortized Amount' | translate }}</th>
14+
<td mat-cell class="r-amount" *matCellDef="let item">
15+
{{ item.amortizedAmount | formatNumber }}
1616
</td>
1717
</ng-container>
1818

1919
<ng-container matColumnDef="unrecognizedAmount">
20-
<th mat-header-cell *matHeaderCellDef>{{ 'labels.inputs.Unrecognized Amount' | translate }}</th>
21-
<td mat-cell *matCellDef="let item">
22-
{{ item.unrecognizedAmount | formatNumber: '0.00' }}
20+
<th mat-header-cell class="center" *matHeaderCellDef>{{ 'labels.inputs.Unrecognized Amount' | translate }}</th>
21+
<td mat-cell class="r-amount" *matCellDef="let item">
22+
{{ item.unrecognizedAmount | formatNumber }}
2323
</td>
2424
</ng-container>
2525

2626
<ng-container matColumnDef="amountAdjustment">
27-
<th mat-header-cell *matHeaderCellDef>{{ 'labels.inputs.Adjustment Amount' | translate }}</th>
28-
<td mat-cell *matCellDef="let item">
29-
{{ item.amountAdjustment | formatNumber: '0.00' }}
27+
<th mat-header-cell class="center" *matHeaderCellDef>{{ 'labels.inputs.Adjustment Amount' | translate }}</th>
28+
<td mat-cell class="r-amount" *matCellDef="let item">
29+
{{ item.amountAdjustment | formatNumber: '-' }}
3030
</td>
3131
</ng-container>
3232

src/app/loans/loans-view/loan-deferred-income-tab/loan-deferred-income-tab.component.ts

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import { NgClass } from '@angular/common';
21
import { Component } from '@angular/core';
32
import {
43
MatCell,
@@ -51,16 +50,16 @@ export class LoanDeferredIncomeTabComponent {
5150
constructor(private route: ActivatedRoute) {
5251
this.loanId = this.route.parent.parent.snapshot.params['loanId'];
5352

54-
let capitalizedIncomeData: LoanCapitalizedIncomeData[] = [];
53+
this.capitalizedIncomeData = [];
5554
this.route.parent.data.subscribe((data: { loanDeferredIncomeData: LoanDeferredIncomeData }) => {
56-
capitalizedIncomeData = data.loanDeferredIncomeData.capitalizedIncomeData || [];
57-
capitalizedIncomeData.forEach((item: LoanCapitalizedIncomeData) => {
58-
item.amortizedAmount = item.amortizedAmount | 0;
59-
item.unrecognizedAmount = item.unrecognizedAmount | 0;
60-
item.amountAdjustment = item.amountAdjustment | 0;
61-
this.capitalizedIncomeData.push(item);
55+
data.loanDeferredIncomeData.capitalizedIncomeData.forEach((item: LoanCapitalizedIncomeData) => {
56+
this.capitalizedIncomeData.push({
57+
amount: item.amount,
58+
amortizedAmount: item.amortizedAmount ?? 0,
59+
unrecognizedAmount: item.unrecognizedAmount ?? 0,
60+
amountAdjustment: item.amountAdjustment ?? 0
61+
});
6262
});
63-
console.log(this.capitalizedIncomeData);
6463
});
6564
}
6665
}

src/app/pipes/format-number.pipe.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ export class FormatNumberPipe implements PipeTransform {
1010
) {}
1111

1212
transform(value: string | number, defaultValue: any): string {
13-
if (!value) {
13+
if (value === undefined) {
1414
return defaultValue ? defaultValue : '';
1515
}
1616
const decimals = this.settingsService.decimals;

0 commit comments

Comments
 (0)