Skip to content

WEB-657: Loan view and Repayment for Working Capital #3622

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
alberto-art3ch wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

WEB-657: Loan view and Repayment for Working Capital #3622

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/app/loans/common-resolvers/loan-action-button.resolver.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,9 @@ export class LoanActionButtonResolver {
if (loanActionButton === 'Assign Loan Officer' || loanActionButton === 'Change Loan Officer') {
return this.loansService.getLoanTemplate(loanId);
} else if (loanActionButton === 'Make Repayment') {
return this.loansService.getLoanActionTemplate(loanId, 'repayment');
return this.loanProductService.isLoanProduct
? this.loansService.getLoanActionTemplate(loanId, 'repayment')
: this.loansService.getWorkingCapitalLoanActionTemplate(loanId, 'repayment');
} else if (loanActionButton === 'Goodwill Credit') {
return this.loansService.getLoanActionTemplate(loanId, 'goodwillCredit');
} else if (loanActionButton === 'Interest Payment Waiver') {
Expand Down
2 changes: 1 addition & 1 deletion src/app/loans/common-resolvers/loan-base.resolver.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ export class LoanBaseResolver {
return this.isLoanProduct ? 'loanproducts' : 'working-capital-loan-products';
}

get loanAccountPath(): string {
get loanAccountPath(): 'loans' | 'working-capital-loans' {
return this.isLoanProduct ? 'loans' : 'working-capital-loans';
}
}
18 changes: 16 additions & 2 deletions src/app/loans/common-resolvers/loans-account-transaction.resolver.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,22 +15,36 @@ import { Observable } from 'rxjs';

/** Custom Services */
import { LoansService } from '../loans.service';
import { LoanBaseResolver } from './loan-base.resolver';

/**
* Loans Account Transaction data resolver.
*/
@Injectable()
export class LoansAccountTransactionResolver {
export class LoansAccountTransactionResolver extends LoanBaseResolver {
private loansService = inject(LoansService);

constructor() {
super();
}

/**
* Returns the Loans Account Transaction data.
* @param {ActivatedRouteSnapshot} route Route Snapshot
* @returns {Observable<any>}
*/
resolve(route: ActivatedRouteSnapshot): Observable<any> {
this.initialize(route);
const loanId = route.paramMap.get('loanId');
const transactionId = route.paramMap.get('id');
return this.loansService.getLoansAccountTransaction(loanId, transactionId);
if (
loanId === null ||
transactionId === null ||
Number.isNaN(Number(loanId)) ||
Number.isNaN(Number(transactionId))
) {
throw new Error('Invalid loan or transaction route params');
}
return this.loansService.getLoansAccountTransaction(this.loanAccountPath, loanId, transactionId);
}
Comment thread
coderabbitai[bot] marked this conversation as resolved.
}
95 changes: 28 additions & 67 deletions src/app/loans/loans-view/general-tab/general-tab.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,80 +13,41 @@ <h3>{{ 'labels.heading.Performance History' | translate }}</h3>
<table>
<tbody>
<tr>
<td class="flex-25">
<b>{{ 'labels.inputs.Number of Repayments' | translate }} :</b>
</td>
<td class="flex-25 left">
{{ loanDetails?.numberOfRepayments | formatNumber }}
</td>
<td class="flex-25">
<b>{{ 'labels.inputs.Maturity Date' | translate }} :</b>
</td>
<td class="flex-25 left">
{{ loanDetails?.timeline.expectedMaturityDate | dateFormat }}
</td>
@if (loanProductService.isLoanProduct) {
<td class="flex-25">
<b>{{ 'labels.inputs.Number of Repayments' | translate }} :</b>
</td>
<td class="flex-25 left">
{{ loanDetails?.numberOfRepayments | formatNumber }}
</td>
<td class="flex-25">
<b>{{ 'labels.inputs.Maturity Date' | translate }} :</b>
</td>
<td class="flex-25 left">
{{ loanDetails?.timeline.expectedMaturityDate | dateFormat }}
</td>
}
@if (loanProductService.isWorkingCapital) {
<td class="flex-25">
<b>{{ 'labels.inputs.Number of Repayments' | translate }} :</b>
</td>
<td class="flex-25 left">
{{ loanDetails?.totalNoPayments | formatNumber }}
</td>
}
</tr>
</tbody>
</table>
</div>
}

@if (loanDetails.summary) {
<div>
<h3>{{ 'labels.heading.Loan Summary' | translate }}</h3>
<table mat-table [dataSource]="dataSource">
<ng-container matColumnDef="Empty">
<th mat-header-cell *matHeaderCellDef></th>
<td mat-cell *matCellDef="let ele">{{ 'labels.inputs.' + ele.property | translate }}</td>
</ng-container>
<ng-container matColumnDef="Original">
<th mat-header-cell class="r-amount" *matHeaderCellDef>{{ 'labels.inputs.Original' | translate }}</th>
<td mat-cell class="r-amount" *matCellDef="let ele">
{{ ele.original | currency: currencyCode : 'symbol-narrow' : '1.2-2' }}
</td>
</ng-container>
<ng-container matColumnDef="Paid">
<th mat-header-cell class="r-amount" *matHeaderCellDef>{{ 'labels.inputs.Paid' | translate }}</th>
<td mat-cell class="r-amount amount-minus" *matCellDef="let ele">
{{ ele.paid | currency: currencyCode : 'symbol-narrow' : '1.2-2' }}
</td>
</ng-container>
<ng-container matColumnDef="Adjustments">
<th mat-header-cell class="r-amount" *matHeaderCellDef>
{{ 'labels.inputs.Credit Adjustments' | translate }}
</th>
<td mat-cell class="r-amount amount-plus" *matCellDef="let ele">
{{ ele.adjustment | currency: currencyCode : 'symbol-narrow' : '1.2-2' }}
</td>
</ng-container>
<ng-container matColumnDef="Waived">
<th mat-header-cell class="r-amount" *matHeaderCellDef>{{ 'labels.inputs.Waived' | translate }}</th>
<td mat-cell class="r-amount amount-minus" *matCellDef="let ele">
{{ ele.waived | currency: currencyCode : 'symbol-narrow' : '1.2-2' }}
</td>
</ng-container>
<ng-container matColumnDef="Written Off">
<th mat-header-cell class="r-amount" *matHeaderCellDef>{{ 'labels.inputs.Written Off' | translate }}</th>
<td mat-cell class="r-amount amount-minus" *matCellDef="let ele">
{{ ele.writtenOff | currency: currencyCode : 'symbol-narrow' : '1.2-2' }}
</td>
</ng-container>
<ng-container matColumnDef="Outstanding">
<th mat-header-cell class="r-amount" *matHeaderCellDef>{{ 'labels.inputs.Outstanding' | translate }}</th>
<td mat-cell class="r-amount" *matCellDef="let ele">
{{ ele.outstanding | currency: currencyCode : 'symbol-narrow' : '1.2-2' }}
</td>
</ng-container>
<ng-container matColumnDef="Over Due">
<th mat-header-cell class="r-amount" *matHeaderCellDef>{{ 'labels.inputs.Over Due' | translate }}</th>
<td mat-cell class="r-amount" *matCellDef="let ele">
{{ ele.overdue | currency: currencyCode : 'symbol-narrow' : '1.2-2' }}
</td>
</ng-container>
<tr mat-header-row *matHeaderRowDef="loanSummaryColumns"></tr>
<tr mat-row *matRowDef="let row; columns: loanSummaryColumns"></tr>
</table>
</div>
<mifosx-loan-summary-balance-component
[summary]="loanDetails.summary"
[currency]="loanDetails.currency"
[hasChargeBack]="hasChargeBack"
>
</mifosx-loan-summary-balance-component>

<div>
<h3>{{ 'labels.heading.Loan Details' | translate }}</h3>
Expand Down
118 changes: 11 additions & 107 deletions src/app/loans/loans-view/general-tab/general-tab.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,8 @@ import {
MatTableDataSource,
MatTable,
MatColumnDef,
MatHeaderCellDef,
MatHeaderCell,
MatCellDef,
MatCell,
MatHeaderRowDef,
MatHeaderRow,
MatRowDef,
MatRow
} from '@angular/material/table';
Expand All @@ -28,6 +24,7 @@ import { FormatNumberPipe } from '../../../pipes/format-number.pipe';
import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
import { LoanProductService } from 'app/products/loan-products/services/loan-product.service';
import { LoanProductBaseComponent } from 'app/products/loan-products/common/loan-product-base.component';
import { LoanSummaryBalanceComponentComponent } from './loan-summary-balance-component/loan-summary-balance-component.component';

@Component({
selector: 'mifosx-general-tab',
Expand All @@ -37,58 +34,34 @@ import { LoanProductBaseComponent } from 'app/products/loan-products/common/loan
...STANDALONE_SHARED_IMPORTS,
MatTable,
MatColumnDef,
MatHeaderCellDef,
MatHeaderCell,
MatCellDef,
MatCell,
MatHeaderRowDef,
MatHeaderRow,
MatRowDef,
MatRow,
ExternalIdentifierComponent,
CurrencyPipe,
DateFormatPipe,
FormatNumberPipe
FormatNumberPipe,
LoanSummaryBalanceComponentComponent
],
changeDetection: ChangeDetectionStrategy.OnPush
})
export class GeneralTabComponent extends LoanProductBaseComponent implements OnInit {
private route = inject(ActivatedRoute);

/** Currency Code */
currencyCode: string;
currencyCode: string | null = null;
loanDetails: any;
status: any;
loanSummaryColumns: string[] = [
'Empty',
'Original',
'Paid',
'Waived',
'Written Off',
'Outstanding',
'Over Due'
];

loanDetailsColumns: string[] = [
'Key',
'Value'
];
loanSummaryTableData: {
property: string;
original: number;
adjustment: number;
paid: number;
waived: number;
writtenOff: number;
outstanding: number;
overdue: number;
}[];
loanDetailsTableData: {
key: string;
value?: string;
}[];
loanDetailsTableData: { key: string; value?: string }[] = [];
hasChargeBack: boolean = false;

/** Data source for loans summary table. */
dataSource: MatTableDataSource<any>;
/** Data source for loans details table. */
detailsDataSource: MatTableDataSource<any>;

constructor() {
Expand All @@ -101,91 +74,22 @@ export class GeneralTabComponent extends LoanProductBaseComponent implements OnI
this.loanDetails = data.loanDetailsData;
this.currencyCode = this.loanDetails.currency.code;
if (this.loanDetails.transactions) {
this.loanDetails.transactions.some((transaction: any) => {
if (transaction.type.code === 'loanTransactionType.chargeback') {
this.loanSummaryColumns = [
'Empty',
'Original',
'Adjustments',
'Paid',
'Waived',
'Written Off',
'Outstanding',
'Over Due'
];
return;
}
});
this.hasChargeBack = this.loanDetails.transactions.some(
(transaction: any) => transaction.type.code === 'loanTransactionType.chargeback'
);
}
});
}

ngOnInit() {
this.status = this.loanDetails.value;
if (this.loanDetails.summary) {
this.setloanSummaryTableData();
this.setloanDetailsTableData();
} else {
this.setloanNonDetailsTableData();
}
}

setloanSummaryTableData() {
this.loanSummaryTableData = [
{
property: 'Principal',
original: this.loanDetails.summary.totalPrincipal,
adjustment: this.loanDetails.summary.principalAdjustments || 0,
paid: this.loanDetails.summary.principalPaid,
waived: this.loanDetails.summary.principalWaived || 0,
writtenOff: this.loanDetails.summary.principalWrittenOff,
outstanding: this.loanDetails.summary.principalOutstanding,
overdue: this.loanDetails.summary.principalOverdue
},
{
property: 'Interest',
original: this.loanDetails.summary.interestCharged,
adjustment: 0,
paid: this.loanDetails.summary.interestPaid,
waived: this.loanDetails.summary.interestWaived,
writtenOff: this.loanDetails.summary.interestWrittenOff,
outstanding: this.loanDetails.summary.interestOutstanding,
overdue: this.loanDetails.summary.interestOverdue
},
{
property: 'Fees',
original: this.loanDetails.summary.feeChargesCharged,
adjustment: 0,
paid: this.loanDetails.summary.feeChargesPaid,
waived: this.loanDetails.summary.feeChargesWaived,
writtenOff: this.loanDetails.summary.feeChargesWrittenOff,
outstanding: this.loanDetails.summary.feeChargesOutstanding,
overdue: this.loanDetails.summary.feeChargesOverdue
},
{
property: 'Penalties',
original: this.loanDetails.summary.penaltyChargesCharged,
adjustment: 0,
paid: this.loanDetails.summary.penaltyChargesPaid,
waived: this.loanDetails.summary.penaltyChargesWaived,
writtenOff: this.loanDetails.summary.penaltyChargesWrittenOff,
outstanding: this.loanDetails.summary.penaltyChargesOutstanding,
overdue: this.loanDetails.summary.penaltyChargesOverdue
},
{
property: 'Total',
original: this.loanDetails.summary.totalExpectedRepayment,
adjustment: this.loanDetails.summary.principalAdjustments || 0,
paid: this.loanDetails.summary.totalRepayment,
waived: this.loanDetails.summary.totalWaived,
writtenOff: this.loanDetails.summary.totalWrittenOff,
outstanding: this.loanDetails.summary.totalOutstanding,
overdue: this.loanDetails.summary.totalOverdue
}
];
this.dataSource = new MatTableDataSource(this.loanSummaryTableData);
}

setloanDetailsTableData() {
this.loanDetailsTableData = [
{
Expand Down
Loading
Loading