From 99c2d4780d707270dc2844e9bb68a8f01624d4cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Alberto=20Hern=C3=A1ndez?= <44206706+josehernandezfintecheandomx@users.noreply.github.com> Date: Mon, 6 Mar 2023 07:56:43 -0600 Subject: [PATCH] Use of Decimals to Display user setting to format numbers (#1695) Co-authored-by: Jose Alberto Hernandez --- .../view-account-transfer.component.html | 2 +- .../search-journal-entry.component.html | 4 +-- .../view-journal-entry.component.html | 2 +- .../view-transaction.component.html | 4 +-- .../view-charge/view-charge.component.html | 2 +- .../view-survey/view-survey.component.html | 2 +- .../general-tab/general-tab.component.html | 32 ++++++++--------- ...rring-deposits-account-view.component.html | 10 +++--- .../glim-preview-step.component.html | 2 +- .../loans-account-charges-step.component.html | 2 +- .../loans-account-preview-step.component.html | 2 +- .../account-details.component.html | 4 +-- .../charges-tab/charges-tab.component.html | 2 +- .../general-tab/general-tab.component.html | 2 +- .../make-repayment.component.html | 8 ++--- .../prepay-loan/prepay-loan.component.html | 8 ++--- .../view-guarantors.component.html | 6 ++-- .../loan-tranche-details.component.html | 2 +- .../loans-view/loans-view.component.html | 10 +++--- .../original-schedule-tab.component.html | 22 ++++++------ .../overdue-charges-tab.component.html | 2 +- .../repayment-schedule-tab.component.html | 34 +++++++++---------- .../transactions-tab.component.html | 12 +++---- .../view-charge/view-charge.component.html | 8 ++--- ...anding-instructions-history.component.html | 10 +++--- .../transactions/transactions.component.html | 18 +++++----- src/app/pipes/format-number.pipe.spec.ts | 8 +++++ src/app/pipes/format-number.pipe.ts | 24 +++++++++++++ src/app/pipes/pipes.module.ts | 7 ++-- .../products/charges/charges.component.html | 2 +- .../fixed-deposit-general-tab.component.html | 6 ++-- .../create-floating-rate.component.html | 2 +- .../general-tab/general-tab.component.html | 10 +++--- .../view-tax-component.component.html | 2 +- ...curring-deposit-general-tab.component.html | 4 +-- .../savings-account-view.component.html | 22 ++++++------ .../transactions-tab.component.html | 6 ++-- .../view-charge/view-charge.component.html | 8 ++--- src/app/settings/settings.component.html | 24 +++++-------- src/app/settings/settings.component.ts | 18 ++++++++++ src/app/settings/settings.service.ts | 18 ++++++++++ .../datatable-single-row.component.html | 2 +- .../cob-workflow/cob-workflow.component.ts | 9 ++--- .../manage-jobs/manage-jobs.component.html | 4 +-- .../manage-jobs/manage-jobs.component.ts | 14 +++++++- .../manage-scheduler-jobs.component.html | 2 +- .../loan-approval.component.html | 2 +- .../loan-disbursal.component.html | 2 +- 48 files changed, 242 insertions(+), 166 deletions(-) create mode 100644 src/app/pipes/format-number.pipe.spec.ts create mode 100644 src/app/pipes/format-number.pipe.ts diff --git a/src/app/account-transfers/view-account-transfer/view-account-transfer.component.html b/src/app/account-transfers/view-account-transfer/view-account-transfer.component.html index a2959f991..24f3e1da1 100644 --- a/src/app/account-transfers/view-account-transfer/view-account-transfer.component.html +++ b/src/app/account-transfers/view-account-transfer/view-account-transfer.component.html @@ -12,7 +12,7 @@
Transaction Amount: - {{ viewAccountTransferData.currency.displaySymbol }} {{ viewAccountTransferData.transferAmount | number }} ({{ viewAccountTransferData.currency.code }}) + {{ viewAccountTransferData.currency.displaySymbol }} {{ viewAccountTransferData.transferAmount | formatNumber }} ({{ viewAccountTransferData.currency.code }})
diff --git a/src/app/accounting/search-journal-entry/search-journal-entry.component.html b/src/app/accounting/search-journal-entry/search-journal-entry.component.html index 0eff4cd67..21cf2fa34 100644 --- a/src/app/accounting/search-journal-entry/search-journal-entry.component.html +++ b/src/app/accounting/search-journal-entry/search-journal-entry.component.html @@ -125,12 +125,12 @@ Debit - {{ journalEntry.amount | number }} + {{ journalEntry.amount | formatNumber }} Credit - {{ journalEntry.amount | number }} + {{ journalEntry.amount | formatNumber }} diff --git a/src/app/accounting/view-journal-entry/view-journal-entry.component.html b/src/app/accounting/view-journal-entry/view-journal-entry.component.html index 38f8253f3..1984f47c1 100644 --- a/src/app/accounting/view-journal-entry/view-journal-entry.component.html +++ b/src/app/accounting/view-journal-entry/view-journal-entry.component.html @@ -45,7 +45,7 @@ Debit - {{ data.journalEntry.currency.displaySymbol }} {{ data.journalEntry.amount | number }} + {{ data.journalEntry.currency.displaySymbol }} {{ data.journalEntry.amount | formatNumber }} diff --git a/src/app/accounting/view-transaction/view-transaction.component.html b/src/app/accounting/view-transaction/view-transaction.component.html index 2557ab500..c638a7c05 100644 --- a/src/app/accounting/view-transaction/view-transaction.component.html +++ b/src/app/accounting/view-transaction/view-transaction.component.html @@ -81,12 +81,12 @@ Debit - {{ (transaction.currency.displaySymbol || transaction.currency.code) }} {{ transaction.amount | number }} + {{ (transaction.currency.displaySymbol || transaction.currency.code) }} {{ transaction.amount | formatNumber }} Credit - {{ (transaction.currency.displaySymbol || transaction.currency.code) }} {{ transaction.amount | number }} + {{ (transaction.currency.displaySymbol || transaction.currency.code) }} {{ transaction.amount | formatNumber }} diff --git a/src/app/clients/clients-view/charges/view-charge/view-charge.component.html b/src/app/clients/clients-view/charges/view-charge/view-charge.component.html index e7c160c7f..8d8158b77 100644 --- a/src/app/clients/clients-view/charges/view-charge/view-charge.component.html +++ b/src/app/clients/clients-view/charges/view-charge/view-charge.component.html @@ -104,7 +104,7 @@ Amount - {{element.amount | number }} + {{element.amount | formatNumber }} diff --git a/src/app/clients/clients-view/client-actions/view-survey/view-survey.component.html b/src/app/clients/clients-view/client-actions/view-survey/view-survey.component.html index c59eb938a..7bb6116f5 100644 --- a/src/app/clients/clients-view/client-actions/view-survey/view-survey.component.html +++ b/src/app/clients/clients-view/client-actions/view-survey/view-survey.component.html @@ -36,7 +36,7 @@ Score - {{ survey.score | number }} + {{ survey.score | formatNumber }} diff --git a/src/app/clients/clients-view/general-tab/general-tab.component.html b/src/app/clients/clients-view/general-tab/general-tab.component.html index 015c8598f..c38b8f6d5 100644 --- a/src/app/clients/clients-view/general-tab/general-tab.component.html +++ b/src/app/clients/clients-view/general-tab/general-tab.component.html @@ -9,13 +9,13 @@

No. Of Loan Cycles :{{clientSummary?.loanCycle}}
No. of Active Loans :{{clientSummary?.activeLoans}}
- Last Loan Amount :{{clientSummary?.lastLoanAmount | number}}
+ Last Loan Amount :{{clientSummary?.lastLoanAmount | formatNumber}}

No. of Active Savings :{{clientSummary?.activeSavings}}
- Total Savings :{{clientSummary?.totalSavings | number}}
+ Total Savings :{{clientSummary?.totalSavings | formatNumber}}

@@ -54,22 +54,22 @@ Due - {{element.amount | number}} + {{element.amount | formatNumber}} Paid - {{element.amountPaid | number}} + {{element.amountPaid | formatNumber}} Waived - {{element.amountWaived | number}} + {{element.amountWaived | formatNumber}} Outstanding - {{element.amountOutstanding | number}} + {{element.amountOutstanding | formatNumber}} @@ -128,12 +128,12 @@ Loan Balance - {{element.loanBalance | number}} + {{element.loanBalance | formatNumber}} Amount Paid - {{element.amountPaid | number}} + {{element.amountPaid | formatNumber}} @@ -203,12 +203,12 @@ Loan Balance - {{element.loanBalance | number}} + {{element.loanBalance | formatNumber}} Amount Paid - {{element.accountBalance | number}} + {{element.accountBalance | formatNumber}} @@ -265,7 +265,7 @@ Balance - {{element.accountBalance | number}} + {{element.accountBalance | formatNumber}} @@ -363,7 +363,7 @@ Balance - {{element.accountBalance | number}} + {{element.accountBalance | formatNumber}} @@ -455,7 +455,7 @@ Balance - {{element.accountBalance | number}} + {{element.accountBalance | formatNumber}} @@ -640,17 +640,17 @@ Quantity - {{ element.quantity | number }} + {{ element.quantity | formatNumber }} Total Value - {{ element.basePrice*element.quantity | number}} + {{ element.basePrice*element.quantity | formatNumber}} Total Collateral Value - {{ element.pctToBase*element.basePrice*element.quantity/100 | number}} + {{ element.pctToBase*element.basePrice*element.quantity/100 | formatNumber}} diff --git a/src/app/deposits/recurring-deposits/recurring-deposits-account-view/recurring-deposits-account-view.component.html b/src/app/deposits/recurring-deposits/recurring-deposits-account-view/recurring-deposits-account-view.component.html index c984390dc..483d57414 100644 --- a/src/app/deposits/recurring-deposits/recurring-deposits-account-view/recurring-deposits-account-view.component.html +++ b/src/app/deposits/recurring-deposits/recurring-deposits-account-view/recurring-deposits-account-view.component.html @@ -122,19 +122,19 @@ Maturity Amount - {{recurringDepositsAccountData.currency.displaySymbol}} {{recurringDepositsAccountData.maturityAmount | number}} + {{recurringDepositsAccountData.currency.displaySymbol}} {{recurringDepositsAccountData.maturityAmount | formatNumber}} Recurring Deposit Amount - {{recurringDepositsAccountData.currency.displaySymbol}} {{recurringDepositsAccountData?.mandatoryRecommendedDepositAmount | number}} + {{recurringDepositsAccountData.currency.displaySymbol}} {{recurringDepositsAccountData?.mandatoryRecommendedDepositAmount | formatNumber}} Deposits till Date {{recurringDepositsAccountData.currency.displaySymbol}} {{recurringDepositsAccountData.summary.totalDeposits | number}} + *ngIf="recurringDepositsAccountData.summary.totalDeposits">{{recurringDepositsAccountData.currency.displaySymbol}} {{recurringDepositsAccountData.summary.totalDeposits | formatNumber}} {{recurringDepositsAccountData.currency.displaySymbol}} 0 @@ -142,7 +142,7 @@ Withdrwals till Date {{recurringDepositsAccountData.currency.displaySymbol}} {{recurringDepositsAccountData.summary.totalWithdrawals | number}} + *ngIf="recurringDepositsAccountData.summary.totalWithdrawals">{{recurringDepositsAccountData.currency.displaySymbol}} {{recurringDepositsAccountData.summary.totalWithdrawals | formatNumber}} {{recurringDepositsAccountData.currency.displaySymbol}} 0 @@ -150,7 +150,7 @@ Interest Earned - {{recurringDepositsAccountData.currency.displaySymbol}} {{recurringDepositsAccountData.summary.totalInterestEarned| number}} + {{recurringDepositsAccountData.currency.displaySymbol}} {{recurringDepositsAccountData.summary.totalInterestEarned| formatNumber}} diff --git a/src/app/loans/glim-account/create-glim-account/glim-account-stepper/glim-preview-step/glim-preview-step.component.html b/src/app/loans/glim-account/create-glim-account/glim-account-stepper/glim-preview-step/glim-preview-step.component.html index 20ddce3fe..2227b4468 100644 --- a/src/app/loans/glim-account/create-glim-account/glim-account-stepper/glim-preview-step/glim-preview-step.component.html +++ b/src/app/loans/glim-account/create-glim-account/glim-account-stepper/glim-preview-step/glim-preview-step.component.html @@ -244,7 +244,7 @@ Amount - {{ charge.amount| number }} + {{ charge.amount| formatNumber }} diff --git a/src/app/loans/loans-account-stepper/loans-account-charges-step/loans-account-charges-step.component.html b/src/app/loans/loans-account-stepper/loans-account-charges-step/loans-account-charges-step.component.html index 3bae35c5d..d8496967b 100644 --- a/src/app/loans/loans-account-stepper/loans-account-charges-step/loans-account-charges-step.component.html +++ b/src/app/loans/loans-account-stepper/loans-account-charges-step/loans-account-charges-step.component.html @@ -104,7 +104,7 @@ Amount - {{ charge.amount| number }} + {{ charge.amount| formatNumber }} diff --git a/src/app/loans/loans-account-stepper/loans-account-preview-step/loans-account-preview-step.component.html b/src/app/loans/loans-account-stepper/loans-account-preview-step/loans-account-preview-step.component.html index 0c7cd9f58..68d310f09 100644 --- a/src/app/loans/loans-account-stepper/loans-account-preview-step/loans-account-preview-step.component.html +++ b/src/app/loans/loans-account-stepper/loans-account-preview-step/loans-account-preview-step.component.html @@ -244,7 +244,7 @@ Amount - {{ charge.amount| number }} + {{ charge.amount| formatNumber }} diff --git a/src/app/loans/loans-view/account-details/account-details.component.html b/src/app/loans/loans-view/account-details/account-details.component.html index 45db098ec..c3a5fa2fe 100644 --- a/src/app/loans/loans-view/account-details/account-details.component.html +++ b/src/app/loans/loans-view/account-details/account-details.component.html @@ -93,7 +93,7 @@
Fixed EMI amount - {{loanDetails.fixedEmiAmount | number}} + {{loanDetails.fixedEmiAmount | formatNumber}}
@@ -108,7 +108,7 @@
Topup closure amount - {{loanDetails.topupAmount| number}} + {{loanDetails.topupAmount| formatNumber}}
diff --git a/src/app/loans/loans-view/charges-tab/charges-tab.component.html b/src/app/loans/loans-view/charges-tab/charges-tab.component.html index f8a159832..b82b64b23 100644 --- a/src/app/loans/loans-view/charges-tab/charges-tab.component.html +++ b/src/app/loans/loans-view/charges-tab/charges-tab.component.html @@ -51,7 +51,7 @@ Outstanding {{ charge.currency.displaySymbol }}{{ - charge.amountOutstanding| number }} + charge.amountOutstanding| formatNumber }} diff --git a/src/app/loans/loans-view/general-tab/general-tab.component.html b/src/app/loans/loans-view/general-tab/general-tab.component.html index 7ff75a9a0..c39d9ce46 100644 --- a/src/app/loans/loans-view/general-tab/general-tab.component.html +++ b/src/app/loans/loans-view/general-tab/general-tab.component.html @@ -10,7 +10,7 @@ Number of Repayments : - {{loanDetails?.numberOfRepayments | number}} + {{loanDetails?.numberOfRepayments | formatNumber}} Maturity Date : diff --git a/src/app/loans/loans-view/loan-account-actions/make-repayment/make-repayment.component.html b/src/app/loans/loans-view/loan-account-actions/make-repayment/make-repayment.component.html index b2fde0cd8..47ccae931 100644 --- a/src/app/loans/loans-view/loan-account-actions/make-repayment/make-repayment.component.html +++ b/src/app/loans/loans-view/loan-account-actions/make-repayment/make-repayment.component.html @@ -25,7 +25,7 @@
- {{ dataObject.principalPortion | number }} + {{ dataObject.principalPortion | formatNumber }}
@@ -33,7 +33,7 @@
- {{ dataObject.interestPortion | number }} + {{ dataObject.interestPortion | formatNumber }}
@@ -41,7 +41,7 @@
- {{ dataObject.feeChargesPortion | number }} + {{ dataObject.feeChargesPortion | formatNumber }}
@@ -49,7 +49,7 @@
- {{ dataObject.penaltyChargesPortion | number }} + {{ dataObject.penaltyChargesPortion | formatNumber }}
diff --git a/src/app/loans/loans-view/loan-account-actions/prepay-loan/prepay-loan.component.html b/src/app/loans/loans-view/loan-account-actions/prepay-loan/prepay-loan.component.html index baf42e642..51aa592b1 100644 --- a/src/app/loans/loans-view/loan-account-actions/prepay-loan/prepay-loan.component.html +++ b/src/app/loans/loans-view/loan-account-actions/prepay-loan/prepay-loan.component.html @@ -25,7 +25,7 @@
- {{ prepayData.principalPortion | number }} + {{ prepayData.principalPortion | formatNumber }}
@@ -33,7 +33,7 @@
- {{ prepayData.interestPortion | number }} + {{ prepayData.interestPortion | formatNumber }}
@@ -41,7 +41,7 @@
- {{ prepayData.feeChargesPortion | number }} + {{ prepayData.feeChargesPortion | formatNumber }}
@@ -49,7 +49,7 @@
- {{ prepayData.penaltyChargesPortion | number }} + {{ prepayData.penaltyChargesPortion | formatNumber }}
diff --git a/src/app/loans/loans-view/loan-account-actions/view-guarantors/view-guarantors.component.html b/src/app/loans/loans-view/loan-account-actions/view-guarantors/view-guarantors.component.html index a444c7014..67b9c4276 100644 --- a/src/app/loans/loans-view/loan-account-actions/view-guarantors/view-guarantors.component.html +++ b/src/app/loans/loans-view/loan-account-actions/view-guarantors/view-guarantors.component.html @@ -43,18 +43,18 @@ Approved Amount - {{dataObject.approvedPrincipal | number}} + {{dataObject.approvedPrincipal | formatNumber}} Disburse Amount - {{dataObject.principal | number}} + {{dataObject.principal | formatNumber}} Arrears By - {{dataObject.summary.totalOverdue | number}} + {{dataObject.summary.totalOverdue | formatNumber}} Not Provided diff --git a/src/app/loans/loans-view/loan-tranche-details/loan-tranche-details.component.html b/src/app/loans/loans-view/loan-tranche-details/loan-tranche-details.component.html index cfbd4a8a5..579ca53fd 100644 --- a/src/app/loans/loans-view/loan-tranche-details/loan-tranche-details.component.html +++ b/src/app/loans/loans-view/loan-tranche-details/loan-tranche-details.component.html @@ -2,7 +2,7 @@
Maximum allowed outstanding balance: - {{ loanDetails.maxOutstandingLoanBalance | number }} + {{ loanDetails.maxOutstandingLoanBalance | formatNumber }}

