From 2ec9ba81d6213e473cec64aad34c63010c7692c6 Mon Sep 17 00:00:00 2001 From: Ralph Hopman Date: Fri, 29 Nov 2024 12:23:26 +0100 Subject: [PATCH] build: Use prettier for html Stop ignoring html files in prettier and fix existing issues. --- .github/ISSUE_TEMPLATE/user-story-template.md | 2 +- .prettierignore | 1 - ...reate-standing-instructions.component.html | 170 ++- .../edit-standing-instructions.component.html | 142 ++- .../list-standing-instructions.component.html | 94 +- .../list-transactions.component.html | 37 +- .../make-account-transfers.component.html | 106 +- .../view-account-transfer.component.html | 60 +- .../view-standing-instructions.component.html | 74 +- .../accounting-rules.component.html | 47 +- .../create-rule/create-rule.component.html | 81 +- .../edit-rule/edit-rule.component.html | 82 +- .../view-rule/view-rule.component.html | 45 +- src/app/accounting/accounting.component.html | 170 ++- .../chart-of-accounts.component.html | 197 +-- .../create-gl-account.component.html | 94 +- .../edit-gl-account.component.html | 63 +- .../view-gl-account.component.html | 43 +- .../closing-entries.component.html | 98 +- .../create-closure.component.html | 44 +- .../edit-closure/edit-closure.component.html | 26 +- .../view-closure/view-closure.component.html | 26 +- .../create-journal-entry.component.html | 158 ++- ...-financial-activity-mapping.component.html | 31 +- ...-financial-activity-mapping.component.html | 27 +- ...financial-activity-mappings.component.html | 84 +- ...-financial-activity-mapping.component.html | 46 +- .../frequent-postings.component.html | 151 ++- .../migrate-opening-balances.component.html | 148 ++- .../periodic-accruals.component.html | 37 +- .../create-provisioning-entry.component.html | 39 +- .../provisioning-entries.component.html | 59 +- .../view-provisioning-entry.component.html | 79 +- ...rovisioning-journal-entries.component.html | 68 +- .../revert-transaction.component.html | 38 +- .../search-journal-entry.component.html | 122 +- .../activate-center.component.html | 42 +- .../attach-center-meeting.component.html | 65 +- .../center-actions.component.html | 4 +- .../center-assign-staff.component.html | 23 +- .../center-attendance.component.html | 42 +- .../close-center/close-center.component.html | 42 +- ...dit-center-meeting-schedule.component.html | 67 +- .../edit-center-meeting.component.html | 83 +- .../manage-groups.component.html | 32 +- .../staff-assignment-history.component.html | 6 +- .../centers-view/centers-view.component.html | 158 ++- .../general-tab/general-tab.component.html | 171 ++- .../notes-tab/notes-tab.component.html | 41 +- src/app/centers/centers.component.html | 53 +- .../create-center.component.html | 99 +- .../edit-center/edit-center.component.html | 51 +- .../client-address-step.component.html | 62 +- .../client-datatable-step.component.html | 55 +- ...client-family-member-dialog.component.html | 75 +- .../client-family-members-step.component.html | 114 +- .../client-general-step.component.html | 173 ++- .../client-preview-step.component.html | 188 +-- .../address-tab/address-tab.component.html | 60 +- .../charges-overview.component.html | 41 +- .../client-pay-charges.component.html | 36 +- .../view-charge/view-charge.component.html | 100 +- .../accept-client-transfer.component.html | 22 +- .../activate-client.component.html | 42 +- .../add-client-charge.component.html | 71 +- .../add-client-collateral.component.html | 137 +-- .../client-actions.component.html | 2 +- .../client-assign-staff.component.html | 23 +- .../client-screen-reports.component.html | 30 +- .../close-client/close-client.component.html | 37 +- .../create-self-service-user.component.html | 221 ++-- .../reactivate-client.component.html | 42 +- .../reject-client-transfer.component.html | 22 +- .../reject-client.component.html | 37 +- .../take-survey/take-survey.component.html | 51 +- .../transfer-client.component.html | 39 +- .../undo-client-rejection.component.html | 42 +- .../undo-client-transfer.component.html | 22 +- ...date-client-savings-account.component.html | 23 +- .../view-survey/view-survey.component.html | 33 +- .../withdraw-client.component.html | 37 +- .../clients-view/clients-view.component.html | 391 ++++-- .../capture-image-dialog.component.html | 18 +- .../delete-signature-dialog.component.html | 16 +- .../edit-notes-dialog.component.html | 14 +- .../unassign-staff-dialog.component.html | 10 +- .../upload-document-dialog.component.html | 25 +- .../upload-image-dialog.component.html | 10 +- .../upload-signature-dialog.component.html | 10 +- .../view-signature-dialog.component.html | 16 +- .../documents-tab.component.html | 4 +- .../add-family-member.component.html | 71 +- .../edit-family-member.component.html | 78 +- .../family-members-tab.component.html | 60 +- .../general-tab/general-tab.component.html | 717 ++++++----- .../identities-tab.component.html | 126 +- .../notes-tab/notes-tab.component.html | 3 +- src/app/clients/clients.component.html | 56 +- .../create-client.component.html | 44 +- .../edit-client/edit-client.component.html | 157 ++- .../edit-collateral.component.html | 85 +- .../view-collateral.component.html | 115 +- ...individual-collection-sheet.component.html | 120 +- .../completion-dialog.component.html | 16 +- .../configuration-wizard.component.html | 69 +- .../continue-setup-dialog.component.html | 21 +- .../next-step-dialog.component.html | 18 +- .../breadcrumb/breadcrumb.component.html | 20 +- src/app/core/shell/shell.component.html | 9 +- .../core/shell/sidenav/sidenav.component.html | 317 +++-- .../core/shell/toolbar/toolbar.component.html | 315 +++-- ...reate-fixed-deposit-account.component.html | 47 +- .../edit-fixed-deposit-account.component.html | 47 +- ...eposit-account-charges-step.component.html | 80 +- ...eposit-account-details-step.component.html | 34 +- ...nt-interest-rate-chart-step.component.html | 102 +- ...eposit-account-preview-step.component.html | 292 +++-- ...posit-account-settings-step.component.html | 110 +- ...-deposit-account-terms-step.component.html | 83 +- .../charges-tab/charges-tab.component.html | 123 +- .../calculate-interest-dialog.component.html | 10 +- .../inactivate-charge-dialog.component.html | 10 +- .../post-interest-dialog.component.html | 10 +- .../toggle-withhold-tax-dialog.component.html | 17 +- .../waive-charge-dialog.component.html | 10 +- .../fixed-deposit-account-view.component.html | 143 ++- .../general-tab/general-tab.component.html | 153 ++- .../interest-rate-chart-tab.component.html | 88 +- .../standing-instructions-tab.component.html | 76 +- .../transactions-tab.component.html | 91 +- .../view-transaction.component.html | 41 +- ...vate-fixed-deposits-account.component.html | 30 +- ...arge-fixed-deposits-account.component.html | 76 +- ...rove-fixed-deposits-account.component.html | 34 +- ...lose-fixed-deposits-account.component.html | 52 +- ...ed-deposits-account-actions.component.html | 12 +- ...d-deposits-cash-transaction.component.html | 177 +-- ...lose-fixed-deposits-account.component.html | 52 +- ...ject-fixed-deposits-account.component.html | 34 +- ...oval-fixed-deposits-account.component.html | 18 +- ...ient-fixed-deposits-account.component.html | 34 +- ...-recurring-deposits-account.component.html | 46 +- ...t-recurring-deposit-account.component.html | 49 +- ...-recurring-deposits-account.component.html | 31 +- ...-recurring-deposits-account.component.html | 76 +- ...-recurring-deposits-account.component.html | 35 +- ...-recurring-deposits-account.component.html | 82 +- ...-recurring-deposits-account.component.html | 72 +- ...e-recurring-deposit-account.component.html | 33 +- ...ng-deposits-account-actions.component.html | 21 +- ...-recurring-deposits-account.component.html | 35 +- ...-recurring-deposits-account.component.html | 18 +- ...-recurring-deposits-account.component.html | 35 +- ...posits-account-charges-step.component.html | 82 +- ...posits-account-details-step.component.html | 34 +- ...nt-interest-rate-chart-step.component.html | 111 +- ...posits-account-preview-step.component.html | 329 +++-- ...osits-account-settings-step.component.html | 153 +-- ...deposits-account-terms-step.component.html | 60 +- .../charges-tab/charges-tab.component.html | 110 +- ...deposit-confirmation-dialog.component.html | 8 +- .../general-tab/general-tab.component.html | 425 ++++--- .../interest-rate-chart-tab.component.html | 94 +- ...rring-deposits-account-view.component.html | 154 ++- .../standing-instructions-tab.component.html | 79 +- .../edit-transaction.component.html | 54 +- .../transactions-tab.component.html | 98 +- .../view-transaction.component.html | 54 +- .../create-group/create-group.component.html | 99 +- .../edit-group/edit-group.component.html | 64 +- .../add-role/add-role.component.html | 34 +- .../committee-tab.component.html | 47 +- .../unassign-role-dialog.component.html | 10 +- .../unassign-staff-dialog.component.html | 10 +- .../general-tab/general-tab.component.html | 409 ++++--- .../activate-group.component.html | 42 +- .../attach-group-meeting.component.html | 72 +- .../close-group/close-group.component.html | 37 +- ...edit-group-meeting-schedule.component.html | 74 +- .../edit-group-meeting.component.html | 90 +- .../group-assign-staff.component.html | 23 +- .../group-attendance.component.html | 48 +- .../group-transfer-clients.component.html | 73 +- .../manage-group-members.component.html | 42 +- .../groups-view/groups-view.component.html | 172 ++- .../notes-tab/notes-tab.component.html | 3 +- src/app/groups/groups.component.html | 48 +- .../amount-collected-pie.component.html | 10 +- .../amount-disbursed-pie.component.html | 10 +- .../client-trends-bar.component.html | 16 +- .../home/dashboard/dashboard.component.html | 20 +- src/app/home/home.component.html | 62 +- .../session-timeout-dialog.component.html | 4 +- .../warning-dialog.component.html | 8 +- .../create-loans-account.component.html | 69 +- ...n-delinquency-action-dialog.component.html | 49 +- ...count-add-collateral-dialog.component.html | 40 +- ...ew-guarantor-details-dialog.component.html | 25 +- .../edit-loans-account.component.html | 69 +- .../create-glim-account.component.html | 47 +- .../glim-charges-step.component.html | 319 ++--- .../glim-details-step.component.html | 164 +-- .../glim-preview-step.component.html | 563 ++++----- .../glim-terms-step.component.html | 237 ++-- .../glim-account/glim-account.component.html | 38 +- .../loans-account-charges-step.component.html | 90 +- ...oans-account-datatable-step.component.html | 55 +- .../loans-account-details-step.component.html | 76 +- .../loans-account-preview-step.component.html | 221 ++-- ...loans-account-schedule-step.component.html | 17 +- .../loans-account-terms-step.component.html | 545 ++++++--- .../account-details.component.html | 409 ++++--- .../charges-tab/charges-tab.component.html | 117 +- .../external-asset-owner-tab.component.html | 143 ++- .../external-asset-transfer.component.html | 59 +- .../floating-interest-rates.component.html | 13 +- .../general-tab/general-tab.component.html | 190 +-- .../add-collateral.component.html | 40 +- .../add-loan-charge.component.html | 52 +- .../adjust-loan-charge.component.html | 61 +- .../approve-loan/approve-loan.component.html | 64 +- .../asset-transfer-loan.component.html | 52 +- .../assign-loan-officer.component.html | 44 +- .../charge-off/charge-off.component.html | 50 +- .../close-as-rescheduled.component.html | 41 +- .../create-guarantor.component.html | 113 +- ...disburse-to-savings-account.component.html | 52 +- .../disburse/disburse.component.html | 76 +- .../edit-repayment-schedule.component.html | 29 +- .../foreclosure/foreclosure.component.html | 61 +- .../loan-account-actions.component.html | 47 +- .../loan-credit-balance-refund.component.html | 52 +- .../loan-reaging/loan-reaging.component.html | 119 +- .../loan-reamortize.component.html | 60 +- .../loan-reschedule.component.html | 101 +- .../loan-screen-reports.component.html | 29 +- .../loans-account-close.component.html | 41 +- .../make-repayment.component.html | 84 +- .../prepay-loan/prepay-loan.component.html | 84 +- .../recovery-repayment.component.html | 76 +- .../reject-loan/reject-loan.component.html | 41 +- .../undo-approval.component.html | 19 +- .../undo-disbursal.component.html | 19 +- .../view-guarantors.component.html | 132 +- .../waive-interest.component.html | 48 +- .../withdrawn-by-client.component.html | 41 +- .../write-off-page.component.html | 40 +- .../loan-collateral-tab.component.html | 37 +- .../loan-delinquency-tags-tab.component.html | 83 +- .../loan-documents-tab.component.html | 4 +- .../loan-term-variations-tab.component.html | 46 +- .../loan-tranche-details.component.html | 70 +- .../loans-view/loans-view.component.html | 322 +++-- .../notes-tab/notes-tab.component.html | 3 +- .../original-schedule-tab.component.html | 95 +- .../overdue-charges-tab.component.html | 21 +- .../repayment-schedule-tab.component.html | 292 +++-- .../reschedule-loan-tab.component.html | 46 +- .../standing-instructions-tab.component.html | 82 +- .../transactions-tab.component.html | 230 +++- .../edit-transaction.component.html | 56 +- .../export-transactions.component.html | 37 +- .../view-reciept/view-reciept.component.html | 7 +- .../view-transaction.component.html | 103 +- .../view-charge/view-charge.component.html | 83 +- .../login-form/login-form.component.html | 41 +- src/app/login/login.component.html | 85 +- .../reset-password.component.html | 70 +- .../two-factor-authentication.component.html | 85 +- .../center-navigation.component.html | 66 +- .../client-navigation.component.html | 37 +- .../group-navigation.component.html | 143 ++- .../loan-account-table.component.html | 32 +- .../member-groups.component.html | 16 +- src/app/navigation/navigation.component.html | 39 +- .../office-navigation.component.html | 12 +- .../savings-account-table.component.html | 23 +- .../share-account-table.component.html | 25 +- .../staff-navigation.component.html | 21 +- src/app/not-found/not-found.component.html | 17 +- .../notifications-page.component.html | 21 +- .../adhoc-query/adhoc-query.component.html | 49 +- .../create-adhoc-query.component.html | 52 +- .../edit-adhoc-query.component.html | 52 +- .../view-adhoc-query.component.html | 12 +- .../bulk-import/bulk-import.component.html | 139 ++- .../view-bulk-import.component.html | 93 +- .../bulk-loan-reassignmnet.component.html | 109 +- .../currencies/currencies.component.html | 82 +- .../manage-currencies.component.html | 91 +- .../create-employee.component.html | 104 +- .../edit-employee.component.html | 68 +- .../employees/employees.component.html | 196 +-- .../view-employee.component.html | 24 +- ...ate-enity-data-table-checks.component.html | 48 +- .../entity-data-table-checks.component.html | 68 +- .../fund-mapping/fund-mapping.component.html | 150 ++- .../create-holiday.component.html | 94 +- .../edit-holiday/edit-holiday.component.html | 69 +- .../holidays/holidays.component.html | 88 +- .../view-holidays.component.html | 92 +- .../investors/investors.component.html | 155 ++- ...-loan-provisioning-criteria.component.html | 70 +- ...-loan-provisioning-criteria.component.html | 74 +- .../loan-provisioning-criteria.component.html | 34 +- ...-loan-provisioning-criteria.component.html | 45 +- .../create-fund/create-fund.component.html | 25 +- .../edit-fund/edit-fund.component.html | 25 +- .../manage-funds/manage-funds.component.html | 46 +- .../view-fund/view-fund.component.html | 20 +- .../create-office.component.html | 67 +- .../edit-office/edit-office.component.html | 40 +- .../offices/offices.component.html | 204 ++-- .../general-tab/general-tab.component.html | 7 +- .../view-office/view-office.component.html | 30 +- .../organization/organization.component.html | 257 ++-- .../password-preferences.component.html | 21 +- .../create-payment-type.component.html | 33 +- .../edit-payment-type.component.html | 33 +- .../payment-types.component.html | 88 +- .../create-campaign.component.html | 17 +- .../edit-campaign.component.html | 17 +- .../campaign-message-step.component.html | 19 +- .../campaign-preview-step.component.html | 21 +- ...it-business-rule-parameters.component.html | 47 +- .../edit-sms-campaign-step.component.html | 41 +- .../business-rule-parameters.component.html | 54 +- .../sms-campaign-step.component.html | 67 +- .../sms-campaigns.component.html | 43 +- .../view-campaign.component.html | 101 +- ...anding-instructions-history.component.html | 94 +- .../allocate-cash.component.html | 56 +- .../tellers/cashiers/cashiers.component.html | 70 +- .../create-cashier.component.html | 56 +- .../edit-cashier/edit-cashier.component.html | 54 +- .../settle-cash/settle-cash.component.html | 56 +- .../transactions/transactions.component.html | 152 +-- .../view-cashier/view-cashier.component.html | 30 +- .../create-teller.component.html | 52 +- .../edit-teller/edit-teller.component.html | 53 +- .../tellers/tellers.component.html | 43 +- .../view-teller/view-teller.component.html | 8 - .../working-days/working-days.component.html | 49 +- .../products/charges/charges.component.html | 154 ++- .../create-charge.component.html | 206 ++-- .../edit-charge/edit-charge.component.html | 166 ++- .../view-charge/view-charge.component.html | 68 +- .../collaterals/collaterals.component.html | 40 +- .../create-collateral.component.html | 65 +- .../edit-collateral.component.html | 66 +- .../view-collateral.component.html | 29 +- ...oduct-incentive-form-dialog.component.html | 48 +- ...reate-fixed-deposit-product.component.html | 52 +- .../edit-fixed-deposit-product.component.html | 66 +- ...sit-product-accounting-step.component.html | 241 ++-- ...eposit-product-charges-step.component.html | 37 +- ...posit-product-currency-step.component.html | 27 +- ...eposit-product-details-step.component.html | 27 +- ...ct-interest-rate-chart-step.component.html | 221 ++-- ...eposit-product-preview-step.component.html | 454 ++++--- ...posit-product-settings-step.component.html | 105 +- ...-deposit-product-terms-step.component.html | 105 +- .../fixed-deposit-products.component.html | 102 +- .../fixed-deposit-general-tab.component.html | 388 +++--- .../view-fixed-deposit-product.component.html | 28 +- .../create-floating-rate.component.html | 145 ++- .../edit-floating-rate.component.html | 137 ++- ...floating-rate-period-dialog.component.html | 36 +- .../floating-rates.component.html | 70 +- .../view-floating-rate.component.html | 68 +- .../loan-product-summary.component.html | 1069 ++++++++++------- .../create-loan-product.component.html | 62 +- .../edit-loan-product.component.html | 204 ++-- ...oan-product-accounting-step.component.html | 339 ++++-- .../loan-product-charges-step.component.html | 94 +- .../loan-product-currency-step.component.html | 45 +- .../loan-product-details-step.component.html | 86 +- ...roduct-interest-refund-step.component.html | 19 +- ...ance-payment-allocation-tab.component.html | 61 +- ...oduct-payment-strategy-step.component.html | 58 +- .../loan-product-preview-step.component.html | 21 +- .../loan-product-settings-step.component.html | 754 ++++++++---- .../loan-product-terms-step.component.html | 578 +++++---- .../loan-products.component.html | 112 +- .../general-tab/general-tab.component.html | 16 +- ...-advance-paymeny-allocation.component.html | 18 +- .../view-loan-product.component.html | 28 +- .../create-bucket.component.html | 66 +- .../delinquency-bucket.component.html | 25 +- .../edit-bucket/edit-bucket.component.html | 72 +- .../view-bucket/view-bucket.component.html | 29 +- .../create-range/create-range.component.html | 41 +- .../delinquency-range.component.html | 32 +- .../edit-range/edit-range.component.html | 41 +- .../view-range/view-range.component.html | 25 +- .../manage-delinquency-buckets.component.html | 26 +- .../create-tax-component.component.html | 91 +- .../edit-tax-component.component.html | 59 +- .../manage-tax-components.component.html | 78 +- .../view-tax-component.component.html | 28 +- .../manage-tax-configurations.component.html | 26 +- .../create-tax-group.component.html | 69 +- .../edit-tax-group.component.html | 78 +- .../manage-tax-groups.component.html | 18 +- .../view-tax-group.component.html | 46 +- .../create-product-mix.component.html | 30 +- .../edit-product-mix.component.html | 27 +- .../products-mix/products-mix.component.html | 24 +- .../view-product-mix.component.html | 63 +- src/app/products/products.component.html | 292 +++-- ...e-recurring-deposit-product.component.html | 68 +- ...t-recurring-deposit-product.component.html | 68 +- ...sit-product-accounting-step.component.html | 241 ++-- ...eposit-product-charges-step.component.html | 39 +- ...posit-product-currency-step.component.html | 44 +- ...eposit-product-details-step.component.html | 48 +- ...ct-interest-rate-chart-step.component.html | 228 ++-- ...eposit-product-preview-step.component.html | 430 ++++--- ...posit-product-settings-step.component.html | 109 +- ...-deposit-product-terms-step.component.html | 65 +- .../recurring-deposit-products.component.html | 112 +- ...curring-deposit-general-tab.component.html | 381 +++--- ...w-recurring-deposit-product.component.html | 28 +- .../create-saving-product.component.html | 46 +- .../edit-saving-product.component.html | 50 +- ...ing-product-accounting-step.component.html | 355 +++--- ...saving-product-charges-step.component.html | 41 +- ...aving-product-currency-step.component.html | 44 +- ...saving-product-details-step.component.html | 43 +- ...saving-product-preview-step.component.html | 237 ++-- ...aving-product-settings-step.component.html | 196 ++- .../saving-product-terms-step.component.html | 93 +- .../saving-products.component.html | 93 +- .../saving-product-general-tab.component.html | 202 ++-- .../view-saving-product.component.html | 28 +- .../create-dividend.component.html | 53 +- .../create-share-product.component.html | 46 +- .../dividends.component.html | 41 +- .../edit-share-product.component.html | 58 +- ...are-product-accounting-step.component.html | 68 +- .../share-product-charges-step.component.html | 41 +- ...share-product-currency-step.component.html | 45 +- .../share-product-details-step.component.html | 42 +- ...e-product-market-price-step.component.html | 31 +- .../share-product-preview-step.component.html | 145 ++- ...share-product-settings-step.component.html | 85 +- .../share-product-terms-step.component.html | 59 +- .../share-products.component.html | 99 +- .../view-dividend.component.html | 32 +- .../share-product-general-tab.component.html | 154 +-- .../view-share-product.component.html | 28 +- src/app/profile/profile.component.html | 35 +- src/app/reports/reports.component.html | 30 +- .../run-report/chart/chart.component.html | 12 +- .../run-report/pentaho/pentaho.component.html | 2 +- .../run-report/run-report.component.html | 86 +- .../table-and-sms.component.html | 42 +- .../xbrl-report/xbrl-report.component.html | 58 +- src/app/reports/xbrl/xbrl.component.html | 92 +- .../create-savings-account.component.html | 24 +- .../edit-savings-account.component.html | 24 +- .../create-gsim-account.component.html | 118 +- .../gsim-account/gsim-account.component.html | 146 ++- .../activate-savings-account.component.html | 30 +- .../add-charge-savings-account.component.html | 71 +- ...annual-fees-savings-account.component.html | 37 +- .../approve-savings-account.component.html | 34 +- .../close-savings-account.component.html | 63 +- .../manage-savings-account.component.html | 47 +- ...erest-as-on-savings-account.component.html | 30 +- .../reject-savings-account.component.html | 34 +- .../saving-account-actions.component.html | 18 +- ...avings-account-assign-staff.component.html | 34 +- ...avings-account-transactions.component.html | 62 +- ...ings-account-unassign-staff.component.html | 30 +- ...do-approval-savings-account.component.html | 18 +- ...w-by-client-savings-account.component.html | 34 +- ...avings-account-charges-step.component.html | 101 +- ...avings-account-details-step.component.html | 36 +- ...avings-account-preview-step.component.html | 147 ++- .../savings-account-terms-step.component.html | 128 +- .../charges-tab/charges-tab.component.html | 120 +- .../calculate-interest-dialog.component.html | 10 +- .../inactivate-charge-dialog.component.html | 10 +- .../post-interest-dialog.component.html | 10 +- .../release-amount-dialog.component.html | 10 +- .../toggle-withhold-tax-dialog.component.html | 17 +- .../undo-transaction-dialog.component.html | 10 +- .../waive-charge-dialog.component.html | 10 +- .../general-tab/general-tab.component.html | 239 ++-- .../notes-tab/notes-tab.component.html | 3 +- .../savings-account-view.component.html | 168 ++- .../savings-documents-tab.component.html | 4 +- .../standing-instructions-tab.component.html | 77 +- .../export-transactions.component.html | 33 +- .../transactions-tab.component.html | 121 +- .../edit-transaction.component.html | 52 +- .../view-reciept/view-reciept.component.html | 7 +- .../datatable-transaction-tab.component.html | 2 +- ...s-transaction-datatable-tab.component.html | 2 +- ...ngs-transaction-general-tab.component.html | 81 +- .../view-transaction.component.html | 25 +- .../view-charge/view-charge.component.html | 86 +- .../search-page/search-page.component.html | 49 +- .../app-configuration.component.html | 72 +- .../task-management.component.html | 6 +- .../create-user/create-user.component.html | 74 +- .../users/edit-user/edit-user.component.html | 46 +- .../self-service/users/users.component.html | 65 +- .../users/view-user/view-user.component.html | 41 +- src/app/settings/settings.component.html | 58 +- .../account-number.component.html | 10 +- .../gl-account-display.component.html | 10 +- .../gl-account-selector.component.html | 15 +- ...w-journal-entry-transaction.component.html | 91 +- .../view-journal-entry.component.html | 8 +- ...-savings-accounting-details.component.html | 163 ++- .../cancel-dialog.component.html | 12 +- .../change-password-dialog.component.html | 50 +- .../confirmation-dialog.component.html | 6 +- .../delete-dialog.component.html | 4 +- .../disable-dialog.component.html | 4 +- .../shared/dropdown/dropdown.component.html | 19 +- .../enable-dialog.component.html | 4 +- .../entity-name/entity-name.component.html | 12 +- .../error-dialog/error-dialog.component.html | 8 +- .../external-identifier.component.html | 16 +- .../file-upload/file-upload.component.html | 6 +- src/app/shared/footer/footer.component.html | 24 +- .../form-dialog/form-dialog.component.html | 20 +- .../formfield/formfield.component.html | 66 +- .../input-amount/input-amount.component.html | 54 +- .../keyboard-shortcuts-dialog.component.html | 16 +- .../language-selector.component.html | 4 +- .../shared/long-text/long-text.component.html | 8 +- .../notifications-tray.component.html | 37 +- .../search-tool/search-tool.component.html | 16 +- .../server-selector.component.html | 44 +- .../stepper-buttons.component.html | 1 - .../datatable-multi-row.component.html | 22 +- .../datatable-single-row.component.html | 48 +- .../entity-datatable-tab.component.html | 6 +- .../entity-documents-tab.component.html | 41 +- .../entity-notes-tab.component.html | 32 +- .../tenant-selector.component.html | 9 +- .../theme-picker/theme-picker.component.html | 7 +- .../theme-toggle/theme-toggle.component.html | 2 +- .../transaction-payment-detail.component.html | 16 +- .../create-shares-account.component.html | 24 +- .../edit-shares-account.component.html | 23 +- .../activate-shares-account.component.html | 42 +- .../apply-shares/apply-shares.component.html | 43 +- .../approve-shares-account.component.html | 34 +- .../approve-share-dialog.component.html | 10 +- .../approve-shares.component.html | 37 +- .../close-shares-account.component.html | 34 +- .../redeem-shares.component.html | 41 +- .../reject-shares-account.component.html | 34 +- .../reject-share-dialog.component.html | 10 +- .../reject-shares.component.html | 37 +- .../shares-account-actions.component.html | 2 +- ...ndo-approval-shares-account.component.html | 18 +- ...shares-account-charges-step.component.html | 41 +- ...shares-account-details-step.component.html | 32 +- ...shares-account-preview-step.component.html | 91 +- .../shares-account-terms-step.component.html | 79 +- .../charges-tab/charges-tab.component.html | 92 +- .../dividends-tab.component.html | 30 +- .../general-tab/general-tab.component.html | 122 +- .../shares-account-view.component.html | 128 +- .../transactions-tab.component.html | 45 +- .../account-number-preferences.component.html | 22 +- ...e-account-number-preference.component.html | 39 +- ...t-account-number-preference.component.html | 38 +- ...w-account-number-preference.component.html | 20 +- .../audit-trails/audit-trails.component.html | 118 +- .../view-audit/view-audit.component.html | 50 +- src/app/system/codes/codes.component.html | 94 +- .../create-code/create-code.component.html | 63 +- .../codes/edit-code/edit-code.component.html | 42 +- .../codes/view-code/view-code.component.html | 93 +- .../business-date-tab.component.html | 110 +- .../configurations.component.html | 5 +- .../edit-configuration.component.html | 41 +- .../global-configurations-tab.component.html | 91 +- ...nfigure-maker-checker-tasks.component.html | 88 +- .../entity-to-entity-mapping.component.html | 98 +- .../amazon-s3/amazon-s3.component.html | 16 +- .../edit-amazon-s3.component.html | 63 +- .../edit-email/edit-email.component.html | 76 +- .../email/email.component.html | 16 +- .../external-services.component.html | 40 +- .../edit-notification.component.html | 43 +- .../notification/notification.component.html | 16 +- .../sms/edit-sms/edit-sms.component.html | 56 +- .../external-services/sms/sms.component.html | 16 +- .../column-dialog.component.html | 47 +- .../create-data-table.component.html | 181 ++- .../edit-data-table.component.html | 147 ++- .../manage-data-tables.component.html | 91 +- .../view-data-table.component.html | 109 +- .../manage-external-events.component.html | 34 +- .../add-event-dialog.component.html | 26 +- .../create-hook/create-hook.component.html | 121 +- .../edit-hook/edit-hook.component.html | 124 +- .../manage-hooks/manage-hooks.component.html | 33 +- .../view-hook/view-hook.component.html | 54 +- .../cob-workflow/cob-workflow.component.html | 7 +- .../loan-locked/loan-locked.component.html | 73 +- .../manage-jobs/manage-jobs.component.html | 7 +- .../custom-parameters-popover.component.html | 18 +- .../custom-parameters-table.component.html | 37 +- .../edit-scheduler-job.component.html | 39 +- .../error-log-popover.component.html | 48 +- .../manage-scheduler-jobs.component.html | 198 +-- .../run-selected-jobs-popover.component.html | 32 +- .../run-selected-jobs-table.component.html | 44 +- .../view-history-scheduler-job.component.html | 60 +- .../view-scheduler-job.component.html | 30 +- .../workflow-diagram.component.html | 31 +- .../workflow-jobs.component.html | 56 +- .../create-report.component.html | 107 +- .../edit-report/edit-report.component.html | 112 +- .../manage-reports.component.html | 186 ++- .../report-parameter-dialog.component.html | 30 +- .../view-report/view-report.component.html | 36 +- .../create-survey.component.html | 188 +-- .../edit-survey/edit-survey.component.html | 299 ++--- .../manage-surveys.component.html | 67 +- .../view-survey/view-survey.component.html | 41 +- .../add-role/add-role.component.html | 36 +- .../edit-role/edit-role.component.html | 45 +- .../roles-and-permissions.component.html | 112 +- .../view-role/view-role.component.html | 97 +- src/app/system/system.component.html | 228 ++-- .../checker-inbox.component.html | 106 +- .../client-approval.component.html | 66 +- .../loan-approval.component.html | 71 +- .../loan-disbursal.component.html | 71 +- .../reschedule-loan.component.html | 86 +- .../checker-inbox-and-tasks.component.html | 66 +- .../view-checker-inbox.component.html | 54 +- .../create-template.component.html | 115 +- .../edit-template.component.html | 107 +- src/app/templates/templates.component.html | 26 +- .../view-template.component.html | 22 +- .../create-user/create-user.component.html | 145 ++- .../users/edit-user/edit-user.component.html | 71 +- src/app/users/users.component.html | 90 +- .../users/view-user/view-user.component.html | 30 +- src/index.html | 86 +- 651 files changed, 28935 insertions(+), 20624 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/user-story-template.md b/.github/ISSUE_TEMPLATE/user-story-template.md index 25c84b181..d8836493b 100644 --- a/.github/ISSUE_TEMPLATE/user-story-template.md +++ b/.github/ISSUE_TEMPLATE/user-story-template.md @@ -20,7 +20,7 @@ As DevOps I want Health liveness Probe on the microservice so that the health of **Acceptance Criteria:** - [ ] [LIST ITEMS] - i.e. + i.e. - [ ] Negative use-cases for Unit Tests in the "common streaming library" - [ ] Integration tests in the "common streaming library" diff --git a/.prettierignore b/.prettierignore index 1aa0e755c..e4eedf001 100644 --- a/.prettierignore +++ b/.prettierignore @@ -1,7 +1,6 @@ /dist /node_modules **/.git -*.html *.js *.json *.ts diff --git a/src/app/account-transfers/create-standing-instructions/create-standing-instructions.component.html b/src/app/account-transfers/create-standing-instructions/create-standing-instructions.component.html index 4407009bb..70a52366e 100644 --- a/src/app/account-transfers/create-standing-instructions/create-standing-instructions.component.html +++ b/src/app/account-transfers/create-standing-instructions/create-standing-instructions.component.html @@ -1,244 +1,282 @@
- -
- -
- - {{"labels.inputs.name" | translate}} - + {{ 'labels.inputs.name' | translate }} + - {{"labels.inputs.name" | translate}} {{"labels.commons.is" | translate}} {{"labels.inputs.required" | translate}} + {{ 'labels.inputs.name' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.inputs.required' | translate }} - {{"labels.inputs.Applicant" | translate}} - + {{ 'labels.inputs.Applicant' | translate }} + - {{"labels.inputs.Type" | translate}} + {{ 'labels.inputs.Type' | translate }} {{ transferType.value }} - {{"labels.inputs.Transfer Type" | translate}} {{"labels.commons.is" | translate}} {{"labels.inputs.required" | translate}} + {{ 'labels.inputs.Transfer Type' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.inputs.required' | translate }} - {{ "labels.inputs.Priority" | translate}} + {{ 'labels.inputs.Priority' | translate }} {{ priorityType.value }} - {{"labels.inputs.Priority" | translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required" | translate}} + {{ 'labels.inputs.Priority' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} - {{"labels.inputs.Status" | translate}} + {{ 'labels.inputs.Status' | translate }} {{ statusType.value }} - {{"labels.inputs.Status" | translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required" | translate}} + {{ 'labels.inputs.Status' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} - {{"labels.inputs.From Account Type" | translate}} + {{ 'labels.inputs.From Account Type' | translate }} {{ fromAccountType.value }} - {{"labels.inputs.From Account Type" | translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required" | translate}} + {{ 'labels.inputs.From Account Type' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} - {{"labels.inputs.From Account" | translate}} + {{ 'labels.inputs.From Account' | translate }} {{ fromAccount.productName }} - {{ fromAccount.accountNo }} - {{"labels.inputs.From Account" | translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required" | translate}} + {{ 'labels.inputs.From Account' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} - {{"labels.inputs.Destination" | translate}} + {{ 'labels.inputs.Destination' | translate }} {{ destinationType.value }} - {{"labels.inputs.Destination" | translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required" | translate}} + {{ 'labels.inputs.Destination' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} - {{"labels.inputs.To Office" | translate}} + {{ 'labels.inputs.To Office' | translate }} {{ toOfficeType.name }} - {{"labels.inputs.To Office" | translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required" | translate}} + {{ 'labels.inputs.To Office' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} - {{"labels.inputs.Beneficiary" | translate}} + {{ 'labels.inputs.Beneficiary' | translate }} {{ toClientType.displayName }} - {{"labels.inputs.Beneficiary" | translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required" | translate}} + {{ 'labels.inputs.Beneficiary' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} - {{"labels.inputs.To Account Type" | translate}} + {{ 'labels.inputs.To Account Type' | translate }} {{ toAccountType.value }} - {{"labels.inputs.To Account Type" | translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required" | translate}} + {{ 'labels.inputs.To Account Type' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} - {{"labels.inputs.To Account" | translate}} + {{ 'labels.inputs.To Account' | translate }} {{ toAccount.productName }} - {{ toAccount.accountNo }} - {{"labels.inputs.To Account" | translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required" | translate}} + {{ 'labels.inputs.To Account' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} - {{"labels.inputs.Standing Instruction Type" | translate}} + {{ 'labels.inputs.Standing Instruction Type' | translate }} {{ instructionsType.value }} - {{"labels.inputs.Standing Instruction Type" | translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required" | translate}} + {{ 'labels.inputs.Standing Instruction Type' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} - {{"labels.inputs.Amount" | translate}} - + {{ 'labels.inputs.Amount' | translate }} + - {{"labels.inputs.Amount" | translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required" | translate}} + {{ 'labels.inputs.Amount' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} - {{"labels.inputs.Validity from" | translate}} - + {{ 'labels.inputs.Validity from' | translate }} + - {{"labels.inputs.Valid From Date" | translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required" | translate}} + {{ 'labels.inputs.Valid From Date' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} - - {{"labels.inputs.Validity To" | translate}} - + + {{ 'labels.inputs.Validity To' | translate }} + - {{"labels.inputs.Valid Till Date" | translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required" | translate}} + {{ 'labels.inputs.Valid Till Date' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} - {{"labels.inputs.Recurrence Type" | translate}} + {{ 'labels.inputs.Recurrence Type' | translate }} {{ recurrenceType.value }} - {{"labels.inputs.Recurrence Type" | translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required" | translate}} + {{ 'labels.inputs.Recurrence Type' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} - {{"labels.inputs.Interval" | translate}} - + {{ 'labels.inputs.Interval' | translate }} + - {{"labels.inputs.Recurrence Interval" | translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required" | translate}} + {{ 'labels.inputs.Recurrence Interval' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} - {{"labels.inputs.Recurrence Frequency" | translate}} + {{ 'labels.inputs.Recurrence Frequency' | translate }} - + {{ recurrenceFrequencyType.value }} - {{"labels.inputs.Recurrence Frequency" | translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required" | translate}} + {{ 'labels.inputs.Recurrence Frequency' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} - - {{"labels.inputs.On Month Day" | translate}} - + + {{ 'labels.inputs.On Month Day' | translate }} + - {{"labels.inputs.On Month Day" | translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required" | translate}} + {{ 'labels.inputs.On Month Day' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} -
- - - + + -
- -
diff --git a/src/app/account-transfers/edit-standing-instructions/edit-standing-instructions.component.html b/src/app/account-transfers/edit-standing-instructions/edit-standing-instructions.component.html index f5c10b4b3..d6ec2be69 100644 --- a/src/app/account-transfers/edit-standing-instructions/edit-standing-instructions.component.html +++ b/src/app/account-transfers/edit-standing-instructions/edit-standing-instructions.component.html @@ -1,171 +1,193 @@
- -
- -
- - {{"labels.inputs.name" | translate}} - + {{ 'labels.inputs.name' | translate }} + - {{"labels.inputs.Applicant" | translate}} - + {{ 'labels.inputs.Applicant' | translate }} + - {{"labels.inputs.Type" | translate}} - + {{ 'labels.inputs.Type' | translate }} + - {{"labels.inputs.From Account Type" | translate}} - + {{ 'labels.inputs.From Account Type' | translate }} + - {{"labels.inputs.Priority" | translate}} + {{ 'labels.inputs.Priority' | translate }} {{ priorityType.value }} - {{"labels.inputs.Priority" | translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required" | translate}} + {{ 'labels.inputs.Priority' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} - {{"labels.inputs.Status" | translate}} + {{ 'labels.inputs.Status' | translate }} {{ statusType.value }} - {{"labels.inputs.Status" | translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required" | translate}} + {{ 'labels.inputs.Status' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} - {{"labels.inputs.From Account" | translate}} - + {{ 'labels.inputs.From Account' | translate }} + - {{"labels.inputs.Destination" | translate}} - + {{ 'labels.inputs.Destination' | translate }} + - {{"labels.inputs.To Office" | translate}} - + {{ 'labels.inputs.To Office' | translate }} + - {{"labels.inputs.Beneficiary" | translate}} - + {{ 'labels.inputs.Beneficiary' | translate }} + - {{"labels.inputs.To Account Type" | translate}} - + {{ 'labels.inputs.To Account Type' | translate }} + - {{"labels.inputs.To Account" | translate}} - + {{ 'labels.inputs.To Account' | translate }} + - {{"labels.inputs.Standing Instruction Type" | translate}} + {{ 'labels.inputs.Standing Instruction Type' | translate }} - + {{ instructionsType.value }} - {{"labels.inputs.Amount" | translate}} - + {{ 'labels.inputs.Amount' | translate }} + - {{"labels.inputs.Validity from" | translate}} - + {{ 'labels.inputs.Validity from' | translate }} + - {{"labels.inputs.Valid From Date" | translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required" | translate}} + {{ 'labels.inputs.Valid From Date' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} - {{"labels.inputs.Validity To" | translate}} - + {{ 'labels.inputs.Validity To' | translate }} + - {{"labels.inputs.Valid Till Date" | translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required" | translate}} + {{ 'labels.inputs.Valid Till Date' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} - {{"labels.inputs.Recurrence Type" | translate}} + {{ 'labels.inputs.Recurrence Type' | translate }} {{ recurrenceType.value }} - {{"labels.inputs.Recurrence Type" | translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required" | translate}} + {{ 'labels.inputs.Recurrence Type' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} - {{"labels.inputs.Interval" | translate}} - + {{ 'labels.inputs.Interval' | translate }} + - {{"labels.inputs.Recurrence Frequency" | translate}} + {{ 'labels.inputs.Recurrence Frequency' | translate }} - + {{ recurrenceFrequencyType.value }} - {{"labels.inputs.On Month Day" | translate}} - + {{ 'labels.inputs.On Month Day' | translate }} + -
- - - + + -
- -
diff --git a/src/app/account-transfers/list-standing-instructions/list-standing-instructions.component.html b/src/app/account-transfers/list-standing-instructions/list-standing-instructions.component.html index a5413f211..8438c817e 100644 --- a/src/app/account-transfers/list-standing-instructions/list-standing-instructions.component.html +++ b/src/app/account-transfers/list-standing-instructions/list-standing-instructions.component.html @@ -1,10 +1,8 @@ -
-
-

{{"labels.heading.Client Type" | translate}}

+

{{ 'labels.heading.Client Type' | translate }}

{{ clientName }}

@@ -13,17 +11,17 @@
- + - +
- {{"labels.inputs.Type" | translate}} + {{ 'labels.inputs.Type' | translate }} {{ transferTypeData.value }} @@ -32,80 +30,102 @@ - + -
- - - - + - - + + - - + + - - + + - - + + - - + - + - - +
{{ "labels.inputs.Client" | translate}} {{instruction.fromClient.displayName}}-{{instruction.fromClient.id}} + {{ 'labels.inputs.Client' | translate }} + {{ instruction.fromClient.displayName }}-{{ instruction.fromClient.id }} {{"labels.inputs.From Account" | translate}} {{instruction.fromAccount.accountNo}} - ({{instruction.fromAccountType.value}}){{ 'labels.inputs.From Account' | translate }} + {{ instruction.fromAccount.accountNo }} ({{ instruction.fromAccountType.value }}) + {{"labels.inputs.Beneficiary" | translate}} {{instruction.toClient.displayName}}{{ 'labels.inputs.Beneficiary' | translate }}{{ instruction.toClient.displayName }} {{"labels.inputs.To Account" | translate}} {{instruction.toAccount.accountNo}} - ({{instruction.toAccountType.value}}){{ 'labels.inputs.To Account' | translate }} + {{ instruction.toAccount.accountNo }} ({{ instruction.toAccountType.value }}) + {{"labels.inputs.Amount" | translate}} {{instruction.instructionType.value}}/{{instruction.amount}}{{ 'labels.inputs.Amount' | translate }}{{ instruction.instructionType.value }}/{{ instruction.amount }} {{"labels.inputs.Validity" | translate}} {{instruction.validFrom | dateFormat}} to {{instruction.validTill | dateFormat}} + {{ 'labels.inputs.Validity' | translate }} + {{ instruction.validFrom | dateFormat }} to {{ instruction.validTill | dateFormat }} {{ "labels.inputs.Actions" | translate}} {{ 'labels.inputs.Actions' | translate }} - - - - -
- diff --git a/src/app/account-transfers/list-transactions/list-transactions.component.html b/src/app/account-transfers/list-transactions/list-transactions.component.html index 0d3fc1a1a..9b7b5d865 100644 --- a/src/app/account-transfers/list-transactions/list-transactions.component.html +++ b/src/app/account-transfers/list-transactions/list-transactions.component.html @@ -1,13 +1,9 @@
- - -
-
- {{"labels.inputs.From Account" | translate}} + {{ 'labels.inputs.From Account' | translate }}
@@ -15,7 +11,7 @@
- {{"labels.inputs.To Account" | translate}} + {{ 'labels.inputs.To Account' | translate }}
@@ -23,51 +19,42 @@
- {{"labels.inputs.Destination" | translate}} + {{ 'labels.inputs.Destination' | translate }}
{{ listTransactionData.toClient.displayName }}
-
- - -
- - - - + + - - + + - - + + - - + + - - - +
{{"labels.inputs.Transaction Date | translate}} {{ transaction.transferDate | dateFormat }} {{"labels.inputs.Transaction Date | translate}}{{ transaction.transferDate | dateFormat }} {{"labels.inputs.Amount" | translate}} {{ transaction.transferAmount }} {{ 'labels.inputs.Amount' | translate }}{{ transaction.transferAmount }} {{"labels.inputs.Notes | translate}} {{ transaction.transferDescription }} {{"labels.inputs.Notes | translate}}{{ transaction.transferDescription }} {{"labels.inputs.Reversed" | translate}} {{ transaction.reversed | yesNo}}{{ 'labels.inputs.Reversed' | translate }}{{ transaction.reversed | yesNo }}
-
diff --git a/src/app/account-transfers/make-account-transfers/make-account-transfers.component.html b/src/app/account-transfers/make-account-transfers/make-account-transfers.component.html index 60cffe6fc..f5cc2bc6f 100644 --- a/src/app/account-transfers/make-account-transfers/make-account-transfers.component.html +++ b/src/app/account-transfers/make-account-transfers/make-account-transfers.component.html @@ -1,79 +1,84 @@
- - -
- -

{{"labels.heading.Transferring From Details" | translate}}

+

{{ 'labels.heading.Transferring From Details' | translate }}

- {{"labels.inputs.Applicant" | translate}} + {{ 'labels.inputs.Applicant' | translate }} {{ accountTransferTemplateData.fromClient.displayName }}
- {{"labels.inputs.Office" | translate}} + {{ 'labels.inputs.Office' | translate }} {{ accountTransferTemplateData.fromOffice.name }}
- {{"labels.inputs.From Account" | translate}} - {{ accountTransferTemplateData.fromAccount.productName}} - #{{ - accountTransferTemplateData.fromAccount.accountNo }} + {{ 'labels.inputs.From Account' | translate }} + {{ accountTransferTemplateData.fromAccount.productName }} - #{{ + accountTransferTemplateData.fromAccount.accountNo + }}
- {{"labels.inputs.From Account Type" | translate}} + {{ 'labels.inputs.From Account Type' | translate }} {{ accountTransferTemplateData.fromAccountType.value }}
- {{"labels.inputs.Currency" | translate}} + {{ 'labels.inputs.Currency' | translate }} {{ accountTransferTemplateData.currency.name }}
-
-

{{"labels.heading.Transferred To" | translate}}

+

{{ 'labels.heading.Transferred To' | translate }}

-
- - {{"labels.inputs.Transaction Date" | translate}} - + {{ 'labels.inputs.Transaction Date' | translate }} + - {{"labels.inputs.Transaction Date" | translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required" | translate}} + {{ 'labels.inputs.Transaction Date' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} - {{"labels.inputs.Office" | translate}} + {{ 'labels.inputs.Office' | translate }} {{ toOfficeType.name }} - {{"labels.inputs.Office" | translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required" | translate}} + {{ 'labels.inputs.Office' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} - {{"labels.inputs.Client" | translate}} - + {{ 'labels.inputs.Client' | translate }} + - {{"labels.inputs.Client" | translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required" | translate}} + {{ 'labels.inputs.Client' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} @@ -84,59 +89,70 @@ - {{"labels.inputs.Account Type" | translate}} + {{ 'labels.inputs.Account Type' | translate }} {{ toAccountType.value }} - {{"labels.inputs.Account Type" | translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required" | translate}} + {{ 'labels.inputs.Account Type' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} - {{"labels.inputs.Account" | translate}} + {{ 'labels.inputs.Account' | translate }} {{ toAccount.productName }} - {{ toAccount.accountNo }} - {{"labels.inputs.Account" | translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required" | translate}} + {{ 'labels.inputs.Account' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} - {{"labels.inputs.Amount" | translate}} - + {{ 'labels.inputs.Amount' | translate }} + - {{"labels.inputs.Amount" | translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required" | translate}} + {{ 'labels.inputs.Amount' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} - {{"labels.inputs.Description" | translate}} - + {{ 'labels.inputs.Description' | translate }} + - {{"labels.inputs.Transfer Description" | translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required" | translate}} + {{ 'labels.inputs.Transfer Description' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} - -
-
- - - + + - -
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 201165e3c..4cb4f190e 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 @@ -1,97 +1,103 @@
-
- -
-

{{"labels.heading.Transaction Details" | translate}}

+

{{ 'labels.heading.Transaction Details' | translate }}

- {{"labels.inputs.Transaction Amount" | translate}}: - {{ viewAccountTransferData.currency.displaySymbol }} {{ viewAccountTransferData.transferAmount | formatNumber }} ({{ viewAccountTransferData.currency.code }}) + {{ 'labels.inputs.Transaction Amount' | translate }}: + {{ viewAccountTransferData.currency.displaySymbol }} + {{ viewAccountTransferData.transferAmount | formatNumber }} ({{ + viewAccountTransferData.currency.code + }})
- {{"labels.inputs.Transaction Date" | translate}}: + {{ 'labels.inputs.Transaction Date' | translate }}: {{ viewAccountTransferData.transferDate | dateFormat }}
- {{"labels.inputs.Destination" | translate}}: + {{ 'labels.inputs.Destination' | translate }}: {{ viewAccountTransferData.transferDescription }}
-

{{"labels.heading.Transferred From" | translate}}

+

{{ 'labels.heading.Transferred From' | translate }}

- {{"labels.inputs.Office" | translate}}: + {{ 'labels.inputs.Office' | translate }}: {{ viewAccountTransferData.fromOffice.name }}
- {{"labels.inputs.Client" | translate}}: + {{ 'labels.inputs.Client' | translate }}: {{ viewAccountTransferData.fromClient.displayName }}
- {{ "labels.inputs.Account Type" | translate}}: + {{ 'labels.inputs.Account Type' | translate }}: {{ viewAccountTransferData.fromAccountType.value }}
- {{ "labels.inputs.Account No" | translate}}: + {{ 'labels.inputs.Account No' | translate }}: {{ viewAccountTransferData.fromAccount.accountNo }}
-

{{"labels.heading.Transferred To" | translate}}

+

{{ 'labels.heading.Transferred To' | translate }}

- {{"labels.inputs.Office" | translate}}: + {{ 'labels.inputs.Office' | translate }}: {{ viewAccountTransferData.toOffice.name }}
- {{"labels.inputs.Client" | translate}}: - - {{ viewAccountTransferData.toClient.displayName }} + {{ 'labels.inputs.Client' | translate }}: + + {{ viewAccountTransferData.toClient.displayName }}
- {{ "labels.inputs.Account Type" | translate}}: + {{ 'labels.inputs.Account Type' | translate }}: {{ viewAccountTransferData.toAccountType.value }}
- {{ "labels.inputs.Account No" | translate}}: - - {{ viewAccountTransferData.toAccount.accountNo }} + {{ 'labels.inputs.Account No' | translate }}: + + {{ viewAccountTransferData.toAccount.accountNo }}
-
- - + -
diff --git a/src/app/account-transfers/view-standing-instructions/view-standing-instructions.component.html b/src/app/account-transfers/view-standing-instructions/view-standing-instructions.component.html index 5d49fd95c..2f1a60c0f 100644 --- a/src/app/account-transfers/view-standing-instructions/view-standing-instructions.component.html +++ b/src/app/account-transfers/view-standing-instructions/view-standing-instructions.component.html @@ -1,122 +1,128 @@
-
- - -
-

{{ standingInstructionsData.name }}

- {{"labels.inputs.Applicant" | translate}}: + {{ 'labels.inputs.Applicant' | translate }}: {{ standingInstructionsData.fromClient.displayName }}
- {{"labels.inputs.Type" | translate}}: + {{ 'labels.inputs.Type' | translate }}: {{ standingInstructionsData.transferType.value }}
- {{ "labels.inputs.Priority" | translate}}: + {{ 'labels.inputs.Priority' | translate }}: {{ standingInstructionsData.priority.value }}
- {{ "labels.inputs.Status" | translate}}: + {{ 'labels.inputs.Status' | translate }}: {{ standingInstructionsData.status.value }}
- {{"labels.inputs.From Account Type" | translate}}: + {{ 'labels.inputs.From Account Type' | translate }}: {{ standingInstructionsData.fromAccountType.value }}
- {{"labels.inputs.From Account" | translate}}: - {{ standingInstructionsData.fromAccount.productName }} - {{ standingInstructionsData.fromAccount.accountNo }} + {{ 'labels.inputs.From Account' | translate }}: + {{ standingInstructionsData.fromAccount.productName }} - + {{ standingInstructionsData.fromAccount.accountNo }}
- {{"labels.inputs.Destination" | translate}}: + {{ 'labels.inputs.Destination' | translate }}: - {{"labels.inputs.Within Bank" | translate}} - {{"labels.inputs.Own Account" | translate}} + {{ 'labels.inputs.Within Bank' | translate }} + {{ 'labels.inputs.Own Account' | translate }}
- {{"labels.inputs.To Office" | translate}}: + {{ 'labels.inputs.To Office' | translate }}: {{ standingInstructionsData.toOffice.name }}
- {{"labels.inputs.Beneficiary" | translate}}: + {{ 'labels.inputs.Beneficiary' | translate }}: {{ standingInstructionsData.toClient.displayName }}
- {{"labels.inputs.To Account Type" | translate}}: + {{ 'labels.inputs.To Account Type' | translate }}: {{ standingInstructionsData.toAccountType.value }}
- {{"labels.inputs.To Account" | translate}}: - {{ standingInstructionsData.toAccount.productName }} - {{standingInstructionsData.toAccount.accountNo}} + {{ 'labels.inputs.To Account' | translate }}: + {{ standingInstructionsData.toAccount.productName }} - + {{ standingInstructionsData.toAccount.accountNo }}
- {{"labels.inputs.Standing Instruction Type" | translate}}: + {{ 'labels.inputs.Standing Instruction Type' | translate }}: {{ standingInstructionsData.instructionType.value }}
- {{"labels.inputs.Amount" | translate}}: + {{ 'labels.inputs.Amount' | translate }}: {{ standingInstructionsData.amount }}
- {{"labels.inputs.Validity" | translate}}: - {{ standingInstructionsData.validFrom | dateFormat }} - {{ standingInstructionsData.validTill | dateFormat }} + {{ 'labels.inputs.Validity' | translate }}: + {{ standingInstructionsData.validFrom | dateFormat }} - + {{ standingInstructionsData.validTill | dateFormat }}
- {{"labels.inputs.Recurrence Type" | translate}}: + {{ 'labels.inputs.Recurrence Type' | translate }}: {{ standingInstructionsData.recurrenceType.value }}
- {{"labels.inputs.Interval" | translate}}: + {{ 'labels.inputs.Interval' | translate }}: {{ standingInstructionsData.recurrenceInterval }}
- {{"labels.inputs.Recurrence Frequency" | translate}}: + {{ 'labels.inputs.Recurrence Frequency' | translate }}: {{ standingInstructionsData.recurrenceFrequency.value }}
- {{"labels.inputs.On Month Day" | translate}}: + {{ 'labels.inputs.On Month Day' | translate }}: {{ standingInstructionsData.recurrenceOnMonthDay | dateFormat }}
-
- - -
diff --git a/src/app/accounting/accounting-rules/accounting-rules.component.html b/src/app/accounting/accounting-rules/accounting-rules.component.html index 44f78ae3a..fa0e6567f 100644 --- a/src/app/accounting/accounting-rules/accounting-rules.component.html +++ b/src/app/accounting/accounting-rules/accounting-rules.component.html @@ -1,60 +1,63 @@
-
- {{'labels.inputs.Filter' | translate}} - + {{ 'labels.inputs.Filter' | translate }} +
- - - - + + - - + + - - + + - - + + - - + + - - + + - - +
{{"labels.inputs.name" | translate}} {{ accountingRule.name }} {{ 'labels.inputs.name' | translate }}{{ accountingRule.name }} {{"labels.inputs.Office" | translate}} {{ accountingRule.officeName }} {{ 'labels.inputs.Office' | translate }}{{ accountingRule.officeName }} {{"labels.inputs.Debit Tags" | translate}} {{ accountingRule.debitTags }} {{ 'labels.inputs.Debit Tags' | translate }}{{ accountingRule.debitTags }} {{"labels.inputs.Debit Account" | translate}} {{ accountingRule.debitAccounts ? accountingRule.debitAccounts[0].name : '' }} {{ 'labels.inputs.Debit Account' | translate }} + {{ accountingRule.debitAccounts ? accountingRule.debitAccounts[0].name : '' }} + {{"labels.inputs.Credit Tags" | translate}} {{ accountingRule.creditTags }} {{ 'labels.inputs.Credit Tags' | translate }}{{ accountingRule.creditTags }} {{"labels.inputs.Credit Account" | translate}} {{ accountingRule.creditAccounts ? accountingRule.creditAccounts[0].name : '' }} {{ 'labels.inputs.Credit Account' | translate }} + {{ accountingRule.creditAccounts ? accountingRule.creditAccounts[0].name : '' }} +
-
-
diff --git a/src/app/accounting/accounting-rules/create-rule/create-rule.component.html b/src/app/accounting/accounting-rules/create-rule/create-rule.component.html index c832aef8b..201feeb69 100644 --- a/src/app/accounting/accounting-rules/create-rule/create-rule.component.html +++ b/src/app/accounting/accounting-rules/create-rule/create-rule.component.html @@ -1,43 +1,42 @@
- -
- -
- - {{"labels.inputs.Accounting Rule Name" | translate}} - + {{ 'labels.inputs.Accounting Rule Name' | translate }} + - {{"labels.inputs.Accounting Rule Name" | translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required" | translate}} + {{ 'labels.inputs.Accounting Rule Name' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} - {{"labels.inputs.Office" | translate}} + {{ 'labels.inputs.Office' | translate }} {{ office.name }} - {{"labels.inputs.Office" | translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required" | translate}} + {{ 'labels.inputs.Office' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }}
- {{"labels.inputs.Affected GL Entry (Debit) Rule Type" | translate}} * + {{ 'labels.inputs.Affected GL Entry (Debit) Rule Type' | translate }} * - {{"labels.inputs.Fixed Account" | translate}} - {{"labels.inputs.List of Accounts"|translate}} + {{ 'labels.inputs.Fixed Account' | translate }} + {{ + 'labels.inputs.List of Accounts' | translate + }}
- {{"labels.inputs.Account to Debit"|translate}} + {{ 'labels.inputs.Account to Debit' | translate }} {{ glAccount.name }} @@ -45,9 +44,15 @@ -
+
- {{"labels.inputs.Debit Tags" | translate}} + {{ 'labels.inputs.Debit Tags' | translate }} {{ debitTag.name }} @@ -57,21 +62,23 @@
- {{"labels.inputs.Multiple Debit Entries Allowed" | translate}} + {{ 'labels.inputs.Multiple Debit Entries Allowed' | translate }}
- {{"labels.inputs.Affected GL Entry (Credit) Rule Type" | translate}} * + {{ 'labels.inputs.Affected GL Entry (Credit) Rule Type' | translate }} * - {{"labels.inputs.Fixed Account" | translate}} - {{"labels.inputs.List of Accounts"|translate}} + {{ 'labels.inputs.Fixed Account' | translate }} + {{ + 'labels.inputs.List of Accounts' | translate + }}
- {{"labels.inputs.Account to Credit" | translate}} + {{ 'labels.inputs.Account to Credit' | translate }} {{ glAccount.name }} @@ -79,9 +86,15 @@ -
+
- {{"labels.inputs.Credit Tags" | translate}} + {{ 'labels.inputs.Credit Tags' | translate }} {{ creditTag.name }} @@ -91,27 +104,31 @@
- {{"labels.inputs.Multiple Credit Entries Allowed" | translate}} + {{ 'labels.inputs.Multiple Credit Entries Allowed' | translate }}
- {{"labels.inputs.Description" | translate}} + {{ 'labels.inputs.Description' | translate }} -
- - - + + - - -
diff --git a/src/app/accounting/accounting-rules/edit-rule/edit-rule.component.html b/src/app/accounting/accounting-rules/edit-rule/edit-rule.component.html index f70eba68a..c8a0dadfb 100644 --- a/src/app/accounting/accounting-rules/edit-rule/edit-rule.component.html +++ b/src/app/accounting/accounting-rules/edit-rule/edit-rule.component.html @@ -1,43 +1,42 @@
- -
- -
- - {{"labels.inputs.Accounting Rule Name" | translate}} - + {{ 'labels.inputs.Accounting Rule Name' | translate }} + - {{"labels.inputs.Accounting Rule Name" | translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required" | translate}} + {{ 'labels.inputs.Accounting Rule Name' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} - {{"labels.inputs.Office" | translate}} + {{ 'labels.inputs.Office' | translate }} {{ office.name }} - {{"labels.inputs.Office" | translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required" | translate}} + {{ 'labels.inputs.Office' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }}
- {{"labels.inputs.Affected GL Entry (Debit) Rule Type" | translate}} * + {{ 'labels.inputs.Affected GL Entry (Debit) Rule Type' | translate }} * - {{"labels.inputs.Fixed Account" | translate}} - {{"labels.inputs.List of Accounts"|translate}} + {{ 'labels.inputs.Fixed Account' | translate }} + {{ + 'labels.inputs.List of Accounts' | translate + }}
- {{"labels.inputs.Account to Debit"|translate}} + {{ 'labels.inputs.Account to Debit' | translate }} {{ glAccount.name }} @@ -45,9 +44,15 @@ -
+
- {{"labels.inputs.Debit Tags" | translate}} + {{ 'labels.inputs.Debit Tags' | translate }} {{ debitTag.name }} @@ -57,21 +62,23 @@
- {{"labels.inputs.Multiple Debit Entries Allowed" | translate}} + {{ 'labels.inputs.Multiple Debit Entries Allowed' | translate }}
- {{"labels.inputs.Affected GL Entry (Credit) Rule Type" | translate}} * + {{ 'labels.inputs.Affected GL Entry (Credit) Rule Type' | translate }} * - {{"labels.inputs.Fixed Account" | translate}} - {{"labels.inputs.List of Accounts"|translate}} + {{ 'labels.inputs.Fixed Account' | translate }} + {{ + 'labels.inputs.List of Accounts' | translate + }}
- {{"labels.inputs.Account to Credit" | translate}} + {{ 'labels.inputs.Account to Credit' | translate }} {{ glAccount.name }} @@ -79,9 +86,15 @@ -
+
- {{"labels.inputs.Credit Tags" | translate}} + {{ 'labels.inputs.Credit Tags' | translate }} {{ creditTag.name }} @@ -91,28 +104,31 @@
- {{"labels.inputs.Multiple Credit Entries Allowed" | translate}} + {{ 'labels.inputs.Multiple Credit Entries Allowed' | translate }}
- {{"labels.inputs.Description" | translate}} + {{ 'labels.inputs.Description' | translate }} -
- - - + + - - -
- diff --git a/src/app/accounting/accounting-rules/view-rule/view-rule.component.html b/src/app/accounting/accounting-rules/view-rule/view-rule.component.html index 560fc7231..5930a45eb 100644 --- a/src/app/accounting/accounting-rules/view-rule/view-rule.component.html +++ b/src/app/accounting/accounting-rules/view-rule/view-rule.component.html @@ -1,26 +1,26 @@
-
-
- - -
-
- {{"labels.inputs.Office" | translate}} + {{ 'labels.inputs.Office' | translate }}
@@ -28,7 +28,7 @@
- {{"labels.inputs.Description" | translate}} + {{ 'labels.inputs.Description' | translate }}
@@ -36,7 +36,7 @@
- {{"labels.inputs.Multiple Debit Entries Allowed" | translate}} + {{ 'labels.inputs.Multiple Debit Entries Allowed' | translate }}
@@ -44,32 +44,24 @@
- {{"labels.inputs.Multiple Credit Entries Allowed" | translate}} + {{ 'labels.inputs.Multiple Credit Entries Allowed' | translate }}
{{ accountingRule.allowMultipleCreditEntries }}
-
- - -
- - -
-
- {{"labels.inputs.Debit Tags" | translate}} + {{ 'labels.inputs.Debit Tags' | translate }}
{{ debitTag.tag.name }} @@ -78,7 +70,7 @@
- {{"labels.inputs.Debit Account Name" | translate}} + {{ 'labels.inputs.Debit Account Name' | translate }}
{{ debitAccount.name + ' (' + debitAccount.glCode + ')' }} @@ -87,7 +79,7 @@
- {{"labels.inputs.Credit Tags" | translate}} + {{ 'labels.inputs.Credit Tags' | translate }}
{{ creditTag.tag.name }} @@ -96,19 +88,14 @@
- {{"labels.inputs.Credit Account Name" | translate}} + {{ 'labels.inputs.Credit Account Name' | translate }}
{{ creditAccount.name + ' (' + creditAccount.glCode + ')' }}
-
- - -
-
diff --git a/src/app/accounting/accounting.component.html b/src/app/accounting/accounting.component.html index e52d0f235..587898b02 100644 --- a/src/app/accounting/accounting.component.html +++ b/src/app/accounting/accounting.component.html @@ -1,21 +1,20 @@
- -
-
- - -

{{"labels.heading.Frequent Postings" | translate}}

+

+ {{ 'labels.heading.Frequent Postings' | translate }} +

-

{{"labels.text.These are predefined postings" | translate}}

+

+ {{ 'labels.text.These are predefined postings' | translate }} +

@@ -23,10 +22,14 @@ -

{{"labels.heading.Create Journal Entries" | translate}}

+

+ {{ 'labels.heading.Create Journal Entries' | translate }} +

-

{{"labels.text.Manual journal entry transactions recorded in a journal" | translate}}

+

+ {{ 'labels.text.Manual journal entry transactions recorded in a journal' | translate }} +

@@ -34,10 +37,14 @@ -

{{"labels.heading.Search Journal Entries" | translate}}

+

+ {{ 'labels.heading.Search Journal Entries' | translate }} +

-

{{"labels.text.Advanced search option for journal entries" | translate}}

+

+ {{ 'labels.text.Advanced search option for journal entries' | translate }} +

@@ -45,54 +52,62 @@ -

{{"labels.heading.Accounts Linked to Financial Activities" | translate}}

+

+ {{ 'labels.heading.Accounts Linked to Financial Activities' | translate }} +

-

{{"labels.text.List of Financial Activities and GL Account Mappings" | translate}}

+

+ {{ 'labels.text.List of Financial Activities and GL Account Mappings' | translate }} +

- + -

{{"labels.heading.Migrate Opening Balances (Office-wise)" | translate}}

+

+ {{ 'labels.heading.Migrate Opening Balances (Office-wise)' | translate }} +

-

{{"labels.text.Set or update office-level opening balances for GL accounts" | translate}}

+

+ {{ 'labels.text.Set or update office-level opening balances for GL accounts' | translate }} +

- -
- -
-

{{"labels.heading.Chart of Accounts" | translate}}

+

{{ 'labels.heading.Chart of Accounts' | translate }}

-

{{"labels.text.List of accounts used by the organization" | translate}}

+

+ {{ 'labels.text.List of accounts used by the organization' | translate }} +

- + -

{{"labels.heading.Closing Entries" | translate}}

+

{{ 'labels.heading.Closing Entries' | translate }}

-

{{"labels.text.Journal entries made at the end of accounting period" | translate}}

+

+ {{ 'labels.text.Journal entries made at the end of accounting period' | translate }} +

@@ -100,88 +115,121 @@ -

{{"labels.heading.Accounting Rules" | translate}}

+

{{ 'labels.heading.Accounting Rules' | translate }}

-

{{"labels.text.List of all accounting rules" | translate}}

+

+ {{ 'labels.text.List of all accounting rules' | translate }} +

-

{{"labels.heading.Accruals" | translate}}

+

{{ 'labels.heading.Accruals' | translate }}

-

{{"labels.text.Accrues income, expenses and liabilities" | translate}}

+

+ {{ 'labels.text.Accrues income, expenses and liabilities' | translate }} +

-

{{"labels.heading.Provisioning Entries" | translate}}

+

+ {{ 'labels.heading.Provisioning Entries' | translate }} +

-

{{"labels.text.Create provisioning entries" | translate}}

+

+ {{ 'labels.text.Create provisioning entries' | translate }} +

- -
-
- -
-

{{"labels.heading.Chart of Accounts" | translate}}

-

{{"labels.text.The Chart of Accounts - General Ledger Setup" | translate}}

+

{{ 'labels.heading.Chart of Accounts' | translate }}

+

{{ 'labels.text.The Chart of Accounts - General Ledger Setup' | translate }}

- - - + + +
-

{{"labels.heading.Accounts Linked to Financial Activities" | translate}}

-

{{"labels.text.Accounts linked to Financial Activities" | translate}}

+

{{ 'labels.heading.Accounts Linked to Financial Activities' | translate }}

+

{{ 'labels.text.Accounts linked to Financial Activities' | translate }}

- - - + + +
-

{{"labels.heading.Migrate Opening Balances (Office-wise)" | translate}}

-

{{"labels.text.GLAccount Balances Application" | translate}}

+

{{ 'labels.heading.Migrate Opening Balances (Office-wise)' | translate }}

+

{{ 'labels.text.GLAccount Balances Application' | translate }}

- - - + + +
-

{{"labels.heading.Closing Entries" | translate}}

-

{{"labels.text.Accounting to journal entries" | translate}}

+

{{ 'labels.heading.Closing Entries' | translate }}

+

{{ 'labels.text.Accounting to journal entries' | translate }}

- - - + + +
-

{{"labels.heading.Create Journal Entries" | translate}}

-

{{"labels.text.Journal Entries Transactions" | translate}}

+

{{ 'labels.heading.Create Journal Entries' | translate }}

+

{{ 'labels.text.Journal Entries Transactions' | translate }}

- - - + + +
diff --git a/src/app/accounting/chart-of-accounts/chart-of-accounts.component.html b/src/app/accounting/chart-of-accounts/chart-of-accounts.component.html index 99e3cc26d..1257a231c 100644 --- a/src/app/accounting/chart-of-accounts/chart-of-accounts.component.html +++ b/src/app/accounting/chart-of-accounts/chart-of-accounts.component.html @@ -10,9 +10,14 @@
-
@@ -20,83 +25,100 @@
-
- {{'labels.inputs.Filter' | translate}} - + {{ 'labels.inputs.Filter' | translate }} +
- - - - + + - - + + - - + + - + - + - - + + - - +
{{"labels.inputs.Account" | translate}} {{ glAccount.name }} {{ 'labels.inputs.Account' | translate }}{{ glAccount.name }} {{"labels.inputs.GL Code" | translate}} {{ glAccount.glCode }} {{ 'labels.inputs.GL Code' | translate }}{{ glAccount.glCode }} {{"labels.inputs.Type" | translate}} {{ 'labels.inputs.accounting.' + glAccount.type.value | translate }} {{ 'labels.inputs.Type' | translate }} + {{ 'labels.inputs.accounting.' + glAccount.type.value | translate }} + {{"labels.inputs.Disabled" | translate}} {{ 'labels.inputs.Disabled' | translate }}
- +
{{"labels.inputs.Manual Entries Allowed" | translate}} + {{ 'labels.inputs.Manual Entries Allowed' | translate }} + - - + + {{"labels.inputs.Used as" | translate}} {{ glAccount.usage.value }} {{ 'labels.inputs.Used as' | translate }}{{ glAccount.usage.value }}
-
-
-
-
-
- -
- - -
-
- {{"labels.inputs.Account Name" | translate}} + {{ 'labels.inputs.Account Name' | translate }}
@@ -145,7 +164,7 @@
- {{"labels.inputs.GL Code" | translate}} + {{ 'labels.inputs.GL Code' | translate }}
@@ -153,7 +172,7 @@
- {{"labels.inputs.Account Type" | translate}} + {{ 'labels.inputs.Account Type' | translate }}
@@ -161,7 +180,7 @@
- {{"labels.inputs.Account Usage" | translate}} + {{ 'labels.inputs.Account Usage' | translate }}
@@ -169,7 +188,7 @@
- {{"labels.inputs.Manual Entries Allowed" | translate}} + {{ 'labels.inputs.Manual Entries Allowed' | translate }}
@@ -177,59 +196,103 @@
- {{"labels.inputs.Description" | translate}} + {{ 'labels.inputs.Description' | translate }}
{{ glAccount.description }}
-
- - -
-
-
-

{{"labels.heading.Tree View" | translate}}

-

{{"labels.text.Alternative way-Tree view" | translate}}

+

{{ 'labels.heading.Tree View' | translate }}

+

{{ 'labels.text.Alternative way-Tree view' | translate }}

- - - + + +
-

{{"labels.heading.Add Account" | translate}}

-

{{"labels.text.Create New GL Account"|translate}}

+

{{ 'labels.heading.Add Account' | translate }}

+

{{ 'labels.text.Create New GL Account' | translate }}

- - - + + +
-

{{"labels.heading.Search bar to filter GL accounts." | translate}}

+

{{ 'labels.heading.Search bar to filter GL accounts.' | translate }}

- - - + + +
-

{{"labels.heading.List of chart of all the accounts being used by your organization." | translate}}

+

+ {{ 'labels.heading.List of chart of all the accounts being used by your organization.' | translate }} +

- - - + + +
diff --git a/src/app/accounting/chart-of-accounts/create-gl-account/create-gl-account.component.html b/src/app/accounting/chart-of-accounts/create-gl-account/create-gl-account.component.html index a935008b1..7832a775c 100644 --- a/src/app/accounting/chart-of-accounts/create-gl-account/create-gl-account.component.html +++ b/src/app/accounting/chart-of-accounts/create-gl-account/create-gl-account.component.html @@ -1,58 +1,54 @@
- -
- -
- - {{"labels.inputs.Account Type" | translate}} + {{ 'labels.inputs.Account Type' | translate }} {{ 'labels.inputs.accounting.' + accountType.value | translate }} - {{"labels.inputs.Account Type" | translate}} {{"labels.commons.is" | translate}} - {{"labels.commons.required" | translate}} + {{ 'labels.inputs.Account Type' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} - {{"labels.inputs.Account Name" | translate}} - + {{ 'labels.inputs.Account Name' | translate }} + - {{"labels.inputs.Account Name" | translate}} {{"labels.commons.is" | translate}} - {{"labels.commons.required" | translate}} + {{ 'labels.inputs.Account Name' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} - {{"labels.inputs.Account Usage" | translate}} + {{ 'labels.inputs.Account Usage' | translate }} {{ accountUsage.value }} - {{"labels.inputs.Account Usage" | translate}} {{"labels.commons.is" | translate}} - {{"labels.commons.required" | translate}} + {{ 'labels.inputs.Account Usage' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} - {{"labels.inputs.GL Code" | translate}} - + {{ 'labels.inputs.GL Code' | translate }} + - {{"labels.inputs.GL Code" | translate}} {{"labels.commons.is" | translate}} - {{"labels.commons.required" | translate}} + {{ 'labels.inputs.GL Code' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} - - {{"labels.inputs.Tag" | translate}} + {{ 'labels.inputs.Tag' | translate }} {{ tag.name }} @@ -71,46 +67,56 @@
- {{"labels.inputs.Manual Entries Allowed" | translate}} + {{ 'labels.inputs.Manual Entries Allowed' | translate }}
- {{"labels.inputs.Description" | translate}} + {{ 'labels.inputs.Description' | translate }} -
- - - + + -
- -
-

{{"labels.heading.Create GL account" | translate}}

-

{{"labels.text.Filling Details" | translate}} {{ 'labels.heading.Create GL account' | translate }} +

+ {{ 'labels.text.Filling Details' | translate }} + {{"labels.inputs.Chart of Accounts" | translate}}

+ target="_blank" + >{{ 'labels.inputs.Chart of Accounts' | translate }} +

- - - - + + + +
diff --git a/src/app/accounting/chart-of-accounts/edit-gl-account/edit-gl-account.component.html b/src/app/accounting/chart-of-accounts/edit-gl-account/edit-gl-account.component.html index 532963f21..373579a13 100644 --- a/src/app/accounting/chart-of-accounts/edit-gl-account/edit-gl-account.component.html +++ b/src/app/accounting/chart-of-accounts/edit-gl-account/edit-gl-account.component.html @@ -1,54 +1,54 @@
- -
- -
- - {{"labels.inputs.Account Type" | translate}} + {{ 'labels.inputs.Account Type' | translate }} {{ accountType.value }} - {{"labels.inputs.Account Type" | translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required" | translate}} + {{ 'labels.inputs.Account Type' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} - {{"labels.inputs.Account Name" | translate}} - + {{ 'labels.inputs.Account Name' | translate }} + - {{"labels.inputs.Account Name" | translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required" | translate}} + {{ 'labels.inputs.Account Name' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} - {{"labels.inputs.Account Usage" | translate}} + {{ 'labels.inputs.Account Usage' | translate }} {{ accountUsage.value }} - {{"labels.inputs.Account Usage" | translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required" | translate}} + {{ 'labels.inputs.Account Usage' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} - {{"labels.inputs.GL Code" | translate}} - + {{ 'labels.inputs.GL Code' | translate }} + - {{"labels.inputs.GL Code" | translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required" | translate}} + {{ 'labels.inputs.GL Code' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} - - {{"labels.inputs.Tag" | translate}} + {{ 'labels.inputs.Tag' | translate }} {{ tag.name }} @@ -66,27 +66,36 @@
- - {{"labels.inputs.Manual Entries Allowed" | translate}} + + {{ 'labels.inputs.Manual Entries Allowed' | translate }}
- {{"labels.inputs.Description" | translate}} + {{ 'labels.inputs.Description' | translate }} -
- - - + + -
- -
diff --git a/src/app/accounting/chart-of-accounts/view-gl-account/view-gl-account.component.html b/src/app/accounting/chart-of-accounts/view-gl-account/view-gl-account.component.html index 6a939b378..6d0a66676 100644 --- a/src/app/accounting/chart-of-accounts/view-gl-account/view-gl-account.component.html +++ b/src/app/accounting/chart-of-accounts/view-gl-account/view-gl-account.component.html @@ -1,44 +1,46 @@
-
- - -
-
- {{"labels.inputs.Account Type" | translate}} + {{ 'labels.inputs.Account Type' | translate }}
@@ -46,7 +48,7 @@
- {{"labels.inputs.GL Code" | translate}} + {{ 'labels.inputs.GL Code' | translate }}
@@ -54,7 +56,7 @@
- {{"labels.inputs.Parent Account Name" | translate}} + {{ 'labels.inputs.Parent Account Name' | translate }}
@@ -64,7 +66,7 @@
- {{"labels.inputs.Tag" | translate}} + {{ 'labels.inputs.Tag' | translate }}
@@ -72,7 +74,7 @@
- {{"labels.inputs.Account Usage" | translate}} + {{ 'labels.inputs.Account Usage' | translate }}
@@ -80,7 +82,7 @@
- {{"labels.inputs.Manual Entries Allowed" | translate}} + {{ 'labels.inputs.Manual Entries Allowed' | translate }}
@@ -88,20 +90,19 @@
- {{"labels.inputs.Description" | translate}} + {{ 'labels.inputs.Description' | translate }}
{{ glAccount.description }}
-
- - + -
diff --git a/src/app/accounting/closing-entries/closing-entries.component.html b/src/app/accounting/closing-entries/closing-entries.component.html index c7403225e..6c208923c 100644 --- a/src/app/accounting/closing-entries/closing-entries.component.html +++ b/src/app/accounting/closing-entries/closing-entries.component.html @@ -2,15 +2,15 @@
- {{"labels.inputs.Office Name" | translate}} - + {{ 'labels.inputs.Office Name' | translate }} +
@@ -22,66 +22,104 @@
-
- - - - + + - - + + - - + + - + - - +
{{"labels.inputs.Office" | translate}} {{ glAccountClosure.officeName }} {{ 'labels.inputs.Office' | translate }}{{ glAccountClosure.officeName }} {{"labels.inputs.Closure Date" | translate}} {{ glAccountClosure.closingDate }} {{ 'labels.inputs.Closure Date' | translate }}{{ glAccountClosure.closingDate }} {{"labels.inputs.Comments" | translate}} {{ glAccountClosure.comments }} {{ 'labels.inputs.Comments' | translate }}{{ glAccountClosure.comments }} {{"labels.inputs.Created By" | translate}} {{ 'labels.inputs.Created By' | translate }} {{ glAccountClosure.createdByUsername }}
-
-
-

{{"labels.heading.Create Closure" | translate}}

-

{{"labels.text.Create new closure" | translate}}

+

{{ 'labels.heading.Create Closure' | translate }}

+

{{ 'labels.text.Create new closure' | translate }}

- - - + + +
-

{{"labels.heading.Search bar to filter closures by office."|translate}}

+

{{ 'labels.heading.Search bar to filter closures by office.' | translate }}

- - - + + +
-

{{"labels.heading.List of closures. To know more click" | translate}}: {{"labels.inputs.Closing Entries" | translate}}

+

+ {{ 'labels.heading.List of closures. To know more click' | translate }}: + {{ + 'labels.inputs.Closing Entries' | translate + }} +

- - - + + +
diff --git a/src/app/accounting/closing-entries/create-closure/create-closure.component.html b/src/app/accounting/closing-entries/create-closure/create-closure.component.html index cf6cd14ef..4af395e62 100644 --- a/src/app/accounting/closing-entries/create-closure/create-closure.component.html +++ b/src/app/accounting/closing-entries/create-closure/create-closure.component.html @@ -1,51 +1,59 @@
- -
- -
- - {{"labels.inputs.Office" | translate}} + {{ 'labels.inputs.Office' | translate }} {{ office.name }} - {{"labels.inputs.Office" | translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required" | translate}} + {{ 'labels.inputs.Office' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} - {{"labels.inputs.Closing Date" | translate}} - + {{ 'labels.inputs.Closing Date' | translate }} + - {{"labels.inputs.Closing Date" | translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required" | translate}} + {{ 'labels.inputs.Closing Date' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} - {{"labels.inputs.Comments" | translate}} + {{ 'labels.inputs.Comments' | translate }} -
- - - + + -
- -
diff --git a/src/app/accounting/closing-entries/edit-closure/edit-closure.component.html b/src/app/accounting/closing-entries/edit-closure/edit-closure.component.html index 39df300fc..ea7807bdf 100644 --- a/src/app/accounting/closing-entries/edit-closure/edit-closure.component.html +++ b/src/app/accounting/closing-entries/edit-closure/edit-closure.component.html @@ -1,15 +1,10 @@
- -
- -
- - {{"labels.inputs.Office" | translate}} + {{ 'labels.inputs.Office' | translate }} {{ office.name }} @@ -18,28 +13,27 @@ - {{"labels.inputs.Closing Date" | translate}} - + {{ 'labels.inputs.Closing Date' | translate }} + - {{"labels.inputs.Comments" | translate}} + {{ 'labels.inputs.Comments' | translate }} -
- - - + + -
- -
diff --git a/src/app/accounting/closing-entries/view-closure/view-closure.component.html b/src/app/accounting/closing-entries/view-closure/view-closure.component.html index 614a9c7bc..a77f7c288 100644 --- a/src/app/accounting/closing-entries/view-closure/view-closure.component.html +++ b/src/app/accounting/closing-entries/view-closure/view-closure.component.html @@ -1,24 +1,20 @@
- - -
-
- {{"labels.inputs.Office" | translate}} + {{ 'labels.inputs.Office' | translate }}
@@ -26,7 +22,7 @@
- {{"labels.inputs.Closure Date" | translate}} + {{ 'labels.inputs.Closure Date' | translate }}
@@ -34,7 +30,7 @@
- {{"labels.inputs.Closed By" | translate}} + {{ 'labels.inputs.Closed By' | translate }}
@@ -42,7 +38,7 @@
- {{"labels.inputs.Updated By" | translate}} + {{ 'labels.inputs.Updated By' | translate }}
@@ -50,7 +46,7 @@
- {{"labels.inputs.Updated On"|translate}} + {{ 'labels.inputs.Updated On' | translate }}
@@ -58,7 +54,7 @@
- {{"labels.inputs.Closure Creation Date"|translate}} + {{ 'labels.inputs.Closure Creation Date' | translate }}
@@ -66,17 +62,13 @@
- {{"labels.inputs.Comments" | translate}} + {{ 'labels.inputs.Comments' | translate }}
{{ glAccountClosure.comments }}
-
- - -
diff --git a/src/app/accounting/create-journal-entry/create-journal-entry.component.html b/src/app/accounting/create-journal-entry/create-journal-entry.component.html index 83a4361af..3a44f733b 100644 --- a/src/app/accounting/create-journal-entry/create-journal-entry.component.html +++ b/src/app/accounting/create-journal-entry/create-journal-entry.component.html @@ -1,43 +1,44 @@
- -
- -
- - {{"labels.inputs.Office" | translate}} + {{ 'labels.inputs.Office' | translate }} {{ office.name }} - {{"labels.inputs.Office" | translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required" | translate}} + {{ 'labels.inputs.Office' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} - {{"labels.inputs.Currency" | translate}} + {{ 'labels.inputs.Currency' | translate }} {{ currency.displayLabel }} - {{"labels.inputs.Currency" | translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required" | translate}} + {{ 'labels.inputs.Currency' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} -
- +
- - - {{"labels.inputs.Debit Amount" | translate}} - + {{ 'labels.inputs.Debit Amount' | translate }} + - {{"labels.inputs.Debit Amount" | translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required" | translate}} + {{ 'labels.inputs.Debit Amount' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} @@ -57,21 +59,29 @@ - -
-
-
- +
- - - {{"labels.inputs.Credit Amount"|translate}} - + {{ 'labels.inputs.Credit Amount' | translate }} + - {{"labels.inputs.Credit Amount"|translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required" | translate}} + {{ 'labels.inputs.Credit Amount' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} @@ -91,32 +102,44 @@ - -
-
- {{"labels.inputs.Reference Number"|translate}} - + {{ 'labels.inputs.Reference Number' | translate }} + - {{"labels.inputs.Transaction Date"|translate}} - + {{ 'labels.inputs.Transaction Date' | translate }} + - {{"labels.inputs.Transaction Date"|translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required" | translate}} + {{ 'labels.inputs.Transaction Date' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} - {{"labels.inputs.Payment Type"|translate}} + {{ 'labels.inputs.Payment Type' | translate }} {{ paymentType.name }} @@ -125,56 +148,71 @@ - {{"labels.inputs.Account Number"|translate}} - + {{ 'labels.inputs.Account Number' | translate }} + - {{"labels.inputs.Cheque Number"|translate}} - + {{ 'labels.inputs.Cheque Number' | translate }} + - {{"labels.inputs.Routing Code"|translate}} - + {{ 'labels.inputs.Routing Code' | translate }} + - {{"labels.inputs.Receipt Number"|translate}} - + {{ 'labels.inputs.Receipt Number' | translate }} + - {{"labels.inputs.Bank Number"|translate}} - + {{ 'labels.inputs.Bank Number' | translate }} + - {{"labels.inputs.Comments"|translate}} + {{ 'labels.inputs.Comments' | translate }} -
- - - + + - - -
-

{{"labels.heading.Add Journal Entry Form" | translate}}

-

{{"labels.text.Red asterisk field" | translate}} {{"labels.inputs.Add Journal Entries" | translate}}

+

{{ 'labels.heading.Add Journal Entry Form' | translate }}

+

+ {{ 'labels.text.Red asterisk field' | translate }} + {{ + 'labels.inputs.Add Journal Entries' | translate + }} +

- - - + + +
diff --git a/src/app/accounting/financial-activity-mappings/create-financial-activity-mapping/create-financial-activity-mapping.component.html b/src/app/accounting/financial-activity-mappings/create-financial-activity-mapping/create-financial-activity-mapping.component.html index 977aac488..5034c8dce 100644 --- a/src/app/accounting/financial-activity-mappings/create-financial-activity-mapping/create-financial-activity-mapping.component.html +++ b/src/app/accounting/financial-activity-mappings/create-financial-activity-mapping/create-financial-activity-mapping.component.html @@ -1,22 +1,19 @@
- -
- -
- - {{"labels.inputs.Financial Activity" | translate}} + {{ 'labels.inputs.Financial Activity' | translate }} - ({{financialActivity.id}}) {{ 'labels.accounting.financialActivity.' + financialActivity.name | translate }} + ({{ financialActivity.id }}) + {{ 'labels.accounting.financialActivity.' + financialActivity.name | translate }} - {{"labels.inputs.Financial Activity" | translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required" | translate}} + {{ 'labels.inputs.Financial Activity' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} @@ -27,18 +24,22 @@ [inputLabel]="'Account'" > -
- - - + + -
- -
diff --git a/src/app/accounting/financial-activity-mappings/edit-financial-activity-mapping/edit-financial-activity-mapping.component.html b/src/app/accounting/financial-activity-mappings/edit-financial-activity-mapping/edit-financial-activity-mapping.component.html index f8a541cba..97bd5270c 100644 --- a/src/app/accounting/financial-activity-mappings/edit-financial-activity-mapping/edit-financial-activity-mapping.component.html +++ b/src/app/accounting/financial-activity-mappings/edit-financial-activity-mapping/edit-financial-activity-mapping.component.html @@ -1,18 +1,14 @@
- -
- -
- - {{"labels.inputs.Financial Activity" | translate}} + {{ 'labels.inputs.Financial Activity' | translate }} - ({{financialActivity.id}}) {{ 'labels.accounting.financialActivity.' + financialActivity.name | translate }} + ({{ financialActivity.id }}) + {{ 'labels.accounting.financialActivity.' + financialActivity.name | translate }} @@ -25,16 +21,21 @@ >
- - - + + -
- -
diff --git a/src/app/accounting/financial-activity-mappings/financial-activity-mappings.component.html b/src/app/accounting/financial-activity-mappings/financial-activity-mappings.component.html index e508e8450..6b255ce41 100644 --- a/src/app/accounting/financial-activity-mappings/financial-activity-mappings.component.html +++ b/src/app/accounting/financial-activity-mappings/financial-activity-mappings.component.html @@ -1,63 +1,95 @@
-
- - - + + ({{ financialActivityAccount.financialActivityData.id }}) + {{ 'labels.accounting.financialActivity.' + financialActivityAccount.financialActivityData.name | translate }} + - - + + - - + + - - + + - - +
{{"labels.inputs.Financial Activity" | translate}} {{ 'labels.inputs.Financial Activity' | translate }} - ({{financialActivityAccount.financialActivityData.id}}) - {{ 'labels.accounting.financialActivity.' + financialActivityAccount.financialActivityData.name | translate }} - {{"labels.inputs.Account Type" | translate}} {{ 'labels.inputs.accounting.' + financialActivityAccount.financialActivityData.mappedGLAccountType | translate }} {{ 'labels.inputs.Account Type' | translate }} + {{ + 'labels.inputs.accounting.' + financialActivityAccount.financialActivityData.mappedGLAccountType | translate + }} + {{"labels.inputs.Account Code" | translate}} {{ financialActivityAccount.glAccountData.glCode }} {{ 'labels.inputs.Account Code' | translate }}{{ financialActivityAccount.glAccountData.glCode }} {{"labels.inputs.Account Name" | translate}} {{ financialActivityAccount.glAccountData.name }} {{ 'labels.inputs.Account Name' | translate }}{{ financialActivityAccount.glAccountData.name }}
-
-

{{"labels.heading.Define New Mapping"|translate}}

-

{{"labels.text.To define new mapping." | translate}}

+

{{ 'labels.heading.Define New Mapping' | translate }}

+

{{ 'labels.text.To define new mapping.' | translate }}

- - - + + +
-

{{"labels.heading.Account Linked Financial" | translate}} {{"labels.heading.Accounts linked to Financial Activities" | translate}}

+

+ {{ 'labels.heading.Account Linked Financial' | translate }} + {{ 'labels.heading.Accounts linked to Financial Activities' | translate }} +

- - - + + +
diff --git a/src/app/accounting/financial-activity-mappings/view-financial-activity-mapping/view-financial-activity-mapping.component.html b/src/app/accounting/financial-activity-mappings/view-financial-activity-mapping/view-financial-activity-mapping.component.html index c951de172..2b6d07c42 100644 --- a/src/app/accounting/financial-activity-mappings/view-financial-activity-mapping/view-financial-activity-mapping.component.html +++ b/src/app/accounting/financial-activity-mappings/view-financial-activity-mapping/view-financial-activity-mapping.component.html @@ -1,51 +1,63 @@
- -
- - -
-
- {{"labels.inputs.Financial Activity" | translate}} + {{ 'labels.inputs.Financial Activity' | translate }}
- ({{financialActivityAccount?.financialActivityData.id}}) {{ 'labels.accounting.financialActivity.' + financialActivityAccount?.financialActivityData.name | translate }} + ({{ financialActivityAccount?.financialActivityData.id }}) + {{ + 'labels.accounting.financialActivity.' + financialActivityAccount?.financialActivityData.name | translate + }}
- {{"labels.inputs.Account Type" | translate}} + {{ 'labels.inputs.Account Type' | translate }}
- {{ 'labels.inputs.accounting.' + financialActivityAccount?.financialActivityData.mappedGLAccountType | translate }} + {{ + 'labels.inputs.accounting.' + financialActivityAccount?.financialActivityData.mappedGLAccountType + | translate + }}
- -
- - + -
diff --git a/src/app/accounting/frequent-postings/frequent-postings.component.html b/src/app/accounting/frequent-postings/frequent-postings.component.html index b04f92177..735aa061d 100644 --- a/src/app/accounting/frequent-postings/frequent-postings.component.html +++ b/src/app/accounting/frequent-postings/frequent-postings.component.html @@ -1,73 +1,76 @@
- -
- -
- - {{"labels.inputs.Office" | translate}} + {{ 'labels.inputs.Office' | translate }} {{ office.name }} - {{"labels.inputs.Office" | translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required" | translate}} + {{ 'labels.inputs.Office' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} - {{"labels.inputs.Accounting Rule" | translate}} + {{ 'labels.inputs.Accounting Rule' | translate }} {{ accountingRule.name }} - {{"labels.inputs.Accounting Rule" | translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required" | translate}} + {{ 'labels.inputs.Accounting Rule' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} - {{"labels.inputs.Currency" | translate}} + {{ 'labels.inputs.Currency' | translate }} {{ currency.displayLabel }} - {{"labels.inputs.Currency" | translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required" | translate}} + {{ 'labels.inputs.Currency' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} -
- +
- - {{"labels.inputs.Affected GL Entry (Debit)" | translate}} + {{ 'labels.inputs.Affected GL Entry (Debit)' | translate }} {{ affectedGLEntryDebit.name }} - {{"labels.inputs.Affected GL Entry (Debit)" | translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required" | translate}} + {{ 'labels.inputs.Affected GL Entry (Debit)' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} - {{"labels.inputs.Debit Amount" | translate}} - + {{ 'labels.inputs.Debit Amount' | translate }} + - {{"labels.inputs.Debit Amount" | translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required" | translate}} + {{ 'labels.inputs.Debit Amount' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} @@ -75,37 +78,49 @@ - -
-
-
- +
- - {{"labels.inputs.Affected GL Entry (Credit)" | translate}} + {{ 'labels.inputs.Affected GL Entry (Credit)' | translate }} - + {{ affectedGLEntryCredit.name }} - {{"labels.inputs.Affected GL Entry (Credit)" | translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required" | translate}} + {{ 'labels.inputs.Affected GL Entry (Credit)' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} - {{"labels.inputs.Credit Amount"|translate}} - + {{ 'labels.inputs.Credit Amount' | translate }} + - {{"labels.inputs.Credit Amount"|translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required" | translate}} + {{ 'labels.inputs.Credit Amount' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} @@ -113,32 +128,44 @@ - -
-
- {{"labels.inputs.Reference Number"|translate}} - + {{ 'labels.inputs.Reference Number' | translate }} + - {{"labels.inputs.Transaction Date"|translate}} - + {{ 'labels.inputs.Transaction Date' | translate }} + - {{"labels.inputs.Transaction Date"|translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required" | translate}} + {{ 'labels.inputs.Transaction Date' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} - {{"labels.inputs.Payment Type"|translate}} + {{ 'labels.inputs.Payment Type' | translate }} {{ paymentType.name }} @@ -147,46 +174,50 @@ - {{"labels.inputs.Account Number"|translate}} - + {{ 'labels.inputs.Account Number' | translate }} + - {{"labels.inputs.Cheque Number"|translate}} - + {{ 'labels.inputs.Cheque Number' | translate }} + - {{"labels.inputs.Routing Code"|translate}} - + {{ 'labels.inputs.Routing Code' | translate }} + - {{"labels.inputs.Receipt Number"|translate}} - + {{ 'labels.inputs.Receipt Number' | translate }} + - {{"labels.inputs.Bank Number"|translate}} - + {{ 'labels.inputs.Bank Number' | translate }} + - {{"labels.inputs.Comments"|translate}} + {{ 'labels.inputs.Comments' | translate }} -
- - - + + - - -
diff --git a/src/app/accounting/migrate-opening-balances/migrate-opening-balances.component.html b/src/app/accounting/migrate-opening-balances/migrate-opening-balances.component.html index 502887a51..17d69081a 100644 --- a/src/app/accounting/migrate-opening-balances/migrate-opening-balances.component.html +++ b/src/app/accounting/migrate-opening-balances/migrate-opening-balances.component.html @@ -1,98 +1,111 @@
- -
- -
- {{"labels.inputs.Office" | translate}} + {{ 'labels.inputs.Office' | translate }} {{ office.name }} - {{"labels.inputs.Office" | translate}} {{"labels.commons.is" | translate}} - {{"labels.commons.required" | translate}} + {{ 'labels.inputs.Office' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }}
- +
- - + - {{"labels.inputs.Currency" | translate}} + {{ 'labels.inputs.Currency' | translate }} {{ currency.displayLabel }} - {{"labels.inputs.Currency" | translate}} {{"labels.commons.is" | translate}} - {{"labels.commons.required" | translate}} + {{ 'labels.inputs.Currency' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} - {{"labels.inputs.Opening Balances Date" | translate}} - + {{ 'labels.inputs.Opening Balances Date' | translate }} + - {{"labels.inputs.Opening Balances Date" | translate}} {{"labels.commons.is" | translate}} - {{"labels.commons.required" | translate}} + {{ 'labels.inputs.Opening Balances Date' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }}
-
- {{"labels.inputs.Type" | translate}} + {{ 'labels.inputs.Type' | translate }}
- {{"labels.inputs.GL Code" | translate}} + {{ 'labels.inputs.GL Code' | translate }}
- {{"labels.inputs.Account" | translate}} + {{ 'labels.inputs.Account' | translate }}
- {{"labels.inputs.Total Debit" | translate}}: {{ debitsSum | currency:currencyCode:'symbol-narrow':'1.2-2' }} + {{ 'labels.inputs.Total Debit' | translate }}: + {{ debitsSum | currency: currencyCode : 'symbol-narrow' : '1.2-2' }}
- {{"labels.inputs.Total Credit" | translate}}: {{ creditsSum | currency:currencyCode:'symbol-narrow':'1.2-2' }} + {{ 'labels.inputs.Total Credit' | translate }}: + {{ creditsSum | currency: currencyCode : 'symbol-narrow' : '1.2-2' }}
-
-
- +
-
- {{ (openingBalancesData.glAccounts[i].glAccountType.value !== - openingBalancesData.glAccounts[i-1]?.glAccountType.value) ? - glAccountTypeLabel(openingBalancesData.glAccounts[i].glAccountType.value) : '' }} + {{ + openingBalancesData.glAccounts[i].glAccountType.value !== + openingBalancesData.glAccounts[i - 1]?.glAccountType.value + ? glAccountTypeLabel(openingBalancesData.glAccounts[i].glAccountType.value) + : '' + }}
@@ -105,51 +118,64 @@
- {{"labels.inputs.Debit" | translate}} - + {{ 'labels.inputs.Debit' | translate }} +
- {{"labels.inputs.Credit" | translate}} - + {{ 'labels.inputs.Credit' | translate }} +
-
-
-
- - - - + + + - - -
-

{{"labels.heading.Migrate opening balances (Office-wise)" | translate}}

-

{{"labels.text.Migrate Opening Balances" | translate}} {{ 'labels.heading.Migrate opening balances (Office-wise)' | translate }} +

+ {{ 'labels.text.Migrate Opening Balances' | translate }} + {{"labels.inputs.Migrate opening balances (Office-wise)" | translate}}

+ target="_blank" + >{{ 'labels.inputs.Migrate opening balances (Office-wise)' | translate }} +

- - - + + +
- \ No newline at end of file + diff --git a/src/app/accounting/periodic-accruals/periodic-accruals.component.html b/src/app/accounting/periodic-accruals/periodic-accruals.component.html index 690a796cc..48a62fadc 100644 --- a/src/app/accounting/periodic-accruals/periodic-accruals.component.html +++ b/src/app/accounting/periodic-accruals/periodic-accruals.component.html @@ -1,37 +1,42 @@
- -
- -
- - {{"labels.inputs.Accrue Till Date" | translate}} - + {{ 'labels.inputs.Accrue Till Date' | translate }} + - {{"labels.inputs.Accrue Date" | translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required" | translate}} + {{ 'labels.inputs.Accrue Date' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} -
- - - + -
- -
diff --git a/src/app/accounting/provisioning-entries/create-provisioning-entry/create-provisioning-entry.component.html b/src/app/accounting/provisioning-entries/create-provisioning-entry/create-provisioning-entry.component.html index 415d639c4..d660151e1 100644 --- a/src/app/accounting/provisioning-entries/create-provisioning-entry/create-provisioning-entry.component.html +++ b/src/app/accounting/provisioning-entries/create-provisioning-entry/create-provisioning-entry.component.html @@ -1,40 +1,47 @@
- -
- -
- - {{"labels.inputs.Date" | translate}} - + {{ 'labels.inputs.Date' | translate }} + - {{"labels.inputs.Date" | translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required" | translate}} + {{ 'labels.inputs.Date' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }}
- {{"labels.inputs.Create Journal Entries" | translate}} + {{ 'labels.inputs.Create Journal Entries' | translate }}
-
- - - + + -
- -
diff --git a/src/app/accounting/provisioning-entries/provisioning-entries.component.html b/src/app/accounting/provisioning-entries/provisioning-entries.component.html index 303f5d7bd..f72237a26 100644 --- a/src/app/accounting/provisioning-entries/provisioning-entries.component.html +++ b/src/app/accounting/provisioning-entries/provisioning-entries.component.html @@ -1,74 +1,85 @@
-
-
- {{'labels.inputs.Filter' | translate}} - + {{ 'labels.inputs.Filter' | translate }} +
- - - - + + - - + + - + - + - + - + - - +
{{"labels.inputs.Created By" | translate}} {{ provisioningEntry.createdUser }} {{ 'labels.inputs.Created By' | translate }}{{ provisioningEntry.createdUser }} {{"labels.inputs.Created On" | translate}} {{ provisioningEntry.createdDate }} {{ 'labels.inputs.Created On' | translate }}{{ provisioningEntry.createdDate }} {{"labels.inputs.Journal Entry Created" | translate}} + {{ 'labels.inputs.Journal Entry Created' | translate }} + {{"labels.inputs.View Report" | translate}} {{ 'labels.inputs.View Report' | translate }} {{"labels.inputs.Recreate Provisioning" | translate}} {{ 'labels.inputs.Recreate Provisioning' | translate }} - {{"labels.inputs.View Journal Entry" | translate}} {{ 'labels.inputs.View Journal Entry' | translate }} -
-
-
diff --git a/src/app/accounting/provisioning-entries/view-provisioning-entry/view-provisioning-entry.component.html b/src/app/accounting/provisioning-entries/view-provisioning-entry/view-provisioning-entry.component.html index 5acb3fadd..b051c545d 100644 --- a/src/app/accounting/provisioning-entries/view-provisioning-entry/view-provisioning-entry.component.html +++ b/src/app/accounting/provisioning-entries/view-provisioning-entry/view-provisioning-entry.component.html @@ -1,20 +1,22 @@
-
-
- -
-
- {{"labels.inputs.Created By" | translate}} + {{ 'labels.inputs.Created By' | translate }}
@@ -22,7 +24,7 @@
- {{"labels.inputs.Created On" | translate}} + {{ 'labels.inputs.Created On' | translate }}
@@ -30,39 +32,33 @@
- {{"labels.inputs.Amount to be Reserved" | translate}} + {{ 'labels.inputs.Amount to be Reserved' | translate }}
{{ provisioningEntry.reservedAmount }}
-
- - -
- - {{"labels.inputs.Office Name" | translate}} - + {{ 'labels.inputs.Office Name' | translate }} + - {{"labels.inputs.Loan Product" | translate}} - + {{ 'labels.inputs.Loan Product' | translate }} + - {{"labels.inputs.Provisioning Category" | translate}} - + {{ 'labels.inputs.Provisioning Category' | translate }} + -
@@ -79,7 +75,10 @@ - + {{ provisioningCategory.categoryName }} @@ -87,49 +86,47 @@
- - - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - +
{{"labels.inputs.Office Name" | translate}} {{ provisioningEntry.officeName }} {{ 'labels.inputs.Office Name' | translate }}{{ provisioningEntry.officeName }} {{"labels.inputs.Product Name" | translate}} {{ provisioningEntry.productName }} {{ 'labels.inputs.Product Name' | translate }}{{ provisioningEntry.productName }} {{"labels.inputs.Currency Code" | translate}} {{ provisioningEntry.currencyCode }} {{ 'labels.inputs.Currency Code' | translate }}{{ provisioningEntry.currencyCode }} {{"labels.inputs.Category Name" | translate}} {{ provisioningEntry.categoryName }} {{ 'labels.inputs.Category Name' | translate }}{{ provisioningEntry.categoryName }} {{"labels.inputs.Provisioning Amount" | translate}} {{ provisioningEntry.amountreserved }} {{ 'labels.inputs.Provisioning Amount' | translate }}{{ provisioningEntry.amountreserved }} {{"labels.inputs.Liability Account (CR)" | translate}} {{ provisioningEntry.liabilityAccountName }} + {{ 'labels.inputs.Liability Account (CR)' | translate }} + {{ provisioningEntry.liabilityAccountName }} {{"labels.inputs.Expense Account (DR)" | translate}} {{ provisioningEntry.expenseAccountName }} {{ 'labels.inputs.Expense Account (DR)' | translate }}{{ provisioningEntry.expenseAccountName }}
-
diff --git a/src/app/accounting/provisioning-entries/view-provisioning-journal-entries/view-provisioning-journal-entries.component.html b/src/app/accounting/provisioning-entries/view-provisioning-journal-entries/view-provisioning-journal-entries.component.html index f69d0e0f8..c857e0794 100644 --- a/src/app/accounting/provisioning-entries/view-provisioning-journal-entries/view-provisioning-journal-entries.component.html +++ b/src/app/accounting/provisioning-entries/view-provisioning-journal-entries/view-provisioning-journal-entries.component.html @@ -1,73 +1,83 @@
-
- {{'labels.inputs.Filter' | translate}} - + {{ 'labels.inputs.Filter' | translate }} +
- - - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - +
{{"labels.inputs.Entry ID" | translate}} {{ provisioningJournalEntry.id }} {{ 'labels.inputs.Entry ID' | translate }}{{ provisioningJournalEntry.id }} {{"labels.inputs.Office" | translate}} {{ provisioningJournalEntry.officeName }} {{ 'labels.inputs.Office' | translate }}{{ provisioningJournalEntry.officeName }} {{"labels.inputs.Transaction Date" | translate}} {{ provisioningJournalEntry.transactionDate }} {{ 'labels.inputs.Transaction Date' | translate }}{{ provisioningJournalEntry.transactionDate }} {{"labels.inputs.Transaction ID" | translate}} {{ provisioningJournalEntry.transactionId }} {{ 'labels.inputs.Transaction ID' | translate }}{{ provisioningJournalEntry.transactionId }} {{"labels.inputs.Type" | translate}} {{ provisioningJournalEntry.glAccountType.value }} {{ 'labels.inputs.Type' | translate }}{{ provisioningJournalEntry.glAccountType.value }} {{"labels.inputs.Type" | translate}} {{ provisioningJournalEntry.createdByUserName }} {{ 'labels.inputs.Type' | translate }}{{ provisioningJournalEntry.createdByUserName }} {{"labels.inputs.Account Code" | translate}} {{ provisioningJournalEntry.glAccountCode }} {{ 'labels.inputs.Account Code' | translate }}{{ provisioningJournalEntry.glAccountCode }} {{"labels.inputs.Account Name" | translate}} {{ provisioningJournalEntry.glAccountName }} {{ 'labels.inputs.Account Name' | translate }}{{ provisioningJournalEntry.glAccountName }} {{"labels.inputs.Debit" | translate}} {{ (provisioningJournalEntry.currency.displaySymbol || provisioningJournalEntry.currency.code) + ' ' + provisioningJournalEntry.amount }} {{ 'labels.inputs.Debit' | translate }} + + {{ + (provisioningJournalEntry.currency.displaySymbol || provisioningJournalEntry.currency.code) + + ' ' + + provisioningJournalEntry.amount + }} + + {{"labels.inputs.Credit" | translate}} {{ (provisioningJournalEntry.currency.displaySymbol || provisioningJournalEntry.currency.code) + ' ' + provisioningJournalEntry.amount }} {{ 'labels.inputs.Credit' | translate }} + + {{ + (provisioningJournalEntry.currency.displaySymbol || provisioningJournalEntry.currency.code) + + ' ' + + provisioningJournalEntry.amount + }} + +
-
-
diff --git a/src/app/accounting/revert-transaction/revert-transaction.component.html b/src/app/accounting/revert-transaction/revert-transaction.component.html index 4e81062d4..7971094ef 100644 --- a/src/app/accounting/revert-transaction/revert-transaction.component.html +++ b/src/app/accounting/revert-transaction/revert-transaction.component.html @@ -1,31 +1,31 @@
- -

{{"labels.heading.Revert Transaction" | translate}}

+

{{ 'labels.heading.Revert Transaction' | translate }}

-

{{"labels.text.Revert this transaction?" | translate}}

+

{{ 'labels.text.Revert this transaction?' | translate }}

- {{"labels.inputs.Comments" | translate}} + {{ 'labels.inputs.Comments' | translate }}
- - + + -
- -

{{"labels.heading.Transaction Reverted" | translate}}

-
-

{{"labels.heading.Success!" | translate}}

-

{{"labels.text.Journal entry reverse transaction" | translate}}

-

{{"labels.text.Transaction ID" | translate}}: {{ data.transactionId }}

-
- - - - - +

{{ 'labels.heading.Transaction Reverted' | translate }}

+
+

{{ 'labels.heading.Success!' | translate }}

+

{{ 'labels.text.Journal entry reverse transaction' | translate }}

+

{{ 'labels.text.Transaction ID' | translate }}: {{ data.transactionId }}

+
+ + + + 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 4ad0ca83f..5ea59ce28 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 @@ -1,11 +1,11 @@
- - {{"labels.inputs.Office Name" | translate}} - + {{ 'labels.inputs.Office Name' | translate }} + - - {{'labels.inputs.Filter' | translate}} + {{ 'labels.inputs.Filter' | translate }} {{ filter.option }} @@ -23,41 +23,61 @@ - {{"labels.inputs.Transaction Date From" | translate}} - + {{ 'labels.inputs.Transaction Date From' | translate }} + - {{"labels.inputs.Transaction Date To" | translate}} - + {{ 'labels.inputs.Transaction Date To' | translate }} + - {{"labels.inputs.Transaction ID" | translate}} - + {{ 'labels.inputs.Transaction ID' | translate }} + - {{"labels.inputs.Submitted on Date From" | translate}} - + {{ 'labels.inputs.Submitted on Date From' | translate }} + - {{"labels.inputs.Submitted on Date To" | translate}} - + {{ 'labels.inputs.Submitted on Date To' | translate }} + -
- @@ -66,74 +86,84 @@
- - - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - - + + - - + + - - +
{{"labels.inputs.Entry ID" | translate}} {{ journalEntry.id }} {{ 'labels.inputs.Entry ID' | translate }}{{ journalEntry.id }} {{"labels.inputs.Office" | translate}} {{ journalEntry.officeName }} {{ 'labels.inputs.Office' | translate }}{{ journalEntry.officeName }} {{"labels.inputs.Transaction ID" | translate}} {{ journalEntry.transactionId }} {{ 'labels.inputs.Transaction ID' | translate }}{{ journalEntry.transactionId }} {{"labels.inputs.Transaction Date" | translate}} {{ journalEntry.transactionDate | dateFormat }} {{ 'labels.inputs.Transaction Date' | translate }}{{ journalEntry.transactionDate | dateFormat }} {{"labels.inputs.Type" | translate}} {{ journalEntry.glAccountType.value }} {{ 'labels.inputs.Type' | translate }}{{ journalEntry.glAccountType.value }} {{"labels.inputs.Created By" | translate}} {{ journalEntry.createdByUserName }} {{ 'labels.inputs.Created By' | translate }}{{ journalEntry.createdByUserName }} {{"labels.inputs.Submitted on date" | translate}} {{ journalEntry.submittedOnDate | datetimeFormat }} {{ 'labels.inputs.Submitted on date' | translate }}{{ journalEntry.submittedOnDate | datetimeFormat }} {{"labels.inputs.Account Code" | translate}} {{ journalEntry.glAccountCode }} {{ 'labels.inputs.Account Code' | translate }}{{ journalEntry.glAccountCode }} {{"labels.inputs.Account Name" | translate}} {{ journalEntry.glAccountName }} {{ 'labels.inputs.Account Name' | translate }}{{ journalEntry.glAccountName }} {{"labels.inputs.Currency" | translate}} {{ 'labels.inputs.Currency' | translate }} {{ journalEntry.currency.code }} {{"labels.inputs.Debit" | translate}} {{ journalEntry.amount | formatNumber }} {{ 'labels.inputs.Debit' | translate }} + {{ journalEntry.amount | formatNumber }} + {{"labels.inputs.Credit" | translate}} {{ journalEntry.amount | formatNumber }} {{ 'labels.inputs.Credit' | translate }} + {{ journalEntry.amount | formatNumber }} +
- - +
diff --git a/src/app/centers/centers-view/center-actions/activate-center/activate-center.component.html b/src/app/centers/centers-view/center-actions/activate-center/activate-center.component.html index c15cb37da..782cc1504 100644 --- a/src/app/centers/centers-view/center-actions/activate-center/activate-center.component.html +++ b/src/app/centers/centers-view/center-actions/activate-center/activate-center.component.html @@ -1,30 +1,34 @@
- -
- - - - {{"labels.inputs.Activated On Date" | translate}} - - - - - {{"labels.inputs.Activated On Date" | translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required" | translate}} - - - + + {{ 'labels.inputs.Activated On Date' | translate }} + + + + + {{ 'labels.inputs.Activated On Date' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} + + - - + + -
- -
diff --git a/src/app/centers/centers-view/center-actions/attach-center-meeting/attach-center-meeting.component.html b/src/app/centers/centers-view/center-actions/attach-center-meeting/attach-center-meeting.component.html index d05277aae..54b57a149 100644 --- a/src/app/centers/centers-view/center-actions/attach-center-meeting/attach-center-meeting.component.html +++ b/src/app/centers/centers-view/center-actions/attach-center-meeting/attach-center-meeting.component.html @@ -1,74 +1,79 @@
- -
- -
- - {{"labels.inputs.Meeting Start Date" | translate}} - + {{ 'labels.inputs.Meeting Start Date' | translate }} + - {{"labels.inputs.Start Date" | translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required" | translate}} + {{ 'labels.inputs.Start Date' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} - {{"labels.inputs.Repeats?" | translate}} + {{ 'labels.inputs.Repeats?' | translate }} - {{"labels.inputs.Repetition Frequency" | translate}} + {{ 'labels.inputs.Repetition Frequency' | translate }} {{ option.value }} - {{"labels.inputs.Repetition Frequency" | translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required" | translate}} + {{ 'labels.inputs.Repetition Frequency' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} - {{"labels.inputs.Repetition Interval" | translate}} + {{ 'labels.inputs.Repetition Interval' | translate }} {{ interval }} - {{"labels.inputs.Repetition Interval" | translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required" | translate}} + {{ 'labels.inputs.Repetition Interval' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} - {{"labels.inputs.Repeats on Day" | translate}} - - - {{ day.value }} - - - - {{"labels.inputs.At least" | translate}} {{"labels.inputs.one" | translate}} {{"labels.inputs.day must be selected" | translate}} - - - + {{ 'labels.inputs.Repeats on Day' | translate }} + + + {{ day.value }} + + + + {{ 'labels.inputs.At least' | translate }} {{ 'labels.inputs.one' | translate }} + {{ 'labels.inputs.day must be selected' | translate }} + +
- - - + + -
- -
diff --git a/src/app/centers/centers-view/center-actions/center-actions.component.html b/src/app/centers/centers-view/center-actions/center-actions.component.html index 6ddf41695..87578b19e 100644 --- a/src/app/centers/centers-view/center-actions/center-actions.component.html +++ b/src/app/centers/centers-view/center-actions/center-actions.component.html @@ -1,7 +1,7 @@ - + - + diff --git a/src/app/centers/centers-view/center-actions/center-assign-staff/center-assign-staff.component.html b/src/app/centers/centers-view/center-actions/center-assign-staff/center-assign-staff.component.html index 4150ef554..48ad98a8e 100644 --- a/src/app/centers/centers-view/center-actions/center-assign-staff/center-assign-staff.component.html +++ b/src/app/centers/centers-view/center-actions/center-assign-staff/center-assign-staff.component.html @@ -1,36 +1,31 @@
- -
- -
- - {{"labels.inputs.Staff" | translate}} + {{ 'labels.inputs.Staff' | translate }} {{ staff.displayName }} - {{"labels.inputs.Staff" | translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required" | translate}} + {{ 'labels.inputs.Staff' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} -
- - - + + -
- -
diff --git a/src/app/centers/centers-view/center-actions/center-attendance/center-attendance.component.html b/src/app/centers/centers-view/center-actions/center-attendance/center-attendance.component.html index a45b94ed5..6f30582fc 100644 --- a/src/app/centers/centers-view/center-actions/center-attendance/center-attendance.component.html +++ b/src/app/centers/centers-view/center-actions/center-attendance/center-attendance.component.html @@ -1,49 +1,49 @@
- - - {{"labels.inputs.Meeting Date" | translate}} + {{ 'labels.inputs.Meeting Date' | translate }} {{ date | dateFormat }} - {{"labels.inputs.Next Meeting on" | translate}}: {{ this.centerData.collectionMeetingCalendar.nextTenRecurringDates[0] | dateFormat }} + {{ 'labels.inputs.Next Meeting on' | translate }}: + {{ this.centerData.collectionMeetingCalendar.nextTenRecurringDates[0] | dateFormat }} - - - + + - + - - +
{{"labels.inputs.name" | translate}} {{ member.clientId | find:membersData:'id':'displayName' }} {{ 'labels.inputs.name' | translate }}{{ member.clientId | find: membersData : 'id' : 'displayName' }} {{"labels.inputs.Attendance" | translate}} {{ 'labels.inputs.Attendance' | translate }} - {{"labels.inputs.Present" | translate}} - {{"labels.inputs.Absent" | translate}} - {{"labels.inputs.Approved" | translate}} - {{"labels.inputs.Leave" | translate}} - {{"labels.inputs.Late" | translate}} -
- - + + - -
diff --git a/src/app/centers/centers-view/center-actions/close-center/close-center.component.html b/src/app/centers/centers-view/center-actions/close-center/close-center.component.html index 672728cef..8e411f42b 100644 --- a/src/app/centers/centers-view/center-actions/close-center/close-center.component.html +++ b/src/app/centers/centers-view/center-actions/close-center/close-center.component.html @@ -1,46 +1,54 @@
- -
- -
- - {{"labels.inputs.Closed On Date" | translate}} - + {{ 'labels.inputs.Closed On Date' | translate }} + - {{"labels.inputs.Closed On Date" | translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required" | translate}} + {{ 'labels.inputs.Closed On Date' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} - {{"labels.inputs.Closure Reason" | translate}} + {{ 'labels.inputs.Closure Reason' | translate }} {{ reason.name }} - {{"labels.inputs.Closure Reason" | translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required" | translate}} + {{ 'labels.inputs.Closure Reason' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} -
- - - + + -
- -
diff --git a/src/app/centers/centers-view/center-actions/edit-center-meeting-schedule/edit-center-meeting-schedule.component.html b/src/app/centers/centers-view/center-actions/edit-center-meeting-schedule/edit-center-meeting-schedule.component.html index e03299faa..e9fa9ecd9 100644 --- a/src/app/centers/centers-view/center-actions/edit-center-meeting-schedule/edit-center-meeting-schedule.component.html +++ b/src/app/centers/centers-view/center-actions/edit-center-meeting-schedule/edit-center-meeting-schedule.component.html @@ -1,46 +1,49 @@
- -
- -
+ + {{ 'labels.inputs.Existing Meeting Date' | translate }} + + + {{ date | dateFormat }} + + + + {{ 'labels.inputs.Existing Meeting Date' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} + + - - {{"labels.inputs.Existing Meeting Date" | translate}} - - - {{ date | dateFormat }} - - - - {{"labels.inputs.Existing Meeting Date" | translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required" | translate}} - - - - - {{"labels.inputs.Revised Meeting Date" | translate}} - - - - - {{"labels.inputs.Revised Meeting Date" | translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required" | translate}} - - - + + {{ 'labels.inputs.Revised Meeting Date' | translate }} + + + + + {{ 'labels.inputs.Revised Meeting Date' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} + +
- - - + + -
- -
diff --git a/src/app/centers/centers-view/center-actions/edit-center-meeting/edit-center-meeting.component.html b/src/app/centers/centers-view/center-actions/edit-center-meeting/edit-center-meeting.component.html index c8c3bc98d..e4efc1ef4 100644 --- a/src/app/centers/centers-view/center-actions/edit-center-meeting/edit-center-meeting.component.html +++ b/src/app/centers/centers-view/center-actions/edit-center-meeting/edit-center-meeting.component.html @@ -1,80 +1,85 @@
- -
- -
- - {{"labels.inputs.Repetition Frequency" | translate}} + {{ 'labels.inputs.Repetition Frequency' | translate }} {{ option.value }} - {{"labels.inputs.Repetition Frequency" | translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required" | translate}} + {{ 'labels.inputs.Repetition Frequency' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} - {{"labels.inputs.Repetition Interval" | translate}} + {{ 'labels.inputs.Repetition Interval' | translate }} {{ interval }} - {{"labels.inputs.Repetition Interval" | translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required" | translate}} + {{ 'labels.inputs.Repetition Interval' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} - {{"labels.inputs.Repeats on Day" | translate}} - - - {{ day.value }} - - - - {{"labels.inputs.At least" | translate}} {{"labels.inputs.one" | translate}} {{"labels.inputs.day must be selected" | translate}} - - - - - {{"labels.inputs.Above Changes are Effective from" | translate}} - - - - - {{"labels.inputs.Changes Affection Date" | translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required" | translate}} - - - {{"labels.text.Repeats' and 'Repeats every" | translate}} - - + {{ 'labels.inputs.Repeats on Day' | translate }} + + + {{ day.value }} + + + + {{ 'labels.inputs.At least' | translate }} {{ 'labels.inputs.one' | translate }} + {{ 'labels.inputs.day must be selected' | translate }} + + + + {{ 'labels.inputs.Above Changes are Effective from' | translate }} + + + + + {{ 'labels.inputs.Changes Affection Date' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} + + + {{ "labels.text.Repeats' and 'Repeats every" | translate }} + +
- - - + + -
- -
diff --git a/src/app/centers/centers-view/center-actions/manage-groups/manage-groups.component.html b/src/app/centers/centers-view/center-actions/manage-groups/manage-groups.component.html index 16a372cb1..f48b00bb4 100644 --- a/src/app/centers/centers-view/center-actions/manage-groups/manage-groups.component.html +++ b/src/app/centers/centers-view/center-actions/manage-groups/manage-groups.component.html @@ -1,10 +1,8 @@
- - - {{"labels.inputs.Add Groups" | translate}} - + {{ 'labels.inputs.Add Groups' | translate }} + @@ -15,41 +13,37 @@
-
{{"labels.inputs.Group Details" | translate}}
+
{{ 'labels.inputs.Group Details' | translate }}
-
{{"labels.inputs.name" | translate}}
-
{{groupChoice.value.name}}
+
{{ 'labels.inputs.name' | translate }}
+
{{ groupChoice.value.name }}
-
{{"labels.inputs.Id" | translate}}
-
{{groupChoice.value.id}}
+
{{ 'labels.inputs.Id' | translate }}
+
{{ groupChoice.value.id }}
-
{{"labels.inputs.Office" | translate}}
-
{{groupChoice.value.officeName}}
+
{{ 'labels.inputs.Office' | translate }}
+
{{ groupChoice.value.officeName }}
- +

{{ 'labels.heading.Group Members' | translate }}

-

{{"labels.heading.Group Members" | translate}}

- - -
- {{group.name}} + +
+ {{ group.name }}
- -
diff --git a/src/app/centers/centers-view/center-actions/staff-assignment-history/staff-assignment-history.component.html b/src/app/centers/centers-view/center-actions/staff-assignment-history/staff-assignment-history.component.html index 0e81c7ffb..92ed26b21 100644 --- a/src/app/centers/centers-view/center-actions/staff-assignment-history/staff-assignment-history.component.html +++ b/src/app/centers/centers-view/center-actions/staff-assignment-history/staff-assignment-history.component.html @@ -1,11 +1,9 @@ -
- - + diff --git a/src/app/centers/centers-view/centers-view.component.html b/src/app/centers/centers-view/centers-view.component.html index f623f41f1..8f7e85ac8 100644 --- a/src/app/centers/centers-view/centers-view.component.html +++ b/src/app/centers/centers-view/centers-view.component.html @@ -3,17 +3,20 @@
- +

- - {{"labels.heading.Center Name" | translate}} : {{centerViewData.name}} + + {{ 'labels.heading.Center Name' | translate }} : {{ centerViewData.name }}

-
+
- - - - - - - + + + + + + + - + - + + {{ 'labels.buttons.Assign Staff' | translate }} + + {{ 'labels.buttons.Unassign Staff' | translate }} + - - + + - - + + + {{ 'labels.buttons.Attach Meeting' | translate }} + - + - diff --git a/src/app/centers/centers-view/general-tab/general-tab.component.html b/src/app/centers/centers-view/general-tab/general-tab.component.html index db671ba81..69688acd1 100644 --- a/src/app/centers/centers-view/general-tab/general-tab.component.html +++ b/src/app/centers/centers-view/general-tab/general-tab.component.html @@ -1,130 +1,173 @@
-
-

{{"labels.heading.Center Closed" | translate}}

+
+

{{ 'labels.heading.Center Closed' | translate }}

-

{{"labels.heading.Summary Details" | translate}}

+

{{ 'labels.heading.Summary Details' | translate }}

- {{"labels.inputs.Active Clients" | translate}}: {{centerSummaryData.activeClients}}
- {{"labels.inputs.Active Group Loans" | translate}}: {{centerSummaryData.activeGroupLoans}}
- {{"labels.inputs.Active Client Loans" | translate}}: {{centerSummaryData.activeClientLoans}}
- {{"labels.inputs.Active Overdue Group Loans" | translate}}: {{centerSummaryData.overdueGroupLoans}}
+ {{ 'labels.inputs.Active Clients' | translate }}: {{ centerSummaryData.activeClients }}
+ {{ 'labels.inputs.Active Group Loans' | translate }}: {{ centerSummaryData.activeGroupLoans }}
+ {{ 'labels.inputs.Active Client Loans' | translate }}: {{ centerSummaryData.activeClientLoans }}
+ {{ 'labels.inputs.Active Overdue Group Loans' | translate }}: {{ centerSummaryData.overdueGroupLoans }}

- {{"labels.inputs.Active Group Borrowers" | translate}}: {{centerSummaryData.activeGroupBorrowers}}
- {{"labels.inputs.Active Client Borrowers" | translate}}: {{centerSummaryData.activeClientBorrowers}}
- {{"labels.inputs.Active Overdue Client Loans" | translate}}: {{centerSummaryData.overdueClientLoans}}
+ {{ 'labels.inputs.Active Group Borrowers' | translate }}: {{ centerSummaryData.activeGroupBorrowers }}
+ {{ 'labels.inputs.Active Client Borrowers' | translate }}: {{ centerSummaryData.activeClientBorrowers }}
+ {{ 'labels.inputs.Active Overdue Client Loans' | translate }}: {{ centerSummaryData.overdueClientLoans }}

- -

{{"labels.heading.Groups"|translate}}

+

{{ 'labels.heading.Groups' | translate }}

- - - + + - - + + - - + + - - + + - - +
{{"labels.inputs.Account Number" | translate}} - {{element.accountNo}} {{ 'labels.inputs.Account Number' | translate }} + + {{ element.accountNo }} + {{"labels.inputs.Group Name" | translate}} {{element.name}} {{ 'labels.inputs.Group Name' | translate }}{{ element.name }} {{"labels.inputs.Office Name" | translate}} {{element.officeName}} {{ 'labels.inputs.Office Name' | translate }}{{ element.officeName }} {{"labels.inputs.Submitted On" | translate}} {{element.timeline.submittedOnDate | dateFormat}} {{ 'labels.inputs.Submitted On' | translate }}{{ element.timeline.submittedOnDate | dateFormat }}
- - - -

{{"labels.heading.Savings Account Overview" | translate}}

+

{{ 'labels.heading.Savings Account Overview' | translate }}

- - - + + - - + + - - + + - + - +
{{"labels.inputs.Account No" | translate}} - {{element.accountNo}} {{ 'labels.inputs.Account No' | translate }} + + {{ element.accountNo }} + {{"labels.inputs.Products" | translate}} {{element.productName}} {{ 'labels.inputs.Products' | translate }}{{ element.productName }} {{"labels.inputs.Balance" | translate}} {{element.accountBalance}} {{ 'labels.inputs.Balance' | translate }}{{ element.accountBalance }} {{"labels.inputs.Actions" | translate}} {{ 'labels.inputs.Actions' | translate }} - - - - - - -
- - -
diff --git a/src/app/centers/centers-view/notes-tab/notes-tab.component.html b/src/app/centers/centers-view/notes-tab/notes-tab.component.html index a49201644..358227616 100644 --- a/src/app/centers/centers-view/notes-tab/notes-tab.component.html +++ b/src/app/centers/centers-view/notes-tab/notes-tab.component.html @@ -1,29 +1,46 @@
-

{{"labels.heading.Notes" | translate}}

+

{{ 'labels.heading.Notes' | translate }}

-
+ - + -
- + -

{{centerNote.note}}

+

{{ centerNote.note }}

- {{"labels.inputs.Created By" | translate}}: {{centerNote.createdByUsername}}
- {{"labels.inputs.Date" | translate}}: {{centerNote.createdOn | dateFormat}} + {{ 'labels.inputs.Created By' | translate }}: {{ centerNote.createdByUsername }}
+ {{ 'labels.inputs.Date' | translate }}: {{ centerNote.createdOn | dateFormat }}

- -
diff --git a/src/app/centers/centers.component.html b/src/app/centers/centers.component.html index 878f36323..59e30cd67 100644 --- a/src/app/centers/centers.component.html +++ b/src/app/centers/centers.component.html @@ -2,60 +2,73 @@
- + - + - {{"labels.inputs.Show Closed Centers" | translate}} + {{ 'labels.inputs.Show Closed Centers' | translate }}
-
- - - + + - - + + - - + + - + - - + + - +
{{"labels.inputs.name" | translate}} {{ center.name }} {{ 'labels.inputs.name' | translate }}{{ center.name }} {{"labels.inputs.Account" | translate}} # {{ center.accountNo }} {{ 'labels.inputs.Account' | translate }} #{{ center.accountNo }} {{"labels.inputs.External Id" | translate}} {{ center.externalId }} {{ 'labels.inputs.External Id' | translate }}{{ center.externalId }} {{"labels.inputs.Status" | translate}} {{ 'labels.inputs.Status' | translate }} -
+
{{"labels.inputs.Office Name" | translate}} {{ center.officeName }} {{ 'labels.inputs.Office Name' | translate }}{{ center.officeName }}
- - + diff --git a/src/app/centers/create-center/create-center.component.html b/src/app/centers/create-center/create-center.component.html index 368686b09..e472d4dca 100644 --- a/src/app/centers/create-center/create-center.component.html +++ b/src/app/centers/create-center/create-center.component.html @@ -1,38 +1,36 @@
- -
- -
- - {{"labels.inputs.name" | translate}} - + {{ 'labels.inputs.name' | translate }} + - {{"labels.inputs.Center Name" | translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required" | translate}} + {{ 'labels.inputs.Center Name' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} - {{"labels.inputs.Center Name" | translate}} {{"labels.inputs.cannot" | translate}} {{"labels.inputs.begin with a special character or number" | translate}} + {{ 'labels.inputs.Center Name' | translate }} {{ 'labels.inputs.cannot' | translate }} + {{ 'labels.inputs.begin with a special character or number' | translate }} - {{"labels.inputs.Office" | translate}} + {{ 'labels.inputs.Office' | translate }} {{ office.name }} - {{"labels.inputs.Office" | translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required" | translate}} + {{ 'labels.inputs.Office' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} - {{"labels.inputs.Staff" | translate}} + {{ 'labels.inputs.Staff' | translate }} {{ staff.displayName }} @@ -41,89 +39,108 @@ - {{"labels.inputs.Active" | translate}} + {{ 'labels.inputs.Active' | translate }} - {{"labels.inputs.Activation Date" | translate}} - + {{ 'labels.inputs.Activation Date' | translate }} + - {{"labels.inputs.Activation Date" | translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required" | translate}} + {{ 'labels.inputs.Activation Date' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} - {{"labels.inputs.External Id" | translate}} - + {{ 'labels.inputs.External Id' | translate }} + - {{"labels.inputs.Submitted On" | translate}} - + {{ 'labels.inputs.Submitted On' | translate }} + - {{"labels.inputs.Submission Date" | translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required" | translate}} + {{ 'labels.inputs.Submission Date' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} - {{"labels.inputs.Select and Add groups" | translate}} + {{ 'labels.inputs.Select and Add groups' | translate }} {{ group.name }} -
-
-
{{"labels.inputs.Group Details" | translate}}
+
{{ 'labels.inputs.Group Details' | translate }}
-
{{"labels.inputs.name" | translate}}
-
{{groupChoice.value.name}}
+
{{ 'labels.inputs.name' | translate }}
+
{{ groupChoice.value.name }}
-
{{"labels.inputs.Id" | translate}}
-
{{groupChoice.value.id}}
+
{{ 'labels.inputs.Id' | translate }}
+
{{ groupChoice.value.id }}
-
{{"labels.inputs.Office" | translate}}
-
{{groupChoice.value.officeName}}
+
{{ 'labels.inputs.Office' | translate }}
+
{{ groupChoice.value.officeName }}
-

{{"labels.heading.Selected Groups" | translate}}

-
+

{{ 'labels.heading.Selected Groups' | translate }}

+
- {{group.name}} + {{ group.name }}
-
- - - + + - - -
diff --git a/src/app/centers/edit-center/edit-center.component.html b/src/app/centers/edit-center/edit-center.component.html index 629790642..b5f8a11fa 100644 --- a/src/app/centers/edit-center/edit-center.component.html +++ b/src/app/centers/edit-center/edit-center.component.html @@ -1,26 +1,23 @@
- -
- -
- - {{"labels.inputs.name" | translate}} - + {{ 'labels.inputs.name' | translate }} + - {{"labels.inputs.Center Name" | translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required" | translate}} + {{ 'labels.inputs.Center Name' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} - {{"labels.inputs.Center Name" | translate}} {{"labels.inputs.cannot" | translate}} {{"labels.inputs.begin with a special character or number" | translate}} + {{ 'labels.inputs.Center Name' | translate }} {{ 'labels.inputs.cannot' | translate }} + {{ 'labels.inputs.begin with a special character or number' | translate }} - {{"labels.inputs.Staff" | translate}} + {{ 'labels.inputs.Staff' | translate }} {{ staff.displayName }} @@ -29,34 +26,40 @@ - {{"labels.inputs.External Id" | translate}} - + {{ 'labels.inputs.External Id' | translate }} + - + - {{"labels.inputs.Activation Date" | translate}} - + {{ 'labels.inputs.Activation Date' | translate }} + - {{"labels.inputs.Activation Date" | translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required" | translate}} + {{ 'labels.inputs.Activation Date' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} -
- - - + + -
- -
diff --git a/src/app/clients/client-stepper/client-address-step/client-address-step.component.html b/src/app/clients/client-stepper/client-address-step/client-address-step.component.html index 675503686..e0e4104cf 100644 --- a/src/app/clients/client-stepper/client-address-step/client-address-step.component.html +++ b/src/app/clients/client-stepper/client-address-step/client-address-step.component.html @@ -1,19 +1,15 @@
- -

{{"labels.heading.Address" | translate}}

+

{{ 'labels.heading.Address' | translate }}

- - - {{ getSelectedValue('addressTypeIdOptions', address.addressTypeId)?.name }} @@ -21,49 +17,63 @@ {{ address.relationship }} -
- -

- {{"labels.inputs.Street" | translate}} : {{address.street}}
 - {{"labels.inputs.Address Line" | translate}} 1 : {{address.addressLine1}}
 - {{"labels.inputs.Address Line" | translate}} 2 : {{address.addressLine2}}
 - {{"labels.inputs.Address Line" | translate}} 3 : {{address.addressLine3}}
 - {{"labels.inputs.Town / Village" | translate}} : {{address.townVillage}}
 - {{"labels.inputs.City" | translate}} : {{address.city}}
 - {{"labels.inputs.State / Province" | translate}} : - {{getSelectedValue('stateProvinceIdOptions',address.stateProvinceId)?.name}}
 - {{"labels.inputs.Country" | translate}} : - {{getSelectedValue('countryIdOptions',address.countryId)?.name}}
 - {{"labels.inputs.Postal Code" | translate}} : {{address.postalCode}}
 - {{"labels.inputs.Active Status" | translate}} : {{address.isActive}}
 + {{ 'labels.inputs.Street' | translate }} : {{ address.street }}
 + {{ 'labels.inputs.Address Line' | translate }} 1 : {{ address.addressLine1 }}
 + {{ 'labels.inputs.Address Line' | translate }} 2 : {{ address.addressLine2 }}
 + {{ 'labels.inputs.Address Line' | translate }} 3 : {{ address.addressLine3 }}
 + {{ 'labels.inputs.Town / Village' | translate }} : {{ address.townVillage }}
 + {{ 'labels.inputs.City' | translate }} : {{ address.city }}
 + {{ 'labels.inputs.State / Province' | translate }} : + {{ getSelectedValue('stateProvinceIdOptions', address.stateProvinceId)?.name }}
 + {{ 'labels.inputs.Country' | translate }} : {{ getSelectedValue('countryIdOptions', address.countryId)?.name + }}
 + {{ 'labels.inputs.Postal Code' | translate }} : {{ address.postalCode }}
 + {{ 'labels.inputs.Active Status' | translate }} : {{ address.isActive }}

- -
-
diff --git a/src/app/clients/client-stepper/client-datatable-step/client-datatable-step.component.html b/src/app/clients/client-stepper/client-datatable-step/client-datatable-step.component.html index 4cb94353d..1a683bdcb 100644 --- a/src/app/clients/client-stepper/client-datatable-step/client-datatable-step.component.html +++ b/src/app/clients/client-stepper/client-datatable-step/client-datatable-step.component.html @@ -1,51 +1,68 @@
-
-
+ {{ getInputName(datatableInput) }} - {{getInputName(datatableInput)}} - - + {{ code.value }} - + - + - + - + - - {{getInputName(datatableInput)}} + + {{ getInputName(datatableInput) }}
-
-
diff --git a/src/app/clients/client-stepper/client-family-members-step/client-family-member-dialog/client-family-member-dialog.component.html b/src/app/clients/client-stepper/client-family-members-step/client-family-member-dialog/client-family-member-dialog.component.html index 98659017f..0c3a00b39 100644 --- a/src/app/clients/client-stepper/client-family-members-step/client-family-member-dialog/client-family-member-dialog.component.html +++ b/src/app/clients/client-stepper/client-family-members-step/client-family-member-dialog/client-family-member-dialog.component.html @@ -1,104 +1,113 @@ -

{{ data.context }} {{"labels.heading.Family Member" | translate}}

+

{{ data.context }} {{ 'labels.heading.Family Member' | translate }}

-
- - {{"labels.inputs.First Name" | translate}} + {{ 'labels.inputs.First Name' | translate }} - {{"labels.inputs.First Name" | translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required" | translate}} + {{ 'labels.inputs.First Name' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} - {{"labels.inputs.Middle Name" | translate}} + {{ 'labels.inputs.Middle Name' | translate }} - {{"labels.inputs.Last Name" | translate}} + {{ 'labels.inputs.Last Name' | translate }} - {{"labels.inputs.Last Name" | translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required" | translate}} + {{ 'labels.inputs.Last Name' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} - {{"labels.inputs.Qualification" | translate}} + {{ 'labels.inputs.Qualification' | translate }} - {{"labels.inputs.Age" | translate}} - + {{ 'labels.inputs.Age' | translate }} + - {{"labels.inputs.Age" | translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required and cannot be negative" | translate}} + {{ 'labels.inputs.Age' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required and cannot be negative' | translate }} - {{"labels.inputs.Is Dependent" | translate}}? + {{ 'labels.inputs.Is Dependent' | translate }}? - {{"labels.inputs.Relationship" | translate}} + {{ 'labels.inputs.Relationship' | translate }} - {{ relation.name | translateKey:'catalogs' }} + {{ relation.name | translateKey: 'catalogs' }} - {{"labels.inputs.Relationship" | translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required" | translate}} + {{ 'labels.inputs.Relationship' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} - {{"labels.inputs.Gender" | translate}} + {{ 'labels.inputs.Gender' | translate }} - {{ gender.name | translateKey:'catalogs' }} + {{ gender.name | translateKey: 'catalogs' }} - {{"labels.inputs.Gender" | translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required" | translate}} + {{ 'labels.inputs.Gender' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} - {{"labels.inputs.Profession" | translate}} + {{ 'labels.inputs.Profession' | translate }} - {{ profession.name | translateKey:'catalogs' }} + {{ profession.name | translateKey: 'catalogs' }} - {{"labels.inputs.Marital Status" | translate}} + {{ 'labels.inputs.Marital Status' | translate }} - - {{ maritalStatus.name | translateKey:'catalogs' }} + + {{ maritalStatus.name | translateKey: 'catalogs' }} - - {{"labels.inputs.Date Of Birth" | translate}} - + {{ 'labels.inputs.Date Of Birth' | translate }} + - {{"labels.inputs.Date Of Birth" | translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required" | translate}} + {{ 'labels.inputs.Date Of Birth' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} -
- - + + -
diff --git a/src/app/clients/client-stepper/client-family-members-step/client-family-members-step.component.html b/src/app/clients/client-stepper/client-family-members-step/client-family-members-step.component.html index 790b3737f..01b602a69 100644 --- a/src/app/clients/client-stepper/client-family-members-step/client-family-members-step.component.html +++ b/src/app/clients/client-stepper/client-family-members-step/client-family-members-step.component.html @@ -1,67 +1,65 @@
+

{{ 'labels.heading.Family Members' | translate }}

-

{{"labels.heading.Family Members" | translate}}

+
+ +
-
- -
+ + + + + {{ member.firstName }} {{ member.middleName ? member.middleName + ' ' + member.lastName : member.lastName }} + - + + {{ member.relationship }} + + - + - +
+ + +
- - {{ member.firstName }} {{ member.middleName ? member.middleName + ' ' + member.lastName : member.lastName }} - - - - {{member.relationship}} - - - - - - -
- - -
- -

- {{"labels.inputs.First Name" | translate}} : {{ member.firstName }}
- {{"labels.inputs.Middle Name" | translate}} : {{ member.middleName }}
- {{"labels.inputs.Last Name" | translate}} : {{ member.lastName }}
- {{"labels.inputs.Qualification" | translate}} : {{ member.qualification }}
- {{"labels.inputs.Relationship" | translate}} : {{ member.relationshipId | find:clientTemplate.familyMemberOptions.relationshipIdOptions:'id':'name' }}
- {{"labels.inputs.Age" | translate}} : {{ member.age }}
- {{"labels.inputs.Is Dependent" | translate}} : {{ member.isDependent ? 'Yes' : 'No' }}
- {{"labels.inputs.Marital Status" | translate}} : {{ member.maritalStatusId | find:clientTemplate.familyMemberOptions.maritalStatusIdOptions:'id':'name' }}
- {{"labels.inputs.Gender" | translate}} : {{ member.genderId | find:clientTemplate.familyMemberOptions.genderIdOptions:'id':'name' }}
- {{"labels.inputs.Profession" | translate}} : {{member.professionId | find:clientTemplate.familyMemberOptions.professionIdOptions:'id':'name' }}
- {{"labels.inputs.Date Of Birth" | translate}} : {{member.dateOfBirth | dateFormat}}
-

- - - - - -
- - -
+

+ {{ 'labels.inputs.First Name' | translate }} : {{ member.firstName }}
+ {{ 'labels.inputs.Middle Name' | translate }} : {{ member.middleName }}
+ {{ 'labels.inputs.Last Name' | translate }} : {{ member.lastName }}
+ {{ 'labels.inputs.Qualification' | translate }} : {{ member.qualification }}
+ {{ 'labels.inputs.Relationship' | translate }} : + {{ member.relationshipId | find: clientTemplate.familyMemberOptions.relationshipIdOptions : 'id' : 'name' + }}
+ {{ 'labels.inputs.Age' | translate }} : {{ member.age }}
+ {{ 'labels.inputs.Is Dependent' | translate }} : {{ member.isDependent ? 'Yes' : 'No' }}
+ {{ 'labels.inputs.Marital Status' | translate }} : + {{ member.maritalStatusId | find: clientTemplate.familyMemberOptions.maritalStatusIdOptions : 'id' : 'name' + }}
+ {{ 'labels.inputs.Gender' | translate }} : + {{ member.genderId | find: clientTemplate.familyMemberOptions.genderIdOptions : 'id' : 'name' }}
+ {{ 'labels.inputs.Profession' | translate }} : + {{ member.professionId | find: clientTemplate.familyMemberOptions.professionIdOptions : 'id' : 'name' }}
+ {{ 'labels.inputs.Date Of Birth' | translate }} : {{ member.dateOfBirth | dateFormat }}
+

+ + +
+ + +
diff --git a/src/app/clients/client-stepper/client-general-step/client-general-step.component.html b/src/app/clients/client-stepper/client-general-step/client-general-step.component.html index 1d3ed8af0..ee662d297 100644 --- a/src/app/clients/client-stepper/client-general-step/client-general-step.component.html +++ b/src/app/clients/client-stepper/client-general-step/client-general-step.component.html @@ -1,88 +1,104 @@
-
- - {{"labels.inputs.Office" | translate}} + {{ 'labels.inputs.Office' | translate }} {{ office.name }} - {{"labels.inputs.Office" | translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required" | translate}} + {{ 'labels.inputs.Office' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} - {{"labels.inputs.Legal Form" | translate}} + {{ 'labels.inputs.Legal Form' | translate }} - {{ legalForm.value | translateKey:'inputs'}} + {{ legalForm.value | translateKey: 'inputs' }} - {{"labels.inputs.External Id" | translate}} - + {{ 'labels.inputs.External Id' | translate }} + - {{ 'labels.inputs.' + getDateLabel(createClientForm.value.legalFormId, ['Name', 'Entity Name']) | translate }} - + {{ + 'labels.inputs.' + getDateLabel(createClientForm.value.legalFormId, ['Name', 'Entity Name']) | translate + }} + - {{"labels.inputs.Client name" | translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required" | translate}} + {{ 'labels.inputs.Client name' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} - {{"labels.inputs.Client name" | translate}} {{"labels.inputs.cannot" | translate}} {{"labels.commons.begin with a special character or number" | translate}} + {{ 'labels.inputs.Client name' | translate }} {{ 'labels.inputs.cannot' | translate }} + {{ 'labels.commons.begin with a special character or number' | translate }} - {{"labels.inputs.First Name" | translate}} - + {{ 'labels.inputs.First Name' | translate }} + - {{"labels.inputs.Client first name" | translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required" | translate}} + {{ 'labels.inputs.Client first name' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} - {{"labels.inputs.Client first name" | translate}} {{"labels.inputs.cannot" | translate}} {{"labels.commons.begin with a special character or number" | translate}} + {{ 'labels.inputs.Client first name' | translate }} {{ 'labels.inputs.cannot' | translate }} + {{ 'labels.commons.begin with a special character or number' | translate }} - {{"labels.inputs.Middle Name" | translate}} - + {{ 'labels.inputs.Middle Name' | translate }} + - {{"labels.inputs.Client middle name" | translate}} {{"labels.inputs.cannot" | translate}} {{"labels.commons.begin with a special character or number" | translate}} + {{ 'labels.inputs.Client middle name' | translate }} {{ 'labels.inputs.cannot' | translate }} + {{ 'labels.commons.begin with a special character or number' | translate }} - {{"labels.inputs.Last Name" | translate}} - + {{ 'labels.inputs.Last Name' | translate }} + - {{"labels.inputs.Client last name" | translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required" | translate}} + {{ 'labels.inputs.Client last name' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} - {{"labels.inputs.Client last name" | translate}} {{"labels.inputs.cannot" | translate}} {{"labels.commons.begin with a special character or number" | translate}} + {{ 'labels.inputs.Client last name' | translate }} {{ 'labels.inputs.cannot' | translate }} + {{ 'labels.commons.begin with a special character or number' | translate }} - {{ 'labels.inputs.' + getDateLabel(createClientForm.value.legalFormId, ['Date of Birth', 'Incorporation Date']) | translate }} - + {{ + 'labels.inputs.' + getDateLabel(createClientForm.value.legalFormId, ['Date of Birth', 'Incorporation Date']) + | translate + }} + -
- +
- {{"labels.inputs.Constitution" | translate}} + {{ 'labels.inputs.Constitution' | translate }} {{ constitution.name }} @@ -91,7 +107,7 @@ - {{"labels.inputs.Main Business Line" | translate}} + {{ 'labels.inputs.Main Business Line' | translate }} {{ business.name }} @@ -100,26 +116,31 @@ - {{"labels.inputs.Incorporation Validity Till Date" | translate}} - + {{ 'labels.inputs.Incorporation Validity Till Date' | translate }} + - {{"labels.inputs.Incorporation Number" | translate}} - + {{ 'labels.inputs.Incorporation Number' | translate }} + - {{"labels.inputs.Remarks" | translate}} + {{ 'labels.inputs.Remarks' | translate }} -
- {{"labels.inputs.Gender" | translate}} + {{ 'labels.inputs.Gender' | translate }} {{ gender.name }} @@ -128,7 +149,7 @@ - {{"labels.inputs.Staff" | translate}} + {{ 'labels.inputs.Staff' | translate }} {{ staff.displayName }} @@ -136,27 +157,33 @@ - - {{"labels.inputs.Is staff" | translate}}? + + {{ 'labels.inputs.Is staff' | translate }}? - {{"labels.inputs.Mobile No" | translate}} - + {{ 'labels.inputs.Mobile No' | translate }} + - {{"labels.inputs.Email Address" | translate}} - + {{ 'labels.inputs.Email Address' | translate }} + - {{"error.Email not valid" | translate}} + {{ 'error.Email not valid' | translate }} - {{"labels.inputs.Client Type" | translate}} + {{ 'labels.inputs.Client Type' | translate }} {{ clientType.name }} @@ -165,17 +192,27 @@ - {{"labels.inputs.Client Classification" | translate}} + {{ 'labels.inputs.Client Classification' | translate }} - + {{ clientClassification.name }} - {{"labels.inputs.Submitted On" | translate}} - + {{ 'labels.inputs.Submitted On' | translate }} + @@ -183,47 +220,57 @@
- {{"labels.inputs.Active" | translate}}? + {{ 'labels.inputs.Active' | translate }}? - - {{"labels.inputs.Activation Date" | translate}} - + + {{ 'labels.inputs.Activation Date' | translate }} + - {{"labels.inputs.Activation Date" | translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required" | translate}} + {{ 'labels.inputs.Activation Date' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} - {{"labels.inputs.Open Savings Account" | translate}}? + {{ 'labels.inputs.Open Savings Account' | translate }}? - {{"labels.inputs.Savings Product" | translate}} + {{ 'labels.inputs.Savings Product' | translate }} {{ product.name }} - {{"labels.inputs.Savings Product" | translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required" | translate}} + {{ 'labels.inputs.Savings Product' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} -
- diff --git a/src/app/clients/client-stepper/client-preview-step/client-preview-step.component.html b/src/app/clients/client-stepper/client-preview-step/client-preview-step.component.html index 02b308596..b634508ae 100644 --- a/src/app/clients/client-stepper/client-preview-step/client-preview-step.component.html +++ b/src/app/clients/client-stepper/client-preview-step/client-preview-step.component.html @@ -1,28 +1,30 @@
- -

{{"labels.heading.General" | translate}}

+

{{ 'labels.heading.General' | translate }}

- {{"labels.inputs.name" | translate}} + {{ 'labels.inputs.name' | translate }} {{ client.fullname }} - {{ client.firstname }} {{ client.middlename ? client.middlename + ' ' + client.lastname : client.lastname }} + {{ client.firstname }} + {{ client.middlename ? client.middlename + ' ' + client.lastname : client.lastname }}
- {{"labels.inputs.Office" | translate}} - {{ client.officeId | find:clientTemplate.officeOptions:'id':'name' }} + {{ 'labels.inputs.Office' | translate }} + {{ client.officeId | find: clientTemplate.officeOptions : 'id' : 'name' }}
- {{"labels.inputs.Legal Form" | translate}} - {{ client.legalFormId | find:clientTemplate.clientLegalFormOptions:'id':'value' }} + {{ 'labels.inputs.Legal Form' | translate }} + {{ client.legalFormId | find: clientTemplate.clientLegalFormOptions : 'id' : 'value' }}
- {{"labels.inputs.Staff" | translate}} - {{ client.staffId | find:clientTemplate.staffOptions:'id':'displayName' }} + {{ 'labels.inputs.Staff' | translate }} + {{ client.staffId | find: clientTemplate.staffOptions : 'id' : 'displayName' }}
@@ -31,195 +33,211 @@
- {{"labels.inputs.External Id" | translate}} + {{ 'labels.inputs.External Id' | translate }} - +
- {{"labels.inputs.Mobile No" | translate}} + {{ 'labels.inputs.Mobile No' | translate }} {{ client.mobileNo }}
- {{"labels.inputs.Email Address" | translate}} + {{ 'labels.inputs.Email Address' | translate }} {{ client.emailAddress }}
- {{"labels.inputs.Client Type" | translate}} - {{ client.clientTypeId | find:clientTemplate.clientTypeOptions:'id':'name' }} + {{ 'labels.inputs.Client Type' | translate }} + {{ client.clientTypeId | find: clientTemplate.clientTypeOptions : 'id' : 'name' }}
- {{"labels.inputs.Client Classification" | translate}} - {{ client.clientClassificationId | find:clientTemplate.clientClassificationOptions:'id':'name' }} + {{ 'labels.inputs.Client Classification' | translate }} + {{ + client.clientClassificationId | find: clientTemplate.clientClassificationOptions : 'id' : 'name' + }}
- {{"labels.inputs.Savings Product" | translate}} - {{ client.savingsProductId | find:clientTemplate.savingProductOptions:'id':'name' }} + {{ 'labels.inputs.Savings Product' | translate }} + {{ client.savingsProductId | find: clientTemplate.savingProductOptions : 'id' : 'name' }}
- {{"labels.inputs.Submitted On Date" | translate}} + {{ 'labels.inputs.Submitted On Date' | translate }} {{ client.submittedOnDate | dateFormat }}
- {{"labels.inputs.Active" | translate}}? + {{ 'labels.inputs.Active' | translate }}? {{ client.active | yesNo }}
- {{"labels.inputs.Activation Date" | translate}} + {{ 'labels.inputs.Activation Date' | translate }} {{ client.activationDate | dateFormat }}
-
- {{"labels.inputs.Gender" | translate}} - {{ client.genderId | find:clientTemplate.genderOptions:'id':'name' }} + {{ 'labels.inputs.Gender' | translate }} + {{ client.genderId | find: clientTemplate.genderOptions : 'id' : 'name' }}
- {{"labels.inputs.Is staff" | translate}}? + {{ 'labels.inputs.Is staff' | translate }}? {{ client.isStaff | yesNo }}
- -
- {{"labels.inputs.Incorporation Validity Till Date" | translate}} + {{ 'labels.inputs.Incorporation Validity Till Date' | translate }} {{ client.clientNonPersonDetails.incorpValidityTillDate | dateFormat }}
- {{"labels.inputs.Incorportation Number" | translate}} + {{ 'labels.inputs.Incorportation Number' | translate }} {{ client.clientNonPersonDetails.incorpNumber || 'Not Provided' }}
- {{"labels.inputs.Main Business Line" | translate}} - {{ client.clientNonPersonDetails.mainBusinessLineId | find:clientTemplate.clientNonPersonMainBusinessLineOptions:'id':'name' }} + {{ 'labels.inputs.Main Business Line' | translate }} + {{ + client.clientNonPersonDetails.mainBusinessLineId + | find: clientTemplate.clientNonPersonMainBusinessLineOptions : 'id' : 'name' + }}
- {{"labels.inputs.Constitution" | translate}} - {{ client.clientNonPersonDetails.constitutionId | find:clientTemplate.clientNonPersonConstitutionOptions:'id':'name'}} + {{ 'labels.inputs.Constitution' | translate }} + {{ + client.clientNonPersonDetails.constitutionId + | find: clientTemplate.clientNonPersonConstitutionOptions : 'id' : 'name' + }}
- {{"labels.inputs.Remarks" | translate}} + {{ 'labels.inputs.Remarks' | translate }} {{ client.clientNonPersonDetails.remarks || 'N/A' }}
-
- -

{{"labels.heading.Family Members" | translate}}

+

{{ 'labels.heading.Family Members' | translate }}

- - - {{ member.firstName }} {{ member.middleName ? member.middleName + ' ' + member.lastName : member.lastName }} - {{member.relationship}} + {{ member.relationship }} -

- {{"labels.inputs.First Name" | translate}} : {{ member.firstName }}
- {{"labels.inputs.Middle Name" | translate}} : {{ member.middleName }}
- {{"labels.inputs.Last Name" | translate}} : {{ member.lastName }}
- {{"labels.inputs.Qualification" | translate}} : {{ member.qualification }}
- {{"labels.inputs.Relationship" | translate}} : {{ member.relationshipId | find:clientTemplate.familyMemberOptions.relationshipIdOptions:'id':'name' }}
- {{"labels.inputs.Age" | translate}} : {{ member.age }}
- {{"labels.inputs.Is Dependent" | translate}} : {{ member.isDependent ? 'Yes' : 'No' }}
- {{"labels.inputs.Marital Status" | translate}} : {{ member.maritalStatusId | find:clientTemplate.familyMemberOptions.maritalStatusIdOptions:'id':'name' }}
- {{"labels.inputs.Gender" | translate}} : {{ member.genderId | find:clientTemplate.familyMemberOptions.genderIdOptions:'id':'name' }}
- {{"labels.inputs.Profession" | translate}} : {{ member.professionId | find:clientTemplate.familyMemberOptions.professionIdOptions:'id':'name' }}
- {{"labels.inputs.Date Of Birth" | translate}} : {{ member.dateOfBirth | dateFormat }}
+ {{ 'labels.inputs.First Name' | translate }} : {{ member.firstName }}
+ {{ 'labels.inputs.Middle Name' | translate }} : {{ member.middleName }}
+ {{ 'labels.inputs.Last Name' | translate }} : {{ member.lastName }}
+ {{ 'labels.inputs.Qualification' | translate }} : {{ member.qualification }}
+ {{ 'labels.inputs.Relationship' | translate }} : + {{ member.relationshipId | find: clientTemplate.familyMemberOptions.relationshipIdOptions : 'id' : 'name' + }}
+ {{ 'labels.inputs.Age' | translate }} : {{ member.age }}
+ {{ 'labels.inputs.Is Dependent' | translate }} : {{ member.isDependent ? 'Yes' : 'No' }}
+ {{ 'labels.inputs.Marital Status' | translate }} : + {{ member.maritalStatusId | find: clientTemplate.familyMemberOptions.maritalStatusIdOptions : 'id' : 'name' + }}
+ {{ 'labels.inputs.Gender' | translate }} : + {{ member.genderId | find: clientTemplate.familyMemberOptions.genderIdOptions : 'id' : 'name' }}
+ {{ 'labels.inputs.Profession' | translate }} : + {{ member.professionId | find: clientTemplate.familyMemberOptions.professionIdOptions : 'id' : 'name' }}
+ {{ 'labels.inputs.Date Of Birth' | translate }} : {{ member.dateOfBirth | dateFormat }}

- - -
-
- -

{{"labels.heading.Address" | translate}}

+
+

{{ 'labels.heading.Address' | translate }}

- - - {{ getSelectedValue('addressTypeIdOptions', address.addressTypeId)?.name }} - {{address.relationship}} + {{ address.relationship }} -

- {{"labels.inputs.Street" | translate}} : {{address.street}}
 - {{"labels.inputs.Address Line" | translate}} 1 : {{address.addressLine1}}
 - {{"labels.inputs.Address Line" | translate}} 2 : {{address.addressLine2}}
 - {{"labels.inputs.Address Line" | translate}} 3 : {{address.addressLine3}}
 - {{"labels.inputs.Town / Village" | translate}} : {{address.townVillage}}
 - {{"labels.inputs.City" | translate}} : {{address.city}}
 - {{"labels.inputs.State / Province" | translate}} : - {{getSelectedValue('stateProvinceIdOptions',address.stateProvinceId)?.name}}
 - {{"labels.inputs.Country" | translate}} : - {{getSelectedValue('countryIdOptions',address.countryId)?.name}}
 - {{"labels.inputs.Postal Code" | translate}} : {{address.postalCode}}
 - {{"labels.inputs.Active Status" | translate}} : {{address.isActive}}
 + {{ 'labels.inputs.Street' | translate }} : {{ address.street }}
 + {{ 'labels.inputs.Address Line' | translate }} 1 : {{ address.addressLine1 }}
 + {{ 'labels.inputs.Address Line' | translate }} 2 : {{ address.addressLine2 }}
 + {{ 'labels.inputs.Address Line' | translate }} 3 : {{ address.addressLine3 }}
 + {{ 'labels.inputs.Town / Village' | translate }} : {{ address.townVillage }}
 + {{ 'labels.inputs.City' | translate }} : {{ address.city }}
 + {{ 'labels.inputs.State / Province' | translate }} : + {{ getSelectedValue('stateProvinceIdOptions', address.stateProvinceId)?.name }}
 + {{ 'labels.inputs.Country' | translate }} : + {{ getSelectedValue('countryIdOptions', address.countryId)?.name }}
 + {{ 'labels.inputs.Postal Code' | translate }} : {{ address.postalCode }}
 + {{ 'labels.inputs.Active Status' | translate }} : {{ address.isActive }}

- - -
-
diff --git a/src/app/clients/clients-view/address-tab/address-tab.component.html b/src/app/clients/clients-view/address-tab/address-tab.component.html index 08796d362..72a60de90 100644 --- a/src/app/clients/clients-view/address-tab/address-tab.component.html +++ b/src/app/clients/clients-view/address-tab/address-tab.component.html @@ -1,52 +1,64 @@
- -

{{"labels.heading.Address" | translate}}

+

{{ 'labels.heading.Address' | translate }}

- - - + - {{address.addressType}} + {{ address.addressType }} - {{address.relationship}} + {{ address.relationship }}
-

- {{"labels.inputs.Street" | translate}} : {{address.street}}
 - {{"labels.inputs.Address Line" | translate}} 1 : {{address.addressLine1}}
 - {{"labels.inputs.Address Line" | translate}} 2 : {{address.addressLine2}}
 - {{"labels.inputs.Address Line" | translate}} 3 : {{address.addressLine3}}
 - {{"labels.inputs.Town / Village" | translate}} : {{address.townVillage}}
 - {{"labels.inputs.City" | translate}} : {{address.city}}
 - {{"labels.inputs.State / Province" | translate}} : - {{getSelectedValue('stateProvinceIdOptions',address.stateProvinceId)?.name}}
 - {{"labels.inputs.Country" | translate}} : - {{getSelectedValue('countryIdOptions',address.countryId)?.name}}
 - {{"labels.inputs.Postal Code" | translate}} : {{address.postalCode}}
 - {{"labels.inputs.Active Status" | translate}} : {{address.isActive}}
 + {{ 'labels.inputs.Street' | translate }} : {{ address.street }}
 + {{ 'labels.inputs.Address Line' | translate }} 1 : {{ address.addressLine1 }}
 + {{ 'labels.inputs.Address Line' | translate }} 2 : {{ address.addressLine2 }}
 + {{ 'labels.inputs.Address Line' | translate }} 3 : {{ address.addressLine3 }}
 + {{ 'labels.inputs.Town / Village' | translate }} : {{ address.townVillage }}
 + {{ 'labels.inputs.City' | translate }} : {{ address.city }}
 + {{ 'labels.inputs.State / Province' | translate }} : + {{ getSelectedValue('stateProvinceIdOptions', address.stateProvinceId)?.name }}
 + {{ 'labels.inputs.Country' | translate }} : {{ getSelectedValue('countryIdOptions', address.countryId)?.name + }}
 + {{ 'labels.inputs.Postal Code' | translate }} : {{ address.postalCode }}
 + {{ 'labels.inputs.Active Status' | translate }} : {{ address.isActive }}

- - -
diff --git a/src/app/clients/clients-view/charges/charges-overview/charges-overview.component.html b/src/app/clients/clients-view/charges/charges-overview/charges-overview.component.html index b21d60c98..2de7bc11f 100644 --- a/src/app/clients/clients-view/charges/charges-overview/charges-overview.component.html +++ b/src/app/clients/clients-view/charges/charges-overview/charges-overview.component.html @@ -1,49 +1,48 @@ -
- -

{{"labels.heading.Charges Overview" | translate}}

+

{{ 'labels.heading.Charges Overview' | translate }}

- - - + + - - + + - - + + - - + + - - + + - - + + - - +
{{"labels.inputs.name" | translate}} - {{chargeOverviewData.name}} {{ 'labels.inputs.name' | translate }} + + {{ chargeOverviewData.name }} + {{"labels.inputs.Due as of" | translate}} {{chargeOverviewData.dueDate | dateFormat}} {{ 'labels.inputs.Due as of' | translate }}{{ chargeOverviewData.dueDate | dateFormat }} {{"labels.inputs.Due" | translate}} {{chargeOverviewData.amount}} {{ 'labels.inputs.Due' | translate }}{{ chargeOverviewData.amount }} {{"labels.inputs.Paid" | translate}} {{chargeOverviewData.amountPaid}} {{ 'labels.inputs.Paid' | translate }}{{ chargeOverviewData.amountPaid }} {{"labels.inputs.Waived" | translate}} {{chargeOverviewData.amountWaived}} {{ 'labels.inputs.Waived' | translate }}{{ chargeOverviewData.amountWaived }} {{"labels.inputs.Outstanding" | translate}} {{chargeOverviewData.amountOutstanding}} {{ 'labels.inputs.Outstanding' | translate }}{{ chargeOverviewData.amountOutstanding }}
-
diff --git a/src/app/clients/clients-view/charges/client-pay-charges/client-pay-charges.component.html b/src/app/clients/clients-view/charges/client-pay-charges/client-pay-charges.component.html index 70052437e..d6feedcfb 100644 --- a/src/app/clients/clients-view/charges/client-pay-charges/client-pay-charges.component.html +++ b/src/app/clients/clients-view/charges/client-pay-charges/client-pay-charges.component.html @@ -1,38 +1,42 @@
- -
-
- - {{"labels.inputs.Amount" | translate}} - + {{ 'labels.inputs.Amount' | translate }} + - {{"labels.inputs.Amount" | translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required" | translate}} + {{ 'labels.inputs.Amount' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} - {{"labels.inputs.Transaction date" | translate}} - + {{ 'labels.inputs.Transaction date' | translate }} + - {{"labels.inputs.Transaction date" | translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required" | translate}} + {{ 'labels.inputs.Transaction date' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} -
- - + +
-
- -
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 3b5d7dc98..511dac8c5 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 @@ -1,115 +1,115 @@
- - - + + {{ chargeData.name }} - - -
-

{{"labels.heading.Transactions" | translate}}

+
+

+ {{ 'labels.heading.Transactions' | translate }} +

- - - + + - - + + - - + + - - + + - - + + - - + - +
{{"labels.inputs.ID" | translate}} {{element.id}} {{ 'labels.inputs.ID' | translate }}{{ element.id }} {{"labels.inputs.Office Name" | translate}} {{element.officeName }} {{ 'labels.inputs.Office Name' | translate }} + {{ element.officeName }} + {{"labels.inputs.Type" | translate}} {{element.type.value}} {{ 'labels.inputs.Type' | translate }} + {{ element.type.value }} + {{"labels.inputs.Transaction Date" | translate}} {{element.date | dateFormat}} {{ 'labels.inputs.Transaction Date' | translate }} + {{ element.date | dateFormat }} + {{"labels.inputs.Amount" | translate}} {{element.amount | formatNumber }} {{ 'labels.inputs.Amount' | translate }} + {{ element.amount | formatNumber }} + {{"labels.inputs.Actions" | translate}} + {{ 'labels.inputs.Actions' | translate }} @@ -117,16 +117,14 @@
-
- - + - -
diff --git a/src/app/clients/clients-view/client-actions/accept-client-transfer/accept-client-transfer.component.html b/src/app/clients/clients-view/client-actions/accept-client-transfer/accept-client-transfer.component.html index 8817b3fd6..24d4f4111 100644 --- a/src/app/clients/clients-view/client-actions/accept-client-transfer/accept-client-transfer.component.html +++ b/src/app/clients/clients-view/client-actions/accept-client-transfer/accept-client-transfer.component.html @@ -1,32 +1,28 @@
- -
- - - {{"labels.inputs.Transfer Date" | translate}} - + {{ 'labels.inputs.Transfer Date' | translate }} + - {{"labels.inputs.Note" | translate}} + {{ 'labels.inputs.Note' | translate }} - - - + + -
- -
diff --git a/src/app/clients/clients-view/client-actions/activate-client/activate-client.component.html b/src/app/clients/clients-view/client-actions/activate-client/activate-client.component.html index 211412e65..e2d3be615 100644 --- a/src/app/clients/clients-view/client-actions/activate-client/activate-client.component.html +++ b/src/app/clients/clients-view/client-actions/activate-client/activate-client.component.html @@ -1,30 +1,34 @@
- -
- - - - {{"labels.inputs.Activated On Date" | translate}} - - - - - {{"labels.inputs.Activated On Date" | translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required" | translate}} - - - + + {{ 'labels.inputs.Activated On Date' | translate }} + + + + + {{ 'labels.inputs.Activated On Date' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} + + - - + + -
- -
diff --git a/src/app/clients/clients-view/client-actions/add-client-charge/add-client-charge.component.html b/src/app/clients/clients-view/client-actions/add-client-charge/add-client-charge.component.html index d12b35dcc..7a79c112b 100644 --- a/src/app/clients/clients-view/client-actions/add-client-charge/add-client-charge.component.html +++ b/src/app/clients/clients-view/client-actions/add-client-charge/add-client-charge.component.html @@ -1,46 +1,45 @@
- -
- -
- {{"labels.inputs.Charge" | translate}} + {{ 'labels.inputs.Charge' | translate }} {{ clientCharge.name + ' (' + clientCharge.currency.name + ')' }} - {{"labels.inputs.Charge" | translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required" | translate}} + {{ 'labels.inputs.Charge' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }}
- - {{"labels.inputs.Amount" | translate}} + {{ 'labels.inputs.Amount' | translate }} - {{"labels.inputs.Amount" | translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required" | translate}} + {{ 'labels.inputs.Amount' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} - {{"labels.inputs.Charge Calculation" | translate}} + {{ 'labels.inputs.Charge Calculation' | translate }} - + {{ chargeCalculation.value }} - {{"labels.inputs.Charge time type" | translate}} + {{ 'labels.inputs.Charge time type' | translate }} {{ chargeTime.value }} @@ -49,45 +48,57 @@ - {{"labels.inputs.Due for collection on" | translate}} - + {{ 'labels.inputs.Due for collection on' | translate }} + - {{"labels.inputs.Due for collection on" | translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required" | translate}} + {{ 'labels.inputs.Due for collection on' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} - {{"labels.inputs.Due On" | translate}} - + {{ 'labels.inputs.Due On' | translate }} + - {{"labels.inputs.Due Date" | translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required" | translate}} + {{ 'labels.inputs.Due Date' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} - {{"labels.inputs.Repeats Every" | translate}} + {{ 'labels.inputs.Repeats Every' | translate }} -
-
- - + + - -
- -
diff --git a/src/app/clients/clients-view/client-actions/add-client-collateral/add-client-collateral.component.html b/src/app/clients/clients-view/client-actions/add-client-collateral/add-client-collateral.component.html index ff344dee0..ce635f39c 100644 --- a/src/app/clients/clients-view/client-actions/add-client-collateral/add-client-collateral.component.html +++ b/src/app/clients/clients-view/client-actions/add-client-collateral/add-client-collateral.component.html @@ -1,82 +1,77 @@
+ +
+ +
+ + {{ 'labels.inputs.Collateral' | translate }} + + + {{ clientCollateral.name }} + + + + {{ 'labels.inputs.Collateral' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} + + - +
+ + {{ 'labels.inputs.name' | translate }} + + - + + {{ 'labels.inputs.Type/Quality' | translate }} + + - + + {{ 'labels.inputs.Unit Type' | translate }} + + -
- - {{"labels.inputs.Collateral" | translate}} - - - {{ clientCollateral.name }} - - - - {{"labels.inputs.Collateral" | translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required" | translate}} - - + + {{ 'labels.inputs.Base Price' | translate }} + + -
+ + {{ 'labels.inputs.Percentage To Base' | translate }} + + - - {{"labels.inputs.name" | translate}} - - + + {{ 'labels.inputs.Quantity' | translate }} + + + {{ 'labels.inputs.Quantity' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} + + - - {{"labels.inputs.Type/Quality" | translate}} - - + + {{ 'labels.inputs.Total' | translate }} + + - - {{"labels.inputs.Unit Type" | translate}} - - - - - {{"labels.inputs.Base Price" | translate}} - - - - - {{"labels.inputs.Percentage To Base" | translate}} - - - - - {{"labels.inputs.Quantity" | translate}} - - - {{"labels.inputs.Quantity" | translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required" | translate}} - - - - - {{"labels.inputs.Total" | translate}} - - - - - {{"labels.inputs.Total Collateral Value" | translate}} - - - -
- -
- - - - - - - - - - - + + {{ 'labels.inputs.Total Collateral Value' | translate }} + + +
+
+
+ + + + + +
diff --git a/src/app/clients/clients-view/client-actions/client-actions.component.html b/src/app/clients/clients-view/client-actions/client-actions.component.html index 8e4dc5c9d..6e04f34c1 100644 --- a/src/app/clients/clients-view/client-actions/client-actions.component.html +++ b/src/app/clients/clients-view/client-actions/client-actions.component.html @@ -15,4 +15,4 @@ - \ No newline at end of file + diff --git a/src/app/clients/clients-view/client-actions/client-assign-staff/client-assign-staff.component.html b/src/app/clients/clients-view/client-actions/client-assign-staff/client-assign-staff.component.html index 995e8c7cb..2524d962b 100644 --- a/src/app/clients/clients-view/client-actions/client-assign-staff/client-assign-staff.component.html +++ b/src/app/clients/clients-view/client-actions/client-assign-staff/client-assign-staff.component.html @@ -1,36 +1,31 @@
- -
- -
- - {{"labels.inputs.Staff" | translate}} + {{ 'labels.inputs.Staff' | translate }} {{ staff.displayName }} - {{"labels.inputs.Staff" | translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required" | translate}} + {{ 'labels.inputs.Staff' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} -
- - - + + -
- -
diff --git a/src/app/clients/clients-view/client-actions/client-screen-reports/client-screen-reports.component.html b/src/app/clients/clients-view/client-actions/client-screen-reports/client-screen-reports.component.html index c57eebfb8..51c7b3ad1 100644 --- a/src/app/clients/clients-view/client-actions/client-screen-reports/client-screen-reports.component.html +++ b/src/app/clients/clients-view/client-actions/client-screen-reports/client-screen-reports.component.html @@ -1,56 +1,46 @@
- -
- -
- - {{"labels.inputs.Client Screen Reports" | translate}} + {{ 'labels.inputs.Client Screen Reports' | translate }} {{ template.name }} - {{"labels.inputs.Screen Report" | translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required" | translate}} + {{ 'labels.inputs.Screen Report' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} -
- - + + {{ 'labels.buttons.Generate Report' | translate }} + -
- -
- -
-

{{"labels.text.Please select a screen report." | translate}}

+

{{ 'labels.text.Please select a screen report.' | translate }}

- -
diff --git a/src/app/clients/clients-view/client-actions/close-client/close-client.component.html b/src/app/clients/clients-view/client-actions/close-client/close-client.component.html index 9952074b9..043e54b24 100644 --- a/src/app/clients/clients-view/client-actions/close-client/close-client.component.html +++ b/src/app/clients/clients-view/client-actions/close-client/close-client.component.html @@ -1,46 +1,49 @@
- -
- -
- - {{"labels.inputs.Closed On Date" | translate}} - + {{ 'labels.inputs.Closed On Date' | translate }} + - {{"labels.inputs.Closed On Date" | translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required" | translate}} + {{ 'labels.inputs.Closed On Date' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} - {{"labels.inputs.Closure Reason" | translate}} + {{ 'labels.inputs.Closure Reason' | translate }} {{ reason.name }} - {{"labels.inputs.Closure Reason" | translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required" | translate}} + {{ 'labels.inputs.Closure Reason' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} -
- - - + + -
- -
diff --git a/src/app/clients/clients-view/client-actions/create-self-service-user/create-self-service-user.component.html b/src/app/clients/clients-view/client-actions/create-self-service-user/create-self-service-user.component.html index 57152f084..f9f054462 100644 --- a/src/app/clients/clients-view/client-actions/create-self-service-user/create-self-service-user.component.html +++ b/src/app/clients/clients-view/client-actions/create-self-service-user/create-self-service-user.component.html @@ -1,123 +1,122 @@
+ +
+ +
+ + {{ 'labels.inputs.User Name' | translate }} + + + {{ 'labels.inputs.User Name' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} + + - + + {{ 'labels.inputs.First Name' | translate }} + + + {{ 'labels.inputs.First Name' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} + + - + + {{ 'labels.inputs.Last Name' | translate }} + + + {{ 'labels.inputs.Last Name' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} + + - + + {{ 'labels.inputs.Email' | translate }} + + + {{ 'labels.inputs.Email' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} + + + {{ 'labels.inputs.Email should be a' | translate }} + {{ 'labels.inputs.valid' | translate }} {{ 'labels.inputs.email' | translate }}. + + -
+ + {{ 'labels.inputs.Auto Generate Password' | translate }} + - - {{"labels.inputs.User Name" | translate}} - - - {{"labels.inputs.User Name" | translate}} {{"labels.commons.is" | translate}} - {{"labels.commons.required" | translate}} - - +
+ + {{ 'labels.inputs.Override Password Expire Policy' | translate }} ? + - - {{"labels.inputs.First Name" | translate}} - - - {{"labels.inputs.First Name" | translate}} {{"labels.commons.is" | translate}} - {{"labels.commons.required" | translate}} - - + +
- - {{"labels.inputs.Last Name" | translate}} - - - {{"labels.inputs.Last Name" | translate}} {{"labels.commons.is" | translate}} - {{"labels.commons.required" | translate}} - - + + {{ 'labels.inputs.Password' | translate }} + + + {{ 'labels.inputs.Password' | translate }} {{ 'labels.commons.is required' | translate }} + + + {{ 'labels.commons.Password should be at least' | translate }} + {{ 'labels.commons.12 characters long' | translate }} + + + {{ 'labels.commons.Password should not be more than' | translate }} + {{ 'labels.commons.50 characters long' | translate }} + + + {{ 'labels.commons.Password should include a' | translate }} + {{ 'labels.commons.numeral' | translate }} {{ 'labels.commons.and at' | translate }} + {{ 'labels.commons.least one uppercase' | translate }} + ,{{ 'labels.commons.lowercase and special character' | translate }} + + - - {{"labels.inputs.Email" | translate}} - - - {{"labels.inputs.Email" | translate}} {{"labels.commons.is" | translate}} - {{"labels.commons.required" | translate}} - - - {{"labels.inputs.Email should be a" | translate}} {{"labels.inputs.valid" | - translate}} {{"labels.inputs.email" | translate}}. - - + + {{ 'labels.inputs.Repeat Password' | translate }} + + + {{ 'labels.inputs.Repeat password' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} + + + {{ 'labels.inputs.Passwords should be' | translate }} + {{ 'labels.inputs.matched' | translate }} + + - - {{"labels.inputs.Auto Generate Password" | translate}} - - -
- - - {{"labels.inputs.Override Password Expire Policy" | translate}} ? - - - - -
- - - {{ 'labels.inputs.Password' | translate }} - - - {{ 'labels.inputs.Password' | translate }} {{'labels.commons.is required' | translate }} - - - {{'labels.commons.Password should be at least' | translate }} {{'labels.commons.12 characters long' | translate }} - - - {{'labels.commons.Password should not be more than' | translate }} - {{'labels.commons.50 characters long' | translate }} - - - {{'labels.commons.Password should include a' | translate }} - {{'labels.commons.numeral' | translate }} {{'labels.commons.and at' | translate }} - {{'labels.commons.least one uppercase' | translate }} - ,{{'labels.commons.lowercase and special character' | translate }} - - - - - {{"labels.inputs.Repeat Password" | translate}} - - - {{"labels.inputs.Repeat password" | translate}} {{"labels.commons.is" | translate}} - {{"labels.commons.required" | translate}} - - - {{"labels.inputs.Passwords should be" | translate}} {{"labels.inputs.matched" | - translate}} - - - - - {{"labels.inputs.Status" | translate}} - - - -
- - - - - - - - - - - - + + {{ 'labels.inputs.Status' | translate }} + + +
+ + + + + +
+ +
diff --git a/src/app/clients/clients-view/client-actions/reactivate-client/reactivate-client.component.html b/src/app/clients/clients-view/client-actions/reactivate-client/reactivate-client.component.html index 629a29561..491b35b01 100644 --- a/src/app/clients/clients-view/client-actions/reactivate-client/reactivate-client.component.html +++ b/src/app/clients/clients-view/client-actions/reactivate-client/reactivate-client.component.html @@ -1,30 +1,34 @@
- -
- - - - {{"labels.inputs.Re Activation On Date" | translate}} - - - - - {{"labels.inputs.Reactivation Date" | translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required" | translate}} - - - + + {{ 'labels.inputs.Re Activation On Date' | translate }} + + + + + {{ 'labels.inputs.Reactivation Date' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} + + - - + + -
- -
diff --git a/src/app/clients/clients-view/client-actions/reject-client-transfer/reject-client-transfer.component.html b/src/app/clients/clients-view/client-actions/reject-client-transfer/reject-client-transfer.component.html index 4df50c527..3ca4abbc5 100644 --- a/src/app/clients/clients-view/client-actions/reject-client-transfer/reject-client-transfer.component.html +++ b/src/app/clients/clients-view/client-actions/reject-client-transfer/reject-client-transfer.component.html @@ -1,32 +1,28 @@
- -
- - - {{"labels.inputs.Transfer Date" | translate}} - + {{ 'labels.inputs.Transfer Date' | translate }} + - {{"labels.inputs.Note" | translate}} + {{ 'labels.inputs.Note' | translate }} - - - + + -
- -
diff --git a/src/app/clients/clients-view/client-actions/reject-client/reject-client.component.html b/src/app/clients/clients-view/client-actions/reject-client/reject-client.component.html index 408a3e10d..9e922b914 100644 --- a/src/app/clients/clients-view/client-actions/reject-client/reject-client.component.html +++ b/src/app/clients/clients-view/client-actions/reject-client/reject-client.component.html @@ -1,46 +1,49 @@
- -
- -
- - {{"labels.inputs.Rejection Date" | translate}} - + {{ 'labels.inputs.Rejection Date' | translate }} + - {{"labels.inputs.Rejection Date" | translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required" | translate}} + {{ 'labels.inputs.Rejection Date' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} - {{"labels.inputs.Rejection Reason" | translate}} + {{ 'labels.inputs.Rejection Reason' | translate }} {{ reason.name }} - {{"labels.inputs.Rejection Reason" | translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required" | translate}} + {{ 'labels.inputs.Rejection Reason' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} -
- - - + + -
- -
diff --git a/src/app/clients/clients-view/client-actions/take-survey/take-survey.component.html b/src/app/clients/clients-view/client-actions/take-survey/take-survey.component.html index fa1ebe3f8..5cbf95cf1 100644 --- a/src/app/clients/clients-view/client-actions/take-survey/take-survey.component.html +++ b/src/app/clients/clients-view/client-actions/take-survey/take-survey.component.html @@ -1,60 +1,53 @@
-
-
- - {{"labels.inputs.Survey Name" | translate}} + {{ 'labels.inputs.Survey Name' | translate }} - {{surveyData.name}} + {{ surveyData.name }} -
-
+
- - -

component[0].componentKey

+

component[0].componentKey

- -
- - {{question.text}} + {{ question.text }} - - + - {{options.text}} + {{ options.text }} - -
-
{{"labels.text.Your answer is" | translate}}: {{question.answer.text}}
- +
+ {{ 'labels.text.Your answer is' | translate }}: {{ question.answer.text }} +
-
- -
- - - + +
-
diff --git a/src/app/clients/clients-view/client-actions/transfer-client/transfer-client.component.html b/src/app/clients/clients-view/client-actions/transfer-client/transfer-client.component.html index a91860a1d..ab8d8d411 100644 --- a/src/app/clients/clients-view/client-actions/transfer-client/transfer-client.component.html +++ b/src/app/clients/clients-view/client-actions/transfer-client/transfer-client.component.html @@ -1,51 +1,54 @@
- -
- -
- - {{"labels.inputs.Office" | translate}} + {{ 'labels.inputs.Office' | translate }} {{ office.name }} - {{"labels.inputs.Office" | translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required" | translate}} + {{ 'labels.inputs.Office' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} - {{"labels.inputs.Transfer Date" | translate}} - + {{ 'labels.inputs.Transfer Date' | translate }} + - {{"labels.inputs.Transfer Date" | translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required" | translate}} + {{ 'labels.inputs.Transfer Date' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} - {{"labels.inputs.Note" | translate}} + {{ 'labels.inputs.Note' | translate }} -
- - - + + -
- -
diff --git a/src/app/clients/clients-view/client-actions/undo-client-rejection/undo-client-rejection.component.html b/src/app/clients/clients-view/client-actions/undo-client-rejection/undo-client-rejection.component.html index 78a25d6cf..7bf854daa 100644 --- a/src/app/clients/clients-view/client-actions/undo-client-rejection/undo-client-rejection.component.html +++ b/src/app/clients/clients-view/client-actions/undo-client-rejection/undo-client-rejection.component.html @@ -1,30 +1,34 @@
- -
- - - - {{"labels.inputs.Reopened On Date" | translate}} - - - - - {{"labels.inputs.Reopened On Date" | translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required" | translate}} - - - + + {{ 'labels.inputs.Reopened On Date' | translate }} + + + + + {{ 'labels.inputs.Reopened On Date' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} + + - - + + -
- -
diff --git a/src/app/clients/clients-view/client-actions/undo-client-transfer/undo-client-transfer.component.html b/src/app/clients/clients-view/client-actions/undo-client-transfer/undo-client-transfer.component.html index ee689bab4..abf22453e 100644 --- a/src/app/clients/clients-view/client-actions/undo-client-transfer/undo-client-transfer.component.html +++ b/src/app/clients/clients-view/client-actions/undo-client-transfer/undo-client-transfer.component.html @@ -1,32 +1,28 @@
- -
- - - {{"labels.inputs.Transfer Date" | translate}} - + {{ 'labels.inputs.Transfer Date' | translate }} + - {{"labels.inputs.Note" | translate}} + {{ 'labels.inputs.Note' | translate }} - - - + + -
- -
diff --git a/src/app/clients/clients-view/client-actions/update-client-savings-account/update-client-savings-account.component.html b/src/app/clients/clients-view/client-actions/update-client-savings-account/update-client-savings-account.component.html index 9f43c8f8d..6140327f3 100644 --- a/src/app/clients/clients-view/client-actions/update-client-savings-account/update-client-savings-account.component.html +++ b/src/app/clients/clients-view/client-actions/update-client-savings-account/update-client-savings-account.component.html @@ -1,36 +1,31 @@
- -
- -
- - {{"labels.inputs.Default Savings Account" | translate}} + {{ 'labels.inputs.Default Savings Account' | translate }} {{ account.accountNo }} - {{"labels.inputs.Account" | translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required" | translate}} + {{ 'labels.inputs.Account' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} -
- - - + + -
- -
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 ca7f45f6e..34c3d89c6 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 @@ -1,51 +1,46 @@
-
-
- {{'labels.inputs.Filter' | translate}} - + {{ 'labels.inputs.Filter' | translate }} +
- - - - + + - - + + - - + + - - + + - - +
{{"labels.inputs.Survey" | translate}} {{ survey.surveyName }} {{ 'labels.inputs.Survey' | translate }}{{ survey.surveyName }} {{"labels.inputs.Created By" | translate}} {{ survey.createdBy }} + {{ 'labels.inputs.Created By' | translate }} + {{ survey.createdBy }} {{"labels.inputs.DateTime" | translate}} {{ survey.date | datetimeFormat }} {{ 'labels.inputs.DateTime' | translate }}{{ survey.date | datetimeFormat }} {{"labels.inputs.Score" | translate}} {{ survey.score | formatNumber }} {{ 'labels.inputs.Score' | translate }}{{ survey.score | formatNumber }}
-
-
diff --git a/src/app/clients/clients-view/client-actions/withdraw-client/withdraw-client.component.html b/src/app/clients/clients-view/client-actions/withdraw-client/withdraw-client.component.html index 32218f0b9..f4ccd3d76 100644 --- a/src/app/clients/clients-view/client-actions/withdraw-client/withdraw-client.component.html +++ b/src/app/clients/clients-view/client-actions/withdraw-client/withdraw-client.component.html @@ -1,46 +1,49 @@
- -
- -
- - {{"labels.inputs.Withdrawal Date" | translate}} - + {{ 'labels.inputs.Withdrawal Date' | translate }} + - {{"labels.inputs.Withdrawal Date" | translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required" | translate}} + {{ 'labels.inputs.Withdrawal Date' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} - {{"labels.inputs.Withdrawal Reason" | translate}} + {{ 'labels.inputs.Withdrawal Reason' | translate }} {{ reason.name }} - {{"labels.inputs.Withdrawal Reason" | translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required" | translate}} + {{ 'labels.inputs.Withdrawal Reason' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} -
- - - + + -
- -
diff --git a/src/app/clients/clients-view/clients-view.component.html b/src/app/clients/clients-view/clients-view.component.html index ab4eb0b4a..406f78636 100644 --- a/src/app/clients/clients-view/clients-view.component.html +++ b/src/app/clients/clients-view/clients-view.component.html @@ -1,39 +1,57 @@
@@ -107,28 +159,28 @@ - {{"labels.buttons.Edit" | translate}} + {{ 'labels.buttons.Edit' | translate }} @@ -136,110 +188,213 @@ - {{"labels.buttons.Unassign Staff" | translate}} + {{ 'labels.buttons.Unassign Staff' | translate }} - - + - - - - - + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + - + - - - - diff --git a/src/app/clients/clients-view/custom-dialogs/capture-image-dialog/capture-image-dialog.component.html b/src/app/clients/clients-view/custom-dialogs/capture-image-dialog/capture-image-dialog.component.html index 1bfbe2c8c..6c7b94d32 100644 --- a/src/app/clients/clients-view/custom-dialogs/capture-image-dialog/capture-image-dialog.component.html +++ b/src/app/clients/clients-view/custom-dialogs/capture-image-dialog/capture-image-dialog.component.html @@ -1,27 +1,27 @@
- -

{{"labels.heading.Capture Client Image" | translate}}

+

{{ 'labels.heading.Capture Client Image' | translate }}

- + -

+

- - + + -
diff --git a/src/app/clients/clients-view/custom-dialogs/delete-signature-dialog/delete-signature-dialog.component.html b/src/app/clients/clients-view/custom-dialogs/delete-signature-dialog/delete-signature-dialog.component.html index ced45541e..816aba1b4 100644 --- a/src/app/clients/clients-view/custom-dialogs/delete-signature-dialog/delete-signature-dialog.component.html +++ b/src/app/clients/clients-view/custom-dialogs/delete-signature-dialog/delete-signature-dialog.component.html @@ -1,15 +1,19 @@ -

{{"labels.heading.Delete Client Signature" | translate}}

+

{{ 'labels.heading.Delete Client Signature' | translate }}

-

{{"labels.text.Delete clients signature" | translate}} ?

+

{{ 'labels.text.Delete clients signature' | translate }} ?

-

{{"labels.text.Client Signature is not provided." | translate}}

+

{{ 'labels.text.Client Signature is not provided.' | translate }}

- - - + + + diff --git a/src/app/clients/clients-view/custom-dialogs/edit-notes-dialog/edit-notes-dialog.component.html b/src/app/clients/clients-view/custom-dialogs/edit-notes-dialog/edit-notes-dialog.component.html index 1c31e6fb7..f8cfed30b 100644 --- a/src/app/clients/clients-view/custom-dialogs/edit-notes-dialog/edit-notes-dialog.component.html +++ b/src/app/clients/clients-view/custom-dialogs/edit-notes-dialog/edit-notes-dialog.component.html @@ -1,13 +1,19 @@ -

{{"labels.heading.Edit Note" | translate}}

+

{{ 'labels.heading.Edit Note' | translate }}

- - + +
diff --git a/src/app/clients/clients-view/custom-dialogs/unassign-staff-dialog/unassign-staff-dialog.component.html b/src/app/clients/clients-view/custom-dialogs/unassign-staff-dialog/unassign-staff-dialog.component.html index 4f1c30fdd..dc6bb4296 100644 --- a/src/app/clients/clients-view/custom-dialogs/unassign-staff-dialog/unassign-staff-dialog.component.html +++ b/src/app/clients/clients-view/custom-dialogs/unassign-staff-dialog/unassign-staff-dialog.component.html @@ -1,8 +1,10 @@ -

{{"labels.heading.Unassign Staff" | translate}}

+

{{ 'labels.heading.Unassign Staff' | translate }}

-

{{"labels.text.Unassign Staff client" | translate}} ?

+

{{ 'labels.text.Unassign Staff client' | translate }} ?

- - + + diff --git a/src/app/clients/clients-view/custom-dialogs/upload-document-dialog/upload-document-dialog.component.html b/src/app/clients/clients-view/custom-dialogs/upload-document-dialog/upload-document-dialog.component.html index ca69e04d9..a6493d3ed 100644 --- a/src/app/clients/clients-view/custom-dialogs/upload-document-dialog/upload-document-dialog.component.html +++ b/src/app/clients/clients-view/custom-dialogs/upload-document-dialog/upload-document-dialog.component.html @@ -1,27 +1,34 @@ -

{{"labels.heading.Upload" | translate}} {{ entityType }} {{"labels.heading.Documents" | translate}}

+

+ {{ 'labels.heading.Upload' | translate }} {{ entityType }} {{ 'labels.heading.Documents' | translate }} +

- - {{"labels.inputs.File Name" | translate}} + {{ 'labels.inputs.File Name' | translate }} - {{"labels.inputs.File Name" | translate}} {{'labels.commons.is' | translate}} {{'labels.commons.required' | translate}} + {{ 'labels.inputs.File Name' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} - {{"labels.inputs.Description" | translate}} + {{ 'labels.inputs.Description' | translate }} - - + + -
diff --git a/src/app/clients/clients-view/custom-dialogs/upload-image-dialog/upload-image-dialog.component.html b/src/app/clients/clients-view/custom-dialogs/upload-image-dialog/upload-image-dialog.component.html index 0aa37ad5c..b853e17b1 100644 --- a/src/app/clients/clients-view/custom-dialogs/upload-image-dialog/upload-image-dialog.component.html +++ b/src/app/clients/clients-view/custom-dialogs/upload-image-dialog/upload-image-dialog.component.html @@ -1,12 +1,12 @@ -

{{"labels.heading.Upload Client Image" | translate}}

+

{{ 'labels.heading.Upload Client Image' | translate }}

- - - + + -
diff --git a/src/app/clients/clients-view/custom-dialogs/upload-signature-dialog/upload-signature-dialog.component.html b/src/app/clients/clients-view/custom-dialogs/upload-signature-dialog/upload-signature-dialog.component.html index 7546e56cc..93e3f9d8f 100644 --- a/src/app/clients/clients-view/custom-dialogs/upload-signature-dialog/upload-signature-dialog.component.html +++ b/src/app/clients/clients-view/custom-dialogs/upload-signature-dialog/upload-signature-dialog.component.html @@ -1,12 +1,12 @@ -

{{"labels.heading.Upload Client Signature" | translate}}

+

{{ 'labels.heading.Upload Client Signature' | translate }}

- - - + + -
diff --git a/src/app/clients/clients-view/custom-dialogs/view-signature-dialog/view-signature-dialog.component.html b/src/app/clients/clients-view/custom-dialogs/view-signature-dialog/view-signature-dialog.component.html index d0b595311..add202276 100644 --- a/src/app/clients/clients-view/custom-dialogs/view-signature-dialog/view-signature-dialog.component.html +++ b/src/app/clients/clients-view/custom-dialogs/view-signature-dialog/view-signature-dialog.component.html @@ -1,15 +1,19 @@ -

{{"labels.heading.View Client Signature" | translate}}

+

{{ 'labels.heading.View Client Signature' | translate }}

- Signature + Signature
-

{{"labels.text.Client Signature is not provided." | translate}}

+

{{ 'labels.text.Client Signature is not provided.' | translate }}

- - - + + + diff --git a/src/app/clients/clients-view/documents-tab/documents-tab.component.html b/src/app/clients/clients-view/documents-tab/documents-tab.component.html index 8c0dd9b62..1be9a0313 100644 --- a/src/app/clients/clients-view/documents-tab/documents-tab.component.html +++ b/src/app/clients/clients-view/documents-tab/documents-tab.component.html @@ -1,4 +1,6 @@ - -
-
- - {{"labels.inputs.First Name" | translate}} + {{ 'labels.inputs.First Name' | translate }} - {{"labels.inputs.First Name" | translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required" | translate}} + {{ 'labels.inputs.First Name' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} - {{"labels.inputs.Middle Name" | translate}} + {{ 'labels.inputs.Middle Name' | translate }} - {{"labels.inputs.Last Name" | translate}} + {{ 'labels.inputs.Last Name' | translate }} - {{"labels.inputs.Last Name" | translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required" | translate}} + {{ 'labels.inputs.Last Name' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} - {{"labels.inputs.Qualification" | translate}} + {{ 'labels.inputs.Qualification' | translate }} - {{"labels.inputs.Age" | translate}} + {{ 'labels.inputs.Age' | translate }} - {{"labels.inputs.Age" | translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required and cannot be negative" | translate}} + {{ 'labels.inputs.Age' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required and cannot be negative' | translate }} - {{"labels.inputs.Is Dependent" | translate}}? + {{ 'labels.inputs.Is Dependent' | translate }}? - {{"labels.inputs.Relationship" | translate}} + {{ 'labels.inputs.Relationship' | translate }} - {{ relation.name | translateKey:'catalogs' }} + {{ relation.name | translateKey: 'catalogs' }} - {{"labels.inputs.Relationship" | translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required" | translate}} + {{ 'labels.inputs.Relationship' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} - {{"labels.inputs.Gender" | translate}} + {{ 'labels.inputs.Gender' | translate }} - {{ gender.name | translateKey:'catalogs' }} + {{ gender.name | translateKey: 'catalogs' }} - {{"labels.inputs.Gender" | translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required" | translate}} + {{ 'labels.inputs.Gender' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} - {{"labels.inputs.Profession" | translate}} + {{ 'labels.inputs.Profession' | translate }} - {{ profession.name | translateKey:'catalogs' }} + {{ profession.name | translateKey: 'catalogs' }} - {{"labels.inputs.Marital Status" | translate}} + {{ 'labels.inputs.Marital Status' | translate }} - - {{ maritalStatus.name | translateKey:'catalogs'}} + + {{ maritalStatus.name | translateKey: 'catalogs' }} - - {{"labels.inputs.Date Of Birth" | translate}} - + {{ 'labels.inputs.Date Of Birth' | translate }} + - {{"labels.inputs.Date Of Birth" | translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required" | translate}} + {{ 'labels.inputs.Date Of Birth' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} -
- - + +
-
-
diff --git a/src/app/clients/clients-view/family-members-tab/edit-family-member/edit-family-member.component.html b/src/app/clients/clients-view/family-members-tab/edit-family-member/edit-family-member.component.html index 38cdcb799..2339699cd 100644 --- a/src/app/clients/clients-view/family-members-tab/edit-family-member/edit-family-member.component.html +++ b/src/app/clients/clients-view/family-members-tab/edit-family-member/edit-family-member.component.html @@ -1,108 +1,118 @@
-
-
- - {{"labels.inputs.First Name" | translate}} + {{ 'labels.inputs.First Name' | translate }} - {{"labels.inputs.First Name" | translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required" | translate}} + {{ 'labels.inputs.First Name' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} - {{"labels.inputs.Middle Name" | translate}} + {{ 'labels.inputs.Middle Name' | translate }} - {{"labels.inputs.Last Name" | translate}} + {{ 'labels.inputs.Last Name' | translate }} - {{"labels.inputs.Last Name" | translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required" | translate}} + {{ 'labels.inputs.Last Name' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} - {{"labels.inputs.Qualification" | translate}} + {{ 'labels.inputs.Qualification' | translate }} - {{"labels.inputs.Age" | translate}} + {{ 'labels.inputs.Age' | translate }} - {{"labels.inputs.Age" | translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required and cannot be negative" | translate}} + {{ 'labels.inputs.Age' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required and cannot be negative' | translate }} - Is Dependent? + Is Dependent? - {{"labels.inputs.Relationship" | translate}} + {{ 'labels.inputs.Relationship' | translate }} - {{ relation.name | translateKey:'catalogs'}} + {{ relation.name | translateKey: 'catalogs' }} - {{"labels.inputs.Relationship" | translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required" | translate}} + {{ 'labels.inputs.Relationship' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} - {{"labels.inputs.Gender" | translate}} + {{ 'labels.inputs.Gender' | translate }} - {{ gender.name | translateKey:'catalogs'}} + {{ gender.name | translateKey: 'catalogs' }} - {{"labels.inputs.Gender" | translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required" | translate}} + {{ 'labels.inputs.Gender' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} - {{"labels.inputs.Profession" | translate}} + {{ 'labels.inputs.Profession' | translate }} - {{ profession.name | translateKey:'catalogs'}} + {{ profession.name | translateKey: 'catalogs' }} - {{"labels.inputs.Marital Status" | translate}} + {{ 'labels.inputs.Marital Status' | translate }} - - {{ maritalStatus.name | translateKey:'catalogs'}} + + {{ maritalStatus.name | translateKey: 'catalogs' }} - - {{"labels.inputs.Date Of Birth" | translate}} - + {{ 'labels.inputs.Date Of Birth' | translate }} + - {{"labels.inputs.Date Of Birth" | translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required" | translate}} + {{ 'labels.inputs.Date Of Birth' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} -
- - + +
-
-
diff --git a/src/app/clients/clients-view/family-members-tab/family-members-tab.component.html b/src/app/clients/clients-view/family-members-tab/family-members-tab.component.html index 89041aa9d..8c4edfca9 100644 --- a/src/app/clients/clients-view/family-members-tab/family-members-tab.component.html +++ b/src/app/clients/clients-view/family-members-tab/family-members-tab.component.html @@ -1,25 +1,21 @@
- - -

{{"labels.heading.Family Members" | translate}}

+

{{ 'labels.heading.Family Members' | translate }}

- - - + - {{displayName(member)}} + {{ displayName(member) }} - {{member.relationship}} + {{ member.relationship }} @@ -27,31 +23,43 @@
-

- {{"labels.inputs.First Name" | translate}} : {{member.firstName}}
 - {{"labels.inputs.Middle Name" | translate}} : {{member.middleName}}
 - {{"labels.inputs.Last Name" | translate}} : {{member.lastName}}
 - {{"labels.inputs.Qualification" | translate}} : {{member.qualification}}
 - {{"labels.inputs.Mobile Number" | translate}} : {{member.mobileNumber}}
 - {{"labels.inputs.Age" | translate}} : {{member.age}}
 - {{"labels.inputs.Is Dependent" | translate}} : {{member.isDependent | yesNo}}
 - {{"labels.inputs.Marital Status" | translate}} : {{member.maritalStatus}}
 - {{"labels.inputs.Gender" | translate}} : {{member.gender}}
 - {{"labels.inputs.Profession" | translate}} : {{member.profession}}
 - {{"labels.inputs.Date Of Birth" | translate}} : {{member.dateOfBirth | dateFormat}}
 + {{ 'labels.inputs.First Name' | translate }} : {{ member.firstName }}
 + {{ 'labels.inputs.Middle Name' | translate }} : {{ member.middleName }}
 + {{ 'labels.inputs.Last Name' | translate }} : {{ member.lastName }}
 + {{ 'labels.inputs.Qualification' | translate }} : {{ member.qualification }}
 + {{ 'labels.inputs.Mobile Number' | translate }} : {{ member.mobileNumber }}
 + {{ 'labels.inputs.Age' | translate }} : {{ member.age }}
 + {{ 'labels.inputs.Is Dependent' | translate }} : {{ member.isDependent | yesNo }}
 + {{ 'labels.inputs.Marital Status' | translate }} : {{ member.maritalStatus }}
 + {{ 'labels.inputs.Gender' | translate }} : {{ member.gender }}
 + {{ 'labels.inputs.Profession' | translate }} : {{ member.profession }}
 + {{ 'labels.inputs.Date Of Birth' | translate }} : {{ member.dateOfBirth | dateFormat }}

- - - -
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 a645c47c1..e093ba34f 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 @@ -1,21 +1,21 @@
- -

{{"labels.heading.Performance History" | translate}}

+

{{ 'labels.heading.Performance History' | translate }}

@@ -27,481 +27,618 @@
-

{{"labels.heading.Upcoming Charges" | translate}}

+

{{ 'labels.heading.Upcoming Charges' | translate }}

- +

- {{"labels.inputs.No. Of Loan Cycles" | translate}} :{{clientSummary?.loanCycle}}
- {{"labels.inputs.No. of Active Loans" | translate}} :{{clientSummary?.activeLoans}}
- {{"labels.inputs.Last Loan Amount" | translate}} :{{clientSummary?.lastLoanAmount | formatNumber}}
+ {{ 'labels.inputs.No. Of Loan Cycles' | translate }} :{{ clientSummary?.loanCycle }}
+ {{ 'labels.inputs.No. of Active Loans' | translate }} :{{ clientSummary?.activeLoans }}
+ {{ 'labels.inputs.Last Loan Amount' | translate }} :{{ clientSummary?.lastLoanAmount | formatNumber }} +

- {{"labels.inputs.No. of Active Savings" | translate}} :{{clientSummary?.activeSavings}}
- {{"labels.inputs.Total Savings" | translate}} :{{clientSummary?.totalSavings | formatNumber}}
+ {{ 'labels.inputs.No. of Active Savings' | translate }} :{{ clientSummary?.activeSavings }}
+ {{ 'labels.inputs.Total Savings' | translate }} :{{ clientSummary?.totalSavings | formatNumber }}

- - - + + - - + + - - + + - - + + - - + + - - + + - + - - - +
{{"labels.inputs.name" | translate}} - {{element.name}} {{ 'labels.inputs.name' | translate }} + {{ element.name }} + {{"labels.inputs.Due as of" | translate}} {{element.dueDate | dateFormat}} {{ 'labels.inputs.Due as of' | translate }}{{ element.dueDate | dateFormat }} {{"labels.inputs.Due" | translate}} {{element.amount | formatNumber}} {{ 'labels.inputs.Due' | translate }}{{ element.amount | formatNumber }} {{"labels.inputs.Paid" | translate}} {{element.amountPaid | formatNumber}} {{ 'labels.inputs.Paid' | translate }}{{ element.amountPaid | formatNumber }} {{"labels.inputs.Waived" | translate}} {{element.amountWaived | formatNumber}} {{ 'labels.inputs.Waived' | translate }}{{ element.amountWaived | formatNumber }} {{"labels.inputs.Outstanding" | translate}} {{element.amountOutstanding | formatNumber}} {{ 'labels.inputs.Outstanding' | translate }}{{ element.amountOutstanding | formatNumber }} {{"labels.inputs.Actions" | translate}} {{ 'labels.inputs.Actions' | translate }} - -
-

{{"labels.heading.Loan Accounts" | translate}}

+

{{ 'labels.heading.Loan Accounts' | translate }}

-
- - +
- - + - - + - - + + - - + + - - + + - + - + - - +
{{"labels.inputs.Account No" | translate}} - + {{ 'labels.inputs.Account No' | translate }} + + {{"labels.inputs.Loan Product" | translate}} - + {{ 'labels.inputs.Loan Product' | translate }} + {{"labels.inputs.Original Loan" | translate}} {{element.originalLoan}} {{ 'labels.inputs.Original Loan' | translate }}{{ element.originalLoan }} {{"labels.inputs.Loan Balance" | translate}} {{element.loanBalance | formatNumber}} {{ 'labels.inputs.Loan Balance' | translate }}{{ element.loanBalance | formatNumber }} {{"labels.inputs.Amount Paid" | translate}} {{element.amountPaid | formatNumber}} {{ 'labels.inputs.Amount Paid' | translate }}{{ element.amountPaid | formatNumber }} {{"labels.inputs.Type" | translate}} {{ 'labels.inputs.Type' | translate }} - + {{"labels.inputs.Actions" | translate}}{{ 'labels.inputs.Actions' | translate }} - - - - +
- - +
- - + - - + - - + + - - + + - - + + - + - - + + - - +
{{"labels.inputs.Account No" | translate}} - + {{ 'labels.inputs.Account No' | translate }} + + {{"labels.inputs.Loan Product" | translate}} - + {{ 'labels.inputs.Loan Product' | translate }} + {{"labels.inputs.Original Loan" | translate}} {{element.lastActiveTransactionDate | dateFormat}} {{ 'labels.inputs.Original Loan' | translate }}{{ element.lastActiveTransactionDate | dateFormat }} {{"labels.inputs.Loan Balance" | translate}} {{element.loanBalance | formatNumber}} {{ 'labels.inputs.Loan Balance' | translate }}{{ element.loanBalance | formatNumber }} {{"labels.inputs.Amount Paid" | translate}} {{element.accountBalance | formatNumber}} {{ 'labels.inputs.Amount Paid' | translate }}{{ element.accountBalance | formatNumber }} {{"labels.inputs.Type" | translate}} {{ 'labels.inputs.Type' | translate }} - + {{"labels.inputs.Closed Date" | translate}} {{element.timeline.closedOnDate | dateFormat}}{{ 'labels.inputs.Closed Date' | translate }}{{ element.timeline.closedOnDate | dateFormat }}
-

{{"labels.heading.Saving Accounts" | translate}}

+

{{ 'labels.heading.Saving Accounts' | translate }}

-
- - +
- - + - - + - - + + - - + + - + - - +
{{"labels.inputs.Account No" | translate}} - + {{ 'labels.inputs.Account No' | translate }} + + {{"labels.inputs.Savings Product" | translate}} - + {{ 'labels.inputs.Savings Product' | translate }} + {{"labels.inputs.Last Active" | translate}} {{element.lastActiveTransactionDate | dateFormat}} {{ 'labels.inputs.Last Active' | translate }}{{ element.lastActiveTransactionDate | dateFormat }} {{"labels.inputs.Balance" | translate}} {{element.accountBalance | formatNumber}} {{ 'labels.inputs.Balance' | translate }}{{ element.accountBalance | formatNumber }} {{"labels.inputs.Actions" | translate}} {{ 'labels.inputs.Actions' | translate }} - - - - -
- - +
- - + - - + - - + + - - +
{{"labels.inputs.Account No" | translate}} - + {{ 'labels.inputs.Account No' | translate }} + + {{"labels.inputs.Saving Product" | translate}} - + {{ 'labels.inputs.Saving Product' | translate }} + {{"labels.inputs.Closed Date" | translate}} {{element.timeline.closedOnDate | dateFormat}}{{ 'labels.inputs.Closed Date' | translate }}{{ element.timeline.closedOnDate | dateFormat }}
-

{{"labels.heading.Fixed Deposit Accounts" | translate}}

+

{{ 'labels.heading.Fixed Deposit Accounts' | translate }}

-
- - +
- - + - - + + - - + + - - + + - + - - +
{{"labels.inputs.Account No" | translate}} - + {{ 'labels.inputs.Account No' | translate }} + + {{"labels.inputs.Fixed Deposit Product" | translate}} {{element.productName}} {{ 'labels.inputs.Fixed Deposit Product' | translate }}{{ element.productName }} {{"labels.inputs.Last Active" | translate}} {{element.lastActiveTransactionDate | dateFormat}} {{ 'labels.inputs.Last Active' | translate }}{{ element.lastActiveTransactionDate | dateFormat }} {{"labels.inputs.Balance" | translate}} {{element.accountBalance | formatNumber}} {{ 'labels.inputs.Balance' | translate }}{{ element.accountBalance | formatNumber }} {{"labels.inputs.Actions" | translate}} {{ 'labels.inputs.Actions' | translate }} - - -
- - +
- - + - - + - - + + - - +
{{"labels.inputs.Account No" | translate}} - + {{ 'labels.inputs.Account No' | translate }} + + {{"labels.inputs.Fixed Deposit Product" | translate}} - + {{ 'labels.inputs.Fixed Deposit Product' | translate }} + {{"labels.inputs.Closed Date" | translate}} {{element.timeline.closedOnDate | dateFormat}}{{ 'labels.inputs.Closed Date' | translate }}{{ element.timeline.closedOnDate | dateFormat }}
-

{{"labels.heading.Recurring Deposit Accounts" | translate}}

+

{{ 'labels.heading.Recurring Deposit Accounts' | translate }}

-
- - +
- - + - - + - - + + - - + + - + - - +
{{"labels.inputs.Account No" | translate}} - + {{ 'labels.inputs.Account No' | translate }} + + {{"labels.inputs.Recurring Deposit Product" | translate}} - + {{ 'labels.inputs.Recurring Deposit Product' | translate }} + {{"labels.inputs.Last Active" | translate}} {{element.lastActiveTransactionDate | dateFormat}} {{ 'labels.inputs.Last Active' | translate }}{{ element.lastActiveTransactionDate | dateFormat }} {{"labels.inputs.Balance" | translate}} {{element.accountBalance | formatNumber}} {{ 'labels.inputs.Balance' | translate }}{{ element.accountBalance | formatNumber }} {{"labels.inputs.Actions" | translate}} {{ 'labels.inputs.Actions' | translate }} - - @@ -509,188 +646,226 @@
- - +
- - + - - + - - + + - +
{{"labels.inputs.Account No" | translate}} - + {{ 'labels.inputs.Account No' | translate }} + + {{"labels.inputs.Recurring Deposit Product" | translate}} - + {{ 'labels.inputs.Recurring Deposit Product' | translate }} + {{"labels.inputs.Closed Date" | translate}} {{element.timeline.closedOnDate | dateFormat}}{{ 'labels.inputs.Closed Date' | translate }}{{ element.timeline.closedOnDate | dateFormat }}
-

{{"labels.inputs.Shares Accounts" | translate}}

+

{{ 'labels.inputs.Shares Accounts' | translate }}

-
- - +
- - + - - + - - + + - - + + - + - - +
{{"labels.inputs.Account No" | translate}} - + {{ 'labels.inputs.Account No' | translate }} + + {{"labels.inputs.Share Product" | translate}} - + {{ 'labels.inputs.Share Product' | translate }} + {{"labels.inputs.Approved Shares" | translate}} {{element.totalApprovedShares}} {{ 'labels.inputs.Approved Shares' | translate }}{{ element.totalApprovedShares }} {{"labels.inputs.Pending For Approval Shares" | translate}} {{element.totalPendingForApprovalShares}} {{ 'labels.inputs.Pending For Approval Shares' | translate }}{{ element.totalPendingForApprovalShares }} {{"labels.inputs.Actions" | translate}} {{ 'labels.inputs.Actions' | translate }} - - -
- - +
- - + - - + + - - + + - - + + - - + + - - +
{{"labels.inputs.Account No" | translate}} - + {{ 'labels.inputs.Account No' | translate }} + + {{"labels.inputs.Share Product" | translate}} {{element.productName}} {{ 'labels.inputs.Share Product' | translate }}{{ element.productName }} {{"labels.inputs.Approved Shares" | translate}} {{element.totalApprovedShares}} {{ 'labels.inputs.Approved Shares' | translate }}{{ element.totalApprovedShares }} {{"labels.inputs.Pending For Approval Shares" | translate}} {{element.totalPendingForApprovalShares}} {{ 'labels.inputs.Pending For Approval Shares' | translate }}{{ element.totalPendingForApprovalShares }} {{"labels.inputs.Closed Date" | translate}} {{element.timeline.closedOnDate | dateFormat}}{{ 'labels.inputs.Closed Date' | translate }}{{ element.timeline.closedOnDate | dateFormat }}
-

{{"labels.heading.Collateral Data" | translate}}

+

{{ 'labels.heading.Collateral Data' | translate }}

- - + - + - + - - + + - - + + - - +
{{"labels.inputs.ID" | translate}}{{ 'labels.inputs.ID' | translate }} {{ element.collateralId }} {{"labels.inputs.name" | translate}}{{ 'labels.inputs.name' | translate }} {{ element.name }} {{"labels.inputs.Quantity" | translate}}{{ 'labels.inputs.Quantity' | translate }} {{ element.quantity | formatNumber }} {{"labels.inputs.Total Value" | translate}}{{ element.basePrice*element.quantity | formatNumber}}{{ 'labels.inputs.Total Value' | translate }} + {{ element.basePrice * element.quantity | formatNumber }} + {{"labels.inputs.Total Collateral Value" | translate}}{{ element.pctToBase*element.basePrice*element.quantity/100 | formatNumber}} + {{ 'labels.inputs.Total Collateral Value' | translate }} + + {{ (element.pctToBase * element.basePrice * element.quantity) / 100 | formatNumber }} +
-
diff --git a/src/app/clients/clients-view/identities-tab/identities-tab.component.html b/src/app/clients/clients-view/identities-tab/identities-tab.component.html index ddf82d470..ac32dfede 100644 --- a/src/app/clients/clients-view/identities-tab/identities-tab.component.html +++ b/src/app/clients/clients-view/identities-tab/identities-tab.component.html @@ -1,65 +1,83 @@
+

{{ 'labels.heading.Identities' | translate }}

-

{{"labels.heading.Identities" | translate}}

+ - + + + + + -
{{ 'labels.inputs.Id' | translate }}{{ identity.id }}
+ + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - - - - - - - - - - - - - - -
{{ 'labels.inputs.Type' | translate }}{{ identity.documentType.name }} {{"labels.inputs.Id" | translate}} {{identity.id}}{{ 'labels.inputs.Document Key' | translate }}{{ identity.documentKey }} {{"labels.inputs.Type" | translate}} {{identity.documentType.name}}{{ 'labels.inputs.Description' | translate }}{{ identity.description }} {{"labels.inputs.Document Key" | translate}} {{identity.documentKey}} {{ 'labels.inputs.Identity Documents' | translate }} +
+ {{ document.name }} + +
+ 		{{"labels.inputs.Description" | translate}} {{identity.description}} {{ 'labels.inputs.Status' | translate }} + {{ identity.status === 'clientIdentifierStatusType.active' ? 'active' : 'inactive' }} + {{"labels.inputs.Identity Documents" | translate}} -
- {{document.name}} - -
- 		{{"labels.inputs.Status" | translate}} - {{(identity.status==='clientIdentifierStatusType.active')?'active':'inactive'}} - {{"labels.inputs.Actions" | translate}} - - -
+ + {{ 'labels.inputs.Actions' | translate }} + + + + + + + +
diff --git a/src/app/clients/clients-view/notes-tab/notes-tab.component.html b/src/app/clients/clients-view/notes-tab/notes-tab.component.html index 04cf7318f..bbeca4fa0 100644 --- a/src/app/clients/clients-view/notes-tab/notes-tab.component.html +++ b/src/app/clients/clients-view/notes-tab/notes-tab.component.html @@ -1,4 +1,5 @@ -
- +
- {{"labels.inputs.Show Closed Accounts" | translate}} + {{ 'labels.inputs.Show Closed Accounts' | translate }}
-
@@ -24,60 +35,63 @@
- - - + + - + - + - + - - + + - - +
{{"labels.inputs.name" | translate}} {{row.displayName}} {{ 'labels.inputs.name' | translate }}{{ row.displayName }} {{"labels.inputs.Account No" | translate}}{{ 'labels.inputs.Account No' | translate }} - + {{"labels.inputs.External Id" | translate}} {{ 'labels.inputs.External Id' | translate }} - + {{"labels.inputs.Status" | translate}} {{ 'labels.inputs.Status' | translate }}
- {{ row.status.value | translate}} + {{ row.status.value | translate }}
{{"labels.inputs.Office Name" | translate}} {{row.officeName}} {{ 'labels.inputs.Office Name' | translate }}{{ row.officeName }}
- +
- {{"labels.text.No client was found" | translate}} + {{ 'labels.text.No client was found' | translate }}
diff --git a/src/app/clients/create-client/create-client.component.html b/src/app/clients/create-client/create-client.component.html index 763f15309..b1622d8aa 100644 --- a/src/app/clients/create-client/create-client.component.html +++ b/src/app/clients/create-client/create-client.component.html @@ -1,7 +1,5 @@
- - @@ -23,52 +21,50 @@ + {{ 'labels.inputs.GENERAL' | translate }} - {{"labels.inputs.GENERAL" | translate}} - - - + + {{ 'labels.inputs.FAMILY MEMBERS' | translate }} - {{"labels.inputs.FAMILY MEMBERS" | translate}} - - - + + {{ 'labels.inputs.ADDRESS' | translate }} - {{"labels.inputs.ADDRESS" | translate}} - - + - - - {{datatable.registeredTableName}} + {{ datatable.registeredTableName }} - - - {{"labels.inputs.PREVIEW" | translate}} + {{ 'labels.inputs.PREVIEW' | translate }} - - -
diff --git a/src/app/clients/edit-client/edit-client.component.html b/src/app/clients/edit-client/edit-client.component.html index b16a27cef..1be6c4a63 100644 --- a/src/app/clients/edit-client/edit-client.component.html +++ b/src/app/clients/edit-client/edit-client.component.html @@ -1,27 +1,23 @@
- -
- -
- - {{"labels.inputs.Office" | translate}} + {{ 'labels.inputs.Office' | translate }} {{ office.name }} - {{"labels.inputs.Office" | translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required" | translate}} + {{ 'labels.inputs.Office' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} - {{"labels.inputs.Legal Form" | translate}} + {{ 'labels.inputs.Legal Form' | translate }} {{ legalForm.value }} @@ -30,55 +26,62 @@ - {{"labels.inputs.Account No" | translate}} - + {{ 'labels.inputs.Account No' | translate }} + - {{"labels.inputs.External Id" | translate}} - + {{ 'labels.inputs.External Id' | translate }} + - {{ 'labels.inputs.' + getDateLabel(legalFormId, ['Name', 'Entity Name']) | translate }} - + {{ + 'labels.inputs.' + getDateLabel(legalFormId, ['Name', 'Entity Name']) | translate + }} + - {{"labels.inputs.Client name" | translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required" | translate}} + {{ 'labels.inputs.Client name' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} - {{"labels.inputs.First Name" | translate}} - + {{ 'labels.inputs.First Name' | translate }} + - {{"labels.inputs.Client first name" | translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required" | translate}} + {{ 'labels.inputs.Client first name' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} - {{"labels.inputs.Middle Name" | translate}} - + {{ 'labels.inputs.Middle Name' | translate }} + - {{"labels.inputs.Last Name" | translate}} - + {{ 'labels.inputs.Last Name' | translate }} + - {{"labels.inputs.Client last name" | translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required" | translate}} + {{ 'labels.inputs.Client last name' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} - {{ 'labels.inputs.' + getDateLabel(legalFormId, ['Date of Birth', 'Incorporation Date']) | translate }} - + {{ + 'labels.inputs.' + getDateLabel(legalFormId, ['Date of Birth', 'Incorporation Date']) | translate + }} + - {{"labels.inputs.Gender" | translate}} + {{ 'labels.inputs.Gender' | translate }} {{ gender.name }} @@ -87,7 +90,7 @@ - {{"labels.inputs.Staff" | translate}} + {{ 'labels.inputs.Staff' | translate }} {{ staff.displayName }} @@ -95,11 +98,16 @@ -
- +
- {{"labels.inputs.Constitution" | translate}} + {{ 'labels.inputs.Constitution' | translate }} {{ constitution.name }} @@ -108,7 +116,7 @@ - {{"labels.inputs.Main Business Line" | translate}} + {{ 'labels.inputs.Main Business Line' | translate }} {{ business.name }} @@ -117,42 +125,52 @@ - {{"labels.inputs.Incorporation Validity Till Date" | translate}} - + {{ 'labels.inputs.Incorporation Validity Till Date' | translate }} + - {{"labels.inputs.Incorporation No" | translate}} - + {{ 'labels.inputs.Incorporation No' | translate }} + - {{"labels.inputs.Remarks" | translate}} + {{ 'labels.inputs.Remarks' | translate }}
- - {{"labels.inputs.Is staff" | translate}}? + + {{ 'labels.inputs.Is staff' | translate }}? - {{"labels.inputs.Mobile No" | translate}} - + {{ 'labels.inputs.Mobile No' | translate }} + - {{"labels.inputs.Email Address" | translate}} - - - Email not valid - + {{ 'labels.inputs.Email Address' | translate }} + + Email not valid - {{"labels.inputs.Client Type" | translate}} + {{ 'labels.inputs.Client Type' | translate }} {{ clientType.name }} @@ -161,43 +179,58 @@ - {{"labels.inputs.Client Classification" | translate}} + {{ 'labels.inputs.Client Classification' | translate }} - + {{ clientClassification.name }} - {{"labels.inputs.Submitted On" | translate}} - + {{ 'labels.inputs.Submitted On' | translate }} + - {{"labels.inputs.Submitted Date" | translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required" | translate}} + {{ 'labels.inputs.Submitted Date' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} - {{"labels.inputs.Activated On" | translate}} - + {{ 'labels.inputs.Activated On' | translate }} + -
- - - + + - - -
diff --git a/src/app/collaterals/edit-collateral/edit-collateral.component.html b/src/app/collaterals/edit-collateral/edit-collateral.component.html index 2b9acb8e4..369966a54 100644 --- a/src/app/collaterals/edit-collateral/edit-collateral.component.html +++ b/src/app/collaterals/edit-collateral/edit-collateral.component.html @@ -1,51 +1,44 @@
+ +
+ +
+
+ + {{ 'labels.inputs.name' | translate }} + + - + + {{ 'labels.inputs.Quantity' | translate }} + + + {{ 'labels.inputs.Quantity' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} + + - + + {{ 'labels.inputs.Total' | translate }} + + - + + {{ 'labels.inputs.Total Collateral Value' | translate }} + + +
+
+ -
- -
- - - {{"labels.inputs.name" |translate}} - - - - - {{"labels.inputs.Quantity" |translate}} - - - {{"labels.inputs.Quantity" |translate}} {{ "labels.commons.is" |translate}} {{ "labels.commons.required" | translate}} - - - - - {{"labels.inputs.Total" |translate}} - - - - - {{"labels.inputs.Total Collateral Value" |translate}} - - - -
- -
- - - - - - - - -
- - - -
\ No newline at end of file + + + + + +
+
diff --git a/src/app/collaterals/view-collateral/view-collateral.component.html b/src/app/collaterals/view-collateral/view-collateral.component.html index 9eaa727a3..af38da600 100644 --- a/src/app/collaterals/view-collateral/view-collateral.component.html +++ b/src/app/collaterals/view-collateral/view-collateral.component.html @@ -1,71 +1,70 @@
- - -
+ + +
+ \ - \ +
+

{{ 'labels.heading.Client Collateral Details' | translate }}

-
+
+

+ {{ 'labels.inputs.name' | translate }}: {{ clientCollateralData.name }}
+ {{ 'labels.inputs.Quantity' | translate }}: {{ clientCollateralData.quantity }}
+ {{ 'labels.inputs.Total Value' | translate }}: {{ clientCollateralData.total }}
+ {{ 'labels.inputs.Total Collateral Value' | translate }}: {{ clientCollateralData.totalCollateral }}
+

+
-

{{"labels.heading.Client Collateral Details" |translate}}

+

{{ 'labels.heading.Transaction Details' | translate }}

-
-

- {{"labels.inputs.name" |translate}}: {{ clientCollateralData.name }}
- {{"labels.inputs.Quantity" |translate}}: {{ clientCollateralData.quantity }}
- {{"labels.inputs.Total Value" |translate}}: {{ clientCollateralData.total }}
- {{"labels.inputs.Total Collateral Value" |translate}}: {{ clientCollateralData.totalCollateral }}
-

+ + + + + - + + + + + + + + -

{{"labels.heading.Transaction Details" |translate}}

+ + + + -
{{ 'labels.inputs.ID' | translate }} + {{ element.loanId }} + {{ 'labels.inputs.Last Repayment' | translate }}{{ element.lastRepayment }}{{ 'labels.inputs.Remaining Amount' | translate }}{{ element.remainingAmount | formatNumber }}{{ 'labels.inputs.Last Repayment Date' | translate }}{{ element.lastRepaymentDate | dateFormat }}
- - - - - - - - - - - - - - - - - - - - - - - - - - -
{{"labels.inputs.ID" |translate}} - {{element.loanId}} - {{"labels.inputs.Last Repayment" |translate}} {{element.lastRepayment}} {{"labels.inputs.Remaining Amount" |translate}} {{element.remainingAmount | formatNumber}} {{"labels.inputs.Last Repayment Date" |translate}} {{element.lastRepaymentDate | dateFormat}}
- -
- - - - + + + +
+ diff --git a/src/app/collections/individual-collection-sheet/individual-collection-sheet.component.html b/src/app/collections/individual-collection-sheet/individual-collection-sheet.component.html index a68f50f64..5470759cf 100644 --- a/src/app/collections/individual-collection-sheet/individual-collection-sheet.component.html +++ b/src/app/collections/individual-collection-sheet/individual-collection-sheet.component.html @@ -1,176 +1,170 @@ -
-
- {{"labels.text.No repayments and disbursal" | translate}} + {{ 'labels.text.No repayments and disbursal' | translate }}
-
-
- - {{"labels.inputs.Branch Office" | translate}} + {{ 'labels.inputs.Branch Office' | translate }} {{ office.name }} - {{"labels.inputs.Branch Office" | translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required" | translate}} + {{ 'labels.inputs.Branch Office' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} - {{"labels.inputs.Repayment Date" | translate}} - + {{ 'labels.inputs.Repayment Date' | translate }} + - {{"labels.inputs.Repayment Date" | translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required" | translate}} + {{ 'labels.inputs.Repayment Date' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} - {{"labels.inputs.Staff" | translate}} + {{ 'labels.inputs.Staff' | translate }} {{ loanOfficer.displayName }} -
- + -
-
-
- -
- -

{{"labels.heading.Due Collections" | translate}}

+

{{ 'labels.heading.Due Collections' | translate }}

- - - + + - - + + - - + + - - + + - - + + - + - - +
{{"labels.inputs.Loan Account" | translate}} # {{ loan.accountId }}{{ 'labels.inputs.Loan Account' | translate }} #{{ loan.accountId }} {{"labels.inputs.Product Name" | translate}} {{ loan.productShortName }}({{ loan.productId }}) {{ 'labels.inputs.Product Name' | translate }}{{ loan.productShortName }}({{ loan.productId }}) {{"labels.inputs.Client Name" | translate}} {{ loan.clientName }}({{ loan.clientId }}) {{ 'labels.inputs.Client Name' | translate }}{{ loan.clientName }}({{ loan.clientId }}) {{"labels.inputs.Total Due" | translate}} {{ loan.totalDue }} {{ 'labels.inputs.Total Due' | translate }}{{ loan.totalDue }} {{"labels.inputs.Charges" | translate}} {{ loan.feeDue }} {{ 'labels.inputs.Charges' | translate }}{{ loan.feeDue }} {{"labels.inputs.Actions" | translate}} {{ 'labels.inputs.Actions' | translate }} - +
- - -

{{"labels.inputs.Due Savings Collections" | translate}}

+

{{ 'labels.inputs.Due Savings Collections' | translate }}

- - - + + - - + + - - + + - - + + - - + + - + - - +
{{"labels.inputs.Deposit Account" | translate}} {{ saving.depositAccountType }}{{ 'labels.inputs.Deposit Account' | translate }}{{ saving.depositAccountType }} {{"labels.inputs.Savings Account" | translate}} # {{ saving.accountId }} + {{ 'labels.inputs.Savings Account' | translate }} # + {{ saving.accountId }} {{"labels.inputs.Product Name" | translate}} {{ saving.productName }}({{ saving.productId }}) {{ 'labels.inputs.Product Name' | translate }}{{ saving.productName }}({{ saving.productId }}) {{"labels.inputs.Client Name" | translate}} {{ saving.clientName }}({{ saving.clientId }}) {{ 'labels.inputs.Client Name' | translate }}{{ saving.clientName }}({{ saving.clientId }}) {{"labels.inputs.Total Due" | translate}} {{ saving.dueAmount }} {{ 'labels.inputs.Total Due' | translate }}{{ saving.dueAmount }} {{"labels.inputs.Actions" | translate}} {{ 'labels.inputs.Actions' | translate }} - +
- - - + + - -
-
diff --git a/src/app/configuration-wizard/completion-dialog/completion-dialog.component.html b/src/app/configuration-wizard/completion-dialog/completion-dialog.component.html index 4eea6856f..90540761d 100644 --- a/src/app/configuration-wizard/completion-dialog/completion-dialog.component.html +++ b/src/app/configuration-wizard/completion-dialog/completion-dialog.component.html @@ -1,17 +1,17 @@ -

{{"labels.heading.Welcome to Mifos" | translate}}

+

{{ 'labels.heading.Welcome to Mifos' | translate }}

+

{{ 'labels.heading.Configure Mifos Organization Needs' | translate }}

-

{{"labels.heading.Configure Mifos Organization Needs" | translate}}

+

{{ 'labels.heading.Configuration Wizard Setup' | translate }}

-

{{"labels.heading.Configuration Wizard Setup" | translate}}

- -

{{"labels.heading.Progress Bar" | translate}} : 100 %

- - +

{{ 'labels.heading.Progress Bar' | translate }} : 100 %

+ - + diff --git a/src/app/configuration-wizard/configuration-wizard.component.html b/src/app/configuration-wizard/configuration-wizard.component.html index 59b91f033..1fa082243 100644 --- a/src/app/configuration-wizard/configuration-wizard.component.html +++ b/src/app/configuration-wizard/configuration-wizard.component.html @@ -1,39 +1,48 @@ -

{{"labels.heading.Welcome to Mifos" | translate}}

+

{{ 'labels.heading.Welcome to Mifos' | translate }}

+

{{ 'labels.heading.Configure Mifos Organization Needs' | translate }}

-

{{"labels.heading.Configure Mifos Organization Needs" | translate}}

+ + + + + + + + + + + + + + + + + + + + +

{{ 'labels.heading.Progress Bar' | translate }} : 0%

- - - - - - - - - - - - - - - - - - - - - - - -

{{"labels.heading.Progress Bar" | translate}} : 0%

- - - + - + diff --git a/src/app/configuration-wizard/continue-setup-dialog/continue-setup-dialog.component.html b/src/app/configuration-wizard/continue-setup-dialog/continue-setup-dialog.component.html index 41a07eacd..b3fb1be50 100644 --- a/src/app/configuration-wizard/continue-setup-dialog/continue-setup-dialog.component.html +++ b/src/app/configuration-wizard/continue-setup-dialog/continue-setup-dialog.component.html @@ -1,13 +1,20 @@ -

{{"labels.heading.Configuration Wizard" | translate}}

+

{{ 'labels.heading.Configuration Wizard' | translate }}

- -

{{"labels.heading.You have created" | translate}} {{stepName}} {{"labels.heading.successfully select option" | translate}}

- +

+ {{ 'labels.heading.You have created' | translate }} {{ stepName }} + {{ 'labels.heading.successfully select option' | translate }} +

- - - + + + diff --git a/src/app/configuration-wizard/next-step-dialog/next-step-dialog.component.html b/src/app/configuration-wizard/next-step-dialog/next-step-dialog.component.html index 0949c4072..69d5fedbf 100644 --- a/src/app/configuration-wizard/next-step-dialog/next-step-dialog.component.html +++ b/src/app/configuration-wizard/next-step-dialog/next-step-dialog.component.html @@ -1,18 +1,18 @@ -

{{"labels.heading.Welcome to Mifos" | translate}}

+

{{ 'labels.heading.Welcome to Mifos' | translate }}

+

{{ 'labels.heading.Configure Mifos Organization Needs' | translate }}

-

{{"labels.heading.Configure Mifos Organization Needs" | translate}}

+

{{ 'labels.heading.Successfully completed' | translate }} {{ previousStepName }}

-

{{"labels.heading.Successfully completed" | translate}} {{ previousStepName }}

- -

{{"labels.heading.Progress Bar" | translate}} : {{stepPercentage}}%

- - +

{{ 'labels.heading.Progress Bar' | translate }} : {{ stepPercentage }}%

+ - - + + diff --git a/src/app/core/shell/breadcrumb/breadcrumb.component.html b/src/app/core/shell/breadcrumb/breadcrumb.component.html index d9c736007..b479efb8a 100644 --- a/src/app/core/shell/breadcrumb/breadcrumb.component.html +++ b/src/app/core/shell/breadcrumb/breadcrumb.component.html @@ -1,7 +1,7 @@ -

{{'labels.popovers.Breadcrumbs' | translate}}

-

{{"labels.text.User's current location" | translate}}

+

{{ 'labels.popovers.Breadcrumbs' | translate }}

+

{{ "labels.text.User's current location" | translate }}

- - - + + +
diff --git a/src/app/core/shell/shell.component.html b/src/app/core/shell/shell.component.html index 45ec49982..57330fb9c 100644 --- a/src/app/core/shell/shell.component.html +++ b/src/app/core/shell/shell.component.html @@ -1,6 +1,5 @@ - - + [opened]="(isHandset$ | async) === false" + > - - @@ -33,7 +30,5 @@ - - diff --git a/src/app/core/shell/sidenav/sidenav.component.html b/src/app/core/shell/sidenav/sidenav.component.html index a2d611b58..7b580dfe0 100644 --- a/src/app/core/shell/sidenav/sidenav.component.html +++ b/src/app/core/shell/sidenav/sidenav.component.html @@ -1,45 +1,52 @@ -
- +
-
- - {{ 'APP_NAME' | translate}} + + {{ 'APP_NAME' | translate }}
- app-user-photo + app-user-photo
- - {{ tenantIdentifier }} / {{ username }} - + {{ tenantIdentifier }} / {{ username }}
- -
-
-
- - {{'labels.menus.Frequently Accessed' | translate}} -
+
+ + {{ 'labels.menus.Frequently Accessed' | translate }} +
-
@@ -47,154 +54,290 @@
- {{'labels.menus.Main Items' | translate}} + {{ 'labels.menus.Main Items' | translate }}
- - + + - {{'labels.menus.Dashboard' | translate}} + {{ 'labels.menus.Dashboard' | translate }} - + - {{'labels.menus.Navigation' | translate}} + {{ 'labels.menus.Navigation' | translate }} - + - + - {{'labels.menus.Checker Inbox and Tasks' | translate}} + {{ 'labels.menus.Checker Inbox and Tasks' | translate }} - + - + - {{'labels.menus.Individual Collection Sheet' | translate}} + {{ 'labels.menus.Individual Collection Sheet' | translate }} - + - {{'labels.menus.Notifications' | translate}} + {{ 'labels.menus.Notifications' | translate }} - + - {{'labels.menus.Frequent Postings' | translate}} + {{ 'labels.menus.Frequent Postings' | translate }} - + - {{'labels.menus.Create Journal Entry' | translate}} + {{ 'labels.menus.Create Journal Entry' | translate }} - + - {{'labels.menus.Chart of Accounts' | translate}} + {{ 'labels.menus.Chart of Accounts' | translate }} - + - {{'labels.menus.Keyboard Shortcuts' | translate}} + {{ 'labels.menus.Keyboard Shortcuts' | translate }} - + - {{'labels.menus.Help' | translate}} + {{ 'labels.menus.Help' | translate }} -
-
-
- -

{{"labels.text.Welcome page logo from anywhere" | translate}}

+

{{ 'labels.text.Welcome page logo from anywhere' | translate }}

- - - + + +
-

{{'labels.menus.User Panel' | translate}}

-

{{"labels.text.Section Buttons" | translate}}

+

{{ 'labels.menus.User Panel' | translate }}

+

{{ 'labels.text.Section Buttons' | translate }}

- - - + + +
-

{{'labels.menus.Frequently Accessed' | translate}}

-

{{"labels.text.Shortcut to the frequently accessed components" | translate}}

+

{{ 'labels.menus.Frequently Accessed' | translate }}

+

{{ 'labels.text.Shortcut to the frequently accessed components' | translate }}

- - - + + +
-

{{'labels.menus.Dashboard' | translate}}

-

{{"labels.text.User Dashboard Component" | translate}}

+

{{ 'labels.menus.Dashboard' | translate }}

+

{{ 'labels.text.User Dashboard Component' | translate }}

- - - + + +
-

{{'labels.menus.Navigation' | translate}}

-

{{"labels.text.User Entity navigation screen" | translate}}

+

{{ 'labels.menus.Navigation' | translate }}

+

{{ 'labels.text.User Entity navigation screen' | translate }}

- - - + + +
-

{{'labels.menus.Frequent Postings' | translate}}

-

{{"labels.text.Shortcut accounting rules" | translate}}

+

{{ 'labels.menus.Frequent Postings' | translate }}

+

{{ 'labels.text.Shortcut accounting rules' | translate }}

- - - + + +
-

{{'labels.menus.Create Journal Entry' | translate}}

-

{{"labels.text.Shortcut entry screen" | translate}}

+

{{ 'labels.menus.Create Journal Entry' | translate }}

+

{{ 'labels.text.Shortcut entry screen' | translate }}

- - - + + +
-

{{'labels.menus.Chart of Accounts' | translate}}

-

{{"labels.text.Shortcut accounts screen" | translate}}

+

{{ 'labels.menus.Chart of Accounts' | translate }}

+

{{ 'labels.text.Shortcut accounts screen' | translate }}

- - - + + +
diff --git a/src/app/core/shell/toolbar/toolbar.component.html b/src/app/core/shell/toolbar/toolbar.component.html index 4b939a133..ba33644e7 100644 --- a/src/app/core/shell/toolbar/toolbar.component.html +++ b/src/app/core/shell/toolbar/toolbar.component.html @@ -1,47 +1,65 @@ - - - @@ -68,51 +86,55 @@
- + - - - + + + - - - - + + + + - - - - - - - + + + + + + + - - - - - + + + + + - - - + + + @@ -121,134 +143,229 @@ - {{'labels.menus.Help' | translate}} + {{ 'labels.menus.Help' | translate }} - -

{{'labels.menus.Institution' | translate}}

-

{{"labels.text.Button for individual account" | translate}}

+

{{ 'labels.menus.Institution' | translate }}

+

{{ 'labels.text.Button for individual account' | translate }}

- - + +
-

{{'labels.menus.Accounting' | translate}}

-

{{"labels.text.Button for accounting department" | translate}}

+

{{ 'labels.menus.Accounting' | translate }}

+

{{ 'labels.text.Button for accounting department' | translate }}

- - - + + +
-

{{'labels.menus.Reports' | translate}}

-

{{"labels.text.Dropdown system reports" | translate}}

+

{{ 'labels.menus.Reports' | translate }}

+

{{ 'labels.text.Dropdown system reports' | translate }}

- - - + + +
-

{{'labels.menus.Admin' | translate}}

-

{{"labels.text.Setup organization including users" | translate}}

+

{{ 'labels.menus.Admin' | translate }}

+

{{ 'labels.text.Setup organization including users' | translate }}

- - - + + +
-

{{'labels.menus.Self Service' | translate}}

-

{{"labels.text.Dropdown self service user administrative portal" | translate}}

+

{{ 'labels.menus.Self Service' | translate }}

+

{{ 'labels.text.Dropdown self service user administrative portal' | translate }}

- - - + + +
-

{{'labels.menus.Configuration Wizard' | translate}}

-

{{"labels.text.Initial setup and application tour" | translate}}

+

{{ 'labels.menus.Configuration Wizard' | translate }}

+

{{ 'labels.text.Initial setup and application tour' | translate }}

- - - + + +
-

{{'labels.menus.Global Search' | translate}}

-

{{"labels.text.Navigate system selecting entity" | translate}}

+

{{ 'labels.menus.Global Search' | translate }}

+

{{ 'labels.text.Navigate system selecting entity' | translate }}

- - - + + +
-

{{'labels.menus.Language Selector' | translate}}

-

{{"labels.text.Organization available languages" | translate}}

+

{{ 'labels.menus.Language Selector' | translate }}

+

{{ 'labels.text.Organization available languages' | translate }}

- - - + + +
-

{{'labels.menus.Theme Picker' | translate}}

-

{{"labels.text.Choose a theme as per organization will" | translate}}

+

{{ 'labels.menus.Theme Picker' | translate }}

+

{{ 'labels.text.Choose a theme as per organization will' | translate }}

- - - + + +
-

{{'labels.menus.Notifications' | translate}}

-

{{"labels.text.This shows all the notifications." | translate}}

+

{{ 'labels.menus.Notifications' | translate }}

+

{{ 'labels.text.This shows all the notifications.' | translate }}

- - - + + +
-

{{'labels.menus.Application Menu' | translate}}

-

{{"labels.text.User settings and sign out button" | translate}}

+

{{ 'labels.menus.Application Menu' | translate }}

+

{{ 'labels.text.User settings and sign out button' | translate }}

- - - + + +
diff --git a/src/app/deposits/fixed-deposits/create-fixed-deposit-account/create-fixed-deposit-account.component.html b/src/app/deposits/fixed-deposits/create-fixed-deposit-account/create-fixed-deposit-account.component.html index 5475deb8a..e50e5a8c6 100644 --- a/src/app/deposits/fixed-deposits/create-fixed-deposit-account/create-fixed-deposit-account.component.html +++ b/src/app/deposits/fixed-deposits/create-fixed-deposit-account/create-fixed-deposit-account.component.html @@ -1,7 +1,5 @@
- - @@ -23,73 +21,66 @@ - - {{"labels.inputs.DETAILS" | translate }} + {{ 'labels.inputs.DETAILS' | translate }} + (fixedDepositsAccountProductTemplate)="setTemplate($event)" + > - - - {{"labels.inputs.TERMS" | translate }} + {{ 'labels.inputs.TERMS' | translate }} + [fixedDepositsAccountProductTemplate]="fixedDepositsAccountProductTemplate" + > - - - {{"labels.inputs.SETTINGS" | translate }} + {{ 'labels.inputs.SETTINGS' | translate }} + [fixedDepositsAccountProductTemplate]="fixedDepositsAccountProductTemplate" + > - - - {{"labels.inputs.INTEREST RATE CHART" | translate }} + {{ 'labels.inputs.INTEREST RATE CHART' | translate }} + [fixedDepositsAccountProductTemplate]="fixedDepositsAccountProductTemplate" + > - - - {{"labels.inputs.CHARGES" | translate }} + {{ 'labels.inputs.CHARGES' | translate }} + [fixedDepositAccountFormValid]="fixedDepositAccountFormValid" + > - - - {{"labels.inputs.PREVIEW" | translate }} + {{ 'labels.inputs.PREVIEW' | translate }} + [fixedDepositAccountData]="fixedDepositAccount" + (submitEvent)="submit()" + > - - -
diff --git a/src/app/deposits/fixed-deposits/edit-fixed-deposit-account/edit-fixed-deposit-account.component.html b/src/app/deposits/fixed-deposits/edit-fixed-deposit-account/edit-fixed-deposit-account.component.html index 940a1c855..e1d8960fd 100644 --- a/src/app/deposits/fixed-deposits/edit-fixed-deposit-account/edit-fixed-deposit-account.component.html +++ b/src/app/deposits/fixed-deposits/edit-fixed-deposit-account/edit-fixed-deposit-account.component.html @@ -1,7 +1,5 @@
- - @@ -23,73 +21,66 @@ - - {{"labels.inputs.DETAILS" | translate }} + {{ 'labels.inputs.DETAILS' | translate }} + (fixedDepositsAccountProductTemplate)="setTemplate($event)" + > - - - {{"labels.inputs.TERMS" | translate }} + {{ 'labels.inputs.TERMS' | translate }} + [fixedDepositsAccountProductTemplate]="fixedDepositsAccountProductTemplate" + > - - - {{"labels.inputs.SETTINGS" | translate }} + {{ 'labels.inputs.SETTINGS' | translate }} + [fixedDepositsAccountProductTemplate]="fixedDepositsAccountProductTemplate" + > - - - {{"labels.inputs.INTEREST RATE CHART" | translate }} + {{ 'labels.inputs.INTEREST RATE CHART' | translate }} + [fixedDepositsAccountProductTemplate]="fixedDepositsAccountProductTemplate" + > - - - {{"labels.inputs.CHARGES" | translate }} + {{ 'labels.inputs.CHARGES' | translate }} + [fixedDepositAccountFormValid]="fixedDepositAccountFormValidAndNotPristine" + > - - - {{"labels.inputs.PREVIEW" | translate }} + {{ 'labels.inputs.PREVIEW' | translate }} + [fixedDepositAccountData]="fixedDepositAccount" + (submitEvent)="submit()" + > - - -
diff --git a/src/app/deposits/fixed-deposits/fixed-deposit-account-stepper/fixed-deposit-account-charges-step/fixed-deposit-account-charges-step.component.html b/src/app/deposits/fixed-deposits/fixed-deposit-account-stepper/fixed-deposit-account-charges-step/fixed-deposit-account-charges-step.component.html index 504646464..7c3b2431b 100644 --- a/src/app/deposits/fixed-deposits/fixed-deposit-account-stepper/fixed-deposit-account-charges-step/fixed-deposit-account-charges-step.component.html +++ b/src/app/deposits/fixed-deposits/fixed-deposit-account-stepper/fixed-deposit-account-charges-step/fixed-deposit-account-charges-step.component.html @@ -1,10 +1,8 @@
- - {{"labels.inputs.Charge" | translate }} + {{ 'labels.inputs.Charge' | translate }} - + {{ charge.name }} @@ -13,28 +11,33 @@
- - +
- + - + - + + - + - + - + - - +
{{"labels.inputs.name" | translate }} {{ 'labels.inputs.name' | translate }} {{ charge.name + ', ' + charge.currency.displaySymbol }} {{"labels.inputs.Type" | translate }} {{ 'labels.inputs.Type' | translate }} {{ charge.chargeCalculationType.value }} {{"labels.inputs.Amount" | translate }} {{ 'labels.inputs.Amount' | translate }} {{ charge.amount }} {{"labels.inputs.Collected On" | translate }} {{ 'labels.inputs.Collected On' | translate }} {{ charge.chargeTimeType.value }} {{"labels.inputs.Date" | translate }} {{ 'labels.inputs.Date' | translate }} - - {{(charge.dueDate | dateFormat) || 'Unassigned*'}} + + {{ (charge.dueDate | dateFormat) || 'Unassigned*' }} - {{charge.feeOnMonthDay ? ([2000].concat(charge.feeOnMonthDay) | dateFormat: 'dd MMMM') : 'Unassigned'}} + {{ charge.feeOnMonthDay ? ([2000].concat(charge.feeOnMonthDay) | dateFormat: 'dd MMMM') : 'Unassigned' }} - - {{"labels.inputs.N/A" | translate }} + + {{ 'labels.inputs.N/A' | translate }} - {{"labels.inputs.Repayments Every" | translate }} {{ 'labels.inputs.Repayments Every' | translate }} {{ charge.feeInterval || 'Not Provided' }} - {{"labels.inputs.Actions" | translate }} {{ 'labels.inputs.Actions' | translate }}
-
diff --git a/src/app/deposits/fixed-deposits/fixed-deposit-account-stepper/fixed-deposit-account-details-step/fixed-deposit-account-details-step.component.html b/src/app/deposits/fixed-deposits/fixed-deposit-account-stepper/fixed-deposit-account-details-step/fixed-deposit-account-details-step.component.html index 6ffe77013..b9424fc96 100644 --- a/src/app/deposits/fixed-deposits/fixed-deposit-account-stepper/fixed-deposit-account-details-step/fixed-deposit-account-details-step.component.html +++ b/src/app/deposits/fixed-deposits/fixed-deposit-account-stepper/fixed-deposit-account-details-step/fixed-deposit-account-details-step.component.html @@ -1,32 +1,38 @@
-
- - {{"labels.inputs.Product Name" | translate }} + {{ 'labels.inputs.Product Name' | translate }} {{ product.name }} - {{"labels.inputs.Product Name" | translate }} {{ "labels.commons.is" |translate}} {{ "labels.commons.required" | translate}} + {{ 'labels.inputs.Product Name' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} - {{"labels.inputs.Submitted On" | translate }} - + {{ 'labels.inputs.Submitted On' | translate }} + - {{"labels.inputs.Submission Date" | translate }} {{ "labels.commons.is" |translate}} {{ "labels.commons.required" | translate}} + {{ 'labels.inputs.Submission Date' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} - {{"labels.inputs.Field Officer" | translate }} + {{ 'labels.inputs.Field Officer' | translate }} {{ officer.displayName }} @@ -35,21 +41,19 @@ - {{"labels.inputs.External id" | translate}} - + {{ 'labels.inputs.External id' | translate }} + -
-
diff --git a/src/app/deposits/fixed-deposits/fixed-deposit-account-stepper/fixed-deposit-account-interest-rate-chart-step/fixed-deposit-account-interest-rate-chart-step.component.html b/src/app/deposits/fixed-deposits/fixed-deposit-account-stepper/fixed-deposit-account-interest-rate-chart-step/fixed-deposit-account-interest-rate-chart-step.component.html index 488f5e1aa..47a3e6d7c 100644 --- a/src/app/deposits/fixed-deposits/fixed-deposit-account-stepper/fixed-deposit-account-interest-rate-chart-step/fixed-deposit-account-interest-rate-chart-step.component.html +++ b/src/app/deposits/fixed-deposits/fixed-deposit-account-stepper/fixed-deposit-account-interest-rate-chart-step/fixed-deposit-account-interest-rate-chart-step.component.html @@ -1,149 +1,161 @@
-
- {{"labels.inputs.name" | translate }}: + {{ 'labels.inputs.name' | translate }}: {{ fixedDepositsAccountProductTemplate.accountChart.name }}
- {{"labels.inputs.Valid from Date" | translate }}: - {{ fixedDepositsAccountProductTemplate?.accountChart.fromDate | dateFormat }} + {{ 'labels.inputs.Valid from Date' | translate }}: + {{ fixedDepositsAccountProductTemplate?.accountChart.fromDate | dateFormat }}
- {{"labels.inputs.End Date" | translate }}: - {{ fixedDepositsAccountProductTemplate?.accountChart.endDate | dateFormat }} + {{ 'labels.inputs.End Date' | translate }}: + {{ fixedDepositsAccountProductTemplate?.accountChart.endDate | dateFormat }}
- {{"labels.inputs.Description" | translate }}: + {{ 'labels.inputs.Description' | translate }}: {{ fixedDepositsAccountProductTemplate?.accountChart.description }}
- {{"labels.inputs.Primary Grouping by Amount" | translate }}: - {{ fixedDepositsAccountProductTemplate?.accountChart.isPrimaryGroupingByAmount ? 'Yes' : 'No' }} + {{ 'labels.inputs.Primary Grouping by Amount' | translate }}: + {{ + fixedDepositsAccountProductTemplate?.accountChart.isPrimaryGroupingByAmount ? 'Yes' : 'No' + }}
- - + + {{ chartSlab.fromPeriod }}-{{ chartSlab.toPeriod }} {{ chartSlab.periodType.value }} + - - + + - - + + - - + + - + - - - - + +
{{"labels.inputs.Period" | translate }} {{ 'labels.inputs.Period' | translate }} - {{chartSlab.fromPeriod}}-{{chartSlab.toPeriod}} {{chartSlab.periodType.value}} {{"labels.inputs.Amount Range" | translate }} {{chartSlab.amountRangeFrom}}-{{chartSlab.amountRangeTo}}{{ 'labels.inputs.Amount Range' | translate }}{{ chartSlab.amountRangeFrom }}-{{ chartSlab.amountRangeTo }} {{"labels.inputs.Interest" | translate }} {{ chartSlab.annualInterestRate }} {{ 'labels.inputs.Interest' | translate }}{{ chartSlab.annualInterestRate }} {{"labels.inputs.Description" | translate }} {{ chartSlab.description }} {{ 'labels.inputs.Description' | translate }}{{ chartSlab.description }} {{"labels.inputs.Actions" | translate }} {{ 'labels.inputs.Actions' | translate }} - - -
- +
+
-

- {{"labels.heading.Incentives" | translate }} + {{ 'labels.heading.Incentives' | translate }}

- - +
- + - + - + - + - + - + - - +
{{"labels.inputs.Entity Type" | translate }} {{ 'labels.inputs.Entity Type' | translate }} {{ incentive.entityType.value }} {{"labels.inputs.Attribute Name" | translate }} {{ 'labels.inputs.Attribute Name' | translate }} {{ incentive.attributeName.value }} {{"labels.inputs.Condition Type" | translate }} {{ 'labels.inputs.Condition Type' | translate }} {{ incentive.conditionType.value | titlecase }} {{"labels.inputs.Attribute Value" | translate }} {{ 'labels.inputs.Attribute Value' | translate }} {{ incentive.attributeValueDesc }} {{"labels.inputs.Incentive Type" | translate }} {{ 'labels.inputs.Incentive Type' | translate }} {{ incentive.incentiveType.value }} {{"labels.inputs.Interest" | translate }} {{ 'labels.inputs.Interest' | translate }} {{ incentive.amount }}
-
-
diff --git a/src/app/deposits/fixed-deposits/fixed-deposit-account-stepper/fixed-deposit-account-preview-step/fixed-deposit-account-preview-step.component.html b/src/app/deposits/fixed-deposits/fixed-deposit-account-stepper/fixed-deposit-account-preview-step/fixed-deposit-account-preview-step.component.html index eda8d9fbe..a500dd38e 100644 --- a/src/app/deposits/fixed-deposits/fixed-deposit-account-stepper/fixed-deposit-account-preview-step/fixed-deposit-account-preview-step.component.html +++ b/src/app/deposits/fixed-deposits/fixed-deposit-account-stepper/fixed-deposit-account-preview-step/fixed-deposit-account-preview-step.component.html @@ -1,358 +1,436 @@
- -

{{"labels.heading.Details" | translate }}

+

{{ 'labels.heading.Details' | translate }}

- {{"labels.inputs.Product" | translate }} - {{ fixedDepositAccountData.productId | find:fixedDepositsAccountTemplate.productOptions:'id':'name' }} + {{ 'labels.inputs.Product' | translate }} + {{ + fixedDepositAccountData.productId | find: fixedDepositsAccountTemplate.productOptions : 'id' : 'name' + }}
- {{"labels.inputs.Submitted On" | translate }} + {{ 'labels.inputs.Submitted On' | translate }} {{ fixedDepositAccountData.submittedOnDate | dateFormat }}
- {{"labels.inputs.External Id" | translate }} + {{ 'labels.inputs.External Id' | translate }} {{ fixedDepositAccountData.externalId }}
- {{"labels.inputs.Field Officer" | translate }} - {{ (fixedDepositAccountData.fieldOfficerId | find:fixedDepositsAccountProductTemplate.fieldOfficerOptions:'id':'displayName') || 'Unassigned' | translateKey:'inputs' }} + {{ 'labels.inputs.Field Officer' | translate }} + {{ + (fixedDepositAccountData.fieldOfficerId + | find: fixedDepositsAccountProductTemplate.fieldOfficerOptions : 'id' : 'displayName') || 'Unassigned' + | translateKey: 'inputs' + }}
-

{{"labels.heading.Currency" | translate }}

+

{{ 'labels.heading.Currency' | translate }}

- {{"labels.inputs.Currency" | translate }} + {{ 'labels.inputs.Currency' | translate }} {{ fixedDepositsAccountProductTemplate.currency.code }}
- {{"labels.inputs.Currency Multiple" | translate }} + {{ 'labels.inputs.Currency Multiple' | translate }} {{ fixedDepositsAccountProductTemplate.currency.inMultiplesOf }}
- {{"labels.inputs.Decimal Places" | translate }} + {{ 'labels.inputs.Decimal Places' | translate }} {{ fixedDepositsAccountProductTemplate.currency.decimalPlaces }}
-

{{"labels.heading.Terms" | translate }}

+

{{ 'labels.heading.Terms' | translate }}

- {{"labels.inputs.Fixed Deposit Amount" | translate }}: - {{ fixedDepositAccountData.depositAmount | currency:fixedDepositsAccountProductTemplate.currency.code:'symbol-narrow':'1.2-2' }} + {{ 'labels.inputs.Fixed Deposit Amount' | translate }}: + {{ + fixedDepositAccountData.depositAmount + | currency: fixedDepositsAccountProductTemplate.currency.code : 'symbol-narrow' : '1.2-2' + }}
- {{"labels.inputs.Deposit Period" | translate }}: - {{ fixedDepositAccountData.depositPeriod }} {{(fixedDepositAccountData.depositPeriodFrequencyId | find:fixedDepositsAccountProductTemplate.periodFrequencyTypeOptions:'id':'value') | translateKey:'catalogs' }} + {{ 'labels.inputs.Deposit Period' | translate }}: + {{ fixedDepositAccountData.depositPeriod }} + {{ + fixedDepositAccountData.depositPeriodFrequencyId + | find: fixedDepositsAccountProductTemplate.periodFrequencyTypeOptions : 'id' : 'value' + | translateKey: 'catalogs' + }}
- {{"labels.inputs.Interest Compounding Period" | translate }}: - {{ (fixedDepositAccountData.interestCompoundingPeriodType | find:fixedDepositsAccountProductTemplate.interestCompoundingPeriodTypeOptions:'id':'value') | translateKey:'catalogs' }} + {{ 'labels.inputs.Interest Compounding Period' | translate }}: + {{ + fixedDepositAccountData.interestCompoundingPeriodType + | find: fixedDepositsAccountProductTemplate.interestCompoundingPeriodTypeOptions : 'id' : 'value' + | translateKey: 'catalogs' + }}
- {{"labels.inputs.Interest Posting Period" | translate }}: - {{ (fixedDepositAccountData.interestPostingPeriodType | find:fixedDepositsAccountProductTemplate.interestPostingPeriodTypeOptions:'id':'value') | translateKey:'catalogs' }} + {{ 'labels.inputs.Interest Posting Period' | translate }}: + {{ + fixedDepositAccountData.interestPostingPeriodType + | find: fixedDepositsAccountProductTemplate.interestPostingPeriodTypeOptions : 'id' : 'value' + | translateKey: 'catalogs' + }}
- {{"labels.inputs.Interest Calculated using" | translate }}: - {{ (fixedDepositAccountData.interestCalculationType | find:fixedDepositsAccountProductTemplate.interestCalculationTypeOptions:'id':'value') | translateKey:'catalogs' }} + {{ 'labels.inputs.Interest Calculated using' | translate }}: + {{ + fixedDepositAccountData.interestCalculationType + | find: fixedDepositsAccountProductTemplate.interestCalculationTypeOptions : 'id' : 'value' + | translateKey: 'catalogs' + }}
- {{"labels.inputs.Days in Year" | translate }}: - {{ (fixedDepositAccountData.interestCalculationDaysInYearType | find:fixedDepositsAccountProductTemplate.interestCalculationDaysInYearTypeOptions:'id':'value') | translateKey:'catalogs' }} + {{ 'labels.inputs.Days in Year' | translate }}: + {{ + fixedDepositAccountData.interestCalculationDaysInYearType + | find: fixedDepositsAccountProductTemplate.interestCalculationDaysInYearTypeOptions : 'id' : 'value' + | translateKey: 'catalogs' + }}
-

{{"labels.heading.Settings" | translate }}

+

{{ 'labels.heading.Settings' | translate }}

- {{"labels.inputs.Lock-in Period" | translate }}: - {{ fixedDepositAccountData.lockinPeriodFrequency }} {{(fixedDepositAccountData.lockinPeriodFrequencyType | find:fixedDepositsAccountProductTemplate.lockinPeriodFrequencyTypeOptions:'id':'value') | translateKey:'catalogs' }} + {{ 'labels.inputs.Lock-in Period' | translate }}: + {{ fixedDepositAccountData.lockinPeriodFrequency }} + {{ + fixedDepositAccountData.lockinPeriodFrequencyType + | find: fixedDepositsAccountProductTemplate.lockinPeriodFrequencyTypeOptions : 'id' : 'value' + | translateKey: 'catalogs' + }}
- {{"labels.inputs.Minimum Deposit Term" | translate }}: - {{ fixedDepositsAccountProductTemplate.minDepositTerm }} {{fixedDepositsAccountProductTemplate.minDepositTermType?.value | translateKey:'catalogs' }} + {{ 'labels.inputs.Minimum Deposit Term' | translate }}: + {{ fixedDepositsAccountProductTemplate.minDepositTerm }} + {{ fixedDepositsAccountProductTemplate.minDepositTermType?.value | translateKey: 'catalogs' }}
- {{"labels.inputs.In Multiples Of" | translate }}: - {{ fixedDepositsAccountProductTemplate.inMultiplesOfDepositTerm }} {{fixedDepositsAccountProductTemplate.inMultiplesOfDepositTermType?.value | translateKey:'catalogs' }} + {{ 'labels.inputs.In Multiples Of' | translate }}: + {{ fixedDepositsAccountProductTemplate.inMultiplesOfDepositTerm }} + {{ fixedDepositsAccountProductTemplate.inMultiplesOfDepositTermType?.value | translateKey: 'catalogs' }}
- {{"labels.inputs.Maximum Deposit Term" | translate }} - {{ fixedDepositsAccountProductTemplate.maxDepositTerm }} {{fixedDepositsAccountProductTemplate.maxDepositTermType?.value | translateKey:'catalogs' }} + {{ 'labels.inputs.Maximum Deposit Term' | translate }} + {{ fixedDepositsAccountProductTemplate.maxDepositTerm }} + {{ fixedDepositsAccountProductTemplate.maxDepositTermType?.value | translateKey: 'catalogs' }}
- {{"labels.inputs.Transfer Interest to Savings Account" | translate }}? + {{ 'labels.inputs.Transfer Interest to Savings Account' | translate }}? {{ fixedDepositAccountData.transferInterestToSavings | yesNo }}
- {{"labels.inputs.Linked Savings Account" | translate }} - {{ fixedDepositAccountData.linkAccountId | find:fixedDepositsAccountProductTemplate.savingsAccounts:'id':'accountNo' }} + {{ 'labels.inputs.Linked Savings Account' | translate }} + {{ + fixedDepositAccountData.linkAccountId + | find: fixedDepositsAccountProductTemplate.savingsAccounts : 'id' : 'accountNo' + }}
- {{"labels.inputs.Maturity Instructions" | translate }} - {{ fixedDepositAccountData.maturityInstructionId | find:fixedDepositsAccountProductTemplate.maturityInstructionOptions:'id':'value' | translateKey:'catalogs' }} + {{ 'labels.inputs.Maturity Instructions' | translate }} + {{ + fixedDepositAccountData.maturityInstructionId + | find: fixedDepositsAccountProductTemplate.maturityInstructionOptions : 'id' : 'value' + | translateKey: 'catalogs' + }}
- {{"labels.inputs.Apply Penal Interest (less)" | translate }}: + {{ 'labels.inputs.Apply Penal Interest (less)' | translate }}: {{ fixedDepositsAccountProductTemplate.preClosurePenalApplicable | yesNo }}
- {{"labels.inputs.Penal Interest" | translate }} (%): - {{ fixedDepositsAccountProductTemplate.preClosurePenalInterest + '% (' + (fixedDepositsAccountProductTemplate.preClosurePenalInterestOnType?.id) + ')' }} + {{ 'labels.inputs.Penal Interest' | translate }} (%): + {{ + fixedDepositsAccountProductTemplate.preClosurePenalInterest + + '% (' + + fixedDepositsAccountProductTemplate.preClosurePenalInterestOnType?.id + + ')' + }}
- {{"labels.inputs.Withhold Tax is Applicable" | translate }}: + {{ 'labels.inputs.Withhold Tax is Applicable' | translate }}: {{ fixedDepositAccountData.withHoldTax | yesNo }}
-

{{"labels.heading.Interest Rate Chart" | translate }}

+

{{ 'labels.heading.Interest Rate Chart' | translate }}

-
- {{"labels.inputs.name" | translate }}: + {{ 'labels.inputs.name' | translate }}: {{ fixedDepositsAccountProductTemplate?.accountChart.name }}
- {{"labels.inputs.Valid from Date" | translate }}: + {{ 'labels.inputs.Valid from Date' | translate }}: {{ fixedDepositsAccountProductTemplate?.accountChart.fromDate | dateFormat }}
- {{"labels.inputs.End Date" | translate }}: + {{ 'labels.inputs.End Date' | translate }}: {{ fixedDepositsAccountProductTemplate?.accountChart.endDate | dateFormat }}
- {{"labels.inputs.Description" | translate }}: + {{ 'labels.inputs.Description' | translate }}: {{ fixedDepositsAccountProductTemplate?.accountChart.description }}
- {{"labels.inputs.Primary Grouping by Amount" | translate }}: - {{ fixedDepositsAccountProductTemplate?.accountChart.isPrimaryGroupingByAmount | yesNo }} + {{ 'labels.inputs.Primary Grouping by Amount' | translate }}: + {{ + fixedDepositsAccountProductTemplate?.accountChart.isPrimaryGroupingByAmount | yesNo + }}
- - + + {{ chartSlab.fromPeriod }} - {{ chartSlab.toPeriod }} {{ + chartSlab.periodType.value | translateKey: 'catalogs' + }} + - - + + - - + + - - + + - + - - - - + +
{{"labels.inputs.Period" | translate }} {{ 'labels.inputs.Period' | translate }} - {{chartSlab.fromPeriod}} - {{chartSlab.toPeriod}} {{chartSlab.periodType.value | translateKey:'catalogs' }} {{"labels.inputs.Amount Range" | translate }} {{chartSlab.amountRangeFrom | formatNumber}} - {{chartSlab.amountRangeTo | formatNumber}}{{ 'labels.inputs.Amount Range' | translate }} + {{ chartSlab.amountRangeFrom | formatNumber }} - {{ chartSlab.amountRangeTo | formatNumber }} + {{"labels.inputs.Interest" | translate }} {{ chartSlab.annualInterestRate | formatNumber }} %{{ 'labels.inputs.Interest' | translate }}{{ chartSlab.annualInterestRate | formatNumber }} % {{"labels.inputs.Description" | translate }} {{ chartSlab.description }} {{ 'labels.inputs.Description' | translate }}{{ chartSlab.description }} {{"labels.inputs.Actions" | translate }} {{ 'labels.inputs.Actions' | translate }} - - -
- +
+
-

- {{"labels.heading.Incentives" | translate }} + {{ 'labels.heading.Incentives' | translate }}

- - +
- + - + - + - + - + - + - - +
{{"labels.inputs.Entity Type" | translate }} {{ 'labels.inputs.Entity Type' | translate }} {{ incentive.entityType.value }} {{"labels.inputs.Attribute Name" | translate }} {{ 'labels.inputs.Attribute Name' | translate }} {{ incentive.attributeName.value }} {{"labels.inputs.Condition Type" | translate }} {{ 'labels.inputs.Condition Type' | translate }} {{ incentive.conditionType.value | titlecase }} {{"labels.inputs.Attribute Value" | translate }} {{ 'labels.inputs.Attribute Value' | translate }} {{ incentive.attributeValueDesc }} {{"labels.inputs.Incentive Type" | translate }} {{ 'labels.inputs.Incentive Type' | translate }} {{ incentive.incentiveType.value }} {{"labels.inputs.Interest" | translate }} {{ 'labels.inputs.Interest' | translate }} {{ incentive.amount | formatNumber }}
-
-
- -

{{"labels.heading.Charges" | translate }}

+

{{ 'labels.heading.Charges' | translate }}

- - + - + - + - + - + - + - - +
{{"labels.inputs.name" | translate }} {{ 'labels.inputs.name' | translate }} {{ charge.name + ', ' + charge.currency.displaySymbol }} {{"labels.inputs.Type" | translate }} {{ 'labels.inputs.Type' | translate }} {{ charge.chargeCalculationType.value }} {{"labels.inputs.Amount" | translate }} {{ 'labels.inputs.Amount' | translate }} {{ charge.amount }} {{"labels.inputs.Date" | translate }} {{ 'labels.inputs.Date' | translate }} - {{(charge.dueDate | dateFormat) || 'Unassigned'}} + *ngIf="charge.chargeTimeType.value === 'Specified due date' || charge.chargeTimeType.value === 'Weekly Fee'" + > + {{ (charge.dueDate | dateFormat) || 'Unassigned' }} - {{charge.feeOnMonthDay ? ([2000].concat(charge.feeOnMonthDay) | dateFormat: 'dd MMMM') : 'Unassigned'}} + {{ charge.feeOnMonthDay ? ([2000].concat(charge.feeOnMonthDay) | dateFormat: 'dd MMMM') : 'Unassigned' }} - {{"labels.inputs.N/A" | translate }} + *ngIf=" + !( + charge.chargeTimeType.value === 'Monthly Fee' || + charge.chargeTimeType.value === 'Annual Fee' || + charge.chargeTimeType.value === 'Specified due date' || + charge.chargeTimeType.value === 'Weekly Fee' + ) + " + > + {{ 'labels.inputs.N/A' | translate }} {{"labels.inputs.Repayments Every" | translate }} {{ 'labels.inputs.Repayments Every' | translate }} {{ charge.feeInterval || 'Not Provided' }} {{"labels.inputs.Collected On" | translate }} {{ 'labels.inputs.Collected On' | translate }} {{ charge.chargeTimeType.value }}
-
-
diff --git a/src/app/deposits/fixed-deposits/fixed-deposit-account-stepper/fixed-deposit-account-settings-step/fixed-deposit-account-settings-step.component.html b/src/app/deposits/fixed-deposits/fixed-deposit-account-stepper/fixed-deposit-account-settings-step/fixed-deposit-account-settings-step.component.html index affe7791c..8af4c8cef 100644 --- a/src/app/deposits/fixed-deposits/fixed-deposit-account-stepper/fixed-deposit-account-settings-step/fixed-deposit-account-settings-step.component.html +++ b/src/app/deposits/fixed-deposits/fixed-deposit-account-stepper/fixed-deposit-account-settings-step/fixed-deposit-account-settings-step.component.html @@ -1,170 +1,176 @@
-
- -

{{"labels.heading.Lock-in Period" | translate }}

+

{{ 'labels.heading.Lock-in Period' | translate }}

- {{"labels.inputs.Frequency" | translate }} - + {{ 'labels.inputs.Frequency' | translate }} + - {{"labels.inputs.Type" | translate }} + {{ 'labels.inputs.Type' | translate }} - - {{ lockinPeriodFrequencyType.value | translateKey:'catalogs' }} + + {{ lockinPeriodFrequencyType.value | translateKey: 'catalogs' }} -

{{"labels.heading.Minimum Deposit Term" | translate }}

+

{{ 'labels.heading.Minimum Deposit Term' | translate }}

- {{"labels.inputs.Frequency" | translate }} - + {{ 'labels.inputs.Frequency' | translate }} + - {{"labels.inputs.Minimum Deposit Term Frequency" | translate }} {{ "labels.commons.is" | translate}} {{ "labels.commons.required" | translate}} + {{ 'labels.inputs.Minimum Deposit Term Frequency' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} - {{"labels.inputs.Frequency Type" | translate }} + {{ 'labels.inputs.Frequency Type' | translate }} - {{ periodFrequencyType.value | translateKey:'catalogs' }} + {{ periodFrequencyType.value | translateKey: 'catalogs' }} - {{"labels.inputs.Minimum Deposit Term Frequency Type" | translate }} {{ "labels.commons.is" | translate}} {{ "labels.commons.required" | translate}} + {{ 'labels.inputs.Minimum Deposit Term Frequency Type' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} -

{{"labels.heading.And thereafter, in Multiples of" | translate }}

+

{{ 'labels.heading.And thereafter, in Multiples of' | translate }}

- {{"labels.inputs.Frequency" | translate }} - + {{ 'labels.inputs.Frequency' | translate }} + - {{"labels.inputs.Type" | translate }} + {{ 'labels.inputs.Type' | translate }} - {{ periodFrequencyType.value | translateKey:'catalogs' }} + {{ periodFrequencyType.value | translateKey: 'catalogs' }} -

{{"labels.heading.Maximum Deposit Term" | translate }}

+

{{ 'labels.heading.Maximum Deposit Term' | translate }}

- {{"labels.inputs.Frequency" | translate }} - + {{ 'labels.inputs.Frequency' | translate }} + - {{"labels.inputs.Type" | translate }} + {{ 'labels.inputs.Type' | translate }} - {{ periodFrequencyType.value | translateKey:'catalogs' }} + {{ periodFrequencyType.value | translateKey: 'catalogs' }} -

{{"labels.heading.Interest Transfer" | translate }}

+

{{ 'labels.heading.Interest Transfer' | translate }}

- {{"labels.inputs.Transfer Interest to Linked Savings Account" | translate }}? + {{ 'labels.inputs.Transfer Interest to Linked Savings Account' | translate }}? - {{"labels.inputs.Linked Savings Account" | translate }} + {{ 'labels.inputs.Linked Savings Account' | translate }} ({{ account.accountNo }}) {{ account.savingsProductName }} - {{"labels.inputs.Linked Savings Account" | translate }} {{ "labels.commons.is" | translate}} {{ "labels.commons.required" | translate}} + {{ 'labels.inputs.Linked Savings Account' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} - {{"labels.inputs.Maturity Instructions" | translate }} + {{ 'labels.inputs.Maturity Instructions' | translate }} - {{ maturityInstruction.value | translateKey:'catalogs' }} + {{ maturityInstruction.value | translateKey: 'catalogs' }} - - {{"labels.inputs.Transfer to savings account" | translate }} + + {{ 'labels.inputs.Transfer to savings account' | translate }} ({{ account.accountNo }}) {{ account.savingsProductName }} - {{"labels.inputs.Transfer to savings account" | translate }} {{ "labels.commons.is" | translate}} {{ "labels.commons.required" | translate}} + {{ 'labels.inputs.Transfer to savings account' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} -

{{"labels.heading.For Pre-mature closure" | translate }}

+

{{ 'labels.heading.For Pre-mature closure' | translate }}

- {{"labels.inputs.Apply Penal Interest (less)" | translate }} + {{ 'labels.inputs.Apply Penal Interest (less)' | translate }} - {{"labels.inputs.Penal Interest" | translate }} (%) - + {{ 'labels.inputs.Penal Interest' | translate }} (%) + - {{"labels.inputs.Period" | translate }} + {{ 'labels.inputs.Period' | translate }} - - {{ preClosurePenalInterestOnType.value | translateKey:'catalogs' }} + + {{ preClosurePenalInterestOnType.value | translateKey: 'catalogs' }} - - {{"labels.inputs.Is Withhold Tax Applicable" | translate }}? + {{ 'labels.inputs.Is Withhold Tax Applicable' | translate }}? - {{"labels.inputs.Tax Group" | translate }} - + {{ 'labels.inputs.Tax Group' | translate }} + - -
-
diff --git a/src/app/deposits/fixed-deposits/fixed-deposit-account-stepper/fixed-deposit-account-terms-step/fixed-deposit-account-terms-step.component.html b/src/app/deposits/fixed-deposits/fixed-deposit-account-stepper/fixed-deposit-account-terms-step/fixed-deposit-account-terms-step.component.html index 831f16ac7..8331721f8 100644 --- a/src/app/deposits/fixed-deposits/fixed-deposit-account-stepper/fixed-deposit-account-terms-step/fixed-deposit-account-terms-step.component.html +++ b/src/app/deposits/fixed-deposits/fixed-deposit-account-stepper/fixed-deposit-account-terms-step/fixed-deposit-account-terms-step.component.html @@ -1,99 +1,114 @@
-
- - + [inputLabel]="'Deposit Amount'" + > - {{"labels.inputs.Deposit Period" | translate }} - + {{ 'labels.inputs.Deposit Period' | translate }} + - {{"labels.inputs.Deposit Period" | translate }} {{ "labels.commons.is" | translate}} {{ "labels.commons.required" | translate}} + {{ 'labels.inputs.Deposit Period' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} - {{"labels.inputs.Deposit Period Type" | translate }} + {{ 'labels.inputs.Deposit Period Type' | translate }} - {{ periodFrequencyType.value | translateKey:'catalogs' }} + {{ periodFrequencyType.value | translateKey: 'catalogs' }} - {{"labels.inputs.Deposit Period Type" | translate }} {{ "labels.commons.is" | translate}} {{ "labels.commons.required" | translate}} + {{ 'labels.inputs.Deposit Period Type' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} - {{"labels.inputs.Interest Compounding Period" | translate }} + {{ 'labels.inputs.Interest Compounding Period' | translate }} - - {{ interestCompoundingPeriodType.value | translateKey:'catalogs' }} + + {{ interestCompoundingPeriodType.value | translateKey: 'catalogs' }} - {{"labels.inputs.Interest Compounding Period" | translate }} {{ "labels.commons.is" | translate}} {{ "labels.commons.required" | translate}} + {{ 'labels.inputs.Interest Compounding Period' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} - {{"labels.inputs.Interest Posting Period" | translate }} + {{ 'labels.inputs.Interest Posting Period' | translate }} - - {{ interestPostingPeriodType.value | translateKey:'catalogs' }} + + {{ interestPostingPeriodType.value | translateKey: 'catalogs' }} - {{"labels.inputs.Interest Posting Period" | translate }} {{ "labels.commons.is" | translate}} {{ "labels.commons.required" | translate}} + {{ 'labels.inputs.Interest Posting Period' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} - {{"labels.inputs.Interest Calculated using" | translate }} + {{ 'labels.inputs.Interest Calculated using' | translate }} - - {{ interestCalculationType.value | translateKey:'catalogs' }} + + {{ interestCalculationType.value | translateKey: 'catalogs' }} - {{"labels.inputs.Interest Calculated using" | translate }} {{ "labels.commons.is" | translate}} {{ "labels.commons.required" | translate}} + {{ 'labels.inputs.Interest Calculated using' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} - {{"labels.inputs.Days in Year" | translate }} + {{ 'labels.inputs.Days in Year' | translate }} - - {{ interestCalculationDaysInYearType.value | translateKey:'catalogs' }} + + {{ interestCalculationDaysInYearType.value | translateKey: 'catalogs' }} - {{"labels.inputs.Days in Year" | translate }} {{ "labels.commons.is" | translate}} {{ "labels.commons.required" | translate}} + {{ 'labels.inputs.Days in Year' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} -
-
diff --git a/src/app/deposits/fixed-deposits/fixed-deposit-account-view/charges-tab/charges-tab.component.html b/src/app/deposits/fixed-deposits/fixed-deposit-account-view/charges-tab/charges-tab.component.html index 5e3097e72..248086833 100644 --- a/src/app/deposits/fixed-deposits/fixed-deposit-account-view/charges-tab/charges-tab.component.html +++ b/src/app/deposits/fixed-deposits/fixed-deposit-account-view/charges-tab/charges-tab.component.html @@ -1,94 +1,138 @@
-
-

{{"labels.heading.All Charges" | translate }}

+

{{ 'labels.heading.All Charges' | translate }}

+ {{ showInactiveCharges ? 'View Active Charges' : 'View Inactive Charges' }} +
- - - +
- - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - - +
{{"labels.inputs.name" | translate }} {{ charge.name }} {{ 'labels.inputs.name' | translate }}{{ charge.name }} {{"labels.inputs.Fee/Penalty" | translate }} {{ charge.penalty === true ? ('Penalty'| translateKey:'catalogs') : ('Fee'| translateKey:'catalogs') }} {{ 'labels.inputs.Fee/Penalty' | translate }} + {{ charge.penalty === true ? ('Penalty' | translateKey: 'catalogs') : ('Fee' | translateKey: 'catalogs') }} + {{"labels.inputs.Payment Due At" | translate }} {{ charge.chargeTimeType.value | translateKey:'catalogs' }} {{ 'labels.inputs.Payment Due At' | translate }}{{ charge.chargeTimeType.value | translateKey: 'catalogs' }} {{"labels.inputs.Due As Of" | translate }} {{ charge.dueDate | dateFormat }} {{ 'labels.inputs.Due As Of' | translate }}{{ charge.dueDate | dateFormat }} {{"labels.inputs.Repeats On" | translate }} {{charge.feeOnMonthDay ? ([2000].concat(charge.feeOnMonthDay) | dateFormat: 'dd MMMM') : ('Unassigned' | translateKey:'inputs')}} {{ 'labels.inputs.Repeats On' | translate }} + {{ + charge.feeOnMonthDay + ? ([2000].concat(charge.feeOnMonthDay) | dateFormat: 'dd MMMM') + : ('Unassigned' | translateKey: 'inputs') + }} + {{"labels.inputs.Calculation Type" | translate }} {{charge.chargeCalculationType.value | translateKey:'catalogs'}} {{ 'labels.inputs.Calculation Type' | translate }}{{ charge.chargeCalculationType.value | translateKey: 'catalogs' }} {{"labels.inputs.Due" | translate }} {{charge.currency.displaySymbol}} {{charge.amount | formatNumber }} {{ 'labels.inputs.Due' | translate }} + {{ charge.currency.displaySymbol }} {{ charge.amount | formatNumber }} + {{"labels.inputs.Paid" | translate }} {{charge.currency.displaySymbol}} {{charge.amountPaid | formatNumber }} {{ 'labels.inputs.Paid' | translate }} + {{ charge.currency.displaySymbol }} {{ charge.amountPaid | formatNumber }} + {{"labels.inputs.Waived" | translate }} {{charge.currency.displaySymbol}} {{charge.amountWaived | formatNumber }} {{ 'labels.inputs.Waived' | translate }} + {{ charge.currency.displaySymbol }} {{ charge.amountWaived | formatNumber }} + {{"labels.inputs.Outstanding" | translate }} {{charge.currency.displaySymbol}} {{charge.amountOutstanding | formatNumber }} {{ 'labels.inputs.Outstanding' | translate }} + {{ charge.currency.displaySymbol }} {{ charge.amountOutstanding | formatNumber }} + {{"labels.inputs.Actions" | translate }} {{ 'labels.inputs.Actions' | translate }} - - - - - @@ -97,10 +141,7 @@
-
-
diff --git a/src/app/deposits/fixed-deposits/fixed-deposit-account-view/custom-dialogs/calculate-interest-dialog/calculate-interest-dialog.component.html b/src/app/deposits/fixed-deposits/fixed-deposit-account-view/custom-dialogs/calculate-interest-dialog/calculate-interest-dialog.component.html index 2f550c943..1c57b59d2 100644 --- a/src/app/deposits/fixed-deposits/fixed-deposit-account-view/custom-dialogs/calculate-interest-dialog/calculate-interest-dialog.component.html +++ b/src/app/deposits/fixed-deposits/fixed-deposit-account-view/custom-dialogs/calculate-interest-dialog/calculate-interest-dialog.component.html @@ -1,8 +1,10 @@ -

{{"labels.heading.Calculate Interest" | translate }}

+

{{ 'labels.heading.Calculate Interest' | translate }}

-

{{"labels.text.Are you sure you want to calculate interest" | translate }} ?

+

{{ 'labels.text.Are you sure you want to calculate interest' | translate }} ?

- - + + diff --git a/src/app/deposits/fixed-deposits/fixed-deposit-account-view/custom-dialogs/inactivate-charge-dialog/inactivate-charge-dialog.component.html b/src/app/deposits/fixed-deposits/fixed-deposit-account-view/custom-dialogs/inactivate-charge-dialog/inactivate-charge-dialog.component.html index 5112ae278..60ef6bbd4 100644 --- a/src/app/deposits/fixed-deposits/fixed-deposit-account-view/custom-dialogs/inactivate-charge-dialog/inactivate-charge-dialog.component.html +++ b/src/app/deposits/fixed-deposits/fixed-deposit-account-view/custom-dialogs/inactivate-charge-dialog/inactivate-charge-dialog.component.html @@ -1,8 +1,10 @@ -

{{"labels.heading.Inactivate Charge" | translate }}

+

{{ 'labels.heading.Inactivate Charge' | translate }}

-

{{"labels.text.Are you sure you want to inactivate charge with id" | translate }}: {{ data.id }} ?

+

{{ 'labels.text.Are you sure you want to inactivate charge with id' | translate }}: {{ data.id }} ?

- - + + diff --git a/src/app/deposits/fixed-deposits/fixed-deposit-account-view/custom-dialogs/post-interest-dialog/post-interest-dialog.component.html b/src/app/deposits/fixed-deposits/fixed-deposit-account-view/custom-dialogs/post-interest-dialog/post-interest-dialog.component.html index d7ed1cf98..0f5c9905e 100644 --- a/src/app/deposits/fixed-deposits/fixed-deposit-account-view/custom-dialogs/post-interest-dialog/post-interest-dialog.component.html +++ b/src/app/deposits/fixed-deposits/fixed-deposit-account-view/custom-dialogs/post-interest-dialog/post-interest-dialog.component.html @@ -1,8 +1,10 @@ -

{{"labels.heading.Post Interest" | translate }}

+

{{ 'labels.heading.Post Interest' | translate }}

-

{{"labels.text.Are you sure you want to post interest" | translate }} ?

+

{{ 'labels.text.Are you sure you want to post interest' | translate }} ?

- - + + diff --git a/src/app/deposits/fixed-deposits/fixed-deposit-account-view/custom-dialogs/toggle-withhold-tax-dialog/toggle-withhold-tax-dialog.component.html b/src/app/deposits/fixed-deposits/fixed-deposit-account-view/custom-dialogs/toggle-withhold-tax-dialog/toggle-withhold-tax-dialog.component.html index 02b8387ae..7970e3346 100644 --- a/src/app/deposits/fixed-deposits/fixed-deposit-account-view/custom-dialogs/toggle-withhold-tax-dialog/toggle-withhold-tax-dialog.component.html +++ b/src/app/deposits/fixed-deposits/fixed-deposit-account-view/custom-dialogs/toggle-withhold-tax-dialog/toggle-withhold-tax-dialog.component.html @@ -1,8 +1,17 @@ -

{{ (data.isEnable ? 'labels.heading.Enable' : 'labels.heading.Disable') | translate }} {{"labels.heading.Withhold Tax" | translate }}

+

+ {{ (data.isEnable ? 'labels.heading.Enable' : 'labels.heading.Disable') | translate }} + {{ 'labels.heading.Withhold Tax' | translate }} +

-

{{"labels.text.Are you sure you want to" | translate }} {{ (data.isEnable ? 'labels.heading.Enable' : 'labels.heading.Disable') | translate }} {{"labels.text.withhold tax for this account" | translate }} ?

+

+ {{ 'labels.text.Are you sure you want to' | translate }} + {{ (data.isEnable ? 'labels.heading.Enable' : 'labels.heading.Disable') | translate }} + {{ 'labels.text.withhold tax for this account' | translate }} ? +

- - + + diff --git a/src/app/deposits/fixed-deposits/fixed-deposit-account-view/custom-dialogs/waive-charge-dialog/waive-charge-dialog.component.html b/src/app/deposits/fixed-deposits/fixed-deposit-account-view/custom-dialogs/waive-charge-dialog/waive-charge-dialog.component.html index 3ecd77cf3..aaf3b182b 100644 --- a/src/app/deposits/fixed-deposits/fixed-deposit-account-view/custom-dialogs/waive-charge-dialog/waive-charge-dialog.component.html +++ b/src/app/deposits/fixed-deposits/fixed-deposit-account-view/custom-dialogs/waive-charge-dialog/waive-charge-dialog.component.html @@ -1,8 +1,10 @@ -

{{"labels.heading.Waive Charge" | translate }}

+

{{ 'labels.heading.Waive Charge' | translate }}

-

{{"labels.text.Are you sure you want to waive charge with id" | translate }}: {{ data.id }} ?

+

{{ 'labels.text.Are you sure you want to waive charge with id' | translate }}: {{ data.id }} ?

- - + + diff --git a/src/app/deposits/fixed-deposits/fixed-deposit-account-view/fixed-deposit-account-view.component.html b/src/app/deposits/fixed-deposits/fixed-deposit-account-view/fixed-deposit-account-view.component.html index 98f15869e..ead66e5fd 100644 --- a/src/app/deposits/fixed-deposits/fixed-deposit-account-view/fixed-deposit-account-view.component.html +++ b/src/app/deposits/fixed-deposits/fixed-deposit-account-view/fixed-deposit-account-view.component.html @@ -1,45 +1,65 @@