Loan Tranche Details

diff --git a/src/app/loans/loans-view/loans-view.component.html b/src/app/loans/loans-view/loans-view.component.html index 2b2bdd6ce..237b8b669 100644 --- a/src/app/loans/loans-view/loans-view.component.html +++ b/src/app/loans/loans-view/loans-view.component.html @@ -31,26 +31,26 @@ - Past Due Days : {{loanDetailsData?.delinquent.pastDueDays | number}}
+ Past Due Days : {{loanDetailsData?.delinquent.pastDueDays | formatNumber}}
 - Delinquent Days : {{loanDetailsData?.delinquent.delinquentDays | number}} + Delinquent Days : {{loanDetailsData?.delinquent.delinquentDays | formatNumber}}

Loan Account OverView

Current Balance: {{loanDetailsData.currency.displaySymbol}} - {{loanDetailsData.summary.totalOutstanding | number}}
- Arrears By: {{loanDetailsData.summary.totalOverdue | number}} + {{loanDetailsData.summary.totalOutstanding | formatNumber}}
+ Arrears By: {{loanDetailsData.summary.totalOverdue | formatNumber}} Not Provided
Arrears Since: {{loanDetailsData.summary.overdueSinceDate | dateFormat}} - Overpaid By: {{loanDetailsData.currency.displaySymbol}} {{loanDetailsData.totalOverpaid | number}} + Overpaid By: {{loanDetailsData.currency.displaySymbol}} {{loanDetailsData.totalOverpaid | formatNumber}}
diff --git a/src/app/loans/loans-view/original-schedule-tab/original-schedule-tab.component.html b/src/app/loans/loans-view/original-schedule-tab/original-schedule-tab.component.html index 6c42569c5..f2c9588b1 100644 --- a/src/app/loans/loans-view/original-schedule-tab/original-schedule-tab.component.html +++ b/src/app/loans/loans-view/original-schedule-tab/original-schedule-tab.component.html @@ -10,38 +10,38 @@ Principal Due - {{ ele.principalDue | number }} - {{ originalScheduleDetails.totalPrincipalExpected | number }} + {{ ele.principalDue | formatNumber }} + {{ originalScheduleDetails.totalPrincipalExpected | formatNumber }} Balance Of Loan - {{ ele.principalLoanBalanceOutstanding | number }} + {{ ele.principalLoanBalanceOutstanding | formatNumber }}   Interest - {{ ele.interestOriginalDue | number}} - {{ originalScheduleDetails.totalInterestCharged | number }} + {{ ele.interestOriginalDue | formatNumber}} + {{ originalScheduleDetails.totalInterestCharged | formatNumber }} Fees - {{ ele.feeChargesDue | number}} - {{ originalScheduleDetails.totalFeeChargesCharged | number }} + {{ ele.feeChargesDue | formatNumber}} + {{ originalScheduleDetails.totalFeeChargesCharged | formatNumber }} Penalties - {{ ele.penaltyChargesDue | number}} - {{ originalScheduleDetails.totalPenaltyChargesCharged | number }} + {{ ele.penaltyChargesDue | formatNumber}} + {{ originalScheduleDetails.totalPenaltyChargesCharged | formatNumber }} Outstanding - {{ ele.totalOutstandingForPeriod | number}} - {{ originalScheduleDetails.totalRepaymentExpected | number }} + {{ ele.totalOutstandingForPeriod | formatNumber}} + {{ originalScheduleDetails.totalRepaymentExpected | formatNumber }} diff --git a/src/app/loans/loans-view/overdue-charges-tab/overdue-charges-tab.component.html b/src/app/loans/loans-view/overdue-charges-tab/overdue-charges-tab.component.html index 2157392bf..e77e40464 100644 --- a/src/app/loans/loans-view/overdue-charges-tab/overdue-charges-tab.component.html +++ b/src/app/loans/loans-view/overdue-charges-tab/overdue-charges-tab.component.html @@ -14,7 +14,7 @@ Amount - {{ charge.amount| number }} + {{ charge.amount| formatNumber }} diff --git a/src/app/loans/loans-view/repayment-schedule-tab/repayment-schedule-tab.component.html b/src/app/loans/loans-view/repayment-schedule-tab/repayment-schedule-tab.component.html index 7dcff5314..5d2dae441 100644 --- a/src/app/loans/loans-view/repayment-schedule-tab/repayment-schedule-tab.component.html +++ b/src/app/loans/loans-view/repayment-schedule-tab/repayment-schedule-tab.component.html @@ -36,62 +36,62 @@ Balance Of Loan - {{ ele.principalLoanBalanceOutstanding | number }} + {{ ele.principalLoanBalanceOutstanding | formatNumber }}   Principal Due - {{ ele.principalDue | number }} + {{ ele.principalDue | formatNumber }} {{ repaymentScheduleDetails.totalPrincipalExpected | currency }} Interest - {{ ele.interestOriginalDue | number}} + {{ ele.interestOriginalDue | formatNumber}} {{ repaymentScheduleDetails.totalInterestCharged | currency }} Fees - {{ ele.feeChargesDue | number}} + {{ ele.feeChargesDue | formatNumber}} {{ repaymentScheduleDetails.totalFeeChargesCharged | currency }} Penalties - {{ ele.penaltyChargesDue | number}} + {{ ele.penaltyChargesDue | formatNumber}} {{ repaymentScheduleDetails.totalPenaltyChargesCharged | currency }} Due - {{ ele.totalDueForPeriod | number}} + {{ ele.totalDueForPeriod | formatNumber}} {{ repaymentScheduleDetails.totalRepaymentExpected | currency }} Paid - {{ ele.totalPaidForPeriod | number}} + {{ ele.totalPaidForPeriod | formatNumber}} {{ repaymentScheduleDetails.totalRepayment | currency }} In advance - {{ ele.totalPaidInAdvanceForPeriod | number}} + {{ ele.totalPaidInAdvanceForPeriod | formatNumber}} {{ repaymentScheduleDetails.totalPaidInAdvance | currency }} Late - {{ ele.totalPaidLateForPeriod | number}} + {{ ele.totalPaidLateForPeriod | formatNumber}} {{ repaymentScheduleDetails.totalPaidLate | currency }} Waived - {{ ele.totalWaivedForPeriod | number}} + {{ ele.totalWaivedForPeriod | formatNumber}} {{ repaymentScheduleDetails.totalWaived | currency }} @@ -106,7 +106,7 @@ Outstanding - {{ ele.totalOutstandingForPeriod | number}} + {{ ele.totalOutstandingForPeriod | formatNumber}} {{ repaymentScheduleDetails.totalOutstanding | currency }} @@ -152,25 +152,25 @@ Balance Of Loan - {{ ele.principalLoanBalanceOutstanding | number }} + {{ ele.principalLoanBalanceOutstanding | formatNumber }}   Principal Due - {{ ele.principalDue | number }} + {{ ele.principalDue | formatNumber }} {{ repaymentScheduleDetails.totalPrincipalExpected | currency }} Interest - {{ ele.interestOriginalDue | number}} + {{ ele.interestOriginalDue | formatNumber}} {{ repaymentScheduleDetails.totalInterestCharged | currency }} Fees - {{ ele.feeChargesDue | number}} + {{ ele.feeChargesDue | formatNumber}} {{ repaymentScheduleDetails.totalFeeChargesCharged | currency }} @@ -178,10 +178,10 @@ Installment Amount - {{ ele.totalDueForPeriod | number}} + {{ ele.totalDueForPeriod | formatNumber}} - {{ ele.totalDueForPeriod | number}} + {{ ele.totalDueForPeriod | formatNumber}} {{ repaymentScheduleDetails.totalRepaymentExpected | currency }} diff --git a/src/app/loans/loans-view/transactions-tab/transactions-tab.component.html b/src/app/loans/loans-view/transactions-tab/transactions-tab.component.html index 5a6773bdb..5991aa209 100644 --- a/src/app/loans/loans-view/transactions-tab/transactions-tab.component.html +++ b/src/app/loans/loans-view/transactions-tab/transactions-tab.component.html @@ -41,32 +41,32 @@ Amount - {{ transaction.amount | number }} + {{ transaction.amount | formatNumber }} Breakdown - {{ transaction.principalPortion | number }} + {{ transaction.principalPortion | formatNumber }} - {{ transaction.interestPortion | number }} + {{ transaction.interestPortion | formatNumber }} - {{ transaction.feeChargesPortion | number }} + {{ transaction.feeChargesPortion | formatNumber }} - {{ transaction.penaltyChargesPortion | number }} + {{ transaction.penaltyChargesPortion | formatNumber }} Loan Balance - {{ transaction.outstandingLoanBalance | number }} + {{ transaction.outstandingLoanBalance | formatNumber }} diff --git a/src/app/loans/loans-view/view-charge/view-charge.component.html b/src/app/loans/loans-view/view-charge/view-charge.component.html index 2ac410e80..fcee0109c 100644 --- a/src/app/loans/loans-view/view-charge/view-charge.component.html +++ b/src/app/loans/loans-view/view-charge/view-charge.component.html @@ -101,7 +101,7 @@
- {{ chargeData.amount | number }} + {{ chargeData.amount | formatNumber }}
@@ -109,7 +109,7 @@
- {{ chargeData.amountPaid | number }} + {{ chargeData.amountPaid | formatNumber }}
@@ -117,7 +117,7 @@
- {{ chargeData.amountWaived | number }} + {{ chargeData.amountWaived | formatNumber }}
@@ -125,7 +125,7 @@
- {{ chargeData.amountOutstanding | number }} + {{ chargeData.amountOutstanding | formatNumber }}
diff --git a/src/app/organization/standing-instructions-history/standing-instructions-history.component.html b/src/app/organization/standing-instructions-history/standing-instructions-history.component.html index 4a3ac3bbb..f9503c690 100644 --- a/src/app/organization/standing-instructions-history/standing-instructions-history.component.html +++ b/src/app/organization/standing-instructions-history/standing-instructions-history.component.html @@ -3,9 +3,9 @@
- + - +
@@ -54,7 +54,7 @@ - +
@@ -70,7 +70,7 @@
- +
@@ -112,7 +112,7 @@ Amount - {{ instruction.amount | number }} + {{ instruction.amount | formatNumber }} diff --git a/src/app/organization/tellers/cashiers/transactions/transactions.component.html b/src/app/organization/tellers/cashiers/transactions/transactions.component.html index 76a4656fe..81e38dc8f 100644 --- a/src/app/organization/tellers/cashiers/transactions/transactions.component.html +++ b/src/app/organization/tellers/cashiers/transactions/transactions.component.html @@ -46,7 +46,7 @@
- {{ cashierData.netCash | number }} [{{currencySelector.value}}] + {{ cashierData.netCash | formatNumber }} [{{currencySelector.value}}]
@@ -94,23 +94,23 @@ - Allocation ({{cashierData.sumCashAllocation | number}}) - {{ transaction.txnType.value === "Allocate Cash" ? (transaction.txnAmount | number) : '-' }} + Allocation ({{cashierData.sumCashAllocation | formatNumber}}) + {{ transaction.txnType.value === "Allocate Cash" ? (transaction.txnAmount | formatNumber) : '-' }} - Cash In ({{cashierData.sumInwardCash | number}}) - {{ transaction.txnType.value === "Cash In" ? (transaction.txnAmount | number) : '-' }} + Cash In ({{cashierData.sumInwardCash | formatNumber}}) + {{ transaction.txnType.value === "Cash In" ? (transaction.txnAmount | formatNumber) : '-' }} - Cash Out ({{cashierData.sumOutwardCash | number}}) - {{ transaction.txnType.value === "Cash Out" ? (transaction.txnAmount | number) : '-' }} + Cash Out ({{cashierData.sumOutwardCash | formatNumber}}) + {{ transaction.txnType.value === "Cash Out" ? (transaction.txnAmount | formatNumber) : '-' }} - Settlement ({{cashierData.sumCashSettlement | number}}) - {{ transaction.txnType.value === "Settle Cash" ? (transaction.txnAmount | number) : '-' }} + Settlement ({{cashierData.sumCashSettlement | formatNumber}}) + {{ transaction.txnType.value === "Settle Cash" ? (transaction.txnAmount | formatNumber) : '-' }} diff --git a/src/app/pipes/format-number.pipe.spec.ts b/src/app/pipes/format-number.pipe.spec.ts new file mode 100644 index 000000000..8d2eeac34 --- /dev/null +++ b/src/app/pipes/format-number.pipe.spec.ts @@ -0,0 +1,8 @@ +import { FormatNumberPipe } from './format-number.pipe'; + +describe('FormatNumberPipe', () => { + it('create an instance', () => { + const pipe = new FormatNumberPipe(); + expect(pipe).toBeTruthy(); + }); +}); diff --git a/src/app/pipes/format-number.pipe.ts b/src/app/pipes/format-number.pipe.ts new file mode 100644 index 000000000..9d8e27aea --- /dev/null +++ b/src/app/pipes/format-number.pipe.ts @@ -0,0 +1,24 @@ +import { DecimalPipe } from '@angular/common'; +import { Pipe, PipeTransform } from '@angular/core'; +import { SettingsService } from 'app/settings/settings.service'; + +@Pipe({ + name: 'formatNumber' +}) +export class FormatNumberPipe implements PipeTransform { + + constructor(private decimalFormat: DecimalPipe, + private settingsService: SettingsService) { + } + + transform(value: string | number, ...args: unknown[]): string { + if (!value) { + return ''; + } + const locale = this.settingsService.language.code; + const decimals = this.settingsService.decimals; + const format = `1.${decimals}-${decimals}`; + return this.decimalFormat.transform(value, format, locale); + } + +} diff --git a/src/app/pipes/pipes.module.ts b/src/app/pipes/pipes.module.ts index cb736bdb5..83d5a502d 100644 --- a/src/app/pipes/pipes.module.ts +++ b/src/app/pipes/pipes.module.ts @@ -9,13 +9,14 @@ import { UrlToStringPipe } from './url-to-string.pipe'; import { DateFormatPipe } from './date-format.pipe'; import { DatetimeFormatPipe } from './datetime-format.pipe'; import { ExternalIdentifierPipe } from './external-identifier.pipe'; +import { FormatNumberPipe } from './format-number.pipe'; @NgModule({ imports: [ CommonModule ], - declarations: [StatusLookupPipe, AccountsFilterPipe, ChargesFilterPipe, ChargesPenaltyFilterPipe, FindPipe, UrlToStringPipe, DateFormatPipe, DatetimeFormatPipe, ExternalIdentifierPipe], - providers: [StatusLookupPipe, AccountsFilterPipe, ChargesFilterPipe, ChargesPenaltyFilterPipe, FindPipe, UrlToStringPipe, DateFormatPipe, DatetimeFormatPipe, ExternalIdentifierPipe], - exports: [StatusLookupPipe, AccountsFilterPipe, ChargesFilterPipe, ChargesPenaltyFilterPipe, FindPipe, UrlToStringPipe, DateFormatPipe, DatetimeFormatPipe, ExternalIdentifierPipe] + declarations: [StatusLookupPipe, AccountsFilterPipe, ChargesFilterPipe, ChargesPenaltyFilterPipe, FindPipe, UrlToStringPipe, DateFormatPipe, DatetimeFormatPipe, ExternalIdentifierPipe, FormatNumberPipe ], + providers: [StatusLookupPipe, AccountsFilterPipe, ChargesFilterPipe, ChargesPenaltyFilterPipe, FindPipe, UrlToStringPipe, DateFormatPipe, DatetimeFormatPipe, ExternalIdentifierPipe, FormatNumberPipe ], + exports: [StatusLookupPipe, AccountsFilterPipe, ChargesFilterPipe, ChargesPenaltyFilterPipe, FindPipe, UrlToStringPipe, DateFormatPipe, DatetimeFormatPipe, ExternalIdentifierPipe, FormatNumberPipe ] }) export class PipesModule { } diff --git a/src/app/products/charges/charges.component.html b/src/app/products/charges/charges.component.html index 824feba56..b6878481a 100644 --- a/src/app/products/charges/charges.component.html +++ b/src/app/products/charges/charges.component.html @@ -42,7 +42,7 @@ Amount - {{ charge.amount | number }} + {{ charge.amount | formatNumber }} diff --git a/src/app/products/fixed-deposit-products/view-fixed-deposit-product/fixed-deposit-general-tab/fixed-deposit-general-tab.component.html b/src/app/products/fixed-deposit-products/view-fixed-deposit-product/fixed-deposit-general-tab/fixed-deposit-general-tab.component.html index 379a03390..46fd740a5 100644 --- a/src/app/products/fixed-deposit-products/view-fixed-deposit-product/fixed-deposit-general-tab/fixed-deposit-general-tab.component.html +++ b/src/app/products/fixed-deposit-products/view-fixed-deposit-product/fixed-deposit-general-tab/fixed-deposit-general-tab.component.html @@ -46,7 +46,7 @@
Currency in Multiples Of: - {{ fixedDepositProductData.currency.inMultiplesOf | number}} + {{ fixedDepositProductData.currency.inMultiplesOf | formatNumber}}

Terms

@@ -125,7 +125,7 @@
Balance Required For Interest Calculation: - {{ fixedDepositProductData.minBalanceForInterestCalculation | number }} + {{ fixedDepositProductData.minBalanceForInterestCalculation | formatNumber }}
@@ -329,7 +329,7 @@ Amount - {{ charge.amount | number }} + {{ charge.amount | formatNumber }} diff --git a/src/app/products/floating-rates/create-floating-rate/create-floating-rate.component.html b/src/app/products/floating-rates/create-floating-rate/create-floating-rate.component.html index dc096e05b..29e50a361 100644 --- a/src/app/products/floating-rates/create-floating-rate/create-floating-rate.component.html +++ b/src/app/products/floating-rates/create-floating-rate/create-floating-rate.component.html @@ -52,7 +52,7 @@ Interest Rate - {{ floatingRatePeriod.interestRate | number }} + {{ floatingRatePeriod.interestRate | formatNumber }} diff --git a/src/app/products/loan-products/view-loan-product/general-tab/general-tab.component.html b/src/app/products/loan-products/view-loan-product/general-tab/general-tab.component.html index d044620f6..20d94315c 100644 --- a/src/app/products/loan-products/view-loan-product/general-tab/general-tab.component.html +++ b/src/app/products/loan-products/view-loan-product/general-tab/general-tab.component.html @@ -75,9 +75,9 @@
Principal: - {{ loanProduct.principal | number }} - (Min {{ (loanProduct.minPrincipal ? loanProduct.minPrincipal : loanProduct.principal) | number }} - : Max {{ (loanProduct.maxPrincipal ? loanProduct.maxPrincipal : loanProduct.principal) | number }}) + {{ loanProduct.principal | formatNumber }} + (Min {{ (loanProduct.minPrincipal ? loanProduct.minPrincipal : loanProduct.principal) | formatNumber }} + : Max {{ (loanProduct.maxPrincipal ? loanProduct.maxPrincipal : loanProduct.principal) | formatNumber }})
@@ -88,9 +88,9 @@
Over Applied Amount: - {{ loanProduct.overAppliedNumber | number + {{ loanProduct.overAppliedNumber | formatNumber }} % - {{ loanProduct.overAppliedNumber | number }} {{ + {{ loanProduct.overAppliedNumber | formatNumber }} {{ loanProduct.currencyCode }}
diff --git a/src/app/products/manage-tax-components/view-tax-component/view-tax-component.component.html b/src/app/products/manage-tax-components/view-tax-component/view-tax-component.component.html index df71cc8eb..a03bf420f 100644 --- a/src/app/products/manage-tax-components/view-tax-component/view-tax-component.component.html +++ b/src/app/products/manage-tax-components/view-tax-component/view-tax-component.component.html @@ -26,7 +26,7 @@
- {{ taxComponentData.percentage | number }} % + {{ taxComponentData.percentage | formatNumber }} %
diff --git a/src/app/products/recurring-deposit-products/view-recurring-deposit-product/recurring-deposit-general-tab/recurring-deposit-general-tab.component.html b/src/app/products/recurring-deposit-products/view-recurring-deposit-product/recurring-deposit-general-tab/recurring-deposit-general-tab.component.html index 2603bd124..d55abb109 100644 --- a/src/app/products/recurring-deposit-products/view-recurring-deposit-product/recurring-deposit-general-tab/recurring-deposit-general-tab.component.html +++ b/src/app/products/recurring-deposit-products/view-recurring-deposit-product/recurring-deposit-general-tab/recurring-deposit-general-tab.component.html @@ -47,7 +47,7 @@
Currency in Multiples Of: - {{ recurringDepositProduct.currency.inMultiplesOf | number}} + {{ recurringDepositProduct.currency.inMultiplesOf | formatNumber}}

Terms

@@ -330,7 +330,7 @@ Amount - {{ charge.amount | number }} + {{ charge.amount | formatNumber }} diff --git a/src/app/savings/savings-account-view/savings-account-view.component.html b/src/app/savings/savings-account-view/savings-account-view.component.html index 11317b2e5..1ae3d21d9 100644 --- a/src/app/savings/savings-account-view/savings-account-view.component.html +++ b/src/app/savings/savings-account-view/savings-account-view.component.html @@ -113,7 +113,7 @@ Interest On Overdraft {{savingsAccountData.currency.displaySymbol}} {{savingsAccountData.summary.totalOverdraftInterestDerived - | number}} + | formatNumber}} Overdraft Interest Not Posted @@ -122,7 +122,7 @@ Nominal Interest Rate - {{savingsAccountData.nominalAnnualInterestRate | number}} % + {{savingsAccountData.nominalAnnualInterestRate | formatNumber}} % Interest Compounding Period @@ -167,28 +167,28 @@ Annual Fee - {{savingsAccountData.currency.displaySymbol}} {{savingsAccountData.annualFee.amount | number}} + {{savingsAccountData.currency.displaySymbol}} {{savingsAccountData.annualFee.amount | formatNumber}} Over Draft Limit - {{savingsAccountData.overdraftLimit | number}} + {{savingsAccountData.overdraftLimit | formatNumber}} Min Overdraft Required for Interest Calculation - {{savingsAccountData.minOverdraftForInterestCalculation | number}} + {{savingsAccountData.minOverdraftForInterestCalculation | formatNumber}} Min Balance Required for Interest Calculation - {{savingsAccountData.minBalanceForInterestCalculation | number}} + {{savingsAccountData.minBalanceForInterestCalculation | formatNumber}} Minimum Required Balance - {{savingsAccountData.minRequiredBalance | number}} + {{savingsAccountData.minRequiredBalance | formatNumber}} Enforce Minimum Required Balance - {{savingsAccountData.enforceMinRequiredBalance | number}} + {{savingsAccountData.enforceMinRequiredBalance | formatNumber}} Interest Recalculation Date @@ -196,7 +196,7 @@ On Hold Funds - {{savingsAccountData.onHoldFunds | number}} + {{savingsAccountData.onHoldFunds | formatNumber}} Withhold Tax Group @@ -255,7 +255,7 @@ Nominal Interest Rate - {{savingsAccountData.nominalAnnualInterestRate | number}} % + {{savingsAccountData.nominalAnnualInterestRate | formatNumber}} % @@ -291,7 +291,7 @@ Total Interest Earned {{savingsAccountData.currency.displaySymbol}} {{savingsAccountData.summary.totalInterestEarned - | number}} + | formatNumber}} diff --git a/src/app/savings/savings-account-view/transactions-tab/transactions-tab.component.html b/src/app/savings/savings-account-view/transactions-tab/transactions-tab.component.html index 63fed4511..0a97121e5 100644 --- a/src/app/savings/savings-account-view/transactions-tab/transactions-tab.component.html +++ b/src/app/savings/savings-account-view/transactions-tab/transactions-tab.component.html @@ -31,17 +31,17 @@ Debit - {{ isDebit(transaction.transactionType) ? (transaction.amount | number) : 'N/A'}} + {{ isDebit(transaction.transactionType) ? (transaction.amount | formatNumber) : 'N/A'}} Credit - {{ !isDebit(transaction.transactionType) ? (transaction.amount | number) : 'N/A' }} + {{ !isDebit(transaction.transactionType) ? (transaction.amount | formatNumber) : 'N/A' }} Balance - {{ transaction.runningBalance | number }} + {{ transaction.runningBalance | formatNumber }} diff --git a/src/app/savings/savings-account-view/view-charge/view-charge.component.html b/src/app/savings/savings-account-view/view-charge/view-charge.component.html index 6052e28de..d5925bbea 100644 --- a/src/app/savings/savings-account-view/view-charge/view-charge.component.html +++ b/src/app/savings/savings-account-view/view-charge/view-charge.component.html @@ -91,7 +91,7 @@
- {{ chargeData.amount | number }} + {{ chargeData.amount | formatNumber }}
@@ -99,7 +99,7 @@
- {{ chargeData.amountPaid | number }} + {{ chargeData.amountPaid | formatNumber }}
@@ -107,7 +107,7 @@
- {{ chargeData.amountWaived | number }} + {{ chargeData.amountWaived | formatNumber }}
@@ -115,7 +115,7 @@
- {{ chargeData.amountOutstanding | number }} + {{ chargeData.amountOutstanding | formatNumber }}
diff --git a/src/app/settings/settings.component.html b/src/app/settings/settings.component.html index 10d0c3bd6..b849501ec 100644 --- a/src/app/settings/settings.component.html +++ b/src/app/settings/settings.component.html @@ -15,21 +15,6 @@
- - Name of the Organization - - - - - Description - - - - - Summary - - - Default Language @@ -48,6 +33,15 @@ + + Decimals to Display + + + {{ decimalOpt }} + + + +
diff --git a/src/app/settings/settings.component.ts b/src/app/settings/settings.component.ts index 9a16307cd..3cdc5273d 100644 --- a/src/app/settings/settings.component.ts +++ b/src/app/settings/settings.component.ts @@ -34,6 +34,18 @@ export class SettingsComponent implements OnInit { 'MM-dd-yy', 'yyyy-MM-dd' ]; + /** Decimals. */ + decimals: string[] = [ + '0', + '1', + '2', + '3', + '4', + '5', + '6', + '7', + '8', + ]; /** Placeholder for fonts. */ fonts: any; @@ -41,6 +53,8 @@ export class SettingsComponent implements OnInit { language = new FormControl(''); /** Date Format Setting */ dateFormat = new FormControl(''); + /** Decimals to Display Setting */ + decimalsToDisplay = new FormControl(''); /** * @param {SettingsService} settingsService Settings Service @@ -50,6 +64,7 @@ export class SettingsComponent implements OnInit { ngOnInit() { this.language.patchValue(this.settingsService.language); this.dateFormat.patchValue(this.settingsService.dateFormat); + this.decimalsToDisplay.patchValue(this.settingsService.decimals); this.buildDependencies(); } @@ -63,6 +78,9 @@ export class SettingsComponent implements OnInit { this.dateFormat.valueChanges.subscribe((dateFormat: string) => { this.settingsService.setDateFormat(dateFormat); }); + this.decimalsToDisplay.valueChanges.subscribe((decimals: string) => { + this.settingsService.setDecimalToDisplay(decimals); + }); } /** diff --git a/src/app/settings/settings.service.ts b/src/app/settings/settings.service.ts index 1223787ed..a95089f28 100644 --- a/src/app/settings/settings.service.ts +++ b/src/app/settings/settings.service.ts @@ -40,6 +40,14 @@ export class SettingsService { localStorage.setItem('mifosXLanguage', JSON.stringify(language)); } + /** + * Sets decimals to Display throughout the app. + * @param {string} decimals. + */ + setDecimalToDisplay(decimals: string) { + localStorage.setItem('mifosXDecimalsToDisplay', decimals); + } + setDefaultLanguage() { const defaultLanguage = environment.defaultLanguage ? environment.defaultLanguage : 'en-US'; this.setLanguage({ @@ -113,6 +121,16 @@ export class SettingsService { return JSON.parse(localStorage.getItem('mifosXLanguage')); } + /** + * Returns Decimals to Display setting + */ + get decimals() { + if (!localStorage.getItem('mifosXDecimalsToDisplay')) { + return '2'; + } + return localStorage.getItem('mifosXDecimalsToDisplay'); + } + /** * Returns list of default server */ diff --git a/src/app/shared/tabs/entity-datatable-tab/datatable-single-row/datatable-single-row.component.html b/src/app/shared/tabs/entity-datatable-tab/datatable-single-row/datatable-single-row.component.html index 50ebdc84c..cbad11e6a 100644 --- a/src/app/shared/tabs/entity-datatable-tab/datatable-single-row/datatable-single-row.component.html +++ b/src/app/shared/tabs/entity-datatable-tab/datatable-single-row/datatable-single-row.component.html @@ -30,7 +30,7 @@ {{dataObject.data[0].row[i] | datetimeFormat}} - {{dataObject.data[0].row[i] | number}} + {{dataObject.data[0].row[i] | formatNumber}} {{dataObject.data[0].row[i]}} diff --git a/src/app/system/manage-jobs/cob-workflow/cob-workflow.component.ts b/src/app/system/manage-jobs/cob-workflow/cob-workflow.component.ts index b14943d0f..0b3273c70 100644 --- a/src/app/system/manage-jobs/cob-workflow/cob-workflow.component.ts +++ b/src/app/system/manage-jobs/cob-workflow/cob-workflow.component.ts @@ -1,4 +1,4 @@ -import { Component, OnDestroy, OnInit } from '@angular/core'; +import { Component, Input, OnDestroy, OnInit } from '@angular/core'; import { SystemService } from 'app/system/system.service'; @Component({ @@ -7,10 +7,10 @@ import { SystemService } from 'app/system/system.service'; styleUrls: ['./cob-workflow.component.scss'] }) export class CobWorkflowComponent implements OnInit, OnDestroy { - + /** Wait time between API status calls 30 seg */ waitTime = 30000; - - isCatchUpRunning = false; + /** Process running flag */ + @Input() isCatchUpRunning = true; /** Timer to refetch COB Catch-Up status every 5 seconds */ timer: any; @@ -18,6 +18,7 @@ export class CobWorkflowComponent implements OnInit, OnDestroy { ngOnInit(): void { setTimeout(() => { this.getCOBCatchUpStatus(); }, this.waitTime); + this.getCOBCatchUpStatus(); } ngOnDestroy() { diff --git a/src/app/system/manage-jobs/manage-jobs.component.html b/src/app/system/manage-jobs/manage-jobs.component.html index 679cb6c02..2bc68d48a 100644 --- a/src/app/system/manage-jobs/manage-jobs.component.html +++ b/src/app/system/manage-jobs/manage-jobs.component.html @@ -1,6 +1,6 @@ - + @@ -8,7 +8,7 @@ - + diff --git a/src/app/system/manage-jobs/manage-jobs.component.ts b/src/app/system/manage-jobs/manage-jobs.component.ts index 6742719da..03da60110 100644 --- a/src/app/system/manage-jobs/manage-jobs.component.ts +++ b/src/app/system/manage-jobs/manage-jobs.component.ts @@ -1,4 +1,6 @@ import { Component, OnInit } from '@angular/core'; +import { MatTabChangeEvent } from '@angular/material/tabs'; +import { SystemService } from '../system.service'; @Component({ selector: 'mifosx-manage-jobs', @@ -6,10 +8,20 @@ import { Component, OnInit } from '@angular/core'; styleUrls: ['./manage-jobs.component.scss'] }) export class ManageJobsComponent implements OnInit { + /** Process running flag */ + isCatchUpRunning = true; - constructor() { } + constructor(private systemService: SystemService) { } ngOnInit(): void { } + onJobTabChange(event: MatTabChangeEvent) { + if (event.index === 2) { + this.systemService.getCOBCatchUpStatus().subscribe((response: any) => { + this.isCatchUpRunning = response.isCatchUpRunning; + }); + } + } + } diff --git a/src/app/system/manage-jobs/scheduler-jobs/manage-scheduler-jobs.component.html b/src/app/system/manage-jobs/scheduler-jobs/manage-scheduler-jobs.component.html index 7ac870ffa..ba4c4c743 100644 --- a/src/app/system/manage-jobs/scheduler-jobs/manage-scheduler-jobs.component.html +++ b/src/app/system/manage-jobs/scheduler-jobs/manage-scheduler-jobs.component.html @@ -2,7 +2,7 @@

Scheduler Status:{{ schedulerActive ? 'Active' : 'Inactive' }}

- diff --git a/src/app/tasks/checker-inbox-and-tasks-tabs/loan-approval/loan-approval.component.html b/src/app/tasks/checker-inbox-and-tasks-tabs/loan-approval/loan-approval.component.html index 9bbaefcc9..1da6dfbbe 100644 --- a/src/app/tasks/checker-inbox-and-tasks-tabs/loan-approval/loan-approval.component.html +++ b/src/app/tasks/checker-inbox-and-tasks-tabs/loan-approval/loan-approval.component.html @@ -49,7 +49,7 @@ Amount - {{ loan.principal | number}} + {{ loan.principal | formatNumber}} diff --git a/src/app/tasks/checker-inbox-and-tasks-tabs/loan-disbursal/loan-disbursal.component.html b/src/app/tasks/checker-inbox-and-tasks-tabs/loan-disbursal/loan-disbursal.component.html index f250d82ca..176f41944 100644 --- a/src/app/tasks/checker-inbox-and-tasks-tabs/loan-disbursal/loan-disbursal.component.html +++ b/src/app/tasks/checker-inbox-and-tasks-tabs/loan-disbursal/loan-disbursal.component.html @@ -45,7 +45,7 @@ Principal - {{loan.principal | number}} + {{loan.principal | formatNumber}}