-
{{ 'labels.inputs.Type' | translate }}
-
- {{ transferTypeData.value }}
-
+ @for (transferTypeData of transferTypeDatas; track transferTypeData) {
+
+ {{ transferTypeData.value }}
+
+ }
@@ -88,30 +94,34 @@
{{ 'labels.inputs.Actions' | translate }}
-
-
-
-
-
-
+ @if (instruction.status.value !== 'Deleted') {
+
+
+
+ }
+ @if (instruction.status.value !== 'Deleted') {
+
+
+
+ }
- {{ '(' + node.glCode + ')' }}
+ @if (node.glCode) {
+ {{ '(' + node.glCode + ')' }}
+ }
{{ node.name }}
@@ -151,61 +157,52 @@
-
{{ 'labels.inputs.Account Type' | translate }}
-
- {{ 'labels.inputs.accounting.' + accountType.value | translate }}
-
+ @for (accountType of accountTypeData; track accountType) {
+
+ {{ 'labels.inputs.accounting.' + accountType.value | translate }}
+
+ }
-
- {{ 'labels.inputs.Account Type' | translate }} {{ 'labels.commons.is' | translate }}
- {{ 'labels.commons.required' | translate }}
-
+ @if (
+ glAccountForm.controls.type.hasError('required') &&
+ (glAccountForm.controls.type.touched || glAccountForm.controls.type.dirty)
+ ) {
+
+ {{ 'labels.inputs.Account Type' | translate }} {{ 'labels.commons.is' | translate }}
+ {{ 'labels.commons.required' | translate }}
+
+ }
{{ 'labels.inputs.Account Name' | translate }}
-
- {{ 'labels.inputs.Account Name' | translate }} {{ 'labels.commons.is' | translate }}
- {{ 'labels.commons.required' | translate }}
-
+ @if (
+ glAccountForm.controls.name.hasError('required') &&
+ (glAccountForm.controls.name.touched || glAccountForm.controls.name.dirty)
+ ) {
+
+ {{ 'labels.inputs.Account Name' | translate }} {{ 'labels.commons.is' | translate }}
+ {{ 'labels.commons.required' | translate }}
+
+ }
{{ 'labels.inputs.Account Usage' | translate }}
-
- {{ accountUsage.value }}
-
+ @for (accountUsage of accountUsageData; track accountUsage) {
+
+ {{ accountUsage.value }}
+
+ }
-
- {{ 'labels.inputs.Account Usage' | translate }} {{ 'labels.commons.is' | translate }}
- {{ 'labels.commons.required' | translate }}
-
+ @if (
+ glAccountForm.controls.usage.hasError('required') &&
+ (glAccountForm.controls.usage.touched || glAccountForm.controls.usage.dirty)
+ ) {
+
+ {{ 'labels.inputs.Account Usage' | translate }} {{ 'labels.commons.is' | translate }}
+ {{ 'labels.commons.required' | translate }}
+
+ }
{{ 'labels.inputs.GL Code' | translate }}
-
- {{ 'labels.inputs.GL Code' | translate }} {{ 'labels.commons.is' | translate }}
- {{ 'labels.commons.required' | translate }}
-
+ @if (
+ glAccountForm.controls.glCode.hasError('required') &&
+ (glAccountForm.controls.glCode.touched || glAccountForm.controls.glCode.dirty)
+ ) {
+
+ {{ 'labels.inputs.GL Code' | translate }} {{ 'labels.commons.is' | translate }}
+ {{ 'labels.commons.required' | translate }}
+
+ }
{{ 'labels.inputs.Tag' | translate }}
-
- {{ tag.name }}
-
+ @for (tag of tagData; track tag) {
+
+ {{ tag.name }}
+
+ }
diff --git a/src/app/accounting/chart-of-accounts/create-gl-account/create-gl-account.component.ts b/src/app/accounting/chart-of-accounts/create-gl-account/create-gl-account.component.ts
index 7640856814..088579e3d8 100644
--- a/src/app/accounting/chart-of-accounts/create-gl-account/create-gl-account.component.ts
+++ b/src/app/accounting/chart-of-accounts/create-gl-account/create-gl-account.component.ts
@@ -1,5 +1,5 @@
/** Angular Imports */
-import { Component, OnInit, TemplateRef, ElementRef, ViewChild, AfterViewInit } from '@angular/core';
+import { Component, OnInit, TemplateRef, ElementRef, ViewChild, AfterViewInit, inject } from '@angular/core';
import { UntypedFormGroup, UntypedFormBuilder, Validators, ReactiveFormsModule } from '@angular/forms';
import { Router, ActivatedRoute, RouterLink } from '@angular/router';
import { MatDialog } from '@angular/material/dialog';
@@ -32,6 +32,14 @@ import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
]
})
export class CreateGlAccountComponent implements OnInit, AfterViewInit {
+ private formBuilder = inject(UntypedFormBuilder);
+ private accountingService = inject(AccountingService);
+ private route = inject(ActivatedRoute);
+ private router = inject(Router);
+ private configurationWizardService = inject(ConfigurationWizardService);
+ private popoverService = inject(PopoverService);
+ dialog = inject(MatDialog);
+
/** GL account form. */
glAccountForm: UntypedFormGroup;
/** Chart of accounts data. */
@@ -66,15 +74,7 @@ export class CreateGlAccountComponent implements OnInit, AfterViewInit {
* @param {PopoverService} popoverService PopoverService.
* @param {Matdialog} dialog Matdialog.
*/
- constructor(
- private formBuilder: UntypedFormBuilder,
- private accountingService: AccountingService,
- private route: ActivatedRoute,
- private router: Router,
- private configurationWizardService: ConfigurationWizardService,
- private popoverService: PopoverService,
- public dialog: MatDialog
- ) {
+ constructor() {
this.route.queryParamMap.subscribe((params) => {
this.accountTypeId = Number(params.get('accountType'));
this.parentId = Number(params.get('parent'));
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 fecc2cb5b0..587d2a2f5c 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
@@ -6,45 +6,57 @@
{{ 'labels.inputs.Account Type' | translate }}
-
- {{ accountType.value }}
-
+ @for (accountType of accountTypeData; track accountType) {
+
+ {{ accountType.value }}
+
+ }
-
- {{ 'labels.inputs.Account Type' | translate }} {{ 'labels.commons.is' | translate }}
- {{ 'labels.commons.required' | translate }}
-
+ @if (glAccountForm.controls.type.hasError('required')) {
+
+ {{ 'labels.inputs.Account Type' | translate }} {{ 'labels.commons.is' | translate }}
+ {{ 'labels.commons.required' | translate }}
+
+ }
{{ 'labels.inputs.Account Name' | translate }}
-
- {{ 'labels.inputs.Account Name' | translate }} {{ 'labels.commons.is' | translate }}
- {{ 'labels.commons.required' | translate }}
-
+ @if (glAccountForm.controls.name.hasError('required')) {
+
+ {{ 'labels.inputs.Account Name' | translate }} {{ 'labels.commons.is' | translate }}
+ {{ 'labels.commons.required' | translate }}
+
+ }
{{ 'labels.inputs.Account Usage' | translate }}
-
- {{ accountUsage.value }}
-
+ @for (accountUsage of accountUsageData; track accountUsage) {
+
+ {{ accountUsage.value }}
+
+ }
-
- {{ 'labels.inputs.Account Usage' | translate }} {{ 'labels.commons.is' | translate }}
- {{ 'labels.commons.required' | translate }}
-
+ @if (glAccountForm.controls.usage.hasError('required')) {
+
+ {{ 'labels.inputs.Account Usage' | translate }} {{ 'labels.commons.is' | translate }}
+ {{ 'labels.commons.required' | translate }}
+
+ }
{{ 'labels.inputs.GL Code' | translate }}
-
- {{ 'labels.inputs.GL Code' | translate }} {{ 'labels.commons.is' | translate }}
- {{ 'labels.commons.required' | translate }}
-
+ @if (glAccountForm.controls.glCode.hasError('required')) {
+
+ {{ 'labels.inputs.GL Code' | translate }} {{ 'labels.commons.is' | translate }}
+ {{ 'labels.commons.required' | translate }}
+
+ }
{{ 'labels.inputs.Tag' | translate }}
-
- {{ tag.name }}
-
+ @for (tag of tagData; track tag) {
+
+ {{ tag.name }}
+
+ }
diff --git a/src/app/accounting/chart-of-accounts/edit-gl-account/edit-gl-account.component.ts b/src/app/accounting/chart-of-accounts/edit-gl-account/edit-gl-account.component.ts
index 7ddf8cd71b..ed02eca1f4 100644
--- a/src/app/accounting/chart-of-accounts/edit-gl-account/edit-gl-account.component.ts
+++ b/src/app/accounting/chart-of-accounts/edit-gl-account/edit-gl-account.component.ts
@@ -1,5 +1,5 @@
/** Angular Imports */
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, inject } from '@angular/core';
import { ActivatedRoute, Router, RouterLink } from '@angular/router';
import { UntypedFormGroup, UntypedFormBuilder, Validators, ReactiveFormsModule } from '@angular/forms';
@@ -25,6 +25,11 @@ import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
]
})
export class EditGlAccountComponent implements OnInit {
+ private formBuilder = inject(UntypedFormBuilder);
+ private accountingService = inject(AccountingService);
+ private route = inject(ActivatedRoute);
+ private router = inject(Router);
+
/** GL account form. */
glAccountForm: UntypedFormGroup;
/** GL account and chart of accounts data. */
@@ -45,12 +50,7 @@ export class EditGlAccountComponent implements OnInit {
* @param {ActivatedRoute} route Activated Route.
* @param {Router} router Router for navigation.
*/
- constructor(
- private formBuilder: UntypedFormBuilder,
- private accountingService: AccountingService,
- private route: ActivatedRoute,
- private router: Router
- ) {
+ constructor() {
this.route.data.subscribe((data: { glAccountAndChartOfAccountsTemplate: any }) => {
this.glAccount = data.glAccountAndChartOfAccountsTemplate;
});
diff --git a/src/app/accounting/chart-of-accounts/gl-account-and-chart-of-accounts-template.resolver.ts b/src/app/accounting/chart-of-accounts/gl-account-and-chart-of-accounts-template.resolver.ts
index 7c37a50931..cbd1e7391e 100644
--- a/src/app/accounting/chart-of-accounts/gl-account-and-chart-of-accounts-template.resolver.ts
+++ b/src/app/accounting/chart-of-accounts/gl-account-and-chart-of-accounts-template.resolver.ts
@@ -1,5 +1,5 @@
/** Angular Imports */
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import { ActivatedRouteSnapshot } from '@angular/router';
/** rxjs Imports */
@@ -14,10 +14,7 @@ import { AccountingService } from '../accounting.service';
*/
@Injectable()
export class GlAccountAndChartOfAccountsTemplateResolver {
- /**
- * @param {AccountingService} accountingService Accounting service.
- */
- constructor(private accountingService: AccountingService) {}
+ private accountingService = inject(AccountingService);
/**
* Returns the gl account and chart of accounts template data.
diff --git a/src/app/accounting/chart-of-accounts/gl-account-tree.service.ts b/src/app/accounting/chart-of-accounts/gl-account-tree.service.ts
index f71ec0c59d..4afb14ff97 100644
--- a/src/app/accounting/chart-of-accounts/gl-account-tree.service.ts
+++ b/src/app/accounting/chart-of-accounts/gl-account-tree.service.ts
@@ -1,5 +1,5 @@
/** Angular Imports */
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
/** rxjs Imports */
import { BehaviorSubject } from 'rxjs';
@@ -16,6 +16,8 @@ import { GLAccount } from 'app/shared/models/general.model';
providedIn: 'root'
})
export class GlAccountTreeService {
+ private translateService = inject(TranslateService);
+
/** GL Account data. */
glAccountData: any;
/** Chart of accounts tree data behavior subject to represent chart of accounts tree nodes. */
@@ -28,8 +30,6 @@ export class GlAccountTreeService {
return this.treeDataChange.value;
}
- constructor(private translateService: TranslateService) {}
-
/**
* Builds the chart of accounts tree and emits the value.
* @param {any} glAccountData Chart of accounts data.
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 19320b8bd3..94d3f9b924 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,15 +1,16 @@
-
- {{ office.name }}
-
+ @for (office of filteredOfficeData | async; track office) {
+
+ {{ office.name }}
+
+ }
{{ 'labels.inputs.Office' | translate }}
-
- {{ office.name }}
-
+ @for (office of officeData; track office) {
+
+ {{ office.name }}
+
+ }
-
- {{ 'labels.inputs.Office' | translate }} {{ 'labels.commons.is' | translate }}
- {{ 'labels.commons.required' | translate }}
-
+ @if (journalEntryForm.controls.officeId.hasError('required')) {
+
+ {{ 'labels.inputs.Office' | translate }} {{ 'labels.commons.is' | translate }}
+ {{ 'labels.commons.required' | translate }}
+
+ }
{{ 'labels.inputs.Currency' | translate }}
-
- {{ currency.displayLabel }}
-
+ @for (currency of currencyData; track currency) {
+
+ {{ currency.displayLabel }}
+
+ }
-
- {{ 'labels.inputs.Currency' | translate }} {{ 'labels.commons.is' | translate }}
- {{ 'labels.commons.required' | translate }}
-
+ @if (journalEntryForm.controls.currencyCode.hasError('required')) {
+
+ {{ 'labels.inputs.Currency' | translate }} {{ 'labels.commons.is' | translate }}
+ {{ 'labels.commons.required' | translate }}
+
+ }
-
- {{ 'labels.inputs.External Asset Owner' | translate }}
-
-
-
-
diff --git a/src/app/clients/clients-view/charges/view-charge/view-charge.component.ts b/src/app/clients/clients-view/charges/view-charge/view-charge.component.ts
index 67313031b5..6b546659f3 100644
--- a/src/app/clients/clients-view/charges/view-charge/view-charge.component.ts
+++ b/src/app/clients/clients-view/charges/view-charge/view-charge.component.ts
@@ -1,10 +1,10 @@
/** Angular Imports */
-import { Component } from '@angular/core';
+import { Component, inject } from '@angular/core';
import { ActivatedRoute, Router, RouterLink } from '@angular/router';
import { ClientsService } from 'app/clients/clients.service';
import { FaIconComponent } from '@fortawesome/angular-fontawesome';
import { MatCard, MatCardTitle, MatCardContent, MatCardActions } from '@angular/material/card';
-import { NgClass, NgIf } from '@angular/common';
+import { NgClass } from '@angular/common';
import { MatDivider } from '@angular/material/divider';
import {
MatTable,
@@ -52,6 +52,10 @@ import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
]
})
export class ViewChargeComponent {
+ private route = inject(ActivatedRoute);
+ private router = inject(Router);
+ private clientService = inject(ClientsService);
+
/** Charge Data. */
chargeData: any;
/** Mat Table Column defs. */
@@ -69,11 +73,7 @@ export class ViewChargeComponent {
* @param {ActivatedRoute} route Activated Route.
* @param {Router} router Router for navigation.
*/
- constructor(
- private route: ActivatedRoute,
- private router: Router,
- private clientService: ClientsService
- ) {
+ constructor() {
this.route.data.subscribe((data: { clientChargeData: any }) => {
this.chargeData = data.clientChargeData;
});
diff --git a/src/app/clients/clients-view/client-actions/accept-client-transfer/accept-client-transfer.component.ts b/src/app/clients/clients-view/client-actions/accept-client-transfer/accept-client-transfer.component.ts
index 366cf431fe..c2b3141a6e 100644
--- a/src/app/clients/clients-view/client-actions/accept-client-transfer/accept-client-transfer.component.ts
+++ b/src/app/clients/clients-view/client-actions/accept-client-transfer/accept-client-transfer.component.ts
@@ -1,5 +1,5 @@
/** Angular Imports */
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, inject } from '@angular/core';
import { UntypedFormGroup, UntypedFormBuilder, ReactiveFormsModule } from '@angular/forms';
import { ActivatedRoute, Router, RouterLink } from '@angular/router';
@@ -23,6 +23,13 @@ import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
]
})
export class AcceptClientTransferComponent implements OnInit {
+ private formBuilder = inject(UntypedFormBuilder);
+ private clientsService = inject(ClientsService);
+ private settingsService = inject(SettingsService);
+ private dateUtils = inject(Dates);
+ private route = inject(ActivatedRoute);
+ private router = inject(Router);
+
/** Accept Client Transfer form. */
acceptClientTransferForm: UntypedFormGroup;
/** Client Id */
@@ -38,14 +45,7 @@ export class AcceptClientTransferComponent implements OnInit {
* @param {ActivatedRoute} route Activated Route
* @param {Router} router Router
*/
- constructor(
- private formBuilder: UntypedFormBuilder,
- private clientsService: ClientsService,
- private settingsService: SettingsService,
- private dateUtils: Dates,
- private route: ActivatedRoute,
- private router: Router
- ) {
+ constructor() {
this.route.data.subscribe((data: { clientActionData: any }) => {
this.transferDate = data.clientActionData;
});
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 218cc32298..ab294299ad 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
@@ -14,10 +14,12 @@
/>
- {{ 'labels.inputs.Activated On Date' | translate }} {{ 'labels.commons.is' | translate }}
- {{ 'labels.commons.required' | translate }}
-
+ @if (activateClientForm.controls.activationDate.hasError('required')) {
+
+ {{ 'labels.inputs.Activated On Date' | translate }} {{ 'labels.commons.is' | translate }}
+ {{ 'labels.commons.required' | translate }}
+
+ }
diff --git a/src/app/clients/clients-view/client-actions/activate-client/activate-client.component.ts b/src/app/clients/clients-view/client-actions/activate-client/activate-client.component.ts
index eb7e6e8752..d9721f7f2e 100644
--- a/src/app/clients/clients-view/client-actions/activate-client/activate-client.component.ts
+++ b/src/app/clients/clients-view/client-actions/activate-client/activate-client.component.ts
@@ -1,5 +1,5 @@
/** Angular Imports */
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, inject } from '@angular/core';
import { UntypedFormGroup, UntypedFormBuilder, Validators, ReactiveFormsModule } from '@angular/forms';
import { ActivatedRoute, Router, RouterLink } from '@angular/router';
@@ -21,6 +21,13 @@ import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
]
})
export class ActivateClientComponent implements OnInit {
+ private formBuilder = inject(UntypedFormBuilder);
+ private clientsService = inject(ClientsService);
+ private dateUtils = inject(Dates);
+ private route = inject(ActivatedRoute);
+ private router = inject(Router);
+ private settingsService = inject(SettingsService);
+
/** Minimum date allowed. */
minDate = new Date(2000, 0, 1);
/** Maximum date allowed. */
@@ -38,14 +45,7 @@ export class ActivateClientComponent implements OnInit {
* @param {Router} router Router
* @param {SettingsService} settingsService Settings Service
*/
- constructor(
- private formBuilder: UntypedFormBuilder,
- private clientsService: ClientsService,
- private dateUtils: Dates,
- private route: ActivatedRoute,
- private router: Router,
- private settingsService: SettingsService
- ) {
+ constructor() {
this.clientId = this.route.parent.snapshot.params['clientId'];
}
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 50e46999c9..571120ff2c 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
@@ -6,88 +6,102 @@
{{ 'labels.inputs.Charge' | translate }}
-
- {{ clientCharge.name + ' (' + clientCharge.currency.name + ')' }}
-
-
-
- {{ 'labels.inputs.Charge' | 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.ts b/src/app/clients/clients-view/client-actions/add-client-charge/add-client-charge.component.ts
index 94d8f29d8e..ca89ef23c5 100644
--- a/src/app/clients/clients-view/client-actions/add-client-charge/add-client-charge.component.ts
+++ b/src/app/clients/clients-view/client-actions/add-client-charge/add-client-charge.component.ts
@@ -1,5 +1,5 @@
/** Angular Imports */
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, inject } from '@angular/core';
import {
UntypedFormGroup,
UntypedFormBuilder,
@@ -27,6 +27,13 @@ import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
]
})
export class AddClientChargeComponent implements OnInit {
+ private formBuilder = inject(UntypedFormBuilder);
+ private route = inject(ActivatedRoute);
+ private router = inject(Router);
+ private dateUtils = inject(Dates);
+ private clientsService = inject(ClientsService);
+ private settingsService = inject(SettingsService);
+
/** Minimum Due Date allowed. */
minDate = new Date(2000, 0, 1);
/** Maximum Due Date allowed. */
@@ -49,14 +56,7 @@ export class AddClientChargeComponent implements OnInit {
* @param {ClientsService} clientsService Clients Service
* @param {SettingsService} settingsService Setting service
*/
- constructor(
- private formBuilder: UntypedFormBuilder,
- private route: ActivatedRoute,
- private router: Router,
- private dateUtils: Dates,
- private clientsService: ClientsService,
- private settingsService: SettingsService
- ) {
+ constructor() {
this.route.data.subscribe((data: { clientActionData: any }) => {
this.clientChargeOptions = data.clientActionData.chargeOptions;
});
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 99551cf095..c9e1a87297 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
@@ -6,61 +6,62 @@
{{ 'labels.inputs.Collateral' | translate }}
-
- {{ clientCollateral.name }}
-
+ @for (clientCollateral of clientCollateralOptions; track clientCollateral) {
+
+ {{ clientCollateral.name }}
+
+ }
-
- {{ 'labels.inputs.Collateral' | translate }} {{ 'labels.commons.is' | translate }}
- {{ 'labels.commons.required' | translate }}
-
-
-
-
{{ 'labels.inputs.Staff' | translate }}
-
- {{ staff.displayName }}
-
+ @for (staff of staffData; track staff) {
+
+ {{ staff.displayName }}
+
+ }
-
- {{ 'labels.inputs.Staff' | translate }} {{ 'labels.commons.is' | translate }}
- {{ 'labels.commons.required' | translate }}
-
+ @if (clientAssignStaffForm.controls.staffId.hasError('required')) {
+
+ {{ 'labels.inputs.Staff' | translate }} {{ 'labels.commons.is' | translate }}
+ {{ 'labels.commons.required' | translate }}
+
+ }
diff --git a/src/app/clients/clients-view/client-actions/client-assign-staff/client-assign-staff.component.ts b/src/app/clients/clients-view/client-actions/client-assign-staff/client-assign-staff.component.ts
index c2a9179725..939abbeb5d 100644
--- a/src/app/clients/clients-view/client-actions/client-assign-staff/client-assign-staff.component.ts
+++ b/src/app/clients/clients-view/client-actions/client-assign-staff/client-assign-staff.component.ts
@@ -1,5 +1,5 @@
/** Angular Imports */
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, inject } from '@angular/core';
import { UntypedFormGroup, UntypedFormBuilder, ReactiveFormsModule } from '@angular/forms';
import { ActivatedRoute, Router, RouterLink } from '@angular/router';
@@ -19,6 +19,11 @@ import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
]
})
export class ClientAssignStaffComponent implements OnInit {
+ private formBuilder = inject(UntypedFormBuilder);
+ private clientsService = inject(ClientsService);
+ private route = inject(ActivatedRoute);
+ private router = inject(Router);
+
/** Client Assign Staff form. */
clientAssignStaffForm: UntypedFormGroup;
/** Staff Data */
@@ -33,12 +38,7 @@ export class ClientAssignStaffComponent implements OnInit {
* @param {ActivatedRoute} route Activated Route
* @param {Router} router Router
*/
- constructor(
- private formBuilder: UntypedFormBuilder,
- private clientsService: ClientsService,
- private route: ActivatedRoute,
- private router: Router
- ) {
+ constructor() {
this.route.data.subscribe((data: { clientActionData: any }) => {
this.clientData = data.clientActionData;
});
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 ab9c1a6cc9..84058bc977 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
@@ -6,14 +6,18 @@
{{ 'labels.inputs.Client Screen Reports' | translate }}
-
- {{ template.name }}
-
+ @for (template of templatesData; track template) {
+
+ {{ template.name }}
+
+ }
-
- {{ 'labels.inputs.Screen Report' | translate }} {{ 'labels.commons.is' | translate }}
- {{ 'labels.commons.required' | translate }}
-
+ @if (clientScreenReportForm.controls.templateId.hasError('required')) {
+
+ {{ 'labels.inputs.Screen Report' | 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.ts b/src/app/clients/clients-view/client-actions/client-screen-reports/client-screen-reports.component.ts
index 2d3dc1fb43..675e456b5c 100644
--- a/src/app/clients/clients-view/client-actions/client-screen-reports/client-screen-reports.component.ts
+++ b/src/app/clients/clients-view/client-actions/client-screen-reports/client-screen-reports.component.ts
@@ -1,5 +1,5 @@
/** Angular Imports */
-import { Component, OnInit, Renderer2, ViewChild, ElementRef, SecurityContext } from '@angular/core';
+import { Component, OnInit, Renderer2, ViewChild, ElementRef, SecurityContext, inject } from '@angular/core';
import { UntypedFormGroup, UntypedFormBuilder, ReactiveFormsModule } from '@angular/forms';
import { ActivatedRoute, Router, RouterLink } from '@angular/router';
@@ -22,6 +22,12 @@ import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
]
})
export class ClientScreenReportsComponent implements OnInit {
+ private formBuilder = inject(UntypedFormBuilder);
+ private clientsService = inject(ClientsService);
+ private route = inject(ActivatedRoute);
+ private sanitizer = inject(DomSanitizer);
+ private renderer = inject(Renderer2);
+
/** Client Screen Reportform. */
clientScreenReportForm: UntypedFormGroup;
/** Templates Data */
@@ -42,13 +48,7 @@ export class ClientScreenReportsComponent implements OnInit {
* @param {DomSanitizer} sanitizer DOM Sanitizer
* @param {Renderer2} renderer Renderer 2
*/
- constructor(
- private formBuilder: UntypedFormBuilder,
- private clientsService: ClientsService,
- private route: ActivatedRoute,
- private sanitizer: DomSanitizer,
- private renderer: Renderer2
- ) {
+ constructor() {
this.route.data.subscribe((data: { clientActionData: any }) => {
this.templatesData = data.clientActionData;
});
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 98590f9099..a899640627 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
@@ -15,23 +15,29 @@
/>
- {{ 'labels.inputs.Closed On Date' | translate }} {{ 'labels.commons.is' | translate }}
- {{ 'labels.commons.required' | translate }}
-
+ @if (closeClientForm.controls.closureDate.hasError('required')) {
+
+ {{ 'labels.inputs.Closed On Date' | translate }} {{ 'labels.commons.is' | translate }}
+ {{ 'labels.commons.required' | translate }}
+
+ }
{{ 'labels.inputs.Closure Reason' | translate }}
-
- {{ reason.name }}
-
+ @for (reason of closureData; track reason) {
+
+ {{ reason.name }}
+
+ }
-
- {{ 'labels.inputs.Closure Reason' | translate }} {{ 'labels.commons.is' | translate }}
- {{ 'labels.commons.required' | translate }}
-
+ @if (closeClientForm.controls.closureReasonId.hasError('required')) {
+
+ {{ 'labels.inputs.Closure Reason' | translate }} {{ 'labels.commons.is' | translate }}
+ {{ 'labels.commons.required' | translate }}
+
+ }
diff --git a/src/app/clients/clients-view/client-actions/close-client/close-client.component.ts b/src/app/clients/clients-view/client-actions/close-client/close-client.component.ts
index 7b6c74437f..a0040401a0 100644
--- a/src/app/clients/clients-view/client-actions/close-client/close-client.component.ts
+++ b/src/app/clients/clients-view/client-actions/close-client/close-client.component.ts
@@ -1,5 +1,5 @@
/** Angular Imports */
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, inject } from '@angular/core';
import { UntypedFormGroup, UntypedFormBuilder, Validators, ReactiveFormsModule } from '@angular/forms';
import { ActivatedRoute, Router, RouterLink } from '@angular/router';
@@ -21,6 +21,13 @@ import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
]
})
export class CloseClientComponent implements OnInit {
+ private formBuilder = inject(UntypedFormBuilder);
+ private clientsService = inject(ClientsService);
+ private dateUtils = inject(Dates);
+ private route = inject(ActivatedRoute);
+ private router = inject(Router);
+ private settingsService = inject(SettingsService);
+
/** Minimum date allowed. */
minDate = new Date(2000, 0, 1);
/** Maximum date allowed. */
@@ -40,14 +47,7 @@ export class CloseClientComponent implements OnInit {
* @param {Router} router Router
* @param {SettingsService} settingsService Setting service
*/
- constructor(
- private formBuilder: UntypedFormBuilder,
- private clientsService: ClientsService,
- private dateUtils: Dates,
- private route: ActivatedRoute,
- private router: Router,
- private settingsService: SettingsService
- ) {
+ constructor() {
this.route.data.subscribe((data: { clientActionData: any }) => {
this.closureData = data.clientActionData.narrations;
});
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 2c4efd633e..c40ee0bf1a 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
@@ -14,10 +14,12 @@
/>
- {{ 'labels.inputs.Reactivation Date' | translate }} {{ 'labels.commons.is' | translate }}
- {{ 'labels.commons.required' | translate }}
-
+ @if (reactivateClientForm.controls.reactivationDate.hasError('required')) {
+
+ {{ 'labels.inputs.Reactivation Date' | translate }} {{ 'labels.commons.is' | translate }}
+ {{ 'labels.commons.required' | translate }}
+
+ }
diff --git a/src/app/clients/clients-view/client-actions/reactivate-client/reactivate-client.component.ts b/src/app/clients/clients-view/client-actions/reactivate-client/reactivate-client.component.ts
index 096730339d..f179f2514f 100644
--- a/src/app/clients/clients-view/client-actions/reactivate-client/reactivate-client.component.ts
+++ b/src/app/clients/clients-view/client-actions/reactivate-client/reactivate-client.component.ts
@@ -1,5 +1,5 @@
/** Angular Imports */
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, inject } from '@angular/core';
import { UntypedFormGroup, UntypedFormBuilder, Validators, ReactiveFormsModule } from '@angular/forms';
import { ActivatedRoute, Router, RouterLink } from '@angular/router';
@@ -21,6 +21,13 @@ import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
]
})
export class ReactivateClientComponent implements OnInit {
+ private formBuilder = inject(UntypedFormBuilder);
+ private clientsService = inject(ClientsService);
+ private dateUtils = inject(Dates);
+ private route = inject(ActivatedRoute);
+ private router = inject(Router);
+ private settingsService = inject(SettingsService);
+
/** Minimum date allowed. */
minDate = new Date(2000, 0, 1);
/** Maximum date allowed. */
@@ -38,14 +45,7 @@ export class ReactivateClientComponent implements OnInit {
* @param {Router} router Router
* @param {SettingsService} settingsService Setting service
*/
- constructor(
- private formBuilder: UntypedFormBuilder,
- private clientsService: ClientsService,
- private dateUtils: Dates,
- private route: ActivatedRoute,
- private router: Router,
- private settingsService: SettingsService
- ) {
+ constructor() {
this.clientId = this.route.parent.snapshot.params['clientId'];
}
diff --git a/src/app/clients/clients-view/client-actions/reject-client-transfer/reject-client-transfer.component.ts b/src/app/clients/clients-view/client-actions/reject-client-transfer/reject-client-transfer.component.ts
index eaa9d02143..bcaf554c76 100644
--- a/src/app/clients/clients-view/client-actions/reject-client-transfer/reject-client-transfer.component.ts
+++ b/src/app/clients/clients-view/client-actions/reject-client-transfer/reject-client-transfer.component.ts
@@ -1,5 +1,5 @@
/** Angular Imports */
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, inject } from '@angular/core';
import { UntypedFormGroup, UntypedFormBuilder, ReactiveFormsModule } from '@angular/forms';
import { ActivatedRoute, Router, RouterLink } from '@angular/router';
@@ -23,6 +23,13 @@ import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
]
})
export class RejectClientTransferComponent implements OnInit {
+ private formBuilder = inject(UntypedFormBuilder);
+ private clientsService = inject(ClientsService);
+ private settingsService = inject(SettingsService);
+ private dateUtils = inject(Dates);
+ private route = inject(ActivatedRoute);
+ private router = inject(Router);
+
/** Reject Client Transfer form. */
rejectClientTransferForm: UntypedFormGroup;
/** Client Id */
@@ -36,14 +43,7 @@ export class RejectClientTransferComponent implements OnInit {
* @param {ActivatedRoute} route Activated Route
* @param {Router} router Router
*/
- constructor(
- private formBuilder: UntypedFormBuilder,
- private clientsService: ClientsService,
- private settingsService: SettingsService,
- private dateUtils: Dates,
- private route: ActivatedRoute,
- private router: Router
- ) {
+ constructor() {
this.route.data.subscribe((data: { clientActionData: any }) => {
this.transferDate = data.clientActionData;
});
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 71d989cc30..294c66a45d 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
@@ -15,23 +15,29 @@
/>
- {{ 'labels.inputs.Rejection Date' | translate }} {{ 'labels.commons.is' | translate }}
- {{ 'labels.commons.required' | translate }}
-
+ @if (rejectClientForm.controls.rejectionDate.hasError('required')) {
+
+ {{ 'labels.inputs.Rejection Date' | translate }} {{ 'labels.commons.is' | translate }}
+ {{ 'labels.commons.required' | translate }}
+
+ }
{{ 'labels.inputs.Rejection Reason' | translate }}
-
- {{ reason.name }}
-
+ @for (reason of rejectionData; track reason) {
+
+ {{ reason.name }}
+
+ }
-
- {{ 'labels.inputs.Rejection Reason' | translate }} {{ 'labels.commons.is' | translate }}
- {{ 'labels.commons.required' | translate }}
-
+ @if (rejectClientForm.controls.rejectionReasonId.hasError('required')) {
+
+ {{ 'labels.inputs.Rejection Reason' | translate }} {{ 'labels.commons.is' | translate }}
+ {{ 'labels.commons.required' | translate }}
+
+ }
diff --git a/src/app/clients/clients-view/client-actions/reject-client/reject-client.component.ts b/src/app/clients/clients-view/client-actions/reject-client/reject-client.component.ts
index 9c8ef234e9..17987c0cb7 100644
--- a/src/app/clients/clients-view/client-actions/reject-client/reject-client.component.ts
+++ b/src/app/clients/clients-view/client-actions/reject-client/reject-client.component.ts
@@ -1,5 +1,5 @@
/** Angular Imports */
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, inject } from '@angular/core';
import { UntypedFormGroup, UntypedFormBuilder, Validators, ReactiveFormsModule } from '@angular/forms';
import { ActivatedRoute, Router, RouterLink } from '@angular/router';
@@ -21,6 +21,13 @@ import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
]
})
export class RejectClientComponent implements OnInit {
+ private formBuilder = inject(UntypedFormBuilder);
+ private clientsService = inject(ClientsService);
+ private dateUtils = inject(Dates);
+ private route = inject(ActivatedRoute);
+ private router = inject(Router);
+ private settingsService = inject(SettingsService);
+
/** Minimum date allowed. */
minDate = new Date(2000, 0, 1);
/** Maximum date allowed. */
@@ -40,14 +47,7 @@ export class RejectClientComponent implements OnInit {
* @param {Router} router Router
* @param {SettingsService} settingsService Setting service
*/
- constructor(
- private formBuilder: UntypedFormBuilder,
- private clientsService: ClientsService,
- private dateUtils: Dates,
- private route: ActivatedRoute,
- private router: Router,
- private settingsService: SettingsService
- ) {
+ constructor() {
this.route.data.subscribe((data: { clientActionData: any }) => {
this.rejectionData = data.clientActionData.narrations;
});
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 62513e0757..d9248cbd07 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
@@ -3,42 +3,41 @@
{{ 'labels.inputs.Survey Name' | translate }}
-
- {{ surveyData.name }}
-
+ @for (surveyData of allSurveyData; track surveyData) {
+
+ {{ surveyData.name }}
+
+ }
-
-
- {{ 'labels.inputs.Activation Date' | translate }}
-
- {{ clientViewData.activationDate | dateFormat }}
-
+ @if (clientViewData.activationDate) {
+
+
+ {{ 'labels.inputs.Activation Date' | translate }}
+
+ {{ clientViewData.activationDate | dateFormat }}
+
+ }
{{ 'labels.inputs.Staff' | translate }}
- {{ clientViewData.staffName }}
- {{ 'labels.inputs.Unassigned' | translate }}
+ @if (clientViewData.staffName) {
+ {{ clientViewData.staffName }}
+ }
+ @if (!clientViewData.staffName) {
+ {{ 'labels.inputs.Unassigned' | translate }}
+ }
@@ -109,22 +115,28 @@
-
+ @if (!showClosedSavingAccounts) {
+
+
+ }
-
-
+ @if (showClosedSavingAccounts) {
+
+
+ }
-
-
-
+ @if (isFromClient) {
+ {{ 'labels.heading.Client Type' | translate }}
- - -{{ clientName }}
- -
+
+
+ }
- {{ 'labels.heading.Client Type' | translate }}
+ + +{{ clientName }}
+ +
-
-
-
-
-
-
-
+ @if (!isFromClient) {
+
+
+
+
+
+
+
+
+ }
{{ clientName }}
-
-
-
diff --git a/src/app/accounting/chart-of-accounts/chart-of-accounts.component.ts b/src/app/accounting/chart-of-accounts/chart-of-accounts.component.ts
index 54ff0b44ff..398b69cef2 100644
--- a/src/app/accounting/chart-of-accounts/chart-of-accounts.component.ts
+++ b/src/app/accounting/chart-of-accounts/chart-of-accounts.component.ts
@@ -1,5 +1,5 @@
/** Angular Imports */
-import { Component, OnInit, TemplateRef, ElementRef, ViewChild, AfterViewInit } from '@angular/core';
+import { Component, OnInit, TemplateRef, ElementRef, ViewChild, AfterViewInit, inject } from '@angular/core';
import { MatPaginator } from '@angular/material/paginator';
import { MatSort, MatSortHeader } from '@angular/material/sort';
import {
@@ -81,6 +81,13 @@ import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
]
})
export class ChartOfAccountsComponent implements AfterViewInit, OnInit {
+ private glAccountTreeService = inject(GlAccountTreeService);
+ private route = inject(ActivatedRoute);
+ private router = inject(Router);
+ private treeControlService = inject(TreeControlService);
+ private configurationWizardService = inject(ConfigurationWizardService);
+ private popoverService = inject(PopoverService);
+
/** Button toggle group form control for type of view. (list/tree) */
viewGroup = new UntypedFormControl('listView');
/** GL Account data. */
@@ -127,14 +134,9 @@ export class ChartOfAccountsComponent implements AfterViewInit, OnInit {
* @param {ConfigurationWizardService} configurationWizardService ConfigurationWizard Service.
* @param {PopoverService} popoverService PopoverService.
*/
- constructor(
- private glAccountTreeService: GlAccountTreeService,
- private route: ActivatedRoute,
- private router: Router,
- private treeControlService: TreeControlService,
- private configurationWizardService: ConfigurationWizardService,
- private popoverService: PopoverService
- ) {
+ constructor() {
+ const glAccountTreeService = this.glAccountTreeService;
+
this.route.data.subscribe((data: { chartOfAccounts: any }) => {
this.glAccountData = data.chartOfAccounts;
glAccountTreeService.initialize(this.glAccountData);
diff --git a/src/app/accounting/chart-of-accounts/chart-of-accounts.resolver.ts b/src/app/accounting/chart-of-accounts/chart-of-accounts.resolver.ts
index a5a54860fa..ff398d45e5 100644
--- a/src/app/accounting/chart-of-accounts/chart-of-accounts.resolver.ts
+++ b/src/app/accounting/chart-of-accounts/chart-of-accounts.resolver.ts
@@ -1,5 +1,5 @@
/** Angular Imports */
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
/** rxjs Imports */
import { Observable } from 'rxjs';
@@ -12,10 +12,7 @@ import { AccountingService } from '../accounting.service';
*/
@Injectable()
export class ChartOfAccountsResolver {
- /**
- * @param {AccountingService} accountingService Accounting service.
- */
- constructor(private accountingService: AccountingService) {}
+ private accountingService = inject(AccountingService);
/**
* Returns the chart of accounts data.
diff --git a/src/app/accounting/chart-of-accounts/create-gl-account/chart-of-accounts-template.resolver.ts b/src/app/accounting/chart-of-accounts/create-gl-account/chart-of-accounts-template.resolver.ts
index 199ca4c976..771227e78e 100644
--- a/src/app/accounting/chart-of-accounts/create-gl-account/chart-of-accounts-template.resolver.ts
+++ b/src/app/accounting/chart-of-accounts/create-gl-account/chart-of-accounts-template.resolver.ts
@@ -1,5 +1,5 @@
/** Angular Imports */
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
/** rxjs Imports */
import { Observable } from 'rxjs';
@@ -12,10 +12,7 @@ import { AccountingService } from '../../accounting.service';
*/
@Injectable()
export class ChartOfAccountsTemplateResolver {
- /**
- * @param {AccountingService} accountingService Accounting service.
- */
- constructor(private accountingService: AccountingService) {}
+ private accountingService = inject(AccountingService);
/**
* Returns the chart of accounts template data.
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 a485041cf1..c99682f2dc 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
@@ -6,65 +6,69 @@
-
+ }
- {{ 'labels.inputs.Account Name' | translate }}
-
-
-
- {{ glAccount.name }}
-
-
-
- {{ 'labels.inputs.GL Code' | translate }}
-
-
-
- {{ glAccount.glCode }}
-
-
-
- {{ 'labels.inputs.Account Type' | translate }}
+ @if (glAccount) {
+
+
+
+
+
+
+
-
-
-
+
-
-
+ {{ 'labels.inputs.Account Name' | translate }}
+
+
+ {{ glAccount.name }}
+
+
+ {{ 'labels.inputs.GL Code' | translate }}
+
+
+ {{ glAccount.glCode }}
+
+
+ {{ 'labels.inputs.Account Type' | translate }}
+
+
+ {{ 'labels.inputs.accounting.' + glAccount.type | translate }}
+
+
+ {{ 'labels.inputs.Account Usage' | translate }}
+
+
+ {{ glAccount.usage }}
+
+
+ {{ 'labels.inputs.Manual Entries Allowed' | translate }}
+
+
+ {{ glAccount.manualEntriesAllowed }}
+
+
+ {{ 'labels.inputs.Description' | translate }}
+
+
+ {{ glAccount.description }}
+
- {{ 'labels.inputs.accounting.' + glAccount.type | translate }}
-
-
-
- {{ 'labels.inputs.Account Usage' | translate }}
-
-
-
- {{ glAccount.usage }}
-
-
-
- {{ 'labels.inputs.Manual Entries Allowed' | translate }}
-
-
-
- {{ glAccount.manualEntriesAllowed }}
-
-
-
- {{ 'labels.inputs.Description' | translate }}
-
-
-
- {{ glAccount.description }}
-
-
-
+ @if (glAccount.usage.value === 'HEADER') {
+
+ }
@@ -20,17 +21,21 @@
-
+ @if (!glAccount.disabled) {
+
+ }
-
+ @if (glAccount.disabled) {
+
+ }
-
-
-
diff --git a/src/app/accounting/chart-of-accounts/view-gl-account/view-gl-account.component.ts b/src/app/accounting/chart-of-accounts/view-gl-account/view-gl-account.component.ts
index eb66055a88..d7654fd28e 100644
--- a/src/app/accounting/chart-of-accounts/view-gl-account/view-gl-account.component.ts
+++ b/src/app/accounting/chart-of-accounts/view-gl-account/view-gl-account.component.ts
@@ -1,5 +1,5 @@
/** Angular Imports */
-import { Component } from '@angular/core';
+import { Component, inject } from '@angular/core';
import { ActivatedRoute, Router, RouterLink } from '@angular/router';
import { MatDialog } from '@angular/material/dialog';
@@ -8,7 +8,7 @@ import { DeleteDialogComponent } from '../../../shared/delete-dialog/delete-dial
/** Custom Services */
import { AccountingService } from '../../accounting.service';
-import { Location, NgIf } from '@angular/common';
+import { Location } from '@angular/common';
import { FaIconComponent } from '@fortawesome/angular-fontawesome';
import { GlAccountDisplayComponent } from '../../../shared/accounting/gl-account-display/gl-account-display.component';
import { YesnoPipe } from '../../../pipes/yesno.pipe';
@@ -29,6 +29,12 @@ import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
]
})
export class ViewGlAccountComponent {
+ private accountingService = inject(AccountingService);
+ private route = inject(ActivatedRoute);
+ private router = inject(Router);
+ private dialog = inject(MatDialog);
+ private location = inject(Location);
+
/** GL Account. */
glAccount: any;
@@ -39,13 +45,7 @@ export class ViewGlAccountComponent {
* @param {Router} router Router for navigation.
* @param {MatDialog} dialog Dialog reference.
*/
- constructor(
- private accountingService: AccountingService,
- private route: ActivatedRoute,
- private router: Router,
- private dialog: MatDialog,
- private location: Location
- ) {
+ constructor() {
this.route.data.subscribe((data: { glAccountAndChartOfAccountsTemplate: any }) => {
this.glAccount = data.glAccountAndChartOfAccountsTemplate;
});
diff --git a/src/app/accounting/closing-entries/closing-entries.component.html b/src/app/accounting/closing-entries/closing-entries.component.html
index 24de5a07b9..842d8af93b 100644
--- a/src/app/accounting/closing-entries/closing-entries.component.html
+++ b/src/app/accounting/closing-entries/closing-entries.component.html
@@ -16,9 +16,11 @@
{{ 'labels.inputs.Parent Account Name' | translate }}
-
-
-
+ }
-
+
- {{ 'labels.inputs.Parent Account Name' | translate }}
+
+
+
-
+ @if (glAccount.tagId.id) {
+ {{ 'labels.inputs.Tag' | translate }}
- {{ glAccount.tagId.name }}
-
+
+ }
{{ 'labels.inputs.Tag' | translate }}
+ {{ glAccount.tagId.name }}
+ {{ 'labels.inputs.Account Usage' | translate }}
@@ -81,10 +90,12 @@
{{ glAccount.manualEntriesAllowed | yesNo }}
-
+ @if (glAccount.description) {
+ {{ 'labels.inputs.Description' | translate }}
- {{ glAccount.description }}
-
+
+ }
{{ 'labels.inputs.Description' | translate }}
+ {{ glAccount.description }}
+
diff --git a/src/app/accounting/closing-entries/closing-entries.component.ts b/src/app/accounting/closing-entries/closing-entries.component.ts
index 9da5f54e93..a06d257229 100644
--- a/src/app/accounting/closing-entries/closing-entries.component.ts
+++ b/src/app/accounting/closing-entries/closing-entries.component.ts
@@ -1,5 +1,5 @@
/** Angular Imports */
-import { Component, OnInit, TemplateRef, ElementRef, ViewChild, AfterViewInit } from '@angular/core';
+import { Component, OnInit, TemplateRef, ElementRef, ViewChild, AfterViewInit, inject } from '@angular/core';
import { MatPaginator } from '@angular/material/paginator';
import { MatSort, MatSortHeader } from '@angular/material/sort';
import {
@@ -26,7 +26,7 @@ import { PopoverService } from '../../configuration-wizard/popover/popover.servi
import { ConfigurationWizardService } from '../../configuration-wizard/configuration-wizard.service';
import { FaIconComponent } from '@fortawesome/angular-fontawesome';
import { MatAutocompleteTrigger, MatAutocomplete, MatOption } from '@angular/material/autocomplete';
-import { NgFor, AsyncPipe } from '@angular/common';
+import { AsyncPipe } from '@angular/common';
import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
/**
@@ -58,6 +58,11 @@ import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
]
})
export class ClosingEntriesComponent implements OnInit, AfterViewInit {
+ private route = inject(ActivatedRoute);
+ private router = inject(Router);
+ private configurationWizardService = inject(ConfigurationWizardService);
+ private popoverService = inject(PopoverService);
+
/** Columns to be displayed in closing entries table. */
displayedColumns: string[] = [
'officeName',
@@ -97,12 +102,7 @@ export class ClosingEntriesComponent implements OnInit, AfterViewInit {
* @param {ConfigurationWizardService} configurationWizardService ConfigurationWizard Service.
* @param {PopoverService} popoverService PopoverService.
*/
- constructor(
- private route: ActivatedRoute,
- private router: Router,
- private configurationWizardService: ConfigurationWizardService,
- private popoverService: PopoverService
- ) {
+ constructor() {
this.route.data.subscribe((data: { offices: any; glAccountClosures: any }) => {
this.officeData = data.offices;
this.glAccountClosureData = data.glAccountClosures;
diff --git a/src/app/accounting/closing-entries/closing-entries.resolver.ts b/src/app/accounting/closing-entries/closing-entries.resolver.ts
index e01d59e4d4..846b51e088 100644
--- a/src/app/accounting/closing-entries/closing-entries.resolver.ts
+++ b/src/app/accounting/closing-entries/closing-entries.resolver.ts
@@ -1,5 +1,5 @@
/** Angular Imports */
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
/** rxjs Imports */
import { Observable } from 'rxjs';
@@ -12,10 +12,7 @@ import { AccountingService } from '../accounting.service';
*/
@Injectable()
export class ClosingEntriesResolver {
- /**
- * @param {AccountingService} accountingService Accounting service.
- */
- constructor(private accountingService: AccountingService) {}
+ private accountingService = inject(AccountingService);
/**
* Returns the gl account closures data.
diff --git a/src/app/accounting/closing-entries/closing-entry.resolver.ts b/src/app/accounting/closing-entries/closing-entry.resolver.ts
index 067e018c36..4d118309dc 100644
--- a/src/app/accounting/closing-entries/closing-entry.resolver.ts
+++ b/src/app/accounting/closing-entries/closing-entry.resolver.ts
@@ -1,5 +1,5 @@
/** Angular Imports */
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import { ActivatedRouteSnapshot } from '@angular/router';
/** rxjs Imports */
@@ -13,10 +13,7 @@ import { AccountingService } from '../accounting.service';
*/
@Injectable()
export class ClosingEntryResolver {
- /**
- * @param {AccountingService} accountingService Accounting service.
- */
- constructor(private accountingService: AccountingService) {}
+ private accountingService = inject(AccountingService);
/**
* Returns the gl account closure data.
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 f4d56713ce..00614c50d5 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
@@ -6,14 +6,18 @@
{{ 'labels.inputs.Office' | translate }}
-
- {{ office.name }}
-
+ @for (office of officeData; track office) {
+
+ {{ office.name }}
+
+ }
-
- {{ 'labels.inputs.Office' | translate }} {{ 'labels.commons.is' | translate }}
- {{ 'labels.commons.required' | translate }}
-
+ @if (accountingClosureForm.controls.officeId.hasError('required')) {
+
+ {{ 'labels.inputs.Office' | translate }} {{ 'labels.commons.is' | translate }}
+ {{ 'labels.commons.required' | translate }}
+
+ }
@@ -28,10 +32,12 @@
/>
- {{ 'labels.inputs.Closing Date' | translate }} {{ 'labels.commons.is' | translate }}
- {{ 'labels.commons.required' | translate }}
-
+ @if (accountingClosureForm.controls.closingDate.hasError('required')) {
+
+ {{ 'labels.inputs.Closing Date' | translate }} {{ 'labels.commons.is' | translate }}
+ {{ 'labels.commons.required' | translate }}
+
+ }
diff --git a/src/app/accounting/closing-entries/create-closure/create-closure.component.ts b/src/app/accounting/closing-entries/create-closure/create-closure.component.ts
index 89473ad924..8ad18d1169 100644
--- a/src/app/accounting/closing-entries/create-closure/create-closure.component.ts
+++ b/src/app/accounting/closing-entries/create-closure/create-closure.component.ts
@@ -1,5 +1,5 @@
/** Angular Imports */
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, inject } from '@angular/core';
import { UntypedFormBuilder, UntypedFormGroup, Validators, ReactiveFormsModule } from '@angular/forms';
import { Router, ActivatedRoute, RouterLink } from '@angular/router';
@@ -22,6 +22,13 @@ import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
]
})
export class CreateClosureComponent implements OnInit {
+ private formBuilder = inject(UntypedFormBuilder);
+ private accountingService = inject(AccountingService);
+ private settingsService = inject(SettingsService);
+ private dateUtils = inject(Dates);
+ private route = inject(ActivatedRoute);
+ private router = inject(Router);
+
/** Minimum closing date allowed. */
minDate = new Date(2000, 0, 1);
/** Maximum closing date allowed. */
@@ -39,14 +46,7 @@ export class CreateClosureComponent implements OnInit {
* @param {ActivatedRoute} route Activated Route.
* @param {Router} router Router for navigation.
*/
- constructor(
- private formBuilder: UntypedFormBuilder,
- private accountingService: AccountingService,
- private settingsService: SettingsService,
- private dateUtils: Dates,
- private route: ActivatedRoute,
- private router: Router
- ) {
+ constructor() {
this.route.data.subscribe((data: { offices: any }) => {
this.officeData = data.offices;
});
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 2ffdca36dc..3c96ff892e 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
@@ -6,9 +6,11 @@
{{ 'labels.inputs.Office' | translate }}
-
- {{ office.name }}
-
+ @for (office of officeData; track office) {
+
+ {{ office.name }}
+
+ }
diff --git a/src/app/accounting/closing-entries/edit-closure/edit-closure.component.ts b/src/app/accounting/closing-entries/edit-closure/edit-closure.component.ts
index ebe3d3460c..065ffab1c5 100644
--- a/src/app/accounting/closing-entries/edit-closure/edit-closure.component.ts
+++ b/src/app/accounting/closing-entries/edit-closure/edit-closure.component.ts
@@ -1,5 +1,5 @@
/** Angular Imports */
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, inject } from '@angular/core';
import { UntypedFormBuilder, UntypedFormGroup, Validators, ReactiveFormsModule } from '@angular/forms';
import { Router, ActivatedRoute, RouterLink } from '@angular/router';
@@ -21,6 +21,11 @@ import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
]
})
export class EditClosureComponent implements OnInit {
+ private formBuilder = inject(UntypedFormBuilder);
+ private accountingService = inject(AccountingService);
+ private route = inject(ActivatedRoute);
+ private router = inject(Router);
+
/** Accounting closure form. */
accountingClosureForm: UntypedFormGroup;
/** GL Account closure. */
@@ -35,12 +40,7 @@ export class EditClosureComponent implements OnInit {
* @param {ActivatedRoute} route Activated Route.
* @param {Router} router Router for navigation.
*/
- constructor(
- private formBuilder: UntypedFormBuilder,
- private accountingService: AccountingService,
- private route: ActivatedRoute,
- private router: Router
- ) {
+ constructor() {
this.route.data.subscribe((data: { glAccountClosure: any }) => {
this.glAccountClosure = data.glAccountClosure;
});
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 05bc54cfd5..ac1a772d41 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
@@ -9,66 +9,55 @@
-
-
-
-
-
-
+@if (glAccountClosure) {
+
-
-
- {{ 'labels.inputs.Office' | translate }}
-
-
-
- {{ glAccountClosure.officeName }}
-
-
-
- {{ 'labels.inputs.Closure Date' | translate }}
-
-
-
- {{ glAccountClosure.closingDate }}
-
-
-
- {{ 'labels.inputs.Closed By' | translate }}
-
-
-
- {{ glAccountClosure.createdByUsername }}
-
-
-
- {{ 'labels.inputs.Updated By' | translate }}
-
-
-
- {{ glAccountClosure.lastUpdatedByUsername }}
-
-
-
- {{ 'labels.inputs.Updated On' | translate }}
-
-
-
- {{ glAccountClosure.lastUpdatedDate }}
-
-
-
- {{ 'labels.inputs.Closure Creation Date' | translate }}
-
-
-
- {{ glAccountClosure.createdDate }}
-
-
-
- {{ 'labels.inputs.Comments' | translate }}
-
-
-
- {{ glAccountClosure.comments }}
-
-
+
+
+
+
+
+}
diff --git a/src/app/accounting/closing-entries/view-closure/view-closure.component.ts b/src/app/accounting/closing-entries/view-closure/view-closure.component.ts
index 292eb8b618..fdbf34db7a 100644
--- a/src/app/accounting/closing-entries/view-closure/view-closure.component.ts
+++ b/src/app/accounting/closing-entries/view-closure/view-closure.component.ts
@@ -1,5 +1,5 @@
/** Angular Imports */
-import { Component } from '@angular/core';
+import { Component, inject } from '@angular/core';
import { ActivatedRoute, Router, RouterLink } from '@angular/router';
import { MatDialog } from '@angular/material/dialog';
@@ -24,6 +24,11 @@ import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
]
})
export class ViewClosureComponent {
+ private accountingService = inject(AccountingService);
+ private route = inject(ActivatedRoute);
+ private router = inject(Router);
+ dialog = inject(MatDialog);
+
/** GL Account closure. */
glAccountClosure: any;
@@ -34,12 +39,7 @@ export class ViewClosureComponent {
* @param {Router} router Router for navigation.
* @param {MatDialog} dialog Dialog reference.
*/
- constructor(
- private accountingService: AccountingService,
- private route: ActivatedRoute,
- private router: Router,
- public dialog: MatDialog
- ) {
+ constructor() {
this.route.data.subscribe((data: { glAccountClosure: any }) => {
this.glAccountClosure = data.glAccountClosure;
});
diff --git a/src/app/accounting/common-resolvers/accounting-rules-associations.resolver.ts b/src/app/accounting/common-resolvers/accounting-rules-associations.resolver.ts
index 88ba896dd8..bd29675f87 100644
--- a/src/app/accounting/common-resolvers/accounting-rules-associations.resolver.ts
+++ b/src/app/accounting/common-resolvers/accounting-rules-associations.resolver.ts
@@ -1,5 +1,5 @@
/** Angular Imports */
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
/** rxjs Imports */
import { Observable } from 'rxjs';
@@ -12,10 +12,7 @@ import { AccountingService } from '../accounting.service';
*/
@Injectable()
export class AccountingRulesAssociationsResolver {
- /**
- * @param {AccountingService} accountingService Accounting service.
- */
- constructor(private accountingService: AccountingService) {}
+ private accountingService = inject(AccountingService);
/**
* Returns the accounting rules associations data.
diff --git a/src/app/accounting/common-resolvers/currencies.resolver.ts b/src/app/accounting/common-resolvers/currencies.resolver.ts
index 7fa158089e..c7091d49c3 100644
--- a/src/app/accounting/common-resolvers/currencies.resolver.ts
+++ b/src/app/accounting/common-resolvers/currencies.resolver.ts
@@ -1,5 +1,5 @@
/** Angular Imports */
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
/** rxjs Imports */
import { Observable } from 'rxjs';
@@ -12,10 +12,7 @@ import { AccountingService } from '../accounting.service';
*/
@Injectable()
export class CurrenciesResolver {
- /**
- * @param {AccountingService} accountingService Accounting service.
- */
- constructor(private accountingService: AccountingService) {}
+ private accountingService = inject(AccountingService);
/**
* Returns the currencies data.
diff --git a/src/app/accounting/common-resolvers/external-asset-configuration.resolver.ts b/src/app/accounting/common-resolvers/external-asset-configuration.resolver.ts
index 8d395e137d..a571102c00 100644
--- a/src/app/accounting/common-resolvers/external-asset-configuration.resolver.ts
+++ b/src/app/accounting/common-resolvers/external-asset-configuration.resolver.ts
@@ -1,5 +1,5 @@
/** Angular Imports */
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
/** rxjs Imports */
import { Observable } from 'rxjs';
@@ -12,10 +12,7 @@ import { SystemService } from 'app/system/system.service';
*/
@Injectable()
export class ExternalAssetConfigurationResolver {
- /**
- * @param {AccountingService} accountingService Accounting service.
- */
- constructor(private systemService: SystemService) {}
+ private systemService = inject(SystemService);
/**
* Returns the offices data.
diff --git a/src/app/accounting/common-resolvers/gl-accounts.resolver.ts b/src/app/accounting/common-resolvers/gl-accounts.resolver.ts
index df09f7a42f..ed3194aa34 100644
--- a/src/app/accounting/common-resolvers/gl-accounts.resolver.ts
+++ b/src/app/accounting/common-resolvers/gl-accounts.resolver.ts
@@ -1,5 +1,5 @@
/** Angular Imports */
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
/** rxjs Imports */
import { Observable } from 'rxjs';
@@ -12,10 +12,7 @@ import { AccountingService } from '../accounting.service';
*/
@Injectable()
export class GlAccountsResolver {
- /**
- * @param {AccountingService} accountingService Accounting service.
- */
- constructor(private accountingService: AccountingService) {}
+ private accountingService = inject(AccountingService);
/**
* Returns the gl accounts data.
diff --git a/src/app/accounting/common-resolvers/journal-entry-transaction.resolver.ts b/src/app/accounting/common-resolvers/journal-entry-transaction.resolver.ts
index d87eb28ffb..1a2ab07bc5 100644
--- a/src/app/accounting/common-resolvers/journal-entry-transaction.resolver.ts
+++ b/src/app/accounting/common-resolvers/journal-entry-transaction.resolver.ts
@@ -1,5 +1,5 @@
/** Angular Imports */
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import { ActivatedRouteSnapshot } from '@angular/router';
/** rxjs Imports */
@@ -13,10 +13,7 @@ import { AccountingService } from '../accounting.service';
*/
@Injectable()
export class JournalEntryTransactionResolver {
- /**
- * @param {AccountingService} accountingService Accounting service.
- */
- constructor(private accountingService: AccountingService) {}
+ private accountingService = inject(AccountingService);
/**
* Returns the transaction data.
diff --git a/src/app/accounting/common-resolvers/loan-products.resolver.ts b/src/app/accounting/common-resolvers/loan-products.resolver.ts
index 29ef058cea..e18057c141 100644
--- a/src/app/accounting/common-resolvers/loan-products.resolver.ts
+++ b/src/app/accounting/common-resolvers/loan-products.resolver.ts
@@ -1,5 +1,5 @@
/** Angular Imports */
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
/** rxjs Imports */
import { Observable } from 'rxjs';
@@ -12,10 +12,7 @@ import { AccountingService } from '../accounting.service';
*/
@Injectable()
export class LoanProductsResolver {
- /**
- * @param {AccountingService} accountingService Accounting service.
- */
- constructor(private accountingService: AccountingService) {}
+ private accountingService = inject(AccountingService);
/**
* Returns the loan products data.
diff --git a/src/app/accounting/common-resolvers/offices.resolver.ts b/src/app/accounting/common-resolvers/offices.resolver.ts
index dc084de449..de89fdbda7 100644
--- a/src/app/accounting/common-resolvers/offices.resolver.ts
+++ b/src/app/accounting/common-resolvers/offices.resolver.ts
@@ -1,5 +1,5 @@
/** Angular Imports */
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
/** rxjs Imports */
import { Observable } from 'rxjs';
@@ -12,10 +12,7 @@ import { AccountingService } from '../accounting.service';
*/
@Injectable()
export class OfficesResolver {
- /**
- * @param {AccountingService} accountingService Accounting service.
- */
- constructor(private accountingService: AccountingService) {}
+ private accountingService = inject(AccountingService);
/**
* Returns the offices data.
diff --git a/src/app/accounting/common-resolvers/payment-types.resolver.ts b/src/app/accounting/common-resolvers/payment-types.resolver.ts
index 9309357812..638bb95c56 100644
--- a/src/app/accounting/common-resolvers/payment-types.resolver.ts
+++ b/src/app/accounting/common-resolvers/payment-types.resolver.ts
@@ -1,5 +1,5 @@
/** Angular Imports */
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
/** rxjs Imports */
import { Observable } from 'rxjs';
@@ -12,10 +12,7 @@ import { AccountingService } from '../accounting.service';
*/
@Injectable()
export class PaymentTypesResolver {
- /**
- * @param {AccountingService} accountingService Accounting service.
- */
- constructor(private accountingService: AccountingService) {}
+ private accountingService = inject(AccountingService);
/**
* Returns the payment types data.
diff --git a/src/app/accounting/common-resolvers/provisioning-categories.resolver.ts b/src/app/accounting/common-resolvers/provisioning-categories.resolver.ts
index 629c057e7d..b25466235f 100644
--- a/src/app/accounting/common-resolvers/provisioning-categories.resolver.ts
+++ b/src/app/accounting/common-resolvers/provisioning-categories.resolver.ts
@@ -1,5 +1,5 @@
/** Angular Imports */
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
/** rxjs Imports */
import { Observable } from 'rxjs';
@@ -12,10 +12,7 @@ import { AccountingService } from '../accounting.service';
*/
@Injectable()
export class ProvisioningCategoriesResolver {
- /**
- * @param {AccountingService} accountingService Accounting service.
- */
- constructor(private accountingService: AccountingService) {}
+ private accountingService = inject(AccountingService);
/**
* Returns the Provisioning categories data.
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 5fcc8121ca..a4e219e674 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
@@ -6,115 +6,131 @@
+
+
+ {{ 'labels.inputs.Office' | translate }}
+
+
+ {{ glAccountClosure.officeName }}
+
+
+ {{ 'labels.inputs.Closure Date' | translate }}
+
+
+ {{ glAccountClosure.closingDate }}
+
+
+ {{ 'labels.inputs.Closed By' | translate }}
+
+
+ {{ glAccountClosure.createdByUsername }}
+
+
+ {{ 'labels.inputs.Updated By' | translate }}
+
+
+ {{ glAccountClosure.lastUpdatedByUsername }}
+
+
+ {{ 'labels.inputs.Updated on' | translate }}
+
+
+ {{ glAccountClosure.lastUpdatedDate }}
+
+
+ {{ 'labels.inputs.Closure Creation Date' | translate }}
+
+
+ {{ glAccountClosure.createdDate }}
+
+
+ {{ 'labels.inputs.Comments' | translate }}
+
+
+ {{ glAccountClosure.comments }}
+
+
-
{{ 'labels.inputs.Reference Number' | translate }}
@@ -133,18 +149,22 @@
/>
- {{ 'labels.inputs.Transaction Date' | translate }} {{ 'labels.commons.is' | translate }}
- {{ 'labels.commons.required' | translate }}
-
+ @if (journalEntryForm.controls.transactionDate.hasError('required')) {
+
+ {{ 'labels.inputs.Transaction Date' | translate }} {{ 'labels.commons.is' | translate }}
+ {{ 'labels.commons.required' | translate }}
+
+ }
{{ 'labels.inputs.Payment Type' | translate }}
-
- {{ paymentType.name }}
-
+ @for (paymentType of paymentTypeData; track paymentType) {
+
+ {{ paymentType.name }}
+
+ }
diff --git a/src/app/accounting/create-journal-entry/create-journal-entry.component.ts b/src/app/accounting/create-journal-entry/create-journal-entry.component.ts
index 11bdf346ed..675b1b9409 100644
--- a/src/app/accounting/create-journal-entry/create-journal-entry.component.ts
+++ b/src/app/accounting/create-journal-entry/create-journal-entry.component.ts
@@ -1,5 +1,5 @@
/** Angular Imports */
-import { Component, OnInit, TemplateRef, ElementRef, ViewChild, AfterViewInit } from '@angular/core';
+import { Component, OnInit, TemplateRef, ElementRef, ViewChild, AfterViewInit, inject } from '@angular/core';
import { UntypedFormGroup, UntypedFormBuilder, Validators, UntypedFormArray, UntypedFormControl } from '@angular/forms';
import { Router, ActivatedRoute } from '@angular/router';
import { MatDialog } from '@angular/material/dialog';
@@ -34,6 +34,21 @@ import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
]
})
export class CreateJournalEntryComponent implements OnInit, AfterViewInit {
+ private formBuilder = inject(UntypedFormBuilder);
+ private accountingService = inject(AccountingService);
+ private settingsService = inject(SettingsService);
+ private dateUtils = inject(Dates);
+ private route = inject(ActivatedRoute);
+ private router = inject(Router);
+ private dialog = inject(MatDialog);
+ private configurationWizardService = inject(ConfigurationWizardService);
+ private popoverService = inject(PopoverService);
+
+ onCreditAmountInput(event: any) {
+ if (event.target.value < 1) {
+ event.target.value = 1;
+ }
+ }
/** Minimum transaction date allowed. */
minDate = new Date(2000, 0, 1);
/** Maximum transaction date allowed. */
@@ -67,17 +82,7 @@ export class CreateJournalEntryComponent implements OnInit, AfterViewInit {
* @param {ConfigurationWizardService} configurationWizardService ConfigurationWizard Service.
* @param {PopoverService} popoverService PopoverService.
*/
- constructor(
- private formBuilder: UntypedFormBuilder,
- private accountingService: AccountingService,
- private settingsService: SettingsService,
- private dateUtils: Dates,
- private route: ActivatedRoute,
- private router: Router,
- private dialog: MatDialog,
- private configurationWizardService: ConfigurationWizardService,
- private popoverService: PopoverService
- ) {
+ constructor() {
this.assetExternalizationEnabled = false;
this.route.data.subscribe(
(data: { offices: any; currencies: any; paymentTypes: any; glAccounts: any; globalConfig: any }) => {
@@ -140,7 +145,10 @@ export class CreateJournalEntryComponent implements OnInit, AfterViewInit {
],
amount: [
'',
- Validators.required
+ [
+ Validators.required,
+ Validators.min(1)
+ ]
]
});
}
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 bd780cede7..16b310fc1d 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
@@ -6,15 +6,19 @@
{{ 'labels.inputs.Financial Activity' | translate }}
-
- ({{ financialActivity.id }})
- {{ 'labels.accounting.financialActivity.' + financialActivity.name | translate }}
-
+ @for (financialActivity of financialActivityData; track financialActivity) {
+
+ ({{ financialActivity.id }})
+ {{ 'labels.accounting.financialActivity.' + financialActivity.name | translate }}
+
+ }
-
- {{ 'labels.inputs.Financial Activity' | translate }} {{ 'labels.commons.is' | translate }}
- {{ 'labels.commons.required' | translate }}
-
+ @if (financialActivityMappingForm.controls.financialActivityId.hasError('required')) {
+
+ {{ 'labels.inputs.Financial Activity' | translate }} {{ 'labels.commons.is' | translate }}
+ {{ 'labels.commons.required' | translate }}
+
+ }
{
this.glAccountOptions = data.financialActivityAccountsTemplate.glAccountOptions;
this.financialActivityData = data.financialActivityAccountsTemplate.financialActivityOptions;
diff --git a/src/app/accounting/financial-activity-mappings/create-financial-activity-mapping/financial-activity-mappings-template.resolver.ts b/src/app/accounting/financial-activity-mappings/create-financial-activity-mapping/financial-activity-mappings-template.resolver.ts
index 176e331a6b..18eafc94e5 100644
--- a/src/app/accounting/financial-activity-mappings/create-financial-activity-mapping/financial-activity-mappings-template.resolver.ts
+++ b/src/app/accounting/financial-activity-mappings/create-financial-activity-mapping/financial-activity-mappings-template.resolver.ts
@@ -1,5 +1,5 @@
/** Angular Imports */
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
/** rxjs Imports */
import { Observable } from 'rxjs';
@@ -12,10 +12,7 @@ import { AccountingService } from '../../accounting.service';
*/
@Injectable()
export class FinancialActivityMappingsTemplateResolver {
- /**
- * @param {AccountingService} accountingService Accounting service.
- */
- constructor(private accountingService: AccountingService) {}
+ private accountingService = inject(AccountingService);
/**
* Returns the financial activity mappings template data.
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 675ac89e3c..e911e3747d 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
@@ -6,10 +6,12 @@
{{ 'labels.inputs.Financial Activity' | translate }}
-
- ({{ financialActivity.id }})
- {{ 'labels.accounting.financialActivity.' + financialActivity.name | translate }}
-
+ @for (financialActivity of financialActivityData; track financialActivity) {
+
+ ({{ financialActivity.id }})
+ {{ 'labels.accounting.financialActivity.' + financialActivity.name | translate }}
+
+ }
diff --git a/src/app/accounting/financial-activity-mappings/edit-financial-activity-mapping/edit-financial-activity-mapping.component.ts b/src/app/accounting/financial-activity-mappings/edit-financial-activity-mapping/edit-financial-activity-mapping.component.ts
index febef2e159..263b6ce03a 100644
--- a/src/app/accounting/financial-activity-mappings/edit-financial-activity-mapping/edit-financial-activity-mapping.component.ts
+++ b/src/app/accounting/financial-activity-mappings/edit-financial-activity-mapping/edit-financial-activity-mapping.component.ts
@@ -1,5 +1,5 @@
/** Angular Imports */
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, inject } from '@angular/core';
import { UntypedFormBuilder, UntypedFormGroup, Validators, ReactiveFormsModule } from '@angular/forms';
import { Router, ActivatedRoute, RouterLink } from '@angular/router';
@@ -22,6 +22,11 @@ import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
]
})
export class EditFinancialActivityMappingComponent implements OnInit {
+ private formBuider = inject(UntypedFormBuilder);
+ private accountingService = inject(AccountingService);
+ private route = inject(ActivatedRoute);
+ private router = inject(Router);
+
/** Financial activity mapping form. */
financialActivityMappingForm: UntypedFormGroup;
/** GL Account options. */
@@ -44,12 +49,7 @@ export class EditFinancialActivityMappingComponent implements OnInit {
* @param {ActivatedRoute} route Activated Route.
* @param {Router} router Router for navigation.
*/
- constructor(
- private formBuider: UntypedFormBuilder,
- private accountingService: AccountingService,
- private route: ActivatedRoute,
- private router: Router
- ) {
+ constructor() {
this.route.data.subscribe((data: { financialActivityAccountAndTemplate: any }) => {
this.financialActivityAccountId = data.financialActivityAccountAndTemplate.id;
this.financialActivityId = data.financialActivityAccountAndTemplate.financialActivityData.id;
diff --git a/src/app/accounting/financial-activity-mappings/edit-financial-activity-mapping/financial-activity-mapping-and-template.resolver.ts b/src/app/accounting/financial-activity-mappings/edit-financial-activity-mapping/financial-activity-mapping-and-template.resolver.ts
index 0e3df98ab5..9b9b80632d 100644
--- a/src/app/accounting/financial-activity-mappings/edit-financial-activity-mapping/financial-activity-mapping-and-template.resolver.ts
+++ b/src/app/accounting/financial-activity-mappings/edit-financial-activity-mapping/financial-activity-mapping-and-template.resolver.ts
@@ -1,5 +1,5 @@
/** Angular Imports */
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import { ActivatedRouteSnapshot } from '@angular/router';
/** rxjs Imports */
@@ -13,10 +13,7 @@ import { AccountingService } from '../../accounting.service';
*/
@Injectable()
export class FinancialActivityMappingAndTemplateResolver {
- /**
- * @param {AccountingService} accountingService Accounting service.
- */
- constructor(private accountingService: AccountingService) {}
+ private accountingService = inject(AccountingService);
/**
* Returns the financial activity mapping and template data.
diff --git a/src/app/accounting/financial-activity-mappings/financial-activity-mappings.component.ts b/src/app/accounting/financial-activity-mappings/financial-activity-mappings.component.ts
index a45d6aec38..228067e01c 100644
--- a/src/app/accounting/financial-activity-mappings/financial-activity-mappings.component.ts
+++ b/src/app/accounting/financial-activity-mappings/financial-activity-mappings.component.ts
@@ -1,5 +1,5 @@
/** Angular Imports */
-import { Component, OnInit, TemplateRef, ElementRef, ViewChild, AfterViewInit } from '@angular/core';
+import { Component, OnInit, TemplateRef, ElementRef, ViewChild, AfterViewInit, inject } from '@angular/core';
import { MatPaginator } from '@angular/material/paginator';
import { MatSort, MatSortHeader } from '@angular/material/sort';
import {
@@ -49,6 +49,11 @@ import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
]
})
export class FinancialActivityMappingsComponent implements OnInit, AfterViewInit {
+ private route = inject(ActivatedRoute);
+ private router = inject(Router);
+ private configurationWizardService = inject(ConfigurationWizardService);
+ private popoverService = inject(PopoverService);
+
/** Financial activity account data. */
financialActivityAccountData: any;
/** Columns to be displayed in financial activity mappings table. */
@@ -82,12 +87,7 @@ export class FinancialActivityMappingsComponent implements OnInit, AfterViewInit
* @param {ConfigurationWizardService} configurationWizardService ConfigurationWizard Service.
* @param {PopoverService} popoverService PopoverService.
*/
- constructor(
- private route: ActivatedRoute,
- private router: Router,
- private configurationWizardService: ConfigurationWizardService,
- private popoverService: PopoverService
- ) {
+ constructor() {
this.route.data.subscribe((data: { financialActivityAccounts: any }) => {
this.financialActivityAccountData = data.financialActivityAccounts;
});
diff --git a/src/app/accounting/financial-activity-mappings/financial-activity-mappings.resolver.ts b/src/app/accounting/financial-activity-mappings/financial-activity-mappings.resolver.ts
index 732d47aa21..124fe22475 100644
--- a/src/app/accounting/financial-activity-mappings/financial-activity-mappings.resolver.ts
+++ b/src/app/accounting/financial-activity-mappings/financial-activity-mappings.resolver.ts
@@ -1,5 +1,5 @@
/** Angular Imports */
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
/** rxjs Imports */
import { Observable } from 'rxjs';
@@ -12,10 +12,7 @@ import { AccountingService } from '../accounting.service';
*/
@Injectable()
export class FinancialActivityMappingsResolver {
- /**
- * @param {AccountingService} accountingService Accounting service.
- */
- constructor(private accountingService: AccountingService) {}
+ private accountingService = inject(AccountingService);
/**
* Returns the financial activity mappings data.
diff --git a/src/app/accounting/financial-activity-mappings/view-financial-activity-mapping/financial-activity-mapping.resolver.ts b/src/app/accounting/financial-activity-mappings/view-financial-activity-mapping/financial-activity-mapping.resolver.ts
index c5675cd7f8..7612b7a68a 100644
--- a/src/app/accounting/financial-activity-mappings/view-financial-activity-mapping/financial-activity-mapping.resolver.ts
+++ b/src/app/accounting/financial-activity-mappings/view-financial-activity-mapping/financial-activity-mapping.resolver.ts
@@ -1,5 +1,5 @@
/** Angular Imports */
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import { ActivatedRouteSnapshot } from '@angular/router';
/** rxjs Imports */
@@ -13,10 +13,7 @@ import { AccountingService } from '../../accounting.service';
*/
@Injectable()
export class FinancialActivityMappingResolver {
- /**
- * @param {AccountingService} accountingService Accounting service.
- */
- constructor(private accountingService: AccountingService) {}
+ private accountingService = inject(AccountingService);
/**
* Returns the financial activity mapping data.
diff --git a/src/app/accounting/financial-activity-mappings/view-financial-activity-mapping/view-financial-activity-mapping.component.ts b/src/app/accounting/financial-activity-mappings/view-financial-activity-mapping/view-financial-activity-mapping.component.ts
index c496383806..d55f90978e 100644
--- a/src/app/accounting/financial-activity-mappings/view-financial-activity-mapping/view-financial-activity-mapping.component.ts
+++ b/src/app/accounting/financial-activity-mappings/view-financial-activity-mapping/view-financial-activity-mapping.component.ts
@@ -1,5 +1,5 @@
/** Angular Imports */
-import { Component } from '@angular/core';
+import { Component, inject } from '@angular/core';
import { ActivatedRoute, Router, RouterLink } from '@angular/router';
import { MatDialog } from '@angular/material/dialog';
@@ -27,6 +27,12 @@ import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
]
})
export class ViewFinancialActivityMappingComponent {
+ private accountingService = inject(AccountingService);
+ private route = inject(ActivatedRoute);
+ private router = inject(Router);
+ private dialog = inject(MatDialog);
+ private location = inject(Location);
+
/** Financial activity account ID. */
financialActivityAccountId: any;
/** Financial activity account data. */
@@ -39,13 +45,7 @@ export class ViewFinancialActivityMappingComponent {
* @param {Router} router Router for navigation.
* @param {MatDialog} dialog Dialog reference.
*/
- constructor(
- private accountingService: AccountingService,
- private route: ActivatedRoute,
- private router: Router,
- private dialog: MatDialog,
- private location: Location
- ) {
+ constructor() {
this.route.data.subscribe((data: { financialActivityAccount: any }) => {
this.financialActivityAccount = data.financialActivityAccount;
this.financialActivityAccountId = data.financialActivityAccount.id;
diff --git a/src/app/accounting/frequent-postings/frequent-postings.component.html b/src/app/accounting/frequent-postings/frequent-postings.component.html
index 82aceee008..ea240bb23a 100644
--- a/src/app/accounting/frequent-postings/frequent-postings.component.html
+++ b/src/app/accounting/frequent-postings/frequent-postings.component.html
@@ -6,136 +6,145 @@
{{ 'labels.inputs.Office' | translate }}
-
- {{ office.name }}
-
+ @for (office of officeData; track office) {
+
+ {{ office.name }}
+
+ }
-
- {{ 'labels.inputs.Office' | translate }} {{ 'labels.commons.is' | translate }}
- {{ 'labels.commons.required' | translate }}
-
+ @if (frequentPostingsForm.controls.officeId.hasError('required')) {
+
+ {{ 'labels.inputs.Office' | translate }} {{ 'labels.commons.is' | translate }}
+ {{ 'labels.commons.required' | translate }}
+
+ }
{{ 'labels.inputs.Accounting Rule' | translate }}
-
- {{ accountingRule.name }}
-
+ @for (accountingRule of accountingRuleData; track accountingRule) {
+
+ {{ accountingRule.name }}
+
+ }
-
- {{ 'labels.inputs.Accounting Rule' | translate }} {{ 'labels.commons.is' | translate }}
- {{ 'labels.commons.required' | translate }}
-
+ @if (frequentPostingsForm.controls.accountingRule.hasError('required')) {
+
+ {{ 'labels.inputs.Accounting Rule' | translate }} {{ 'labels.commons.is' | translate }}
+ {{ 'labels.commons.required' | translate }}
+
+ }
{{ 'labels.inputs.Currency' | translate }}
-
- {{ currency.displayLabel }}
-
+ @for (currency of currencyData; track currency) {
+
+ {{ currency.displayLabel }}
+
+ }
-
- {{ 'labels.inputs.Currency' | translate }} {{ 'labels.commons.is' | translate }}
- {{ 'labels.commons.required' | translate }}
-
+ @if (frequentPostingsForm.controls.currencyCode.hasError('required')) {
+
+ {{ 'labels.inputs.Currency' | translate }} {{ 'labels.commons.is' | translate }}
+ {{ 'labels.commons.required' | translate }}
+
+ }
-
-
-
-
-
-
- {{ 'labels.inputs.Debit Amount' | translate }}
-
-
- {{ 'labels.inputs.Debit Amount' | translate }} {{ 'labels.commons.is' | translate }}
- {{ 'labels.commons.required' | translate }}
-
-
-
-
-
-
-
-
-
+ }
-
-
-
-
- {{ 'labels.inputs.Credit Amount' | translate }}
-
-
- {{ 'labels.inputs.Credit Amount' | translate }} {{ 'labels.commons.is' | translate }}
- {{ 'labels.commons.required' | 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.Debit Amount' | translate }}
-
-
- {{ 'labels.inputs.Debit Amount' | translate }} {{ 'labels.commons.is' | translate }}
- {{ 'labels.commons.required' | translate }}
-
-
-
-
-
-
-
+ @for (debit of debits.controls; track debit; let i = $index) {
+
-
-
+
-
+
+ {{ 'labels.inputs.Affected GL Entry (Debit)' | translate }}
+
+ @for (affectedGLEntryDebit of debitAccountData; track affectedGLEntryDebit) {
+
+ {{ affectedGLEntryDebit.name }}
+
+ }
+
+ @if (debits.at(i).controls.glAccountId.hasError('required')) {
+
+ {{ 'labels.inputs.Affected GL Entry (Debit)' | translate }} {{ 'labels.commons.is' | translate }}
+ {{ 'labels.commons.required' | translate }}
+
+ }
+
+
+ {{ 'labels.inputs.Debit Amount' | translate }}
+
+ @if (debits.at(i).controls.amount.hasError('required')) {
+
+ {{ 'labels.inputs.Debit Amount' | translate }} {{ 'labels.commons.is' | translate }}
+ {{ 'labels.commons.required' | translate }}
+
+ }
+
+
+ @if (i !== 0) {
+
+ }
+ @if (i === 0 && allowMultipleDebitEntries) {
+
+ }
+
+
-
{{ 'labels.inputs.Reference Number' | translate }}
@@ -154,18 +163,22 @@
/>
- {{ 'labels.inputs.Transaction Date' | translate }} {{ 'labels.commons.is' | translate }}
- {{ 'labels.commons.required' | translate }}
-
+ @if (frequentPostingsForm.controls.transactionDate.hasError('required')) {
+
+ {{ 'labels.inputs.Transaction Date' | translate }} {{ 'labels.commons.is' | translate }}
+ {{ 'labels.commons.required' | translate }}
+
+ }
{{ 'labels.inputs.Payment Type' | translate }}
-
- {{ paymentType.name }}
-
+ @for (paymentType of paymentTypeData; track paymentType) {
+
+ {{ paymentType.name }}
+
+ }
diff --git a/src/app/accounting/frequent-postings/frequent-postings.component.ts b/src/app/accounting/frequent-postings/frequent-postings.component.ts
index 9264b04b72..50b1149bba 100644
--- a/src/app/accounting/frequent-postings/frequent-postings.component.ts
+++ b/src/app/accounting/frequent-postings/frequent-postings.component.ts
@@ -1,5 +1,5 @@
/** Angular Imports */
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, inject } from '@angular/core';
import {
UntypedFormGroup,
UntypedFormBuilder,
@@ -32,6 +32,13 @@ import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
]
})
export class FrequentPostingsComponent implements OnInit {
+ private formBuilder = inject(UntypedFormBuilder);
+ private accountingService = inject(AccountingService);
+ private settingsService = inject(SettingsService);
+ private dateUtils = inject(Dates);
+ private route = inject(ActivatedRoute);
+ private router = inject(Router);
+
/** Minimum transaction date allowed. */
minDate = new Date(2000, 0, 1);
/** Maximum transaction date allowed. */
@@ -63,14 +70,7 @@ export class FrequentPostingsComponent implements OnInit {
* @param {ActivatedRoute} route Activated Route.
* @param {Router} router Router for navigation.
*/
- constructor(
- private formBuilder: UntypedFormBuilder,
- private accountingService: AccountingService,
- private settingsService: SettingsService,
- private dateUtils: Dates,
- private route: ActivatedRoute,
- private router: Router
- ) {
+ constructor() {
this.route.data.subscribe((data: { offices: any; accountingRules: any; currencies: any; paymentTypes: any }) => {
this.officeData = data.offices;
this.accountingRuleData = data.accountingRules;
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 75a428f639..bca4a216d5 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
@@ -8,14 +8,18 @@
{{ 'labels.inputs.Office' | translate }}
-
- {{ office.name }}
-
+ @for (office of officeData; track office) {
+
+ {{ office.name }}
+
+ }
-
- {{ 'labels.inputs.Office' | translate }} {{ 'labels.commons.is' | translate }}
- {{ 'labels.commons.required' | translate }}
-
+ @if (openingBalancesForm.controls.officeId.hasError('required')) {
+
+ {{ 'labels.inputs.Office' | translate }} {{ 'labels.commons.is' | translate }}
+ {{ 'labels.commons.required' | translate }}
+
+ }
@@ -26,125 +30,121 @@
-
- {{ '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.Credit Amount' | translate }}
-
-
- {{ 'labels.inputs.Credit Amount' | translate }} {{ 'labels.commons.is' | translate }}
- {{ 'labels.commons.required' | translate }}
-
-
-
-
-
-
-
+ }
+
+ @for (credit of credits.controls; track credit; let i = $index) {
+
+ }
+
-
+
+ {{ 'labels.inputs.Affected GL Entry (Credit)' | translate }}
+
+ @for (affectedGLEntryCredit of creditAccountData; track affectedGLEntryCredit) {
+
+ {{ affectedGLEntryCredit.name }}
+
+ }
+
+ @if (credits.at(i).controls.glAccountId.hasError('required')) {
+
+ {{ 'labels.inputs.Affected GL Entry (Credit)' | translate }} {{ 'labels.commons.is' | translate }}
+ {{ 'labels.commons.required' | translate }}
+
+ }
+
+
+ {{ 'labels.inputs.Credit Amount' | translate }}
+
+ @if (credits.at(i).controls.amount.hasError('required')) {
+
+ {{ 'labels.inputs.Credit Amount' | translate }} {{ 'labels.commons.is' | translate }}
+ {{ 'labels.commons.required' | translate }}
+
+ }
+
+
+ @if (i !== 0) {
+
+ }
+ @if (i === 0 && allowMultipleCreditEntries) {
+
+ }
+
+
-
-
-
-
- {{ 'labels.inputs.Currency' | translate }}
-
-
- {{ currency.displayLabel }}
-
-
-
- {{ '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.commons.is' | translate }}
- {{ 'labels.commons.required' | translate }}
-
-
-
-
-
-
-
- {{ getSelectedValue('addressTypeIdOptions', address.addressTypeId)?.name }}
-
-
-
- {{ address.relationship }}
-
-
-
-
-
+ @if (clientAddressData.length > 0) {
+
+ @for (address of clientAddressData; track address; let i = $index) {
+
+
+
+ {{ getSelectedValue('addressTypeIdOptions', address.addressTypeId)?.name }}
+
+
+ {{ address.relationship }}
+
+
+
+ }
+
+ }
diff --git a/src/app/clients/clients-view/charges/client-pay-charges/client-pay-charges.component.ts b/src/app/clients/clients-view/charges/client-pay-charges/client-pay-charges.component.ts
index 8589de642a..a22ee72351 100644
--- a/src/app/clients/clients-view/charges/client-pay-charges/client-pay-charges.component.ts
+++ b/src/app/clients/clients-view/charges/client-pay-charges/client-pay-charges.component.ts
@@ -1,5 +1,5 @@
/** Angular Imports */
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, inject } from '@angular/core';
import { UntypedFormBuilder, Validators, ReactiveFormsModule } from '@angular/forms';
import { ActivatedRoute, Router, RouterLink } from '@angular/router';
@@ -21,6 +21,13 @@ import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
]
})
export class ClientPayChargesComponent implements OnInit {
+ private clientsService = inject(ClientsService);
+ private formBuilder = inject(UntypedFormBuilder);
+ private route = inject(ActivatedRoute);
+ private router = inject(Router);
+ private dateUtils = inject(Dates);
+ private settingsService = inject(SettingsService);
+
/** Transaction Form. */
transactionForm: any;
/** Transaction Data. */
@@ -36,14 +43,7 @@ export class ClientPayChargesComponent implements OnInit {
* @param {Router} router Router for navigation.
* @param {SettingsService} settingsService Setting service
*/
- constructor(
- private clientsService: ClientsService,
- private formBuilder: UntypedFormBuilder,
- private route: ActivatedRoute,
- private router: Router,
- private dateUtils: Dates,
- private settingsService: SettingsService
- ) {
+ constructor() {
this.route.data.subscribe((data: { transactionData: any }) => {
this.transactionData = data.transactionData;
});
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 46b36b4305..eb86949604 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
@@ -74,51 +74,48 @@
-
+ @if (chargeData.clientTransactionDatas) {
+
+
+ }
-
-
-
- {{ 'labels.inputs.Type' | translate }}
-
-
-
- {{ 'labels.inputs.GL Code' | translate }}
-
-
-
- {{ 'labels.inputs.GL Name' | translate }}
- {{ 'labels.inputs.Account' | translate }}
-
-
-
- {{ '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.name' | 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 }}
-
+ @if (centerForm.controls.name.hasError('required')) {
+
+ {{ 'labels.inputs.Center Name' | translate }} {{ 'labels.commons.is' | translate }}
+ {{ 'labels.commons.required' | translate }}
+
+ }
+ @if (centerForm.controls.name.hasError('pattern')) {
+
+ {{ 'labels.inputs.Center Name' | translate }} {{ 'labels.inputs.cannot' | translate }}
+ {{ 'labels.inputs.begin with a special character or number' | translate }}
+
+ }
{{ 'labels.inputs.Office' | translate }}
-
- {{ office.name }}
-
+ @for (office of officeData; track office) {
+
+ {{ office.name }}
+
+ }
-
- {{ 'labels.inputs.Office' | translate }} {{ 'labels.commons.is' | translate }}
- {{ 'labels.commons.required' | translate }}
-
+ @if (centerForm.controls.officeId.hasError('required')) {
+
+ {{ 'labels.inputs.Office' | translate }} {{ 'labels.commons.is' | translate }}
+ {{ 'labels.commons.required' | translate }}
+
+ }
{{ 'labels.inputs.Staff' | translate }}
-
- {{ staff.displayName }}
-
+ @for (staff of staffData; track staff) {
+
+ {{ staff.displayName }}
+
+ }
@@ -42,23 +52,27 @@
{{ 'labels.inputs.Active' | translate }}
-
- {{ 'labels.inputs.Activation Date' | translate }}
-
-
- {{ 'labels.inputs.Activation Date' | translate }} {{ 'labels.commons.is' | translate }}
- {{ 'labels.commons.required' | translate }}
-
-
+ @if (this.centerForm.controls.active.value) {
+
+ {{ 'labels.inputs.Activation Date' | translate }}
+
+
+ {{ 'labels.inputs.Activation Date' | translate }} {{ 'labels.commons.is' | translate }}
+ {{ 'labels.commons.required' | translate }}
+
+ }
+
+ }
{{ 'labels.inputs.External Id' | translate }}
@@ -77,53 +91,63 @@
/>
- {{ 'labels.inputs.Submission Date' | translate }} {{ 'labels.commons.is' | translate }}
- {{ 'labels.commons.required' | translate }}
-
+ @if (centerForm.controls.submittedOnDate.hasError('required')) {
+
+ {{ 'labels.inputs.Submission Date' | translate }} {{ 'labels.commons.is' | translate }}
+ {{ 'labels.commons.required' | translate }}
+
+ }
{{ 'labels.inputs.Select and Add groups' | translate }}
-
- {{ group.name }}
-
+ @for (group of groupsData; track group) {
+
+ {{ group.name }}
+
+ }
- {{
- openingBalancesData.glAccounts[i].glAccountType.value !==
- openingBalancesData.glAccounts[i - 1]?.glAccountType.value
- ? glAccountTypeLabel(openingBalancesData.glAccounts[i].glAccountType.value)
- : ''
- }}
+ @if (openingBalancesData) {
+
-
-
+ @for (centerNote of centerNotes; track centerNote; let i = $index) {
+
+
+ }
diff --git a/src/app/centers/centers-view/notes-tab/notes-tab.component.ts b/src/app/centers/centers-view/notes-tab/notes-tab.component.ts
index 654c03035f..bae6e5fbe6 100644
--- a/src/app/centers/centers-view/notes-tab/notes-tab.component.ts
+++ b/src/app/centers/centers-view/notes-tab/notes-tab.component.ts
@@ -1,4 +1,4 @@
-import { Component, OnInit, ViewChild } from '@angular/core';
+import { Component, OnInit, ViewChild, inject } from '@angular/core';
import { UntypedFormBuilder, UntypedFormGroup, Validators, ReactiveFormsModule } from '@angular/forms';
import { MatDialog } from '@angular/material/dialog';
import { ActivatedRoute } from '@angular/router';
@@ -31,20 +31,20 @@ import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
]
})
export class NotesTabComponent implements OnInit {
+ private route = inject(ActivatedRoute);
+ private formBuilder = inject(UntypedFormBuilder);
+ private centersService = inject(CentersService);
+ private authenticationService = inject(AuthenticationService);
+ private dialog = inject(MatDialog);
+ private translateService = inject(TranslateService);
+
centerId: string;
username: string;
centerNotes: any;
noteForm: UntypedFormGroup;
@ViewChild('formRef', { static: true }) formRef: any;
- constructor(
- private route: ActivatedRoute,
- private formBuilder: UntypedFormBuilder,
- private centersService: CentersService,
- private authenticationService: AuthenticationService,
- private dialog: MatDialog,
- private translateService: TranslateService
- ) {
+ constructor() {
const savedCredentials = this.authenticationService.getCredentials();
this.username = savedCredentials.username;
this.centerId = this.route.parent.snapshot.params['centerId'];
diff --git a/src/app/centers/centers.component.ts b/src/app/centers/centers.component.ts
index 34db3d5e49..c741ef6a01 100644
--- a/src/app/centers/centers.component.ts
+++ b/src/app/centers/centers.component.ts
@@ -1,5 +1,5 @@
/** Angular Imports */
-import { Component, OnInit, ViewChild, AfterViewInit } from '@angular/core';
+import { Component, OnInit, ViewChild, AfterViewInit, inject } from '@angular/core';
import { MatCheckbox } from '@angular/material/checkbox';
import { MatPaginator } from '@angular/material/paginator';
@@ -63,6 +63,8 @@ import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
]
})
export class CentersComponent implements OnInit, AfterViewInit {
+ private centersService = inject(CentersService);
+
@ViewChild('showClosedCenters', { static: true }) showClosedCenters: MatCheckbox;
/** Name form control. */
@@ -96,8 +98,6 @@ export class CentersComponent implements OnInit, AfterViewInit {
/** Sorter for centers table. */
@ViewChild(MatSort, { static: true }) sort: MatSort;
- constructor(private centersService: CentersService) {}
-
ngOnInit() {
this.getCenters();
}
diff --git a/src/app/centers/centers.service.ts b/src/app/centers/centers.service.ts
index a728d51e2a..48805a3da9 100644
--- a/src/app/centers/centers.service.ts
+++ b/src/app/centers/centers.service.ts
@@ -1,5 +1,5 @@
/** Angular Imports */
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import { HttpClient, HttpParams } from '@angular/common/http';
/** rxjs Imports */
@@ -12,10 +12,7 @@ import { Observable } from 'rxjs';
providedIn: 'root'
})
export class CentersService {
- /**
- * @param {HttpClient} http Http Client to send requests.
- */
- constructor(private http: HttpClient) {}
+ private http = inject(HttpClient);
/**
* @param {any} filterBy Properties by which entries should be filtered.
diff --git a/src/app/centers/common-resolvers/center-actions.resolver.ts b/src/app/centers/common-resolvers/center-actions.resolver.ts
index bf11d698f5..3aa5ccf596 100644
--- a/src/app/centers/common-resolvers/center-actions.resolver.ts
+++ b/src/app/centers/common-resolvers/center-actions.resolver.ts
@@ -1,5 +1,5 @@
/** Angular Imports */
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import { ActivatedRouteSnapshot } from '@angular/router';
/** rxjs Imports */
@@ -13,10 +13,7 @@ import { CentersService } from '../centers.service';
*/
@Injectable()
export class CenterActionsResolver {
- /**
- * @param {CentersService} centersService Savings service.
- */
- constructor(private centersService: CentersService) {}
+ private centersService = inject(CentersService);
/**
* Returns the Centers account actions data.
diff --git a/src/app/centers/common-resolvers/center-data-and-template.resolver.ts b/src/app/centers/common-resolvers/center-data-and-template.resolver.ts
index 9f54b0eb2f..c186ed2445 100644
--- a/src/app/centers/common-resolvers/center-data-and-template.resolver.ts
+++ b/src/app/centers/common-resolvers/center-data-and-template.resolver.ts
@@ -1,5 +1,5 @@
/** Angular Imports */
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import { ActivatedRouteSnapshot } from '@angular/router';
/** rxjs Imports */
@@ -13,10 +13,7 @@ import { CentersService } from '../centers.service';
*/
@Injectable()
export class CenterDataAndTemplateResolver {
- /**
- * @param {CentersService} CentersService Centers service.
- */
- constructor(private centersService: CentersService) {}
+ private centersService = inject(CentersService);
/**
* Returns the Centers and template data.
diff --git a/src/app/centers/common-resolvers/center-datatable.resolver.ts b/src/app/centers/common-resolvers/center-datatable.resolver.ts
index 1d6ffce065..c216b58014 100644
--- a/src/app/centers/common-resolvers/center-datatable.resolver.ts
+++ b/src/app/centers/common-resolvers/center-datatable.resolver.ts
@@ -1,5 +1,5 @@
/** Angular Imports */
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import { ActivatedRouteSnapshot } from '@angular/router';
/** rxjs Imports */
@@ -13,10 +13,7 @@ import { CentersService } from '../centers.service';
*/
@Injectable()
export class CenterDatatableResolver {
- /**
- * @param {CentersService} CentersService Centers service.
- */
- constructor(private centersService: CentersService) {}
+ private centersService = inject(CentersService);
/**
* Returns the Centers Notes Data.
diff --git a/src/app/centers/common-resolvers/center-datatables.resolver.ts b/src/app/centers/common-resolvers/center-datatables.resolver.ts
index 315a4cde56..8fff88a36b 100644
--- a/src/app/centers/common-resolvers/center-datatables.resolver.ts
+++ b/src/app/centers/common-resolvers/center-datatables.resolver.ts
@@ -1,5 +1,5 @@
/** Angular Imports */
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
/** rxjs Imports */
import { Observable } from 'rxjs';
@@ -12,10 +12,7 @@ import { CentersService } from '../centers.service';
*/
@Injectable()
export class CenterDatatablesResolver {
- /**
- * @param {centersService} centersService centers service.
- */
- constructor(private centersService: CentersService) {}
+ private centersService = inject(CentersService);
/**
* Returns the center datatables.
diff --git a/src/app/centers/common-resolvers/center-notes.resolver.ts b/src/app/centers/common-resolvers/center-notes.resolver.ts
index a3b74fd099..54e0a7fba7 100644
--- a/src/app/centers/common-resolvers/center-notes.resolver.ts
+++ b/src/app/centers/common-resolvers/center-notes.resolver.ts
@@ -1,5 +1,5 @@
/** Angular Imports */
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import { ActivatedRouteSnapshot } from '@angular/router';
/** rxjs Imports */
@@ -13,10 +13,7 @@ import { CentersService } from '../centers.service';
*/
@Injectable()
export class CenterNotesResolver {
- /**
- * @param {CentersService} CentersService Centers service.
- */
- constructor(private centersService: CentersService) {}
+ private centersService = inject(CentersService);
/**
* Returns the Centers Notes Data.
diff --git a/src/app/centers/common-resolvers/center-resource.resolver.ts b/src/app/centers/common-resolvers/center-resource.resolver.ts
index fd076ad2e6..213965ca5e 100644
--- a/src/app/centers/common-resolvers/center-resource.resolver.ts
+++ b/src/app/centers/common-resolvers/center-resource.resolver.ts
@@ -1,5 +1,5 @@
/** Angular Imports */
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import { ActivatedRouteSnapshot } from '@angular/router';
/** rxjs Imports */
@@ -13,10 +13,7 @@ import { CentersService } from '../centers.service';
*/
@Injectable()
export class CenterResourceResolver {
- /**
- * @param {CentersService} CentersService Centers service.
- */
- constructor(private centersService: CentersService) {}
+ private centersService = inject(CentersService);
/**
* Returns the Centers data for General Tab.
diff --git a/src/app/centers/common-resolvers/center-summary.resolver.ts b/src/app/centers/common-resolvers/center-summary.resolver.ts
index b4f0945e7d..886a4da8a3 100644
--- a/src/app/centers/common-resolvers/center-summary.resolver.ts
+++ b/src/app/centers/common-resolvers/center-summary.resolver.ts
@@ -1,5 +1,5 @@
/** Angular Imports */
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import { ActivatedRouteSnapshot } from '@angular/router';
/** rxjs Imports */
@@ -13,10 +13,7 @@ import { CentersService } from '../centers.service';
*/
@Injectable()
export class CenterSummaryResolver {
- /**
- * @param {CentersService} CentersService Centers service.
- */
- constructor(private centersService: CentersService) {}
+ private centersService = inject(CentersService);
/**
* Returns the Centers Summary Data.
diff --git a/src/app/centers/common-resolvers/center-view.resolver.ts b/src/app/centers/common-resolvers/center-view.resolver.ts
index 07a355aaa9..f744bb84ee 100644
--- a/src/app/centers/common-resolvers/center-view.resolver.ts
+++ b/src/app/centers/common-resolvers/center-view.resolver.ts
@@ -1,5 +1,5 @@
/** Angular Imports */
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import { ActivatedRouteSnapshot } from '@angular/router';
/** rxjs Imports */
@@ -13,10 +13,7 @@ import { CentersService } from '../centers.service';
*/
@Injectable()
export class CenterViewResolver {
- /**
- * @param {CentersService} CentersService Centers service.
- */
- constructor(private centersService: CentersService) {}
+ private centersService = inject(CentersService);
/**
* Returns the Centers data.
diff --git a/src/app/centers/common-resolvers/savings-account.resolver.ts b/src/app/centers/common-resolvers/savings-account.resolver.ts
index b1093e6cf9..ccbdd179db 100644
--- a/src/app/centers/common-resolvers/savings-account.resolver.ts
+++ b/src/app/centers/common-resolvers/savings-account.resolver.ts
@@ -1,5 +1,5 @@
/** Angular Imports */
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import { ActivatedRouteSnapshot } from '@angular/router';
/** rxjs Imports */
@@ -13,10 +13,7 @@ import { CentersService } from '../centers.service';
*/
@Injectable()
export class SavingsAccountResolver {
- /**
- * @param {CentersService} CentersService Centers service.
- */
- constructor(private centersService: CentersService) {}
+ private centersService = inject(CentersService);
/**
* Returns the Center Savings Account data.
diff --git a/src/app/centers/create-center/create-center.component.html b/src/app/centers/create-center/create-center.component.html
index 02d0f8062b..9da5dbb872 100644
--- a/src/app/centers/create-center/create-center.component.html
+++ b/src/app/centers/create-center/create-center.component.html
@@ -6,35 +6,45 @@
+
+
+
+ {{ 'labels.inputs.Currency' | translate }}
+
+ @for (currency of currencyData; track currency) {
+
+ {{ currency.displayLabel }}
+
+ }
+
+ @if (openingBalancesForm.controls.currencyCode.hasError('required')) {
+
+ {{ '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.commons.is' | translate }}
+ {{ 'labels.commons.required' | translate }}
+
+ }
+
+
- {{ 'labels.inputs.Date' | translate }} {{ 'labels.commons.is' | translate }}
- {{ 'labels.commons.required' | translate }}
-
+ @if (provisioningEntryForm.controls.date.hasError('required')) {
+
+ {{ 'labels.inputs.Date' | translate }} {{ 'labels.commons.is' | translate }}
+ {{ 'labels.commons.required' | translate }}
+
+ }
-
-
-
+ @if (!(centerViewData.status.value === 'Active')) {
+
+
+
+ }
-
-
-
-
-
-
+ @if (centerViewData.active) {
+
-
-
-
-
-
-
-
-
-
+ }
+
+
+ @if (centerViewData.collectionMeetingCalendar) {
+
+
+
+ }
+ @if (!centerViewData.staffId) {
+
+
+
+ }
+ @if (centerViewData.staffId) {
+
+
+
+ }
+ @if (centerViewData.status.value === 'Active') {
+
+
+
+ }
-
-
-
+ @if (centerViewData.status.value === 'Active' && !centerViewData.collectionMeetingCalendar) {
+
+
+
+ }
+
- {{ 'labels.inputs.Accrue Date' | translate }} {{ 'labels.commons.is' | translate }}
- {{ 'labels.commons.required' | translate }}
-
+ @if (periodicAccrualsForm.controls.tillDate.hasError('required')) {
+
+ {{ 'labels.inputs.Accrue Date' | translate }} {{ 'labels.commons.is' | translate }}
+ {{ 'labels.commons.required' | translate }}
+
+ }
diff --git a/src/app/accounting/periodic-accruals/periodic-accruals.component.ts b/src/app/accounting/periodic-accruals/periodic-accruals.component.ts
index c54637123d..55d5ec4fb0 100644
--- a/src/app/accounting/periodic-accruals/periodic-accruals.component.ts
+++ b/src/app/accounting/periodic-accruals/periodic-accruals.component.ts
@@ -1,5 +1,5 @@
/** Angular Imports */
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, inject } from '@angular/core';
import { UntypedFormGroup, UntypedFormBuilder, Validators, ReactiveFormsModule } from '@angular/forms';
import { Router, ActivatedRoute, RouterLink } from '@angular/router';
@@ -22,6 +22,13 @@ import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
]
})
export class PeriodicAccrualsComponent implements OnInit {
+ private formBuilder = inject(UntypedFormBuilder);
+ private accountingService = inject(AccountingService);
+ private settingsService = inject(SettingsService);
+ private dateUtils = inject(Dates);
+ private route = inject(ActivatedRoute);
+ private router = inject(Router);
+
/** Minimum accrue date allowed. */
minDate = new Date(2000, 0, 1);
/** Maximum accrue date allowed. */
@@ -29,22 +36,6 @@ export class PeriodicAccrualsComponent implements OnInit {
/** Periodic accruals form. */
periodicAccrualsForm: UntypedFormGroup;
- /**
- * @param {FormBuilder} formBuilder Form Builder.
- * @param {AccountingService} accountingService Accounting Service.
- * @param {SettingsService} settingsService Settings Service.
- * @param {ActivatedRoute} route Activated Route.
- * @param {Router} router Router for navigation.
- */
- constructor(
- private formBuilder: UntypedFormBuilder,
- private accountingService: AccountingService,
- private settingsService: SettingsService,
- private dateUtils: Dates,
- private route: ActivatedRoute,
- private router: Router
- ) {}
-
/**
* Creates periodic accruals form.
*/
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 58d8393e26..bc92cb74c1 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
@@ -15,10 +15,12 @@
/>
+ {{ 'labels.inputs.Type' | translate }}
-
-
- {{ openingBalancesData.glAccounts[i].glAccountCode }}
+
-
-
-
+ @if (openingBalancesData) {
+
+
+
+
+ }
diff --git a/src/app/accounting/migrate-opening-balances/migrate-opening-balances.component.ts b/src/app/accounting/migrate-opening-balances/migrate-opening-balances.component.ts
index 6f7e20c308..e3761176db 100644
--- a/src/app/accounting/migrate-opening-balances/migrate-opening-balances.component.ts
+++ b/src/app/accounting/migrate-opening-balances/migrate-opening-balances.component.ts
@@ -1,5 +1,5 @@
/** Angular Imports */
-import { Component, OnInit, TemplateRef, ElementRef, ViewChild, AfterViewInit } from '@angular/core';
+import { Component, OnInit, TemplateRef, ElementRef, ViewChild, AfterViewInit, inject } from '@angular/core';
import {
UntypedFormGroup,
UntypedFormBuilder,
@@ -19,7 +19,7 @@ import { ConfigurationWizardService } from '../../configuration-wizard/configura
import { onlyOneOfTheFieldsIsRequiredValidator } from './only-one-of-the-fields-is-required.validator';
import { Dates } from 'app/core/utils/dates';
import { TranslateService } from '@ngx-translate/core';
-import { NgFor, NgIf, CurrencyPipe } from '@angular/common';
+import { CurrencyPipe } from '@angular/common';
import { GlAccountDisplayComponent } from '../../shared/accounting/gl-account-display/gl-account-display.component';
import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
@@ -37,6 +37,16 @@ import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
]
})
export class MigrateOpeningBalancesComponent implements OnInit, AfterViewInit {
+ private formBuilder = inject(UntypedFormBuilder);
+ private accountingService = inject(AccountingService);
+ private settingsService = inject(SettingsService);
+ private dateUtils = inject(Dates);
+ private route = inject(ActivatedRoute);
+ private router = inject(Router);
+ private configurationWizardService = inject(ConfigurationWizardService);
+ private popoverService = inject(PopoverService);
+ private translateService = inject(TranslateService);
+
/** Minimum opening balances date allowed. */
minDate = new Date(2000, 0, 1);
/** Maximum opening balances date allowed. */
@@ -70,17 +80,7 @@ export class MigrateOpeningBalancesComponent implements OnInit, AfterViewInit {
* @param {ConfigurationWizardService} configurationWizardService ConfigurationWizard Service.
* @param {PopoverService} popoverService PopoverService.
*/
- constructor(
- private formBuilder: UntypedFormBuilder,
- private accountingService: AccountingService,
- private settingsService: SettingsService,
- private dateUtils: Dates,
- private route: ActivatedRoute,
- private router: Router,
- private configurationWizardService: ConfigurationWizardService,
- private popoverService: PopoverService,
- private translateService: TranslateService
- ) {
+ constructor() {
this.route.data.subscribe((data: { offices: any; currencies: any }) => {
this.officeData = data.offices;
this.currencyData = data.currencies.selectedCurrencyOptions;
diff --git a/src/app/accounting/periodic-accruals/periodic-accruals.component.html b/src/app/accounting/periodic-accruals/periodic-accruals.component.html
index 1cb0119c69..fff1f1f63d 100644
--- a/src/app/accounting/periodic-accruals/periodic-accruals.component.html
+++ b/src/app/accounting/periodic-accruals/periodic-accruals.component.html
@@ -15,10 +15,12 @@
/>
+ {{ 'labels.inputs.GL Code' | translate }}
-
-
- {{ openingBalancesData.glAccounts[i].glAccountName }}
+
+ }
-
+ {{ 'labels.inputs.GL Name' | translate }}
+ {{ 'labels.inputs.Account' | translate }}
-
-
-
- {{ 'labels.inputs.Debit' | translate }}
-
-
+
-
+ {{ 'labels.inputs.Total Debit' | translate }}:
+ {{ debitsSum | currency: currencyCode : 'symbol-narrow' : '1.2-2' }}
-
-
-
- {{ 'labels.inputs.Credit' | translate }}
-
-
+
+ @for (credit of glAccountEntries.controls; track credit; let i = $index) {
+
+ {{ '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].glAccountCode }}
+
+
+ {{ openingBalancesData.glAccounts[i].glAccountName }}
+
+
+
+ {{ 'labels.inputs.Debit' | translate }}
+
+
+
+
+
+ {{ 'labels.inputs.Credit' | translate }}
+
+
+
+
diff --git a/src/app/accounting/provisioning-entries/create-provisioning-entry/create-provisioning-entry.component.ts b/src/app/accounting/provisioning-entries/create-provisioning-entry/create-provisioning-entry.component.ts
index b51ff83794..8d52929a49 100644
--- a/src/app/accounting/provisioning-entries/create-provisioning-entry/create-provisioning-entry.component.ts
+++ b/src/app/accounting/provisioning-entries/create-provisioning-entry/create-provisioning-entry.component.ts
@@ -1,5 +1,5 @@
/** Angular Imports */
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, inject } from '@angular/core';
import { UntypedFormGroup, UntypedFormBuilder, Validators, ReactiveFormsModule } from '@angular/forms';
import { ActivatedRoute, Router, RouterLink } from '@angular/router';
@@ -22,6 +22,13 @@ import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
]
})
export class CreateProvisioningEntryComponent implements OnInit {
+ private formBuilder = inject(UntypedFormBuilder);
+ private accountingService = inject(AccountingService);
+ private settingsService = inject(SettingsService);
+ private dateUtils = inject(Dates);
+ private route = inject(ActivatedRoute);
+ private router = inject(Router);
+
/** Minimum provisioning date allowed. */
minDate = new Date(2000, 0, 1);
/** Maximum provisioning date allowed. */
@@ -29,22 +36,6 @@ export class CreateProvisioningEntryComponent implements OnInit {
/** Provisioning entry form. */
provisioningEntryForm: UntypedFormGroup;
- /**
- * @param {FormBuilder} formBuilder Form Builder.
- * @param {AccountingService} accountingService Accounting Service.
- * @param {SettingsService} settingsService Settings Service.
- * @param {ActivatedRoute} route Activated Route.
- * @param {Router} router Router for navigation.
- */
- constructor(
- private formBuilder: UntypedFormBuilder,
- private accountingService: AccountingService,
- private settingsService: SettingsService,
- private dateUtils: Dates,
- private route: ActivatedRoute,
- private router: Router
- ) {}
-
/**
* Creates the provisioning entry form.
*/
diff --git a/src/app/accounting/provisioning-entries/provisioning-entries.component.ts b/src/app/accounting/provisioning-entries/provisioning-entries.component.ts
index 6aee9844bf..a7519428ef 100644
--- a/src/app/accounting/provisioning-entries/provisioning-entries.component.ts
+++ b/src/app/accounting/provisioning-entries/provisioning-entries.component.ts
@@ -1,5 +1,5 @@
/** Angular Imports */
-import { Component, OnInit, ViewChild } from '@angular/core';
+import { Component, OnInit, ViewChild, inject } from '@angular/core';
import { MatPaginator } from '@angular/material/paginator';
import { MatSort, MatSortHeader } from '@angular/material/sort';
import {
@@ -50,6 +50,10 @@ import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
]
})
export class ProvisioningEntriesComponent implements OnInit {
+ private accountingService = inject(AccountingService);
+ private route = inject(ActivatedRoute);
+ private router = inject(Router);
+
/** Provisioning entry data. */
provisioningEntryData: any;
/** Columns to be displayed in provisioning entries table. */
@@ -75,11 +79,7 @@ export class ProvisioningEntriesComponent implements OnInit {
* @param {ActivatedRoute} route Activated Route.
* @param {Router} router Router for navigation.
*/
- constructor(
- private accountingService: AccountingService,
- private route: ActivatedRoute,
- private router: Router
- ) {
+ constructor() {
this.route.data.subscribe((data: { provisioningEntries: any }) => {
this.provisioningEntryData = data.provisioningEntries.pageItems;
});
diff --git a/src/app/accounting/provisioning-entries/provisioning-entries.resolver.ts b/src/app/accounting/provisioning-entries/provisioning-entries.resolver.ts
index 68a1eaf590..089747ebcf 100644
--- a/src/app/accounting/provisioning-entries/provisioning-entries.resolver.ts
+++ b/src/app/accounting/provisioning-entries/provisioning-entries.resolver.ts
@@ -1,5 +1,5 @@
/** Angular Imports */
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
/** rxjs Imports */
import { Observable } from 'rxjs';
@@ -12,10 +12,7 @@ import { AccountingService } from '../accounting.service';
*/
@Injectable()
export class ProvisioningEntriesResolver {
- /**
- * @param {AccountingService} accountingService Accounting service.
- */
- constructor(private accountingService: AccountingService) {}
+ private accountingService = inject(AccountingService);
/**
* Returns the provisioning entries data.
diff --git a/src/app/accounting/provisioning-entries/view-provisioning-entry/provisioning-entry-entries.resolver.ts b/src/app/accounting/provisioning-entries/view-provisioning-entry/provisioning-entry-entries.resolver.ts
index d7cb4b6277..41a1df6d66 100644
--- a/src/app/accounting/provisioning-entries/view-provisioning-entry/provisioning-entry-entries.resolver.ts
+++ b/src/app/accounting/provisioning-entries/view-provisioning-entry/provisioning-entry-entries.resolver.ts
@@ -1,5 +1,5 @@
/** Angular Imports */
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import { ActivatedRouteSnapshot } from '@angular/router';
/** rxjs Imports */
@@ -13,10 +13,7 @@ import { AccountingService } from '../../accounting.service';
*/
@Injectable()
export class ProvisioningEntryEntriesResolver {
- /**
- * @param {AccountingService} accountingService Accounting service.
- */
- constructor(private accountingService: AccountingService) {}
+ private accountingService = inject(AccountingService);
/**
* Returns the provisioning entry entries data.
diff --git a/src/app/accounting/provisioning-entries/view-provisioning-entry/provisioning-entry.resolver.ts b/src/app/accounting/provisioning-entries/view-provisioning-entry/provisioning-entry.resolver.ts
index 302e835e5c..6bc6fe5e38 100644
--- a/src/app/accounting/provisioning-entries/view-provisioning-entry/provisioning-entry.resolver.ts
+++ b/src/app/accounting/provisioning-entries/view-provisioning-entry/provisioning-entry.resolver.ts
@@ -1,5 +1,5 @@
/** Angular Imports */
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import { ActivatedRouteSnapshot } from '@angular/router';
/** rxjs Imports */
@@ -13,10 +13,7 @@ import { AccountingService } from '../../accounting.service';
*/
@Injectable()
export class ProvisioningEntryResolver {
- /**
- * @param {AccountingService} accountingService Accounting service.
- */
- constructor(private accountingService: AccountingService) {}
+ private accountingService = inject(AccountingService);
/**
* Returns the provisioning entry data.
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 a846afda80..1fd45aa3ca 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,46 +1,43 @@
-
-
-
-
diff --git a/src/app/centers/centers-view/center-actions/edit-center-meeting-schedule/edit-center-meeting-schedule.component.ts b/src/app/centers/centers-view/center-actions/edit-center-meeting-schedule/edit-center-meeting-schedule.component.ts
index 693f6abfe6..21c57a002e 100644
--- a/src/app/centers/centers-view/center-actions/edit-center-meeting-schedule/edit-center-meeting-schedule.component.ts
+++ b/src/app/centers/centers-view/center-actions/edit-center-meeting-schedule/edit-center-meeting-schedule.component.ts
@@ -1,5 +1,5 @@
/** Angular Imports */
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, inject } from '@angular/core';
import { UntypedFormGroup, UntypedFormBuilder, Validators, FormControl, ReactiveFormsModule } from '@angular/forms';
import { ActivatedRoute, Router, RouterLink } from '@angular/router';
@@ -23,6 +23,13 @@ import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
]
})
export class EditCenterMeetingScheduleComponent implements OnInit {
+ private formBuilder = inject(UntypedFormBuilder);
+ private centersService = inject(CentersService);
+ private settingsService = inject(SettingsService);
+ private dateUtils = inject(Dates);
+ private route = inject(ActivatedRoute);
+ private router = inject(Router);
+
/** Minimum date allowed. */
minDate = new Date(2000, 0, 1);
/** Maximum date allowed. */
@@ -47,14 +54,7 @@ export class EditCenterMeetingScheduleComponent implements OnInit {
* @param {ActivatedRoute} route Activated Route
* @param {Router} router Router
*/
- constructor(
- private formBuilder: UntypedFormBuilder,
- private centersService: CentersService,
- private settingsService: SettingsService,
- private dateUtils: Dates,
- private route: ActivatedRoute,
- private router: Router
- ) {
+ constructor() {
this.route.data.subscribe((data: { centersActionData: any }) => {
this.calendarTemplate = data.centersActionData;
this.nextMeetingDates = this.calendarTemplate.nextTenRecurringDates;
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 b3162741c5..1779b28078 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
@@ -13,41 +13,55 @@
{{ 'labels.inputs.Repetition Frequency' | translate }}
-
- {{ option.value }}
-
+ @for (option of frequencyOptions; track option) {
+
+ {{ option.value }}
+
+ }
-
- {{ 'labels.inputs.Repetition Frequency' | translate }} {{ 'labels.commons.is' | translate }}
- {{ 'labels.commons.required' | translate }}
-
+ @if (centerEditMeetingForm.controls.frequency.hasError('repeatsOnDay')) {
+
+ {{ 'labels.inputs.Repetition Frequency' | translate }} {{ 'labels.commons.is' | translate }}
+ {{ 'labels.commons.required' | translate }}
+
+ }
{{ 'labels.inputs.Repetition Interval' | translate }}
-
- {{ interval }}
-
+ @for (interval of repetitionIntervals; track interval) {
+
+ {{ interval }}
+
+ }
-
- {{ 'labels.inputs.Repetition Interval' | translate }} {{ 'labels.commons.is' | translate }}
- {{ 'labels.commons.required' | translate }}
-
+ @if (centerEditMeetingForm.controls.interval.hasError('repeatsOnDay')) {
+
+ {{ '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 }}
-
-
+ @if (centerEditMeetingForm.contains('repeatsOnDay')) {
+
+ {{ 'labels.inputs.Repeats on Day' | translate }}
+
+ @for (day of repeatsOnDays; track day) {
+
+ {{ day.value }}
+
+ }
+
+ @if (centerEditMeetingForm.controls.repeatsOnDay.hasError('repeatsOnDay')) {
+
+ {{ 'labels.inputs.At least' | translate }} {{ 'labels.inputs.one' | translate }}
+ {{ 'labels.inputs.day must be selected' | translate }}
+
+ }
+
+ }
{{ 'labels.inputs.Above Changes are Effective from' | translate }}
@@ -61,10 +75,12 @@
/>
- {{ 'labels.inputs.Changes Affection Date' | translate }} {{ 'labels.commons.is' | translate }}
- {{ 'labels.commons.required' | translate }}
-
+ @if (centerEditMeetingForm.controls.startDate.hasError('required')) {
+
+ {{ '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/edit-center-meeting/edit-center-meeting.component.ts b/src/app/centers/centers-view/center-actions/edit-center-meeting/edit-center-meeting.component.ts
index 3fc7fed974..a029ca87ea 100644
--- a/src/app/centers/centers-view/center-actions/edit-center-meeting/edit-center-meeting.component.ts
+++ b/src/app/centers/centers-view/center-actions/edit-center-meeting/edit-center-meeting.component.ts
@@ -1,5 +1,5 @@
/** Angular Imports */
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, inject } from '@angular/core';
import {
UntypedFormGroup,
UntypedFormBuilder,
@@ -31,6 +31,13 @@ import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
]
})
export class EditCenterMeetingComponent implements OnInit {
+ private formBuilder = inject(UntypedFormBuilder);
+ private centersService = inject(CentersService);
+ private settingsService = inject(SettingsService);
+ private dateUtils = inject(Dates);
+ private route = inject(ActivatedRoute);
+ private router = inject(Router);
+
/** Minimum date allowed. */
minDate = new Date(2000, 0, 1);
/** Maximum date allowed. */
@@ -59,14 +66,7 @@ export class EditCenterMeetingComponent implements OnInit {
* @param {ActivatedRoute} route Activated Route
* @param {Router} router Router
*/
- constructor(
- private formBuilder: UntypedFormBuilder,
- private centersService: CentersService,
- private settingsService: SettingsService,
- private dateUtils: Dates,
- private route: ActivatedRoute,
- private router: Router
- ) {
+ constructor() {
this.route.data.subscribe((data: { centersActionData: any }) => {
this.calendarTemplate = data.centersActionData;
this.frequencyOptions = this.calendarTemplate.frequencyOptions;
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 45c43c1330..5edc2613e7 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
@@ -6,9 +6,11 @@
-
- {{ group.name }}
-
+ @for (group of groupsData; track group) {
+
+ {{ group.name }}
+
+ }
-
-
-
-
-
+}
- {{ 'labels.inputs.Created By' | translate }}
-
-
- {{ provisioningEntry.createdUser }}
-
-
-
- {{ 'labels.inputs.Created On' | translate }}
-
-
-
- {{ provisioningEntry.createdDate }}
+@if (provisioningEntry) {
+
+
+
+
+
+
+
-
-
-
+
+
+
+
-
-
+ {{ 'labels.inputs.Created By' | translate }}
+
+
+ {{ provisioningEntry.createdUser }}
+
+
+ {{ 'labels.inputs.Created On' | translate }}
+
+
+ {{ provisioningEntry.createdDate }}
+
+
+ {{ 'labels.inputs.Amount to be Reserved' | translate }}
+
+
+ {{ provisioningEntry.reservedAmount }}
+
- {{ 'labels.inputs.Amount to be Reserved' | translate }}
-
-
-
- {{ provisioningEntry.reservedAmount }}
-
-
@@ -62,24 +59,27 @@
-
- {{ office.name }}
-
+ @for (office of filteredOfficeData | async; track office) {
+
+ {{ office.name }}
+
+ }
-
- {{ loanProduct.name }}
-
+ @for (loanProduct of filteredLoanProductData | async; track loanProduct) {
+
+ {{ loanProduct.name }}
+
+ }
-
- {{ provisioningCategory.categoryName }}
-
+ @for (provisioningCategory of filteredProvisioningCategoryData | async; track provisioningCategory) {
+
+ {{ provisioningCategory.categoryName }}
+
+ }
diff --git a/src/app/accounting/provisioning-entries/view-provisioning-entry/view-provisioning-entry.component.ts b/src/app/accounting/provisioning-entries/view-provisioning-entry/view-provisioning-entry.component.ts
index ea6f192617..d3a48c216d 100644
--- a/src/app/accounting/provisioning-entries/view-provisioning-entry/view-provisioning-entry.component.ts
+++ b/src/app/accounting/provisioning-entries/view-provisioning-entry/view-provisioning-entry.component.ts
@@ -1,5 +1,5 @@
/** Angular Imports */
-import { Component, OnInit, ViewChild, AfterViewInit } from '@angular/core';
+import { Component, OnInit, ViewChild, AfterViewInit, inject } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router';
import { UntypedFormControl, ReactiveFormsModule } from '@angular/forms';
import { MatPaginator } from '@angular/material/paginator';
@@ -23,7 +23,7 @@ import { startWith, map, debounceTime, distinctUntilChanged, tap } from 'rxjs/op
/** Custom Services */
import { AccountingService } from '../../accounting.service';
-import { NgIf, NgFor, AsyncPipe } from '@angular/common';
+import { AsyncPipe } from '@angular/common';
import { FaIconComponent } from '@fortawesome/angular-fontawesome';
import { MatAutocompleteTrigger, MatAutocomplete, MatOption } from '@angular/material/autocomplete';
import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
@@ -57,6 +57,10 @@ import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
]
})
export class ViewProvisioningEntryComponent implements OnInit, AfterViewInit {
+ private accountingService = inject(AccountingService);
+ private route = inject(ActivatedRoute);
+ private router = inject(Router);
+
/** Provisioning entry id. */
provisioningEntryId: string;
/** Provisioning entry. */
@@ -112,11 +116,7 @@ export class ViewProvisioningEntryComponent implements OnInit, AfterViewInit {
* @param {ActivatedRoute} route Activated Route.
* @param {Router} router Router for navigation.
*/
- constructor(
- private accountingService: AccountingService,
- private route: ActivatedRoute,
- private router: Router
- ) {
+ constructor() {
this.route.data.subscribe(
(data: {
provisioningEntry: any;
diff --git a/src/app/accounting/provisioning-entries/view-provisioning-journal-entries/provisioning-journal-entries.resolver.ts b/src/app/accounting/provisioning-entries/view-provisioning-journal-entries/provisioning-journal-entries.resolver.ts
index 27aa23cb52..2af5f36ad5 100644
--- a/src/app/accounting/provisioning-entries/view-provisioning-journal-entries/provisioning-journal-entries.resolver.ts
+++ b/src/app/accounting/provisioning-entries/view-provisioning-journal-entries/provisioning-journal-entries.resolver.ts
@@ -1,5 +1,5 @@
/** Angular Imports */
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import { ActivatedRouteSnapshot } from '@angular/router';
/** rxjs Imports */
@@ -13,10 +13,7 @@ import { AccountingService } from '../../accounting.service';
*/
@Injectable()
export class ProvisioningJournalEntriesResolver {
- /**
- * @param {AccountingService} accountingService Accounting service.
- */
- constructor(private accountingService: AccountingService) {}
+ private accountingService = inject(AccountingService);
/**
* Returns the provisioning journal entries data.
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 aed4c56a26..f08883efb6 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
@@ -51,26 +51,30 @@
{{ 'labels.inputs.Debit' | translate }}
-
- {{
- (provisioningJournalEntry.currency.displaySymbol || provisioningJournalEntry.currency.code) +
- ' ' +
- provisioningJournalEntry.amount
- }}
-
+ @if (provisioningJournalEntry.entryType.value === 'DEBIT') {
+
+ {{
+ (provisioningJournalEntry.currency.displaySymbol || provisioningJournalEntry.currency.code) +
+ ' ' +
+ provisioningJournalEntry.amount
+ }}
+
+ }
{{ 'labels.inputs.Credit' | translate }}
-
- {{
- (provisioningJournalEntry.currency.displaySymbol || provisioningJournalEntry.currency.code) +
- ' ' +
- provisioningJournalEntry.amount
- }}
-
+ @if (provisioningJournalEntry.entryType.value === 'CREDIT') {
+
+ {{
+ (provisioningJournalEntry.currency.displaySymbol || provisioningJournalEntry.currency.code) +
+ ' ' +
+ provisioningJournalEntry.amount
+ }}
+
+ }
diff --git a/src/app/accounting/provisioning-entries/view-provisioning-journal-entries/view-provisioning-journal-entries.component.ts b/src/app/accounting/provisioning-entries/view-provisioning-journal-entries/view-provisioning-journal-entries.component.ts
index e5f616d917..7524277ee5 100644
--- a/src/app/accounting/provisioning-entries/view-provisioning-journal-entries/view-provisioning-journal-entries.component.ts
+++ b/src/app/accounting/provisioning-entries/view-provisioning-journal-entries/view-provisioning-journal-entries.component.ts
@@ -1,5 +1,5 @@
/** Angular Imports */
-import { Component, OnInit, ViewChild } from '@angular/core';
+import { Component, OnInit, ViewChild, inject } from '@angular/core';
import { ActivatedRoute } from '@angular/router';
import { MatPaginator } from '@angular/material/paginator';
import { MatSort, MatSortHeader } from '@angular/material/sort';
@@ -43,6 +43,8 @@ import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
]
})
export class ViewProvisioningJournalEntriesComponent implements OnInit {
+ private route = inject(ActivatedRoute);
+
/** Provisioning journal entry data. */
provisioningJournalEntryData: any;
/** Columns to be displayed in provisioning journal entries table. */
@@ -70,7 +72,7 @@ export class ViewProvisioningJournalEntriesComponent implements OnInit {
* Retrieves the provisioning journal entries data from `resolve`.
* @param {ActivatedRoute} route Activated Route.
*/
- constructor(private route: ActivatedRoute) {
+ constructor() {
this.route.data.subscribe((data: { provisioningJournalEntry: any }) => {
this.provisioningJournalEntryData = data.provisioningJournalEntry.pageItems;
});
diff --git a/src/app/accounting/revert-transaction/revert-transaction.component.html b/src/app/accounting/revert-transaction/revert-transaction.component.html
index 85e3d969ae..7ac530bf78 100644
--- a/src/app/accounting/revert-transaction/revert-transaction.component.html
+++ b/src/app/accounting/revert-transaction/revert-transaction.component.html
@@ -1,21 +1,21 @@
-
{{ 'labels.inputs.Existing Meeting Date' | translate }}
-
- {{ date | dateFormat }}
-
+ @for (date of nextMeetingDates; track date) {
+
+ {{ date | dateFormat }}
+
+ }
-
- {{ 'labels.inputs.Existing Meeting Date' | translate }} {{ 'labels.commons.is' | translate }}
- {{ 'labels.commons.required' | translate }}
-
+ @if (centerEditMeetingScheduleForm.controls.presentMeetingDate.hasError('repeatsOnDay')) {
+
+ {{ 'labels.inputs.Existing Meeting Date' | translate }} {{ 'labels.commons.is' | translate }}
+ {{ 'labels.commons.required' | translate }}
+
+ }
@@ -28,10 +32,12 @@
/>
- {{ 'labels.inputs.Revised Meeting Date' | translate }} {{ 'labels.commons.is' | translate }}
- {{ 'labels.commons.required' | translate }}
-
+ @if (centerEditMeetingScheduleForm.controls.newMeetingDate.hasError('required')) {
+
+ {{ 'labels.inputs.Revised Meeting Date' | translate }} {{ 'labels.commons.is' | translate }}
+ {{ 'labels.commons.required' | translate }}
+
+ }
-
+} @else {
>(MatDialogRef);
+ data = inject(MAT_DIALOG_DATA);
+
/** Comments input form control. */
comments = new UntypedFormControl('');
-
- /**
- * @param {MatDialogRef} dialogRef Component reference to dialog.
- * @param {any} data Provides comments or reverted transaction ID.
- */
- constructor(
- public dialogRef: MatDialogRef,
- @Inject(MAT_DIALOG_DATA) public data: any
- ) {}
}
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 2b83a7af69..b601a0723c 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
@@ -16,9 +16,11 @@
{{ 'labels.inputs.Filter' | translate }}
-
- {{ filter.option }}
-
+ @for (filter of entryTypeFilterData; track filter) {
+
+ {{ filter.option }}
+
+ }
@@ -80,9 +82,11 @@
-
- {{ office.name }}
-
+ @for (office of filteredOfficeData | async; track office) {
+
+ {{ office.name }}
+
+ }
{{ 'labels.inputs.Staff' | translate }}
-
- {{ staff.displayName }}
-
+ @for (staff of staffData; track staff) {
+
+ {{ staff.displayName }}
+
+ }
-
- {{ 'labels.inputs.Staff' | translate }} {{ 'labels.commons.is' | translate }}
- {{ 'labels.commons.required' | translate }}
-
+ @if (centerAssignStaffForm.controls.staffId.hasError('required')) {
+
+ {{ 'labels.inputs.Staff' | translate }} {{ 'labels.commons.is' | translate }}
+ {{ 'labels.commons.required' | translate }}
+
+ }
diff --git a/src/app/centers/centers-view/center-actions/center-assign-staff/center-assign-staff.component.ts b/src/app/centers/centers-view/center-actions/center-assign-staff/center-assign-staff.component.ts
index 97050f0819..73f36342b8 100644
--- a/src/app/centers/centers-view/center-actions/center-assign-staff/center-assign-staff.component.ts
+++ b/src/app/centers/centers-view/center-actions/center-assign-staff/center-assign-staff.component.ts
@@ -1,5 +1,5 @@
/** Angular Imports */
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, inject } from '@angular/core';
import { UntypedFormGroup, UntypedFormBuilder, ReactiveFormsModule } from '@angular/forms';
import { ActivatedRoute, Router, RouterLink } from '@angular/router';
@@ -19,6 +19,11 @@ import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
]
})
export class CenterAssignStaffComponent implements OnInit {
+ private formBuilder = inject(UntypedFormBuilder);
+ private centersService = inject(CentersService);
+ private route = inject(ActivatedRoute);
+ private router = inject(Router);
+
/** Center Assign Staff form. */
centerAssignStaffForm: UntypedFormGroup;
/** Field Officer Data */
@@ -33,12 +38,7 @@ export class CenterAssignStaffComponent implements OnInit {
* @param {ActivatedRoute} route Activated Route
* @param {Router} router Router
*/
- constructor(
- private formBuilder: UntypedFormBuilder,
- private centersService: CentersService,
- private route: ActivatedRoute,
- private router: Router
- ) {
+ constructor() {
this.route.data.subscribe((data: { centersActionData: any }) => {
this.centerData = data.centersActionData;
});
diff --git a/src/app/centers/centers-view/center-actions/center-attendance/center-attendance.component.ts b/src/app/centers/centers-view/center-actions/center-attendance/center-attendance.component.ts
index 8c3dbd690f..75e5e7eacd 100644
--- a/src/app/centers/centers-view/center-actions/center-attendance/center-attendance.component.ts
+++ b/src/app/centers/centers-view/center-actions/center-attendance/center-attendance.component.ts
@@ -1,5 +1,5 @@
/** Angular Imports */
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, inject } from '@angular/core';
import { UntypedFormControl, ReactiveFormsModule } from '@angular/forms';
import { MatDialog } from '@angular/material/dialog';
import { ActivatedRoute, Router, RouterLink } from '@angular/router';
@@ -65,6 +65,14 @@ import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
]
})
export class CenterAttendanceComponent implements OnInit {
+ private route = inject(ActivatedRoute);
+ private dateUtils = inject(Dates);
+ private router = inject(Router);
+ private centersService = inject(CentersService);
+ private settingsService = inject(SettingsService);
+ dialog = inject(MatDialog);
+ private translateService = inject(TranslateService);
+
/** Members data. */
membersData: any;
/** Center Data */
@@ -96,15 +104,7 @@ export class CenterAttendanceComponent implements OnInit {
* @param {SettingsService} settingsService Settings Service.
* @param {MatDialog} dialog Mat Dialog
*/
- constructor(
- private route: ActivatedRoute,
- private dateUtils: Dates,
- private router: Router,
- private centersService: CentersService,
- private settingsService: SettingsService,
- public dialog: MatDialog,
- private translateService: TranslateService
- ) {
+ constructor() {
this.route.data.subscribe((data: { centersActionData: any }) => {
this.centerData = data.centersActionData;
this.membersData = data.centersActionData.clients;
@@ -149,7 +149,6 @@ export class CenterAttendanceComponent implements OnInit {
options: { label: 'value', value: 'id', data: this.attendanceTypeOptions },
required: false
})
-
];
const data = {
title:
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 052ac1d53a..2c8d756851 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
@@ -15,23 +15,29 @@
/>
- {{ 'labels.inputs.Closed On Date' | translate }} {{ 'labels.commons.is' | translate }}
- {{ 'labels.commons.required' | translate }}
-
+ @if (closeCenterForm.controls.closureDate.hasError('required')) {
+
+ {{ 'labels.inputs.Closed On Date' | translate }} {{ 'labels.commons.is' | translate }}
+ {{ 'labels.commons.required' | translate }}
+
+ }
{{ 'labels.inputs.Closure Reason' | translate }}
-
- {{ reason.name }}
-
+ @for (reason of closureData; track reason) {
+
+ {{ reason.name }}
+
+ }
-
- {{ 'labels.inputs.Closure Reason' | translate }} {{ 'labels.commons.is' | translate }}
- {{ 'labels.commons.required' | translate }}
-
+ @if (closeCenterForm.controls.closureReasonId.hasError('required')) {
+
+ {{ 'labels.inputs.Closure Reason' | translate }} {{ 'labels.commons.is' | translate }}
+ {{ 'labels.commons.required' | translate }}
+
+ }
diff --git a/src/app/centers/centers-view/center-actions/close-center/close-center.component.ts b/src/app/centers/centers-view/center-actions/close-center/close-center.component.ts
index d1d060eebb..0d8d4fda37 100644
--- a/src/app/centers/centers-view/center-actions/close-center/close-center.component.ts
+++ b/src/app/centers/centers-view/center-actions/close-center/close-center.component.ts
@@ -1,5 +1,5 @@
/** Angular Imports */
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, inject } from '@angular/core';
import { UntypedFormGroup, UntypedFormBuilder, Validators, ReactiveFormsModule } from '@angular/forms';
import { ActivatedRoute, Router, RouterLink } from '@angular/router';
@@ -21,6 +21,13 @@ import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
]
})
export class CloseCenterComponent implements OnInit {
+ private formBuilder = inject(UntypedFormBuilder);
+ private centersService = inject(CentersService);
+ private settingsService = inject(SettingsService);
+ private dateUtils = inject(Dates);
+ private route = inject(ActivatedRoute);
+ private router = inject(Router);
+
/** Minimum date allowed. */
minDate = new Date(2000, 0, 1);
/** Maximum date allowed. */
@@ -40,14 +47,7 @@ export class CloseCenterComponent implements OnInit {
* @param {ActivatedRoute} route Activated Route
* @param {Router} router Router
*/
- constructor(
- private formBuilder: UntypedFormBuilder,
- private centersService: CentersService,
- private settingsService: SettingsService,
- private dateUtils: Dates,
- private route: ActivatedRoute,
- private router: Router
- ) {
+ constructor() {
this.route.data.subscribe((data: { centeractionData: any }) => {
this.closureData = data.centeractionData.closureReasons;
});
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 a6eafece82..1271c6b025 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
@@ -6,14 +6,18 @@
{{ 'labels.heading.Revert Transaction' | translate }}
-
-
- {{ 'labels.inputs.Comments' | translate }}
-
-
+@if (!data.reverted) {
+
-
-
-
-
-
-{{ 'labels.text.Revert this transaction?' | translate }}
-
+
+
+
+
- {{ 'labels.heading.Revert Transaction' | translate }}
+
+
+ {{ 'labels.inputs.Comments' | translate }}
+
+
+
+ {{ 'labels.text.Revert this transaction?' | translate }}
+{{ 'labels.heading.Transaction Reverted' | translate }}
{{ 'labels.heading.Success!' | translate }}
@@ -28,4 +28,4 @@{{ 'labels.heading.Success!' | translate }}
{{ 'labels.buttons.Redirect to New Transaction' | translate }} - +} diff --git a/src/app/accounting/revert-transaction/revert-transaction.component.ts b/src/app/accounting/revert-transaction/revert-transaction.component.ts index 40b778e7df..800b959bc4 100644 --- a/src/app/accounting/revert-transaction/revert-transaction.component.ts +++ b/src/app/accounting/revert-transaction/revert-transaction.component.ts @@ -1,5 +1,5 @@ /** Angular Imports */ -import { Component, Inject } from '@angular/core'; +import { Component, inject } from '@angular/core'; import { MatDialogRef, MAT_DIALOG_DATA, @@ -29,15 +29,9 @@ import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module'; ] }) export class RevertTransactionComponent { + dialogRef = inject
@@ -139,14 +143,18 @@
{{ 'labels.inputs.Debit' | translate }}
- {{ journalEntry.amount | formatNumber }}
+ @if (journalEntry.entryType.value === 'DEBIT') {
+ {{ journalEntry.amount | formatNumber }}
+ }
{{ 'labels.inputs.Credit' | translate }}
- {{ journalEntry.amount | formatNumber }}
+ @if (journalEntry.entryType.value === 'CREDIT') {
+ {{ journalEntry.amount | formatNumber }}
+ }
diff --git a/src/app/accounting/search-journal-entry/search-journal-entry.component.ts b/src/app/accounting/search-journal-entry/search-journal-entry.component.ts
index dde72a9b9e..fea1048836 100644
--- a/src/app/accounting/search-journal-entry/search-journal-entry.component.ts
+++ b/src/app/accounting/search-journal-entry/search-journal-entry.component.ts
@@ -1,5 +1,5 @@
/** Angular Imports */
-import { Component, OnInit, ViewChild, AfterViewInit } from '@angular/core';
+import { Component, OnInit, ViewChild, AfterViewInit, inject } from '@angular/core';
import { MatPaginator } from '@angular/material/paginator';
import { MatSort, MatSortHeader } from '@angular/material/sort';
import { UntypedFormControl, ReactiveFormsModule } from '@angular/forms';
@@ -17,7 +17,7 @@ import { JournalEntriesDataSource } from './journal-entry.datasource';
import { Dates } from 'app/core/utils/dates';
import { MatAutocompleteTrigger, MatOption, MatAutocomplete } from '@angular/material/autocomplete';
import { GlAccountSelectorComponent } from '../../shared/accounting/gl-account-selector/gl-account-selector.component';
-import { NgFor, NgIf, AsyncPipe } from '@angular/common';
+import { AsyncPipe } from '@angular/common';
import {
MatTable,
MatColumnDef,
@@ -67,6 +67,11 @@ import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
]
})
export class SearchJournalEntryComponent implements OnInit, AfterViewInit {
+ private accountingService = inject(AccountingService);
+ private settingsService = inject(SettingsService);
+ private dateUtils = inject(Dates);
+ private route = inject(ActivatedRoute);
+
/** Minimum transaction date allowed. */
minDate = new Date(2000, 0, 1);
/** Maximum transaction date allowed. */
@@ -185,12 +190,7 @@ export class SearchJournalEntryComponent implements OnInit, AfterViewInit {
* @param {ActivatedRoute} route Activated Route.
* @param {SettingsService} settingsService Settings Service.
*/
- constructor(
- private accountingService: AccountingService,
- private settingsService: SettingsService,
- private dateUtils: Dates,
- private route: ActivatedRoute
- ) {
+ constructor() {
this.route.data.subscribe((data: { offices: any; glAccounts: any }) => {
this.officeData = data.offices;
this.glAccountData = data.glAccounts;
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 90c6d8aef3..1f0e7868ec 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -121,7 +121,6 @@ export function HttpLoaderFactory(http: HttpClient) {
AppRoutingModule,
NotFoundComponent,
CallbackComponent
-
],
providers: [
DatePipe,
diff --git a/src/app/centers/centers-routing.module.ts b/src/app/centers/centers-routing.module.ts
index b4ca7cda3e..64fd6f6118 100644
--- a/src/app/centers/centers-routing.module.ts
+++ b/src/app/centers/centers-routing.module.ts
@@ -112,7 +112,6 @@ const routes: Routes = [
]
}
])
-
];
@NgModule({
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 2c33f92c1f..8a89bb8c7d 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
@@ -14,10 +14,12 @@
/>
- {{ 'labels.inputs.Activated On Date' | translate }} {{ 'labels.commons.is' | translate }}
- {{ 'labels.commons.required' | translate }}
-
+ @if (activateCenterForm.controls.activationDate.hasError('required')) {
+
+ {{ 'labels.inputs.Activated On Date' | translate }} {{ 'labels.commons.is' | translate }}
+ {{ 'labels.commons.required' | translate }}
+
+ }
diff --git a/src/app/centers/centers-view/center-actions/activate-center/activate-center.component.ts b/src/app/centers/centers-view/center-actions/activate-center/activate-center.component.ts
index 7858952e60..9ec6430ecf 100644
--- a/src/app/centers/centers-view/center-actions/activate-center/activate-center.component.ts
+++ b/src/app/centers/centers-view/center-actions/activate-center/activate-center.component.ts
@@ -1,5 +1,5 @@
/** Angular Imports */
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, inject } from '@angular/core';
import { UntypedFormGroup, UntypedFormBuilder, Validators, ReactiveFormsModule } from '@angular/forms';
import { ActivatedRoute, Router, RouterLink } from '@angular/router';
@@ -21,6 +21,13 @@ import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
]
})
export class ActivateCenterComponent implements OnInit {
+ private formBuilder = inject(UntypedFormBuilder);
+ private centersService = inject(CentersService);
+ private settingsService = inject(SettingsService);
+ private dateUtils = inject(Dates);
+ private route = inject(ActivatedRoute);
+ private router = inject(Router);
+
/** Minimum date allowed. */
minDate = new Date(2000, 0, 1);
/** Maximum date allowed. */
@@ -38,14 +45,7 @@ export class ActivateCenterComponent implements OnInit {
* @param {ActivatedRoute} route Activated Route
* @param {Router} router Router
*/
- constructor(
- private formBuilder: UntypedFormBuilder,
- private centersService: CentersService,
- private settingsService: SettingsService,
- private dateUtils: Dates,
- private route: ActivatedRoute,
- private router: Router
- ) {
+ constructor() {
this.centerId = this.route.parent.snapshot.params['centerId'];
}
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 385d93ce03..e297e840ac 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
@@ -15,54 +15,74 @@
/>
- {{ 'labels.inputs.Start Date' | translate }} {{ 'labels.commons.is' | translate }}
- {{ 'labels.commons.required' | translate }}
-
+ @if (centerMeetingForm.controls.startDate.hasError('required')) {
+
+ {{ 'labels.inputs.Start Date' | translate }} {{ 'labels.commons.is' | translate }}
+ {{ 'labels.commons.required' | translate }}
+
+ }
{{ 'labels.inputs.Repeats?' | translate }}
-
- {{ 'labels.inputs.Repetition Frequency' | translate }}
-
-
- {{ option.value }}
-
-
-
- {{ 'labels.inputs.Repetition Frequency' | translate }} {{ 'labels.commons.is' | translate }}
- {{ 'labels.commons.required' | translate }}
-
-
+ @if (centerMeetingForm.contains('frequency')) {
+
+ {{ 'labels.inputs.Repetition Frequency' | translate }}
+
+ @for (option of frequencyOptions; track option) {
+
+ {{ option.value }}
+
+ }
+
+ @if (centerMeetingForm.controls.frequency.hasError('repeatsOnDay')) {
+
+ {{ 'labels.inputs.Repetition Frequency' | translate }} {{ 'labels.commons.is' | translate }}
+ {{ 'labels.commons.required' | translate }}
+
+ }
+
+ }
-
- {{ 'labels.inputs.Repetition Interval' | translate }}
-
-
- {{ interval }}
-
-
-
- {{ 'labels.inputs.Repetition Interval' | translate }} {{ 'labels.commons.is' | translate }}
- {{ 'labels.commons.required' | translate }}
-
-
+ @if (centerMeetingForm.contains('interval')) {
+
+ {{ 'labels.inputs.Repetition Interval' | translate }}
+
+ @for (interval of repetitionIntervals; track interval) {
+
+ {{ interval }}
+
+ }
+
+ @if (centerMeetingForm.controls.interval.hasError('repeatsOnDay')) {
+
+ {{ '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 }}
-
-
+ @if (centerMeetingForm.contains('repeatsOnDay')) {
+
+ {{ 'labels.inputs.Repeats on Day' | translate }}
+
+ @for (day of repeatsOnDays; track day) {
+
+ {{ day.value }}
+
+ }
+
+ @if (centerMeetingForm.controls.repeatsOnDay.hasError('repeatsOnDay')) {
+
+ {{ '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/attach-center-meeting/attach-center-meeting.component.ts b/src/app/centers/centers-view/center-actions/attach-center-meeting/attach-center-meeting.component.ts
index d8f26f9b01..a8cc8d4f77 100644
--- a/src/app/centers/centers-view/center-actions/attach-center-meeting/attach-center-meeting.component.ts
+++ b/src/app/centers/centers-view/center-actions/attach-center-meeting/attach-center-meeting.component.ts
@@ -1,5 +1,5 @@
/** Angular Imports */
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, inject } from '@angular/core';
import {
UntypedFormGroup,
UntypedFormBuilder,
@@ -29,6 +29,13 @@ import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
]
})
export class AttachCenterMeetingComponent implements OnInit {
+ private formBuilder = inject(UntypedFormBuilder);
+ private centersService = inject(CentersService);
+ private settingsService = inject(SettingsService);
+ private dateUtils = inject(Dates);
+ private route = inject(ActivatedRoute);
+ private router = inject(Router);
+
/** Minimum date allowed. */
minDate = new Date(2000, 0, 1);
/** Maximum date allowed. */
@@ -55,14 +62,7 @@ export class AttachCenterMeetingComponent implements OnInit {
* @param {ActivatedRoute} route Activated Route
* @param {Router} router Router
*/
- constructor(
- private formBuilder: UntypedFormBuilder,
- private centersService: CentersService,
- private settingsService: SettingsService,
- private dateUtils: Dates,
- private route: ActivatedRoute,
- private router: Router
- ) {
+ constructor() {
this.route.data.subscribe((data: { centersActionData: any }) => {
this.calendarTemplate = data.centersActionData;
this.frequencyOptions = this.calendarTemplate.frequencyOptions;
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 87578b19ef..106a300871 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,9 +1,27 @@
-
@@ -36,19 +38,23 @@
-
+ @if (groupMembers?.length) {
+
+ @for (group of groupMembers; track group; let i = $index) {
+
+ }
diff --git a/src/app/centers/centers-view/center-actions/manage-groups/manage-groups.component.ts b/src/app/centers/centers-view/center-actions/manage-groups/manage-groups.component.ts
index e4a8b3de9a..afe16f6f68 100644
--- a/src/app/centers/centers-view/center-actions/manage-groups/manage-groups.component.ts
+++ b/src/app/centers/centers-view/center-actions/manage-groups/manage-groups.component.ts
@@ -1,5 +1,5 @@
/** Angular Imports */
-import { Component, AfterViewInit } from '@angular/core';
+import { Component, AfterViewInit, inject } from '@angular/core';
import { UntypedFormControl, ReactiveFormsModule } from '@angular/forms';
import { ActivatedRoute } from '@angular/router';
@@ -33,6 +33,11 @@ import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
]
})
export class ManageGroupsComponent implements AfterViewInit {
+ private route = inject(ActivatedRoute);
+ private centersService = inject(CentersService);
+ private groupsService = inject(GroupsService);
+ dialog = inject(MatDialog);
+
/** Center Data */
centerData: any;
/** Group data. */
@@ -49,12 +54,7 @@ export class ManageGroupsComponent implements AfterViewInit {
* @param {GroupsService} groupsService Groups Service
* @param {MatDialog} dialog Mat Dialog
*/
- constructor(
- private route: ActivatedRoute,
- private centersService: CentersService,
- private groupsService: GroupsService,
- public dialog: MatDialog
- ) {
+ constructor() {
this.route.data.subscribe((data: { centersActionData: any }) => {
this.centerData = data.centersActionData;
this.groupMembers = data.centersActionData.groupMembers;
diff --git a/src/app/centers/centers-view/center-actions/staff-assignment-history/staff-assignment-history.component.ts b/src/app/centers/centers-view/center-actions/staff-assignment-history/staff-assignment-history.component.ts
index b7ae59e121..c0a05d4043 100644
--- a/src/app/centers/centers-view/center-actions/staff-assignment-history/staff-assignment-history.component.ts
+++ b/src/app/centers/centers-view/center-actions/staff-assignment-history/staff-assignment-history.component.ts
@@ -1,5 +1,5 @@
/** Angular Imports */
-import { Component, OnInit, Input } from '@angular/core';
+import { Component, OnInit, Input, inject } from '@angular/core';
import { DomSanitizer } from '@angular/platform-browser';
import { ActivatedRoute, RouterLink } from '@angular/router';
@@ -21,6 +21,9 @@ import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
]
})
export class StaffAssignmentHistoryComponent implements OnInit {
+ private sanitizer = inject(DomSanitizer);
+ private route = inject(ActivatedRoute);
+
/** Staff Assignment History Data */
staffAssignmentHistoryData: any;
/** trusted resource url for pentaho output */
@@ -29,10 +32,7 @@ export class StaffAssignmentHistoryComponent implements OnInit {
/**
* @param {DomSanitizer} sanitizer DOM Sanitizer
*/
- constructor(
- private sanitizer: DomSanitizer,
- private route: ActivatedRoute
- ) {
+ constructor() {
this.route.data.subscribe((data: { centersActionData: any }) => {
this.staffAssignmentHistoryData = data.centersActionData;
});
diff --git a/src/app/centers/centers-view/centers-view.component.html b/src/app/centers/centers-view/centers-view.component.html
index a0400d0c74..94712cf9f5 100644
--- a/src/app/centers/centers-view/centers-view.component.html
+++ b/src/app/centers/centers-view/centers-view.component.html
@@ -17,13 +17,15 @@ {{ 'labels.heading.Group Members' | translate }}
-
- {{ group.name }}
-
-
-
+ {{ group.name }}
+
+
+ }
+ > {{ 'labels.heading.Center Name' | translate }} : {{ centerViewData.name }}
-
-
-
+ @if (!(centerViewData.status.value === 'Closed')) {
+
+
+
+ }
@@ -31,33 +33,44 @@
{{ 'labels.inputs.Account' | translate }} #:{{ centerViewData.accountNo }}
{{ 'labels.inputs.Office' | translate }}: {{ centerViewData.officeName }}
-
- {{ 'labels.inputs.External Id' | translate }}:
-
-
-
- {{ 'labels.inputs.Staff' | translate }}: {{ centerViewData.staffName }}
-
+ @if (centerViewData.externalId) {
+
+ {{ 'labels.inputs.External Id' | translate }}:
+
+
+ }
+ @if (centerViewData.staffName) {
+ {{ 'labels.inputs.Staff' | translate }}: {{ centerViewData.staffName }}
+ }
{{ 'labels.inputs.Activation Date' | translate }} :
{{ centerViewData.activationDate ? (centerViewData.activationDate | dateFormat) : 'Not Activated'
}}
-
+ @if (centerViewData.collectionMeetingCalendar) {
+
-
+ }
-
-
- {{ 'labels.inputs.Next Meeting on' | translate }}:
- {{ centerViewData.collectionMeetingCalendar?.nextTenRecurringDates[0] | dateFormat }}
-
-
-
- {{ 'labels.inputs.Meeting Frequency' | translate }}:
- {{ centerViewData.collectionMeetingCalendar?.frequency.value | lowercase }}
-
+
+ } @else {
+ {{ 'labels.inputs.Next Meeting on' | translate }}:
+ {{ centerViewData.collectionMeetingCalendar?.nextTenRecurringDates[0] | dateFormat }}
+ @if (editMeeting) {
+
+
+
+ }
+ {{ 'labels.inputs.Meeting Frequency' | translate }}:
+ {{ centerViewData.collectionMeetingCalendar?.frequency.value | lowercase }}
+
{{ 'labels.inputs.Next Meeting on' | translate }}: {{ 'labels.text.Unassigned' | translate }} @@ -65,21 +78,23 @@
{{ 'labels.inputs.Meeting Frequency' | translate }}: {{ 'labels.text.N/A' | translate }}
{{ centerNote.note }}
-
- {{ 'labels.inputs.Created By' | translate }}: {{ centerNote.createdByUsername }}
- {{ 'labels.inputs.Date' | translate }}: {{ centerNote.createdOn | dateFormat }}
-
-
-
-
- {{ centerNote.note }}
+
+ {{ 'labels.inputs.Created By' | translate }}: {{ centerNote.createdByUsername }}
+ {{ 'labels.inputs.Date' | translate }}: {{ centerNote.createdOn | dateFormat }}
+
+
+
+
+
-
{{ 'labels.inputs.name' | 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 }}
-
+ @if (editCenterForm.controls.name.hasError('required')) {
+
+ {{ 'labels.inputs.Center Name' | translate }} {{ 'labels.commons.is' | translate }}
+ {{ 'labels.commons.required' | translate }}
+
+ }
+ @if (editCenterForm.controls.name.hasError('pattern')) {
+
+ {{ 'labels.inputs.Center Name' | translate }} {{ 'labels.inputs.cannot' | translate }}
+ {{ 'labels.inputs.begin with a special character or number' | translate }}
+
+ }
{{ 'labels.inputs.Staff' | translate }}
-
- {{ staff.displayName }}
-
+ @for (staff of staffs; track staff) {
+
+ {{ staff.displayName }}
+
+ }
@@ -30,25 +36,29 @@
-
-
- {{ 'labels.inputs.Activation Date' | translate }}
-
-
- {{ 'labels.inputs.Activation Date' | translate }} {{ 'labels.commons.is' | translate }}
- {{ 'labels.commons.required' | translate }}
-
-
-
+ @if (centerData.status.value === 'Pending') {
+
+
+ {{ 'labels.inputs.Activation Date' | translate }}
+
+
+ {{ 'labels.inputs.Activation Date' | translate }} {{ 'labels.commons.is' | translate }}
+ {{ 'labels.commons.required' | translate }}
+
+ }
+
+
+ }
diff --git a/src/app/centers/edit-center/edit-center.component.ts b/src/app/centers/edit-center/edit-center.component.ts
index 2d188b7912..362540d27e 100644
--- a/src/app/centers/edit-center/edit-center.component.ts
+++ b/src/app/centers/edit-center/edit-center.component.ts
@@ -1,5 +1,5 @@
/** Angular Imports */
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, inject } from '@angular/core';
import {
UntypedFormGroup,
UntypedFormBuilder,
@@ -27,6 +27,13 @@ import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
]
})
export class EditCenterComponent implements OnInit {
+ private formBuilder = inject(UntypedFormBuilder);
+ private route = inject(ActivatedRoute);
+ private router = inject(Router);
+ private centersService = inject(CentersService);
+ private settingsService = inject(SettingsService);
+ private dateUtils = inject(Dates);
+
/** Center Data */
centerData: any;
/** Staffs Data */
@@ -47,14 +54,7 @@ export class EditCenterComponent implements OnInit {
* @param {GroupsService} groupService GroupsService.
* @param {Dates} dateUtils Date Utils to format date.
*/
- constructor(
- private formBuilder: UntypedFormBuilder,
- private route: ActivatedRoute,
- private router: Router,
- private centersService: CentersService,
- private settingsService: SettingsService,
- private dateUtils: Dates
- ) {
+ constructor() {
this.route.data.subscribe((data: { centerData: any }) => {
this.centerData = data.centerData;
this.staffs = this.centerData.staffOptions;
@@ -79,7 +79,8 @@ export class EditCenterComponent implements OnInit {
this.centerData.name,
[
Validators.required,
- Validators.pattern('(^[A-z]).*')]
+ Validators.pattern('(^[A-z]).*')
+ ]
],
staffId: [this.centerData.staffId],
externalId: [this.centerData.externalId]
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 424362ccd4..e31a38366c 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
@@ -7,64 +7,70 @@
-
-
+ @if (groupMembers.length) {
+
+
+ }
diff --git a/src/app/centers/create-center/create-center.component.ts b/src/app/centers/create-center/create-center.component.ts
index 7b672455b3..8d4ac04f36 100644
--- a/src/app/centers/create-center/create-center.component.ts
+++ b/src/app/centers/create-center/create-center.component.ts
@@ -1,5 +1,5 @@
/** Angular Imports */
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, inject } from '@angular/core';
import {
UntypedFormGroup,
UntypedFormBuilder,
@@ -39,6 +39,14 @@ import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
]
})
export class CreateCenterComponent implements OnInit {
+ private formBuilder = inject(UntypedFormBuilder);
+ private route = inject(ActivatedRoute);
+ private router = inject(Router);
+ private centerService = inject(CentersService);
+ private settingsService = inject(SettingsService);
+ private groupService = inject(GroupsService);
+ private dateUtils = inject(Dates);
+
/** Minimum date allowed. */
minDate = new Date(2000, 0, 1);
/** Maximum date allowed. */
@@ -66,15 +74,7 @@ export class CreateCenterComponent implements OnInit {
* @param {GroupsService} groupService GroupsService.
* @param {Dates} dateUtils Date Utils to format date.
*/
- constructor(
- private formBuilder: UntypedFormBuilder,
- private route: ActivatedRoute,
- private router: Router,
- private centerService: CentersService,
- private settingsService: SettingsService,
- private groupService: GroupsService,
- private dateUtils: Dates
- ) {
+ constructor() {
this.route.data.subscribe((data: { offices: any }) => {
this.officeData = data.offices;
});
@@ -97,7 +97,8 @@ export class CreateCenterComponent implements OnInit {
'',
[
Validators.required,
- Validators.pattern('(^[A-z]).*')]
+ Validators.pattern('(^[A-z]).*')
+ ]
],
officeId: [
'',
diff --git a/src/app/centers/edit-center/edit-center.component.html b/src/app/centers/edit-center/edit-center.component.html
index bada6043d1..5dc0a2a2b3 100644
--- a/src/app/centers/edit-center/edit-center.component.html
+++ b/src/app/centers/edit-center/edit-center.component.html
@@ -6,22 +6,28 @@
-
- {{ 'labels.inputs.Group Details' | translate }}
-
-
-
- {{ 'labels.inputs.name' | translate }}
- {{ groupChoice.value.name }}
-
-
+ }
- {{ 'labels.inputs.Id' | translate }}
- {{ groupChoice.value.id }}
+ @if (groupChoice.value) {
+
+
-
+
+ {{ 'labels.inputs.Group Details' | translate }}
+
+
+
+ {{ 'labels.inputs.name' | translate }}
+ {{ groupChoice.value.name }}
+
+
+ {{ '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 }}
-
-
- {{ group.name }}
-
- {{ 'labels.heading.Selected Groups' | translate }}
+ @for (group of groupMembers; track group; let i = $index) { +
+
+ {{ group.name }}
+
+ }
+ {{ 'labels.heading.Address' | translate }}
-
-
-
-
-
- {{ '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 }}
-
+
+
+
+
+ @if (isFieldEnabled('street')) {
+ {{ 'labels.inputs.Street' | translate }} : {{ address.street }}
+ }
+ @if (isFieldEnabled('addressLine1')) {
+ {{ 'labels.inputs.Address Line' | translate }} 1 : {{ address.addressLine1 }}
+ }
+ @if (isFieldEnabled('addressLine2')) {
+ {{ 'labels.inputs.Address Line' | translate }} 2 : {{ address.addressLine2 }}
+ }
+ @if (isFieldEnabled('addressLine3')) {
+ {{ 'labels.inputs.Address Line' | translate }} 3 : {{ address.addressLine3 }}
+ }
+ @if (isFieldEnabled('townVillage')) {
+ {{ 'labels.inputs.Town / Village' | translate }} : {{ address.townVillage }}
+ }
+ @if (isFieldEnabled('city')) {
+ {{ 'labels.inputs.City' | translate }} : {{ address.city }}
+ }
+ @if (isFieldEnabled('stateProvinceId')) {
+ {{ 'labels.inputs.State / Province' | translate }} :
+ {{ getSelectedValue('stateProvinceIdOptions', address.stateProvinceId)?.name }}
+ }
+ @if (isFieldEnabled('countryId')) {
+ {{ 'labels.inputs.Country' | translate }} :
+ {{ getSelectedValue('countryIdOptions', address.countryId)?.name }}
+ }
+ @if (isFieldEnabled('postalCode')) {
+ {{ 'labels.inputs.Postal Code' | translate }} : {{ address.postalCode }}
+ }
+ @if (isFieldEnabled('isActive')) {
+ {{ 'labels.inputs.Active Status' | translate }} : {{ address.isActive }}
+ }
+
{{ 'labels.heading.Transactions' | translate }}
-| {{ 'labels.inputs.ID' | translate }} | -{{ element.id }} | -{{ 'labels.inputs.Office Name' | translate }} | -- {{ element.officeName }} - | -{{ 'labels.inputs.Type' | translate }} | -- {{ element.type.value }} - | -{{ 'labels.inputs.Transaction Date' | translate }} | -- {{ element.date | dateFormat }} - | -{{ 'labels.inputs.Amount' | translate }} | -- {{ element.amount | formatNumber }} - | -{{ 'labels.inputs.Actions' | translate }} | -- - | -
|---|
| {{ 'labels.inputs.ID' | translate }} | +{{ element.id }} | +{{ 'labels.inputs.Office Name' | translate }} | ++ {{ element.officeName }} + | +{{ 'labels.inputs.Type' | translate }} | ++ {{ element.type.value }} + | +{{ 'labels.inputs.Transaction Date' | translate }} | ++ {{ element.date | dateFormat }} + | +{{ 'labels.inputs.Amount' | translate }} | ++ {{ element.amount | formatNumber }} + | +{{ 'labels.inputs.Actions' | translate }} | ++ + | +
|---|
-
- {{ 'labels.inputs.Amount' | translate }}
-
-
- {{ 'labels.inputs.Amount' | translate }} {{ 'labels.commons.is' | translate }}
- {{ 'labels.commons.required' | translate }}
-
-
-
-
- {{ 'labels.inputs.Charge Calculation' | translate }}
-
-
- {{ chargeCalculation.value }}
-
-
-
-
-
- {{ 'labels.inputs.Charge time type' | translate }}
-
-
- {{ chargeTime.value }}
+ @for (clientCharge of clientChargeOptions; track clientCharge) {
+
+ {{ clientCharge.name + ' (' + clientCharge.currency.name + ')' }}
-
-
-
-
- {{ '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 On' | translate }}
-
-
- {{ 'labels.inputs.Due Date' | translate }} {{ 'labels.commons.is' | translate }}
+ }
+
+ @if (clientChargeForm.controls.chargeId.hasError('required')) {
+
+ {{ 'labels.inputs.Charge' | translate }} {{ 'labels.commons.is' | translate }}
{{ 'labels.commons.required' | translate }}
-
+ }
+
-
- {{ 'labels.inputs.Repeats Every' | translate }}
-
-
-
+ @if (chargeDetails) {
+
+
+ {{ 'labels.inputs.Amount' | translate }}
+
+ @if (clientChargeForm.controls.amount.hasError('required')) {
+
+ {{ 'labels.inputs.Amount' | translate }} {{ 'labels.commons.is' | translate }}
+ {{ 'labels.commons.required' | translate }}
+
+ }
+
+
+ {{ 'labels.inputs.Charge Calculation' | translate }}
+
+ @for (chargeCalculation of chargeDetails.chargeCalculationTypeOptions; track chargeCalculation) {
+
+ {{ chargeCalculation.value }}
+
+ }
+
+
+
+ {{ 'labels.inputs.Charge time type' | translate }}
+
+ @for (chargeTime of chargeDetails.chargeTimeTypeOptions; track chargeTime) {
+
+ {{ chargeTime.value }}
+
+ }
+
+
+ @if (clientChargeForm.contains('dueDate')) {
+
+ {{ 'labels.inputs.Due for collection on' | translate }}
+
+
+ {{ 'labels.inputs.Due for collection on' | translate }} {{ 'labels.commons.is' | translate }}
+ {{ 'labels.commons.required' | translate }}
+
+ }
+
+ }
+ @if (clientChargeForm.contains('feeOnMonthDay')) {
+
+ {{ 'labels.inputs.Due On' | translate }}
+
+
+ {{ 'labels.inputs.Due Date' | translate }} {{ 'labels.commons.is' | translate }}
+ {{ 'labels.commons.required' | translate }}
+
+ }
+
+ }
+ @if (clientChargeForm.contains('feeInterval')) {
+
+ {{ 'labels.inputs.Repeats Every' | translate }}
+
+
+ }
+
+ }
-
- {{ 'labels.inputs.name' | translate }}
-
-
-
-
- {{ 'labels.inputs.Type/Quality' | 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 }}
+ @if (clientCollateralForm.controls.collateralId.hasError('required')) {
+
+ {{ 'labels.inputs.Collateral' | translate }} {{ 'labels.commons.is' | translate }}
{{ 'labels.commons.required' | translate }}
-
-
-
- {{ 'labels.inputs.Total' | translate }}
-
-
+ }
+
-
- {{ 'labels.inputs.Total Collateral Value' | translate }}
-
-
-
+ @if (collateralDetails) {
+
+
+ {{ 'labels.inputs.name' | translate }}
+
+
+
+ {{ 'labels.inputs.Type/Quality' | translate }}
+
+
+
+ {{ 'labels.inputs.Unit Type' | translate }}
+
+
+
+ {{ 'labels.inputs.Base Price' | translate }}
+
+
+
+ {{ 'labels.inputs.Percentage To Base' | translate }}
+
+
+
+ {{ 'labels.inputs.Quantity' | translate }}
+
+ @if (clientCollateralForm.controls.quantity.hasError('required')) {
+
+ {{ 'labels.inputs.Quantity' | translate }} {{ 'labels.commons.is' | translate }}
+ {{ 'labels.commons.required' | translate }}
+
+ }
+
+
+ {{ 'labels.inputs.Total' | translate }}
+
+
+
+ {{ 'labels.inputs.Total Collateral Value' | translate }}
+
+
+
+ }
diff --git a/src/app/clients/clients-view/client-actions/add-client-collateral/add-client-collateral.component.ts b/src/app/clients/clients-view/client-actions/add-client-collateral/add-client-collateral.component.ts
index c008b5e63b..7bdaab16ed 100644
--- a/src/app/clients/clients-view/client-actions/add-client-collateral/add-client-collateral.component.ts
+++ b/src/app/clients/clients-view/client-actions/add-client-collateral/add-client-collateral.component.ts
@@ -1,5 +1,5 @@
/** Angular Imports */
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, inject } from '@angular/core';
import { UntypedFormBuilder, UntypedFormGroup, Validators, ReactiveFormsModule } from '@angular/forms';
import { ActivatedRoute, Router, RouterLink } from '@angular/router';
@@ -20,6 +20,13 @@ import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
]
})
export class AddClientCollateralComponent implements OnInit {
+ private formBuilder = inject(UntypedFormBuilder);
+ private route = inject(ActivatedRoute);
+ private router = inject(Router);
+ private productsService = inject(ProductsService);
+ private clientsService = inject(ClientsService);
+ private settingsService = inject(SettingsService);
+
/** Client Collateral Form */
clientCollateralForm: UntypedFormGroup;
/** Client Collateral Options */
@@ -36,14 +43,7 @@ export class AddClientCollateralComponent implements OnInit {
* @param {Router} router Router.
* @param {ProductsService} productsService Products Service
*/
- constructor(
- private formBuilder: UntypedFormBuilder,
- private route: ActivatedRoute,
- private router: Router,
- private productsService: ProductsService,
- private clientsService: ClientsService,
- private settingsService: SettingsService
- ) {
+ constructor() {
this.route.data.subscribe((data: { clientActionData: any }) => {
this.clientCollateralOptions = data.clientActionData;
});
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 4b04874d6f..d9b42fd9ef 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
@@ -1,17 +1,51 @@
-
-
-
+ }
component[0].componentKey
- + @for (component of componentGroups; track component) { + @if (component[0].componentKey) { +component[0].componentKey
+ }
-
+ @for (question of component; track question) {
{{ question.text }}
-
-
-
- {{ options.text }}
-
-
+ @for (options of question.responseDatas; track options) {
+
+
+ {{ options.text }}
+
+
+ }
-
-
+ @if (question.answer) {
+
-
- {{ 'labels.text.Your answer is' | translate }}: {{ question.answer.text }}
-
- {{ 'labels.text.Your answer is' | translate }}: {{ question.answer.text }}
+ }
+ }
-
-
- {{ 'labels.inputs.Member Of' | translate }}
-
-
-
- {{ group.name }}
-
-
-
-
-
- {{ 'labels.inputs.Client Type' | translate }}
-
- {{ clientViewData.clientType.name }}
-
+ @if (clientViewData.groups.length > 0) {
+
+
+ {{ 'labels.inputs.Member Of' | translate }}
+
+
+ @for (group of clientViewData.groups; track group) {
+
+ {{ group.name }}
+
+ }
+
+
+ }
+ @if (clientViewData.clientType) {
+
+
+ {{ 'labels.inputs.Client Type' | translate }}
+
+ {{ clientViewData.clientType.name }}
+
+ }
{{ 'labels.inputs.Mobile Number' | translate }}
@@ -162,12 +174,14 @@
{{ 'labels.buttons.Edit' | translate }}
-
+ @if (isActive()) {
+
+ }
-
-
-
-
+ }
+
+ @if (clientViewData.staffId) {
+
+
+
+ }
@@ -230,49 +248,67 @@
-
-
-
-
-
-
-
-
-
+ @if (clientViewData.status.value === 'Pending') {
+
+ }
+ @if (clientViewData.status.value === 'Pending') {
+
+ }
+ @if (clientViewData.status.value === 'Pending') {
+
+ }
+ @if (clientViewData.status.value === 'Pending') {
+
+ }
+ @if (clientViewData.status.value === 'Closed') {
+
+ }
+ @if (clientViewData.status.value === 'Rejected') {
+
+ }
+ @if (clientViewData.status.value === 'Transfer in progress') {
+
+ }
+ @if (clientViewData.status.value === 'Transfer in progress') {
+
+ }
+ @if (clientViewData.status.value === 'Transfer in progress') {
+
+ }
@@ -308,15 +344,17 @@
>
{{ 'labels.buttons.Create Standing Instructions' | translate }}
-
-
-
+ @if (clientViewData.status.value !== 'Transfer on hold') {
+
+
+
+ }
@@ -380,7 +418,7 @@
>
{{ 'labels.inputs.Notes' | translate }}
-
+ @for (clientDatatable of clientDatatables; track clientDatatable) {
>
{{ clientDatatable.registeredTableName }}
-
+ }
{{ 'labels.heading.Capture Client Image' | translate }}
-
+
@@ -10,12 +10,16 @@ {{ 'labels.heading.Capture Client Image' | t
-
-
+ @if (!isCaptured) {
+
+ }
+ @if (isCaptured) {
+
+ }
diff --git a/src/app/clients/clients-view/custom-dialogs/capture-image-dialog/capture-image-dialog.component.scss b/src/app/clients/clients-view/custom-dialogs/capture-image-dialog/capture-image-dialog.component.scss
index e69de29bb2..613b35c1b9 100644
--- a/src/app/clients/clients-view/custom-dialogs/capture-image-dialog/capture-image-dialog.component.scss
+++ b/src/app/clients/clients-view/custom-dialogs/capture-image-dialog/capture-image-dialog.component.scss
@@ -0,0 +1,10 @@
+@use '../../../../../assets/styles/colours' as colors;
+
+.capture-video {
+ width: 100%;
+ max-width: 640px;
+ height: auto;
+ object-fit: contain;
+ border-radius: 4px;
+ background-color: colors.$black;
+}
diff --git a/src/app/clients/clients-view/custom-dialogs/capture-image-dialog/capture-image-dialog.component.ts b/src/app/clients/clients-view/custom-dialogs/capture-image-dialog/capture-image-dialog.component.ts
index 31840b6980..480435fbb7 100644
--- a/src/app/clients/clients-view/custom-dialogs/capture-image-dialog/capture-image-dialog.component.ts
+++ b/src/app/clients/clients-view/custom-dialogs/capture-image-dialog/capture-image-dialog.component.ts
@@ -1,7 +1,7 @@
/** Angular Imports */
-import { Component, ViewChild, ElementRef, AfterViewInit, Renderer2, OnDestroy } from '@angular/core';
+import { Component, ViewChild, ElementRef, AfterViewInit, Renderer2, OnDestroy, inject } from '@angular/core';
import { MatDialogRef, MatDialogTitle, MatDialogActions, MatDialogClose } from '@angular/material/dialog';
-import { NgStyle, NgIf } from '@angular/common';
+import { NgStyle } from '@angular/common';
import { FaIconComponent } from '@fortawesome/angular-fontawesome';
import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
@@ -22,6 +22,9 @@ import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
]
})
export class CaptureImageDialogComponent implements AfterViewInit, OnDestroy {
+ dialogRef = inject>(MatDialogRef);
+ private renderer = inject(Renderer2);
+
/** Video element reference */
@ViewChild('video', { static: true }) video: ElementRef;
/** Canvas element reference */
@@ -36,15 +39,6 @@ export class CaptureImageDialogComponent implements AfterViewInit, OnDestroy {
/** Client image file */
clientImageDataURL: string;
- /**
- * @param {MatDialogRef} dialogRef Mat Dialog Reference
- * @param {Renderer2} renderer Template Renderer
- */
- constructor(
- public dialogRef: MatDialogRef,
- private renderer: Renderer2
- ) {}
-
ngAfterViewInit() {
this.startCamera();
}
@@ -60,8 +54,13 @@ export class CaptureImageDialogComponent implements AfterViewInit, OnDestroy {
*/
startCamera() {
if (navigator.mediaDevices && navigator.mediaDevices.getUserMedia) {
+ const videoConstraints: MediaTrackConstraints = {
+ width: { ideal: 640 },
+ height: { ideal: 480 },
+ facingMode: 'user'
+ };
navigator.mediaDevices
- .getUserMedia({ video: true })
+ .getUserMedia({ video: videoConstraints })
.then((stream: MediaStream) => {
this.renderer.setProperty(this.video.nativeElement, 'srcObject', stream);
this.video.nativeElement.play();
@@ -101,13 +100,26 @@ export class CaptureImageDialogComponent implements AfterViewInit, OnDestroy {
/**
* Captures the image by drawing video state on canvas, then converts canvas state to data URL.
+ * Uses actual video dimensions to prevent aspect ratio distortion.
* See https://developer.mozilla.org/en-US/docs/Web/API/HTMLCanvasElement/toDataURL for details.
*/
capture() {
this.isCaptured = true;
this.video.nativeElement.pause();
- this.canvas.nativeElement.getContext('2d').drawImage(this.video.nativeElement, 0, 0, 150, 150);
- this.clientImageDataURL = this.canvas.nativeElement.toDataURL();
+
+ // Get actual video stream dimensions to preserve aspect ratio
+ const videoWidth = this.video.nativeElement.videoWidth;
+ const videoHeight = this.video.nativeElement.videoHeight;
+
+ // Set canvas dimensions to match video stream
+ this.canvas.nativeElement.width = videoWidth;
+ this.canvas.nativeElement.height = videoHeight;
+
+ // Draw the video frame at full resolution without distortion
+ this.canvas.nativeElement.getContext('2d').drawImage(this.video.nativeElement, 0, 0, videoWidth, videoHeight);
+
+ // Convert to data URL with JPEG format for smaller file size
+ this.clientImageDataURL = this.canvas.nativeElement.toDataURL('image/jpeg', 0.9);
}
/**
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 816aba1b4e..b84049ec85 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,19 +1,27 @@
{{ 'labels.heading.Delete Client Signature' | translate }}
-
- {{ 'labels.text.Delete clients signature' | translate }} ?
-
+@if (signatureId) {
+
+ {{ 'labels.text.Delete clients signature' | translate }} ?
+
+}
-
- {{ 'labels.text.Client Signature is not provided.' | translate }}
-
+@if (!signatureId) {
+
+ {{ 'labels.text.Client Signature is not provided.' | translate }}
+
+}
-
-
+ @if (signatureId) {
+
+ }
+ @if (!signatureId) {
+
+ }
diff --git a/src/app/clients/clients-view/custom-dialogs/delete-signature-dialog/delete-signature-dialog.component.ts b/src/app/clients/clients-view/custom-dialogs/delete-signature-dialog/delete-signature-dialog.component.ts
index 13f2570b81..1794581a63 100644
--- a/src/app/clients/clients-view/custom-dialogs/delete-signature-dialog/delete-signature-dialog.component.ts
+++ b/src/app/clients/clients-view/custom-dialogs/delete-signature-dialog/delete-signature-dialog.component.ts
@@ -1,5 +1,5 @@
/** Angular Imports */
-import { Component, Inject } from '@angular/core';
+import { Component, inject } from '@angular/core';
import {
MatDialogRef,
MAT_DIALOG_DATA,
@@ -28,6 +28,9 @@ import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
]
})
export class DeleteSignatureDialogComponent {
+ dialogRef = inject>(MatDialogRef);
+ data = inject(MAT_DIALOG_DATA);
+
/** Id of client signature in documents */
signatureId: any;
@@ -35,10 +38,7 @@ export class DeleteSignatureDialogComponent {
* @param {MatDialogRef} dialogRef Component reference to dialog.
* @param {any} data Documents data
*/
- constructor(
- public dialogRef: MatDialogRef,
- @Inject(MAT_DIALOG_DATA) public data: any[]
- ) {
+ constructor() {
const signature = this.data.find((document: any) => document.name === 'clientSignature') || {};
this.signatureId = signature.id;
}
diff --git a/src/app/clients/clients-view/custom-dialogs/edit-notes-dialog/edit-notes-dialog.component.ts b/src/app/clients/clients-view/custom-dialogs/edit-notes-dialog/edit-notes-dialog.component.ts
index 7291ee9b49..3284d2c041 100644
--- a/src/app/clients/clients-view/custom-dialogs/edit-notes-dialog/edit-notes-dialog.component.ts
+++ b/src/app/clients/clients-view/custom-dialogs/edit-notes-dialog/edit-notes-dialog.component.ts
@@ -1,5 +1,5 @@
/** Angular Imports */
-import { Component, OnInit, Inject } from '@angular/core';
+import { Component, OnInit, inject } from '@angular/core';
import {
MatDialogRef,
MAT_DIALOG_DATA,
@@ -22,13 +22,11 @@ import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
]
})
export class EditNotesDialogComponent implements OnInit {
- noteForm: UntypedFormGroup;
+ dialogRef = inject>(MatDialogRef);
+ private formBuilder = inject(UntypedFormBuilder);
+ data = inject(MAT_DIALOG_DATA);
- constructor(
- public dialogRef: MatDialogRef,
- private formBuilder: UntypedFormBuilder,
- @Inject(MAT_DIALOG_DATA) public data: any
- ) {}
+ noteForm: UntypedFormGroup;
ngOnInit() {
this.createNoteForm();
diff --git a/src/app/clients/clients-view/custom-dialogs/unassign-staff-dialog/unassign-staff-dialog.component.ts b/src/app/clients/clients-view/custom-dialogs/unassign-staff-dialog/unassign-staff-dialog.component.ts
index cb52774ed7..aa63500560 100644
--- a/src/app/clients/clients-view/custom-dialogs/unassign-staff-dialog/unassign-staff-dialog.component.ts
+++ b/src/app/clients/clients-view/custom-dialogs/unassign-staff-dialog/unassign-staff-dialog.component.ts
@@ -1,5 +1,5 @@
/** Angular Imports */
-import { Component, Inject } from '@angular/core';
+import { Component, inject } from '@angular/core';
import {
MatDialogRef,
MAT_DIALOG_DATA,
@@ -28,8 +28,5 @@ import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
]
})
export class UnassignStaffDialogComponent {
- /**
- * @param {MatDialogRef} dialogRef Component reference to dialog.
- */
- constructor(public dialogRef: MatDialogRef) {}
+ dialogRef = inject>(MatDialogRef);
}
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 60514f16b2..a626a1b866 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,21 +1,79 @@
- {{ 'labels.heading.Upload' | translate }} {{ entityType }} {{ 'labels.heading.Documents' | translate }}
+ @if (documentIdentifier) {
+ {{ 'labels.heading.Add Client Identifier' | translate }}
+ } @else {
+ {{ 'labels.heading.Upload' | translate }} {{ entityType }} {{ 'labels.heading.Documents' | translate }}
+ }
diff --git a/src/app/clients/clients-view/custom-dialogs/upload-document-dialog/upload-document-dialog.component.ts b/src/app/clients/clients-view/custom-dialogs/upload-document-dialog/upload-document-dialog.component.ts
index 3eeba8a93f..985a604ac7 100644
--- a/src/app/clients/clients-view/custom-dialogs/upload-document-dialog/upload-document-dialog.component.ts
+++ b/src/app/clients/clients-view/custom-dialogs/upload-document-dialog/upload-document-dialog.component.ts
@@ -1,4 +1,4 @@
-import { Component, OnInit, Inject } from '@angular/core';
+import { Component, OnInit, inject } from '@angular/core';
import {
MatDialogRef,
MAT_DIALOG_DATA,
@@ -23,27 +23,35 @@ import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
]
})
export class UploadDocumentDialogComponent implements OnInit {
+ dialogRef = inject>(MatDialogRef);
+ private formBuilder = inject(UntypedFormBuilder);
+ data = inject(MAT_DIALOG_DATA);
+
/** Upload Document form. */
uploadDocumentForm: UntypedFormGroup;
/** Upload Document Data */
uploadDocumentData: any = [];
- /** Triggers description field */
+ /** Triggers identity fields (documentType, status, documentKey) */
documentIdentifier = false;
/** Entity Type */
entityType: string;
+ /** Allowed Document Types for identifiers */
+ allowedDocumentTypes: any[] = [];
+ /** Status options for identifiers */
+ statusOptions: any[] = [];
/**
* @param {MatDialogRef} dialogRef Dialog reference element
* @param {FormBuilder} formBuilder Form Builder
* @param {any} data Dialog Data
*/
- constructor(
- public dialogRef: MatDialogRef,
- private formBuilder: UntypedFormBuilder,
- @Inject(MAT_DIALOG_DATA) public data: any
- ) {
+ constructor() {
+ const data = this.data;
+
this.documentIdentifier = data.documentIdentifier;
this.entityType = data.entityType;
+ this.allowedDocumentTypes = data.allowedDocumentTypes || [];
+ this.statusOptions = data.statusOptions || [];
}
ngOnInit() {
@@ -54,14 +62,39 @@ export class UploadDocumentDialogComponent implements OnInit {
* Creates the upload Document form.
*/
createUploadDocumentForm() {
- this.uploadDocumentForm = this.formBuilder.group({
- fileName: [
- '',
- Validators.required
- ],
- description: [''],
- file: ['']
- });
+ if (this.documentIdentifier) {
+ // Unified form for identity: identifier fields + document upload
+ this.uploadDocumentForm = this.formBuilder.group({
+ documentTypeId: [
+ '',
+ Validators.required
+ ],
+ status: [
+ 'Active',
+ Validators.required
+ ],
+ documentKey: [
+ '',
+ Validators.required
+ ],
+ description: [''],
+ fileName: [
+ '',
+ Validators.required
+ ],
+ file: ['']
+ });
+ } else {
+ // Standard document upload form
+ this.uploadDocumentForm = this.formBuilder.group({
+ fileName: [
+ '',
+ Validators.required
+ ],
+ description: [''],
+ file: ['']
+ });
+ }
}
/**
diff --git a/src/app/clients/clients-view/custom-dialogs/upload-image-dialog/upload-image-dialog.component.ts b/src/app/clients/clients-view/custom-dialogs/upload-image-dialog/upload-image-dialog.component.ts
index c315852894..acf2bc98c2 100644
--- a/src/app/clients/clients-view/custom-dialogs/upload-image-dialog/upload-image-dialog.component.ts
+++ b/src/app/clients/clients-view/custom-dialogs/upload-image-dialog/upload-image-dialog.component.ts
@@ -1,5 +1,5 @@
/** Angular Imports */
-import { Component } from '@angular/core';
+import { Component, inject } from '@angular/core';
import { MatDialogRef, MatDialogTitle, MatDialogActions, MatDialogClose } from '@angular/material/dialog';
import { FileUploadComponent } from '../../../../shared/file-upload/file-upload.component';
import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
@@ -20,14 +20,11 @@ import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
]
})
export class UploadImageDialogComponent {
+ dialogRef = inject>(MatDialogRef);
+
/** Client Image */
image: File;
- /**
- * @param {MatDialogRef} dialogRef Component reference to dialog.
- */
- constructor(public dialogRef: MatDialogRef) {}
-
/**
* Sets file form control value.
* @param {any} $event file change event.
diff --git a/src/app/clients/clients-view/custom-dialogs/upload-signature-dialog/upload-signature-dialog.component.ts b/src/app/clients/clients-view/custom-dialogs/upload-signature-dialog/upload-signature-dialog.component.ts
index 189bbadcb1..d135fb89e2 100644
--- a/src/app/clients/clients-view/custom-dialogs/upload-signature-dialog/upload-signature-dialog.component.ts
+++ b/src/app/clients/clients-view/custom-dialogs/upload-signature-dialog/upload-signature-dialog.component.ts
@@ -1,5 +1,5 @@
/** Angular Imports */
-import { Component } from '@angular/core';
+import { Component, inject } from '@angular/core';
import { MatDialogRef, MatDialogTitle, MatDialogActions, MatDialogClose } from '@angular/material/dialog';
import { FileUploadComponent } from '../../../../shared/file-upload/file-upload.component';
import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
@@ -20,14 +20,11 @@ import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
]
})
export class UploadSignatureDialogComponent {
+ dialogRef = inject>(MatDialogRef);
+
/** Client Signature */
signature: File;
- /**
- * @param {MatDialogRef} dialogRef Component reference to dialog.
- */
- constructor(public dialogRef: MatDialogRef) {}
-
/**
* Sets file form control value.
* @param {any} $event file change event.
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 add202276a..5ec30bc275 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,19 +1,27 @@
{{ 'labels.heading.View Client Signature' | translate }}
-
- ![Signature]()
-
+@if (signatureId) {
+
+ ![Signature]()
+
+}
-
- {{ 'labels.text.Client Signature is not provided.' | translate }}
-
+@if (!signatureId) {
+
+ {{ 'labels.text.Client Signature is not provided.' | translate }}
+
+}
-
-
+ @if (signatureId) {
+
+ }
+ @if (!signatureId) {
+
+ }
diff --git a/src/app/clients/clients-view/custom-dialogs/view-signature-dialog/view-signature-dialog.component.ts b/src/app/clients/clients-view/custom-dialogs/view-signature-dialog/view-signature-dialog.component.ts
index de887a7024..abca5f557a 100644
--- a/src/app/clients/clients-view/custom-dialogs/view-signature-dialog/view-signature-dialog.component.ts
+++ b/src/app/clients/clients-view/custom-dialogs/view-signature-dialog/view-signature-dialog.component.ts
@@ -1,5 +1,5 @@
/** Angular Imports */
-import { Component, Inject, OnInit } from '@angular/core';
+import { Component, OnInit, inject } from '@angular/core';
import {
MatDialogRef,
MAT_DIALOG_DATA,
@@ -35,6 +35,14 @@ import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
]
})
export class ViewSignatureDialogComponent implements OnInit {
+ dialogRef = inject>(MatDialogRef);
+ private clientsService = inject(ClientsService);
+ private sanitizer = inject(DomSanitizer);
+ data = inject<{
+ documents: any[];
+ id: string;
+ }>(MAT_DIALOG_DATA);
+
/** Id of client signature in documents */
signatureId: any;
/** Signature Image */
@@ -46,12 +54,7 @@ export class ViewSignatureDialogComponent implements OnInit {
* @param {MatDialogRef} dialogRef Component reference to dialog.
* @param {any} data Documents data
*/
- constructor(
- public dialogRef: MatDialogRef,
- private clientsService: ClientsService,
- private sanitizer: DomSanitizer,
- @Inject(MAT_DIALOG_DATA) public data: { documents: any[]; id: string }
- ) {
+ constructor() {
const signature = this.data.documents.find((document: any) => document.name === 'clientSignature') || {};
this.signatureId = signature.id;
this.clientId = this.data.id;
diff --git a/src/app/clients/clients-view/datatable-tab/datatable-tab.component.ts b/src/app/clients/clients-view/datatable-tab/datatable-tab.component.ts
index ff0aaf5e2c..96bc28a5ac 100644
--- a/src/app/clients/clients-view/datatable-tab/datatable-tab.component.ts
+++ b/src/app/clients/clients-view/datatable-tab/datatable-tab.component.ts
@@ -1,4 +1,4 @@
-import { Component } from '@angular/core';
+import { Component, inject } from '@angular/core';
import { ActivatedRoute } from '@angular/router';
import { EntityDatatableTabComponent } from '../../../shared/tabs/entity-datatable-tab/entity-datatable-tab.component';
import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
@@ -13,11 +13,13 @@ import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
]
})
export class DatatableTabComponent {
+ private route = inject(ActivatedRoute);
+
entityId: string;
entityDatatable: any;
multiRowDatatableFlag: boolean;
- constructor(private route: ActivatedRoute) {
+ constructor() {
this.entityId = this.route.parent.parent.snapshot.paramMap.get('clientId');
this.route.data.subscribe((data: { clientDatatable: any }) => {
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 1be9a0313e..4692cdf53d 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
@@ -3,7 +3,6 @@
[entityId]="entityId"
[entityDocuments]="entityDocuments"
[callbackUpload]="uploadDocument"
- [callbackDownload]="downloadDocument"
[callbackDelete]="deleteDocument"
>
diff --git a/src/app/clients/clients-view/documents-tab/documents-tab.component.ts b/src/app/clients/clients-view/documents-tab/documents-tab.component.ts
index dd6d954f34..a43d97904a 100644
--- a/src/app/clients/clients-view/documents-tab/documents-tab.component.ts
+++ b/src/app/clients/clients-view/documents-tab/documents-tab.component.ts
@@ -1,4 +1,4 @@
-import { Component } from '@angular/core';
+import { Component, inject } from '@angular/core';
import { ActivatedRoute } from '@angular/router';
import { MatDialog } from '@angular/material/dialog';
@@ -17,28 +17,21 @@ import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
]
})
export class DocumentsTabComponent {
+ private route = inject(ActivatedRoute);
+ private clientsService = inject(ClientsService);
+ dialog = inject(MatDialog);
+
entityDocuments: any;
entityId: string;
entityType = 'clients';
- constructor(
- private route: ActivatedRoute,
- private clientsService: ClientsService,
- public dialog: MatDialog
- ) {
+ constructor() {
this.route.data.subscribe((data: { clientDocuments: any }) => {
this.entityDocuments = data.clientDocuments;
});
this.entityId = this.route.parent.snapshot.paramMap.get('clientId');
}
- downloadDocument(documentId: string) {
- this.clientsService.downloadClientDocument(this.entityId, documentId).subscribe((res) => {
- const url = window.URL.createObjectURL(res);
- window.open(url);
- });
- }
-
deleteDocument(documentId: string) {
this.clientsService.deleteClientDocument(this.entityId, documentId).subscribe((res) => {});
}
diff --git a/src/app/clients/clients-view/family-members-tab/add-family-member/add-family-member.component.html b/src/app/clients/clients-view/family-members-tab/add-family-member/add-family-member.component.html
index bb1b9eb67b..ab6ef6defc 100644
--- a/src/app/clients/clients-view/family-members-tab/add-family-member/add-family-member.component.html
+++ b/src/app/clients/clients-view/family-members-tab/add-family-member/add-family-member.component.html
@@ -11,10 +11,12 @@
placeholder="First Name"
title="First Name"
/>
-
- {{ 'labels.inputs.First Name' | translate }} {{ 'labels.commons.is' | translate }}
- {{ 'labels.commons.required' | translate }}
-
+ @if (addFamilyMemberForm.controls.firstName.hasError('required')) {
+
+ {{ 'labels.inputs.First Name' | translate }} {{ 'labels.commons.is' | translate }}
+ {{ 'labels.commons.required' | translate }}
+
+ }
@@ -38,10 +40,12 @@
placeholder="Last Name"
title="Last Name"
/>
-
- {{ 'labels.inputs.Last Name' | translate }} {{ 'labels.commons.is' | translate }}
- {{ 'labels.commons.required' | translate }}
-
+ @if (addFamilyMemberForm.controls.lastName.hasError('required')) {
+
+ {{ 'labels.inputs.Last Name' | translate }} {{ 'labels.commons.is' | translate }}
+ {{ 'labels.commons.required' | translate }}
+
+ }
@@ -76,47 +80,56 @@
{{ 'labels.inputs.Relationship' | translate }}
-
- {{ relation.name | translateKey: 'catalogs' }}
-
+ @for (relation of addFamilyMemberTemplate.relationshipIdOptions; track relation) {
+
+ {{ relation.name | translateKey: 'catalogs' }}
+
+ }
-
- {{ 'labels.inputs.Relationship' | translate }} {{ 'labels.commons.is' | translate }}
- {{ 'labels.commons.required' | translate }}
-
+ @if (addFamilyMemberForm.controls.relationshipId.hasError('required')) {
+
+ {{ 'labels.inputs.Relationship' | translate }} {{ 'labels.commons.is' | translate }}
+ {{ 'labels.commons.required' | translate }}
+
+ }
{{ 'labels.inputs.Gender' | translate }}
-
- {{ gender.name | translateKey: 'catalogs' }}
-
+ @for (gender of addFamilyMemberTemplate.genderIdOptions; track gender) {
+
+ {{ gender.name | translateKey: 'catalogs' }}
+
+ }
-
- {{ 'labels.inputs.Gender' | translate }} {{ 'labels.commons.is' | translate }}
- {{ 'labels.commons.required' | translate }}
-
+ @if (addFamilyMemberForm.controls.genderId.hasError('required')) {
+
+ {{ 'labels.inputs.Gender' | translate }} {{ 'labels.commons.is' | translate }}
+ {{ 'labels.commons.required' | translate }}
+
+ }
{{ 'labels.inputs.Profession' | translate }}
-
- {{ profession.name | translateKey: 'catalogs' }}
-
+ @for (profession of addFamilyMemberTemplate.professionIdOptions; track profession) {
+
+ {{ profession.name | translateKey: 'catalogs' }}
+
+ }
{{ 'labels.inputs.Marital Status' | translate }}
-
- {{ maritalStatus.name | translateKey: 'catalogs' }}
-
+ @for (maritalStatus of addFamilyMemberTemplate.maritalStatusIdOptions; track maritalStatus) {
+
+ {{ maritalStatus.name | translateKey: 'catalogs' }}
+
+ }
diff --git a/src/app/clients/clients-view/family-members-tab/add-family-member/add-family-member.component.ts b/src/app/clients/clients-view/family-members-tab/add-family-member/add-family-member.component.ts
index c8a82670bc..bd84864817 100644
--- a/src/app/clients/clients-view/family-members-tab/add-family-member/add-family-member.component.ts
+++ b/src/app/clients/clients-view/family-members-tab/add-family-member/add-family-member.component.ts
@@ -1,5 +1,5 @@
/** Angular Imports */
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, inject } from '@angular/core';
import { UntypedFormGroup, UntypedFormBuilder, Validators, ReactiveFormsModule } from '@angular/forms';
import { Router, ActivatedRoute, RouterLink } from '@angular/router';
@@ -23,6 +23,13 @@ import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
]
})
export class AddFamilyMemberComponent implements OnInit {
+ private formBuilder = inject(UntypedFormBuilder);
+ private dateUtils = inject(Dates);
+ private router = inject(Router);
+ private route = inject(ActivatedRoute);
+ private clientsService = inject(ClientsService);
+ private settingsService = inject(SettingsService);
+
/** Maximum Due Date allowed. */
maxDate = new Date();
/** Minimum age allowed is 0. */
@@ -42,14 +49,7 @@ export class AddFamilyMemberComponent implements OnInit {
* @param {ClientsService} clientsService Clients Service
* @param {SettingsService} settingsService Setting service
*/
- constructor(
- private formBuilder: UntypedFormBuilder,
- private dateUtils: Dates,
- private router: Router,
- private route: ActivatedRoute,
- private clientsService: ClientsService,
- private settingsService: SettingsService
- ) {
+ constructor() {
this.route.data.subscribe((data: { clientTemplate: any }) => {
this.addFamilyMemberTemplate = data.clientTemplate.familyMemberOptions;
});
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 49750b8b6d..57a0c3cd15 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
@@ -4,10 +4,12 @@
{{ 'labels.inputs.First Name' | translate }}
-
- {{ 'labels.inputs.First Name' | translate }} {{ 'labels.commons.is' | translate }}
- {{ 'labels.commons.required' | translate }}
-
+ @if (editFamilyMemberForm.controls.firstName.hasError('required')) {
+
+ {{ 'labels.inputs.First Name' | translate }} {{ 'labels.commons.is' | translate }}
+ {{ 'labels.commons.required' | translate }}
+
+ }
@@ -18,10 +20,12 @@
{{ 'labels.inputs.Last Name' | translate }}
-
- {{ 'labels.inputs.Last Name' | translate }} {{ 'labels.commons.is' | translate }}
- {{ 'labels.commons.required' | translate }}
-
+ @if (editFamilyMemberForm.controls.lastName.hasError('required')) {
+
+ {{ 'labels.inputs.Last Name' | translate }} {{ 'labels.commons.is' | translate }}
+ {{ 'labels.commons.required' | translate }}
+
+ }
@@ -41,47 +45,56 @@
{{ 'labels.inputs.Relationship' | translate }}
-
- {{ relation.name | translateKey: 'catalogs' }}
-
+ @for (relation of addFamilyMemberTemplate.relationshipIdOptions; track relation) {
+
+ {{ relation.name | translateKey: 'catalogs' }}
+
+ }
-
- {{ 'labels.inputs.Relationship' | translate }} {{ 'labels.commons.is' | translate }}
- {{ 'labels.commons.required' | translate }}
-
+ @if (editFamilyMemberForm.controls.relationshipId.hasError('required')) {
+
+ {{ 'labels.inputs.Relationship' | translate }} {{ 'labels.commons.is' | translate }}
+ {{ 'labels.commons.required' | translate }}
+
+ }
{{ 'labels.inputs.Gender' | translate }}
-
- {{ gender.name | translateKey: 'catalogs' }}
-
+ @for (gender of addFamilyMemberTemplate.genderIdOptions; track gender) {
+
+ {{ gender.name | translateKey: 'catalogs' }}
+
+ }
-
- {{ 'labels.inputs.Gender' | translate }} {{ 'labels.commons.is' | translate }}
- {{ 'labels.commons.required' | translate }}
-
+ @if (editFamilyMemberForm.controls.genderId.hasError('required')) {
+
+ {{ 'labels.inputs.Gender' | translate }} {{ 'labels.commons.is' | translate }}
+ {{ 'labels.commons.required' | translate }}
+
+ }
{{ 'labels.inputs.Profession' | translate }}
-
- {{ profession.name | translateKey: 'catalogs' }}
-
+ @for (profession of addFamilyMemberTemplate.professionIdOptions; track profession) {
+
+ {{ profession.name | translateKey: 'catalogs' }}
+
+ }
{{ 'labels.inputs.Marital Status' | translate }}
-
- {{ maritalStatus.name | translateKey: 'catalogs' }}
-
+ @for (maritalStatus of addFamilyMemberTemplate.maritalStatusIdOptions; track maritalStatus) {
+
+ {{ maritalStatus.name | translateKey: 'catalogs' }}
+
+ }
diff --git a/src/app/clients/clients-view/family-members-tab/edit-family-member/edit-family-member.component.ts b/src/app/clients/clients-view/family-members-tab/edit-family-member/edit-family-member.component.ts
index 8315e8f49d..7c6dd199be 100644
--- a/src/app/clients/clients-view/family-members-tab/edit-family-member/edit-family-member.component.ts
+++ b/src/app/clients/clients-view/family-members-tab/edit-family-member/edit-family-member.component.ts
@@ -1,5 +1,5 @@
/** Angular Imports */
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, inject } from '@angular/core';
import { UntypedFormGroup, UntypedFormBuilder, Validators, ReactiveFormsModule } from '@angular/forms';
import { Router, ActivatedRoute, RouterLink } from '@angular/router';
@@ -23,6 +23,13 @@ import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
]
})
export class EditFamilyMemberComponent implements OnInit {
+ private formBuilder = inject(UntypedFormBuilder);
+ private dateUtils = inject(Dates);
+ private router = inject(Router);
+ private route = inject(ActivatedRoute);
+ private clientsService = inject(ClientsService);
+ private settingsService = inject(SettingsService);
+
/** Maximum Due Date allowed. */
maxDate = new Date();
/** Add family member form. */
@@ -40,14 +47,7 @@ export class EditFamilyMemberComponent implements OnInit {
* @param {ClientsService} clientsService Clients Service
* @param {SettingsService} settingsService Setting service
*/
- constructor(
- private formBuilder: UntypedFormBuilder,
- private dateUtils: Dates,
- private router: Router,
- private route: ActivatedRoute,
- private clientsService: ClientsService,
- private settingsService: SettingsService
- ) {
+ constructor() {
this.route.data.subscribe((data: { clientTemplate: any; editFamilyMember: any }) => {
this.addFamilyMemberTemplate = data.clientTemplate.familyMemberOptions;
this.familyMemberDetails = data.editFamilyMember;
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 48bb848415..880f01331f 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
@@ -9,57 +9,66 @@ {{ 'labels.heading.Family Members' | translate }}
-
-
-
- {{ displayName(member) }}
-
-
- {{ 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.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 }}
-
-
+ @for (member of clientFamilyMembers; track member; let i = $index) {
+
+
+
+ {{ displayName(member) }}
+
+
+ {{ member.relationship }}
+
+
+
+ @if (member.firstName) {
+ {{ 'labels.inputs.First Name' | translate }} : {{ member.firstName }}
+ }
+ @if (member.middleName) {
+ {{ 'labels.inputs.Middle Name' | translate }} : {{ member.middleName }}
+ }
+ @if (member.lastName) {
+ {{ 'labels.inputs.Last Name' | translate }} : {{ member.lastName }}
+ }
+ @if (member.qualification) {
+ {{ 'labels.inputs.Qualification' | translate }} : {{ member.qualification }}
+ }
+ @if (member.mobileNumber) {
+ {{ 'labels.inputs.Mobile Number' | translate }} : {{ member.mobileNumber }}
+ }
+ @if (member.age) {
+ {{ 'labels.inputs.Age' | translate }} : {{ member.age }}
+ }
+ @if (member.isDependent) {
+ {{ 'labels.inputs.Is Dependent' | translate }} : {{ member.isDependent | yesNo }}
+ }
+ @if (member.maritalStatus) {
+ {{ 'labels.inputs.Marital Status' | translate }} : {{ member.maritalStatus }}
+ }
+ @if (member.gender) {
+ {{ 'labels.inputs.Gender' | translate }} : {{ member.gender }}
+ }
+ @if (member.profession) {
+ {{ 'labels.inputs.Profession' | translate }} : {{ member.profession }}
+ }
+ @if (member.dateOfBirth) {
+ {{ 'labels.inputs.Date Of Birth' | translate }} : {{ member.dateOfBirth | dateFormat }}
+ }
+
+
+ }
diff --git a/src/app/clients/clients-view/family-members-tab/family-members-tab.component.ts b/src/app/clients/clients-view/family-members-tab/family-members-tab.component.ts
index 64c67a7ee7..41e492fd1c 100644
--- a/src/app/clients/clients-view/family-members-tab/family-members-tab.component.ts
+++ b/src/app/clients/clients-view/family-members-tab/family-members-tab.component.ts
@@ -1,5 +1,5 @@
/** Angular Imports */
-import { Component } from '@angular/core';
+import { Component, inject } from '@angular/core';
import { ActivatedRoute, RouterOutlet, RouterLink } from '@angular/router';
import { MatDialog } from '@angular/material/dialog';
@@ -43,6 +43,10 @@ import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
]
})
export class FamilyMembersTabComponent {
+ private route = inject(ActivatedRoute);
+ private clientsService = inject(ClientsService);
+ dialog = inject(MatDialog);
+
/** Client Family Members */
clientFamilyMembers: any;
@@ -51,11 +55,7 @@ export class FamilyMembersTabComponent {
* @param {ClientsService} clientsService Clients Service
* @param {MatDialog }dialog Mat Dialog
*/
- constructor(
- private route: ActivatedRoute,
- private clientsService: ClientsService,
- public dialog: MatDialog
- ) {
+ constructor() {
this.route.data.subscribe((data: { clientFamilyMembers: any }) => {
this.clientFamilyMembers = data.clientFamilyMembers;
});
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 c8bfb9c2f2..0d4e9e0ee8 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
@@ -123,179 +123,177 @@ {{ 'labels.heading.Loan Accounts' | translate }}
-
-
- {{ 'labels.inputs.Account No' | translate }}
-
-
-
-
-
-
- {{ 'labels.inputs.Loan Product' | translate }}
-
-
-
-
-
- {{ 'labels.inputs.Original Loan' | translate }}
- {{ element.originalLoan }}
-
-
- {{ 'labels.inputs.Loan Balance' | translate }}
- {{ element.loanBalance | formatNumber }}
-
-
-
- {{ 'labels.inputs.Amount Paid' | translate }}
- {{ element.amountPaid | formatNumber }}
-
-
-
- {{ 'labels.inputs.Type' | translate }}
-
-
-
-
-
-
- {{ 'labels.inputs.Actions' | translate }}
-
-
-
-
-
-
-
-
-
-
+ >
+
+
+
+ {{ 'labels.inputs.Actions' | translate }}
+
+ @if (element.status.active) {
+
+ }
+ @if (element.status.pendingApproval) {
+
+
+
+ }
+ @if (!element.status.pendingApproval && !element.status.active && !element.status.overpaid) {
+
+
+
+ }
+ @if (!element.status.pendingApproval && !element.status.active && element.status.overpaid) {
+
+
+
+ }
+
+
+
+ }
-
-
- {{ 'labels.inputs.Account No' | translate }}
-
-
-
-
-
-
- {{ 'labels.inputs.Loan Product' | translate }}
-
-
-
-
-
- {{ 'labels.inputs.Original Loan' | translate }}
- {{ element.lastActiveTransactionDate | dateFormat }}
-
-
-
- {{ 'labels.inputs.Loan Balance' | translate }}
- {{ element.loanBalance | formatNumber }}
-
-
-
- {{ 'labels.inputs.Amount Paid' | translate }}
- {{ element.accountBalance | formatNumber }}
-
-
-
- {{ 'labels.inputs.Type' | translate }}
-
-
-
-
-
-
- {{ 'labels.inputs.Closed Date' | translate }}
- {{ element.timeline.closedOnDate | dateFormat }}
-
-
-
+ @if (showClosedLoanAccounts) {
+
+
+ {{ 'labels.inputs.Account No' | translate }}
+
+
+
+
+
+ {{ 'labels.inputs.Loan Product' | translate }}
+
+
+
+
+ {{ 'labels.inputs.Original Loan' | translate }}
+ {{ element.lastActiveTransactionDate | dateFormat }}
+
+
+ {{ 'labels.inputs.Loan Balance' | translate }}
+ {{ element.loanBalance | formatNumber }}
+
+
+ {{ 'labels.inputs.Amount Paid' | translate }}
+ {{ element.accountBalance | formatNumber }}
+
+
+ {{ 'labels.inputs.Type' | translate }}
+
+
+
+
+
+ {{ 'labels.inputs.Closed Date' | translate }}
+ {{ element.timeline.closedOnDate | dateFormat }}
+
+
+ }
@@ -313,131 +311,124 @@ {{ 'labels.heading.Saving Accounts' | translate }}
-
| - {{ 'labels.inputs.Member Of' | translate }} - | -- - {{ group.name }} - - | -|||||||||||||||
| - {{ 'labels.inputs.Client Type' | translate }} - | -{{ clientViewData.clientType.name }} | -|||||||||||||||
| + {{ 'labels.inputs.Member Of' | translate }} + | ++ @for (group of clientViewData.groups; track group) { + + {{ group.name }} + + } + | +|||||||||||||||
| + {{ 'labels.inputs.Client Type' | translate }} + | +{{ clientViewData.clientType.name }} | +|||||||||||||||
{{ 'labels.inputs.Mobile Number' | translate }}
@@ -162,12 +174,14 @@
{{ 'labels.buttons.Edit' | translate }}
-
+ @if (isActive()) {
+
+ }
-
-
-
-
+ }
+
+ @if (clientViewData.staffId) {
+
+
+
+ }
@@ -230,49 +248,67 @@ > {{ 'labels.buttons.Create Standing Instructions' | translate }} - - - + @if (clientViewData.status.value !== 'Transfer on hold') { + + + + }
>
{{ 'labels.inputs.Notes' | translate }}
- |
+
+ {{ 'labels.inputs.Actions' | translate }} | ++ @if (element.status.active) { + + } + @if (element.status.pendingApproval) { + + + + } + @if (!element.status.pendingApproval && !element.status.active && !element.status.overpaid) { + + + + } + @if (!element.status.pendingApproval && !element.status.active && element.status.overpaid) { + + + + } + | +||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
{{ 'labels.heading.Capture Client Image' | translate }}
- + @@ -10,12 +10,16 @@{{ 'labels.heading.Capture Client Image' | t
-
-
+ @if (!isCaptured) {
+
+ }
+ @if (isCaptured) {
+
+ }
{{ 'labels.heading.Delete Client Signature' | translate }}
-
-
+@if (signatureId) {
+ {{ 'labels.text.Delete clients signature' | translate }} ?
-
+
+}
-{{ 'labels.text.Delete clients signature' | translate }} ?
+
-
+@if (!signatureId) {
+ {{ 'labels.text.Client Signature is not provided.' | translate }}
-
+
+}
{{ 'labels.text.Client Signature is not provided.' | translate }}
+- {{ 'labels.heading.Upload' | translate }} {{ entityType }} {{ 'labels.heading.Documents' | translate }} + @if (documentIdentifier) { + {{ 'labels.heading.Add Client Identifier' | translate }} + } @else { + {{ 'labels.heading.Upload' | translate }} {{ entityType }} {{ 'labels.heading.Documents' | translate }} + }
diff --git a/src/app/clients/clients-view/custom-dialogs/upload-document-dialog/upload-document-dialog.component.ts b/src/app/clients/clients-view/custom-dialogs/upload-document-dialog/upload-document-dialog.component.ts
index 3eeba8a93f..985a604ac7 100644
--- a/src/app/clients/clients-view/custom-dialogs/upload-document-dialog/upload-document-dialog.component.ts
+++ b/src/app/clients/clients-view/custom-dialogs/upload-document-dialog/upload-document-dialog.component.ts
@@ -1,4 +1,4 @@
-import { Component, OnInit, Inject } from '@angular/core';
+import { Component, OnInit, inject } from '@angular/core';
import {
MatDialogRef,
MAT_DIALOG_DATA,
@@ -23,27 +23,35 @@ import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
]
})
export class UploadDocumentDialogComponent implements OnInit {
+ dialogRef = inject>(MatDialogRef);
+ private formBuilder = inject(UntypedFormBuilder);
+ data = inject(MAT_DIALOG_DATA);
+
/** Upload Document form. */
uploadDocumentForm: UntypedFormGroup;
/** Upload Document Data */
uploadDocumentData: any = [];
- /** Triggers description field */
+ /** Triggers identity fields (documentType, status, documentKey) */
documentIdentifier = false;
/** Entity Type */
entityType: string;
+ /** Allowed Document Types for identifiers */
+ allowedDocumentTypes: any[] = [];
+ /** Status options for identifiers */
+ statusOptions: any[] = [];
/**
* @param {MatDialogRef} dialogRef Dialog reference element
* @param {FormBuilder} formBuilder Form Builder
* @param {any} data Dialog Data
*/
- constructor(
- public dialogRef: MatDialogRef,
- private formBuilder: UntypedFormBuilder,
- @Inject(MAT_DIALOG_DATA) public data: any
- ) {
+ constructor() {
+ const data = this.data;
+
this.documentIdentifier = data.documentIdentifier;
this.entityType = data.entityType;
+ this.allowedDocumentTypes = data.allowedDocumentTypes || [];
+ this.statusOptions = data.statusOptions || [];
}
ngOnInit() {
@@ -54,14 +62,39 @@ export class UploadDocumentDialogComponent implements OnInit {
* Creates the upload Document form.
*/
createUploadDocumentForm() {
- this.uploadDocumentForm = this.formBuilder.group({
- fileName: [
- '',
- Validators.required
- ],
- description: [''],
- file: ['']
- });
+ if (this.documentIdentifier) {
+ // Unified form for identity: identifier fields + document upload
+ this.uploadDocumentForm = this.formBuilder.group({
+ documentTypeId: [
+ '',
+ Validators.required
+ ],
+ status: [
+ 'Active',
+ Validators.required
+ ],
+ documentKey: [
+ '',
+ Validators.required
+ ],
+ description: [''],
+ fileName: [
+ '',
+ Validators.required
+ ],
+ file: ['']
+ });
+ } else {
+ // Standard document upload form
+ this.uploadDocumentForm = this.formBuilder.group({
+ fileName: [
+ '',
+ Validators.required
+ ],
+ description: [''],
+ file: ['']
+ });
+ }
}
/**
diff --git a/src/app/clients/clients-view/custom-dialogs/upload-image-dialog/upload-image-dialog.component.ts b/src/app/clients/clients-view/custom-dialogs/upload-image-dialog/upload-image-dialog.component.ts
index c315852894..acf2bc98c2 100644
--- a/src/app/clients/clients-view/custom-dialogs/upload-image-dialog/upload-image-dialog.component.ts
+++ b/src/app/clients/clients-view/custom-dialogs/upload-image-dialog/upload-image-dialog.component.ts
@@ -1,5 +1,5 @@
/** Angular Imports */
-import { Component } from '@angular/core';
+import { Component, inject } from '@angular/core';
import { MatDialogRef, MatDialogTitle, MatDialogActions, MatDialogClose } from '@angular/material/dialog';
import { FileUploadComponent } from '../../../../shared/file-upload/file-upload.component';
import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
@@ -20,14 +20,11 @@ import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
]
})
export class UploadImageDialogComponent {
+ dialogRef = inject>(MatDialogRef);
+
/** Client Image */
image: File;
- /**
- * @param {MatDialogRef} dialogRef Component reference to dialog.
- */
- constructor(public dialogRef: MatDialogRef) {}
-
/**
* Sets file form control value.
* @param {any} $event file change event.
diff --git a/src/app/clients/clients-view/custom-dialogs/upload-signature-dialog/upload-signature-dialog.component.ts b/src/app/clients/clients-view/custom-dialogs/upload-signature-dialog/upload-signature-dialog.component.ts
index 189bbadcb1..d135fb89e2 100644
--- a/src/app/clients/clients-view/custom-dialogs/upload-signature-dialog/upload-signature-dialog.component.ts
+++ b/src/app/clients/clients-view/custom-dialogs/upload-signature-dialog/upload-signature-dialog.component.ts
@@ -1,5 +1,5 @@
/** Angular Imports */
-import { Component } from '@angular/core';
+import { Component, inject } from '@angular/core';
import { MatDialogRef, MatDialogTitle, MatDialogActions, MatDialogClose } from '@angular/material/dialog';
import { FileUploadComponent } from '../../../../shared/file-upload/file-upload.component';
import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
@@ -20,14 +20,11 @@ import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
]
})
export class UploadSignatureDialogComponent {
+ dialogRef = inject>(MatDialogRef);
+
/** Client Signature */
signature: File;
- /**
- * @param {MatDialogRef} dialogRef Component reference to dialog.
- */
- constructor(public dialogRef: MatDialogRef) {}
-
/**
* Sets file form control value.
* @param {any} $event file change event.
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 add202276a..5ec30bc275 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,19 +1,27 @@
-
-
+ @if (signatureId) {
+
+ }
+ @if (!signatureId) {
+
+ }
diff --git a/src/app/clients/clients-view/custom-dialogs/view-signature-dialog/view-signature-dialog.component.ts b/src/app/clients/clients-view/custom-dialogs/view-signature-dialog/view-signature-dialog.component.ts
index de887a7024..abca5f557a 100644
--- a/src/app/clients/clients-view/custom-dialogs/view-signature-dialog/view-signature-dialog.component.ts
+++ b/src/app/clients/clients-view/custom-dialogs/view-signature-dialog/view-signature-dialog.component.ts
@@ -1,5 +1,5 @@
/** Angular Imports */
-import { Component, Inject, OnInit } from '@angular/core';
+import { Component, OnInit, inject } from '@angular/core';
import {
MatDialogRef,
MAT_DIALOG_DATA,
@@ -35,6 +35,14 @@ import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
]
})
export class ViewSignatureDialogComponent implements OnInit {
+ dialogRef = inject>(MatDialogRef);
+ private clientsService = inject(ClientsService);
+ private sanitizer = inject(DomSanitizer);
+ data = inject<{
+ documents: any[];
+ id: string;
+ }>(MAT_DIALOG_DATA);
+
/** Id of client signature in documents */
signatureId: any;
/** Signature Image */
@@ -46,12 +54,7 @@ export class ViewSignatureDialogComponent implements OnInit {
* @param {MatDialogRef} dialogRef Component reference to dialog.
* @param {any} data Documents data
*/
- constructor(
- public dialogRef: MatDialogRef,
- private clientsService: ClientsService,
- private sanitizer: DomSanitizer,
- @Inject(MAT_DIALOG_DATA) public data: { documents: any[]; id: string }
- ) {
+ constructor() {
const signature = this.data.documents.find((document: any) => document.name === 'clientSignature') || {};
this.signatureId = signature.id;
this.clientId = this.data.id;
diff --git a/src/app/clients/clients-view/datatable-tab/datatable-tab.component.ts b/src/app/clients/clients-view/datatable-tab/datatable-tab.component.ts
index ff0aaf5e2c..96bc28a5ac 100644
--- a/src/app/clients/clients-view/datatable-tab/datatable-tab.component.ts
+++ b/src/app/clients/clients-view/datatable-tab/datatable-tab.component.ts
@@ -1,4 +1,4 @@
-import { Component } from '@angular/core';
+import { Component, inject } from '@angular/core';
import { ActivatedRoute } from '@angular/router';
import { EntityDatatableTabComponent } from '../../../shared/tabs/entity-datatable-tab/entity-datatable-tab.component';
import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
@@ -13,11 +13,13 @@ import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
]
})
export class DatatableTabComponent {
+ private route = inject(ActivatedRoute);
+
entityId: string;
entityDatatable: any;
multiRowDatatableFlag: boolean;
- constructor(private route: ActivatedRoute) {
+ constructor() {
this.entityId = this.route.parent.parent.snapshot.paramMap.get('clientId');
this.route.data.subscribe((data: { clientDatatable: any }) => {
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 1be9a0313e..4692cdf53d 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
@@ -3,7 +3,6 @@
[entityId]="entityId"
[entityDocuments]="entityDocuments"
[callbackUpload]="uploadDocument"
- [callbackDownload]="downloadDocument"
[callbackDelete]="deleteDocument"
>
diff --git a/src/app/clients/clients-view/documents-tab/documents-tab.component.ts b/src/app/clients/clients-view/documents-tab/documents-tab.component.ts
index dd6d954f34..a43d97904a 100644
--- a/src/app/clients/clients-view/documents-tab/documents-tab.component.ts
+++ b/src/app/clients/clients-view/documents-tab/documents-tab.component.ts
@@ -1,4 +1,4 @@
-import { Component } from '@angular/core';
+import { Component, inject } from '@angular/core';
import { ActivatedRoute } from '@angular/router';
import { MatDialog } from '@angular/material/dialog';
@@ -17,28 +17,21 @@ import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
]
})
export class DocumentsTabComponent {
+ private route = inject(ActivatedRoute);
+ private clientsService = inject(ClientsService);
+ dialog = inject(MatDialog);
+
entityDocuments: any;
entityId: string;
entityType = 'clients';
- constructor(
- private route: ActivatedRoute,
- private clientsService: ClientsService,
- public dialog: MatDialog
- ) {
+ constructor() {
this.route.data.subscribe((data: { clientDocuments: any }) => {
this.entityDocuments = data.clientDocuments;
});
this.entityId = this.route.parent.snapshot.paramMap.get('clientId');
}
- downloadDocument(documentId: string) {
- this.clientsService.downloadClientDocument(this.entityId, documentId).subscribe((res) => {
- const url = window.URL.createObjectURL(res);
- window.open(url);
- });
- }
-
deleteDocument(documentId: string) {
this.clientsService.deleteClientDocument(this.entityId, documentId).subscribe((res) => {});
}
diff --git a/src/app/clients/clients-view/family-members-tab/add-family-member/add-family-member.component.html b/src/app/clients/clients-view/family-members-tab/add-family-member/add-family-member.component.html
index bb1b9eb67b..ab6ef6defc 100644
--- a/src/app/clients/clients-view/family-members-tab/add-family-member/add-family-member.component.html
+++ b/src/app/clients/clients-view/family-members-tab/add-family-member/add-family-member.component.html
@@ -11,10 +11,12 @@
placeholder="First Name"
title="First Name"
/>
-
- {{ 'labels.inputs.First Name' | translate }} {{ 'labels.commons.is' | translate }}
- {{ 'labels.commons.required' | translate }}
-
+ @if (addFamilyMemberForm.controls.firstName.hasError('required')) {
+
+ {{ 'labels.inputs.First Name' | translate }} {{ 'labels.commons.is' | translate }}
+ {{ 'labels.commons.required' | translate }}
+
+ }
@@ -38,10 +40,12 @@
placeholder="Last Name"
title="Last Name"
/>
-
- {{ 'labels.inputs.Last Name' | translate }} {{ 'labels.commons.is' | translate }}
- {{ 'labels.commons.required' | translate }}
-
+ @if (addFamilyMemberForm.controls.lastName.hasError('required')) {
+
+ {{ 'labels.inputs.Last Name' | translate }} {{ 'labels.commons.is' | translate }}
+ {{ 'labels.commons.required' | translate }}
+
+ }
@@ -76,47 +80,56 @@
{{ 'labels.inputs.Relationship' | translate }}
-
- {{ relation.name | translateKey: 'catalogs' }}
-
+ @for (relation of addFamilyMemberTemplate.relationshipIdOptions; track relation) {
+
+ {{ relation.name | translateKey: 'catalogs' }}
+
+ }
-
- {{ 'labels.inputs.Relationship' | translate }} {{ 'labels.commons.is' | translate }}
- {{ 'labels.commons.required' | translate }}
-
+ @if (addFamilyMemberForm.controls.relationshipId.hasError('required')) {
+
+ {{ 'labels.inputs.Relationship' | translate }} {{ 'labels.commons.is' | translate }}
+ {{ 'labels.commons.required' | translate }}
+
+ }
{{ 'labels.inputs.Gender' | translate }}
-
- {{ gender.name | translateKey: 'catalogs' }}
-
+ @for (gender of addFamilyMemberTemplate.genderIdOptions; track gender) {
+
+ {{ gender.name | translateKey: 'catalogs' }}
+
+ }
-
- {{ 'labels.inputs.Gender' | translate }} {{ 'labels.commons.is' | translate }}
- {{ 'labels.commons.required' | translate }}
-
+ @if (addFamilyMemberForm.controls.genderId.hasError('required')) {
+
+ {{ 'labels.inputs.Gender' | translate }} {{ 'labels.commons.is' | translate }}
+ {{ 'labels.commons.required' | translate }}
+
+ }
{{ 'labels.inputs.Profession' | translate }}
-
- {{ profession.name | translateKey: 'catalogs' }}
-
+ @for (profession of addFamilyMemberTemplate.professionIdOptions; track profession) {
+
+ {{ profession.name | translateKey: 'catalogs' }}
+
+ }
{{ 'labels.inputs.Marital Status' | translate }}
-
- {{ maritalStatus.name | translateKey: 'catalogs' }}
-
+ @for (maritalStatus of addFamilyMemberTemplate.maritalStatusIdOptions; track maritalStatus) {
+
+ {{ maritalStatus.name | translateKey: 'catalogs' }}
+
+ }
diff --git a/src/app/clients/clients-view/family-members-tab/add-family-member/add-family-member.component.ts b/src/app/clients/clients-view/family-members-tab/add-family-member/add-family-member.component.ts
index c8a82670bc..bd84864817 100644
--- a/src/app/clients/clients-view/family-members-tab/add-family-member/add-family-member.component.ts
+++ b/src/app/clients/clients-view/family-members-tab/add-family-member/add-family-member.component.ts
@@ -1,5 +1,5 @@
/** Angular Imports */
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, inject } from '@angular/core';
import { UntypedFormGroup, UntypedFormBuilder, Validators, ReactiveFormsModule } from '@angular/forms';
import { Router, ActivatedRoute, RouterLink } from '@angular/router';
@@ -23,6 +23,13 @@ import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
]
})
export class AddFamilyMemberComponent implements OnInit {
+ private formBuilder = inject(UntypedFormBuilder);
+ private dateUtils = inject(Dates);
+ private router = inject(Router);
+ private route = inject(ActivatedRoute);
+ private clientsService = inject(ClientsService);
+ private settingsService = inject(SettingsService);
+
/** Maximum Due Date allowed. */
maxDate = new Date();
/** Minimum age allowed is 0. */
@@ -42,14 +49,7 @@ export class AddFamilyMemberComponent implements OnInit {
* @param {ClientsService} clientsService Clients Service
* @param {SettingsService} settingsService Setting service
*/
- constructor(
- private formBuilder: UntypedFormBuilder,
- private dateUtils: Dates,
- private router: Router,
- private route: ActivatedRoute,
- private clientsService: ClientsService,
- private settingsService: SettingsService
- ) {
+ constructor() {
this.route.data.subscribe((data: { clientTemplate: any }) => {
this.addFamilyMemberTemplate = data.clientTemplate.familyMemberOptions;
});
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 49750b8b6d..57a0c3cd15 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
@@ -4,10 +4,12 @@
{{ 'labels.inputs.First Name' | translate }}
-
- {{ 'labels.inputs.First Name' | translate }} {{ 'labels.commons.is' | translate }}
- {{ 'labels.commons.required' | translate }}
-
+ @if (editFamilyMemberForm.controls.firstName.hasError('required')) {
+
+ {{ 'labels.inputs.First Name' | translate }} {{ 'labels.commons.is' | translate }}
+ {{ 'labels.commons.required' | translate }}
+
+ }
@@ -18,10 +20,12 @@
{{ 'labels.inputs.Last Name' | translate }}
-
- {{ 'labels.inputs.Last Name' | translate }} {{ 'labels.commons.is' | translate }}
- {{ 'labels.commons.required' | translate }}
-
+ @if (editFamilyMemberForm.controls.lastName.hasError('required')) {
+
+ {{ 'labels.inputs.Last Name' | translate }} {{ 'labels.commons.is' | translate }}
+ {{ 'labels.commons.required' | translate }}
+
+ }
@@ -41,47 +45,56 @@
{{ 'labels.inputs.Relationship' | translate }}
-
- {{ relation.name | translateKey: 'catalogs' }}
-
+ @for (relation of addFamilyMemberTemplate.relationshipIdOptions; track relation) {
+
+ {{ relation.name | translateKey: 'catalogs' }}
+
+ }
-
- {{ 'labels.inputs.Relationship' | translate }} {{ 'labels.commons.is' | translate }}
- {{ 'labels.commons.required' | translate }}
-
+ @if (editFamilyMemberForm.controls.relationshipId.hasError('required')) {
+
+ {{ 'labels.inputs.Relationship' | translate }} {{ 'labels.commons.is' | translate }}
+ {{ 'labels.commons.required' | translate }}
+
+ }
{{ 'labels.inputs.Gender' | translate }}
-
- {{ gender.name | translateKey: 'catalogs' }}
-
+ @for (gender of addFamilyMemberTemplate.genderIdOptions; track gender) {
+
+ {{ gender.name | translateKey: 'catalogs' }}
+
+ }
-
- {{ 'labels.inputs.Gender' | translate }} {{ 'labels.commons.is' | translate }}
- {{ 'labels.commons.required' | translate }}
-
+ @if (editFamilyMemberForm.controls.genderId.hasError('required')) {
+
+ {{ 'labels.inputs.Gender' | translate }} {{ 'labels.commons.is' | translate }}
+ {{ 'labels.commons.required' | translate }}
+
+ }
{{ 'labels.inputs.Profession' | translate }}
-
- {{ profession.name | translateKey: 'catalogs' }}
-
+ @for (profession of addFamilyMemberTemplate.professionIdOptions; track profession) {
+
+ {{ profession.name | translateKey: 'catalogs' }}
+
+ }
{{ 'labels.inputs.Marital Status' | translate }}
-
- {{ maritalStatus.name | translateKey: 'catalogs' }}
-
+ @for (maritalStatus of addFamilyMemberTemplate.maritalStatusIdOptions; track maritalStatus) {
+
+ {{ maritalStatus.name | translateKey: 'catalogs' }}
+
+ }
diff --git a/src/app/clients/clients-view/family-members-tab/edit-family-member/edit-family-member.component.ts b/src/app/clients/clients-view/family-members-tab/edit-family-member/edit-family-member.component.ts
index 8315e8f49d..7c6dd199be 100644
--- a/src/app/clients/clients-view/family-members-tab/edit-family-member/edit-family-member.component.ts
+++ b/src/app/clients/clients-view/family-members-tab/edit-family-member/edit-family-member.component.ts
@@ -1,5 +1,5 @@
/** Angular Imports */
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, inject } from '@angular/core';
import { UntypedFormGroup, UntypedFormBuilder, Validators, ReactiveFormsModule } from '@angular/forms';
import { Router, ActivatedRoute, RouterLink } from '@angular/router';
@@ -23,6 +23,13 @@ import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
]
})
export class EditFamilyMemberComponent implements OnInit {
+ private formBuilder = inject(UntypedFormBuilder);
+ private dateUtils = inject(Dates);
+ private router = inject(Router);
+ private route = inject(ActivatedRoute);
+ private clientsService = inject(ClientsService);
+ private settingsService = inject(SettingsService);
+
/** Maximum Due Date allowed. */
maxDate = new Date();
/** Add family member form. */
@@ -40,14 +47,7 @@ export class EditFamilyMemberComponent implements OnInit {
* @param {ClientsService} clientsService Clients Service
* @param {SettingsService} settingsService Setting service
*/
- constructor(
- private formBuilder: UntypedFormBuilder,
- private dateUtils: Dates,
- private router: Router,
- private route: ActivatedRoute,
- private clientsService: ClientsService,
- private settingsService: SettingsService
- ) {
+ constructor() {
this.route.data.subscribe((data: { clientTemplate: any; editFamilyMember: any }) => {
this.addFamilyMemberTemplate = data.clientTemplate.familyMemberOptions;
this.familyMemberDetails = data.editFamilyMember;
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 48bb848415..880f01331f 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
@@ -9,57 +9,66 @@
{{ 'labels.heading.View Client Signature' | translate }}
-
- ![Signature]()
-
+@if (signatureId) {
+
+ ![Signature]()
+
+}
-
-
+@if (!signatureId) {
+ {{ 'labels.text.Client Signature is not provided.' | translate }}
-
+
+}
{{ 'labels.text.Client Signature is not provided.' | translate }}
+{{ 'labels.heading.Family Members' | translate }}
-
-
-
-
-
- {{ '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 }}
-
+
+
+
+
+ @if (member.firstName) {
+ {{ 'labels.inputs.First Name' | translate }} : {{ member.firstName }}
+ }
+ @if (member.middleName) {
+ {{ 'labels.inputs.Middle Name' | translate }} : {{ member.middleName }}
+ }
+ @if (member.lastName) {
+ {{ 'labels.inputs.Last Name' | translate }} : {{ member.lastName }}
+ }
+ @if (member.qualification) {
+ {{ 'labels.inputs.Qualification' | translate }} : {{ member.qualification }}
+ }
+ @if (member.mobileNumber) {
+ {{ 'labels.inputs.Mobile Number' | translate }} : {{ member.mobileNumber }}
+ }
+ @if (member.age) {
+ {{ 'labels.inputs.Age' | translate }} : {{ member.age }}
+ }
+ @if (member.isDependent) {
+ {{ 'labels.inputs.Is Dependent' | translate }} : {{ member.isDependent | yesNo }}
+ }
+ @if (member.maritalStatus) {
+ {{ 'labels.inputs.Marital Status' | translate }} : {{ member.maritalStatus }}
+ }
+ @if (member.gender) {
+ {{ 'labels.inputs.Gender' | translate }} : {{ member.gender }}
+ }
+ @if (member.profession) {
+ {{ 'labels.inputs.Profession' | translate }} : {{ member.profession }}
+ }
+ @if (member.dateOfBirth) {
+ {{ 'labels.inputs.Date Of Birth' | translate }} : {{ member.dateOfBirth | dateFormat }}
+ }
+
{{ 'labels.heading.Loan Accounts' | translate }}
-| {{ 'labels.inputs.Account No' | translate }} | -
-
- |
- {{ 'labels.inputs.Loan Product' | translate }} | -
- |
- {{ 'labels.inputs.Original Loan' | translate }} | -{{ element.originalLoan }} | -{{ 'labels.inputs.Loan Balance' | translate }} | -{{ element.loanBalance | formatNumber }} | -{{ 'labels.inputs.Amount Paid' | translate }} | -{{ element.amountPaid | formatNumber }} | -{{ 'labels.inputs.Type' | translate }} | -- - | -{{ 'labels.inputs.Actions' | translate }} | -- - - - - - - - - |
|---|
| {{ 'labels.inputs.Account No' | translate }} | -
-
- |
- {{ 'labels.inputs.Loan Product' | translate }} | -
- |
- {{ 'labels.inputs.Original Loan' | translate }} | -{{ element.lastActiveTransactionDate | dateFormat }} | -{{ 'labels.inputs.Loan Balance' | translate }} | -{{ element.loanBalance | formatNumber }} | -{{ 'labels.inputs.Amount Paid' | translate }} | -{{ element.accountBalance | formatNumber }} | -{{ 'labels.inputs.Type' | translate }} | -- - | -{{ 'labels.inputs.Closed Date' | translate }} | -{{ element.timeline.closedOnDate | dateFormat }} | -
|---|
| {{ 'labels.inputs.Account No' | translate }} | +
+
+ |
+ {{ 'labels.inputs.Loan Product' | translate }} | +
+ |
+ {{ 'labels.inputs.Original Loan' | translate }} | +{{ element.lastActiveTransactionDate | dateFormat }} | +{{ 'labels.inputs.Loan Balance' | translate }} | +{{ element.loanBalance | formatNumber }} | +{{ 'labels.inputs.Amount Paid' | translate }} | +{{ element.accountBalance | formatNumber }} | +{{ 'labels.inputs.Type' | translate }} | ++ + | +{{ 'labels.inputs.Closed Date' | translate }} | +{{ element.timeline.closedOnDate | dateFormat }} | +
|---|
@@ -313,131 +311,124 @@
{{ 'labels.heading.Saving Accounts' | translate }}
| {{ 'labels.inputs.Account No' | translate }} | -
-
- |
- {{ 'labels.inputs.Savings Product' | translate }} | -
- |
- {{ 'labels.inputs.Last Active' | translate }} | -{{ element.lastActiveTransactionDate | dateFormat }} | -{{ 'labels.inputs.Balance' | translate }} | -{{ element.accountBalance | formatNumber }} | -{{ 'labels.inputs.Actions' | translate }} | -- - - - - - | -
|---|
| {{ 'labels.inputs.Account No' | translate }} | +
+
+ |
+ {{ 'labels.inputs.Savings Product' | translate }} | +
+ |
+ {{ 'labels.inputs.Last Active' | translate }} | +{{ element.lastActiveTransactionDate | dateFormat }} | +{{ 'labels.inputs.Balance' | translate }} | +{{ element.accountBalance | formatNumber }} | +{{ 'labels.inputs.Actions' | translate }} | ++ @if (element.status.active) { + + } + @if (element.status.active) { + + } + @if (element.status.submittedAndPendingApproval) { + + } + @if (!element.status.submittedAndPendingApproval && !element.status.active) { + + } + @if (!element.status.submittedAndPendingApproval && !element.status.active) { + + } + | +
|---|
| {{ 'labels.inputs.Account No' | translate }} | -
-
- |
- {{ 'labels.inputs.Savings Product' | translate }} | -
- |
- {{ 'labels.inputs.Closed Date' | translate }} | -{{ element.timeline.closedOnDate | dateFormat }} | -
|---|
| {{ 'labels.inputs.Account No' | translate }} | +
+
+ |
+ {{ 'labels.inputs.Savings Product' | translate }} | +
+ |
+ {{ 'labels.inputs.Closed Date' | translate }} | +{{ element.timeline.closedOnDate | dateFormat }} | +
|---|
@@ -455,110 +446,101 @@
{{ 'labels.heading.Fixed Deposit Accounts' | translate }}
| {{ 'labels.inputs.Account No' | translate }} | -
-
- |
- {{ 'labels.inputs.Fixed Deposit Product' | translate }} | -{{ element.productName }} | -{{ 'labels.inputs.Last Active' | translate }} | -{{ element.lastActiveTransactionDate | dateFormat }} | -{{ 'labels.inputs.Balance' | translate }} | -{{ element.accountBalance | formatNumber }} | -{{ 'labels.inputs.Actions' | translate }} | -- - - - | -
|---|
| {{ 'labels.inputs.Account No' | translate }} | +
+
+ |
+ {{ 'labels.inputs.Fixed Deposit Product' | translate }} | +{{ element.productName }} | +{{ 'labels.inputs.Last Active' | translate }} | +{{ element.lastActiveTransactionDate | dateFormat }} | +{{ 'labels.inputs.Balance' | translate }} | +{{ element.accountBalance | formatNumber }} | +{{ 'labels.inputs.Actions' | translate }} | ++ @if (element.status.submittedAndPendingApproval) { + + } + @if (!element.status.submittedAndPendingApproval && !element.status.active) { + + } + @if (!element.status.submittedAndPendingApproval && !element.status.active) { + + } + | +
|---|
| {{ 'labels.inputs.Account No' | translate }} | -
-
- |
- {{ 'labels.inputs.Fixed Deposit Product' | translate }} | -
- |
- {{ 'labels.inputs.Closed Date' | translate }} | -{{ element.timeline.closedOnDate | dateFormat }} | -
|---|
| {{ 'labels.inputs.Account No' | translate }} | +
+
+ |
+ {{ 'labels.inputs.Fixed Deposit Product' | translate }} | +
+ |
+ {{ 'labels.inputs.Closed Date' | translate }} | +{{ element.timeline.closedOnDate | dateFormat }} | +
|---|
@@ -576,118 +558,106 @@
- {{ 'labels.heading.Recurring Deposit Accounts' | translate }}
| {{ 'labels.inputs.Account No' | translate }} | -
-
- |
- {{ 'labels.inputs.Recurring Deposit Product' | translate }} | -
- |
- {{ 'labels.inputs.Last Active' | translate }} | -{{ element.lastActiveTransactionDate | dateFormat }} | -{{ 'labels.inputs.Balance' | translate }} | -{{ element.accountBalance | formatNumber }} | -{{ 'labels.inputs.Actions' | translate }} | -
- |
-
|---|
| {{ 'labels.inputs.Account No' | translate }} | +
+
+ |
+ {{ 'labels.inputs.Recurring Deposit Product' | translate }} | +
+ |
+ {{ 'labels.inputs.Last Active' | translate }} | +{{ element.lastActiveTransactionDate | dateFormat }} | +{{ 'labels.inputs.Balance' | translate }} | +{{ element.accountBalance | formatNumber }} | +{{ 'labels.inputs.Actions' | translate }} | ++ @if (element.status.submittedAndPendingApproval) { + + } + @if (!element.status.submittedAndPendingApproval && !element.status.active) { + + + } + | +
|---|
| {{ 'labels.inputs.Account No' | translate }} | -
-
- |
- {{ 'labels.inputs.Recurring Deposit Product' | translate }} | -
- |
- {{ 'labels.inputs.Closed Date' | translate }} | -{{ element.timeline.closedOnDate | dateFormat }} | -
|---|
| {{ 'labels.inputs.Account No' | translate }} | +
+
+ |
+ {{ 'labels.inputs.Recurring Deposit Product' | translate }} | +
+ |
+ {{ 'labels.inputs.Closed Date' | translate }} | +{{ element.timeline.closedOnDate | dateFormat }} | +
|---|
@@ -705,113 +675,110 @@
- {{ 'labels.inputs.Shares Accounts' | translate }}
| {{ 'labels.inputs.Account No' | translate }} | -
-
- |
- {{ 'labels.inputs.Share Product' | translate }} | -
- |
- {{ 'labels.inputs.Approved Shares' | translate }} | -{{ element.totalApprovedShares }} | -{{ 'labels.inputs.Pending For Approval Shares' | translate }} | -{{ element.totalPendingForApprovalShares }} | -{{ 'labels.inputs.Actions' | translate }} | -- - - - | -
|---|
| {{ 'labels.inputs.Account No' | translate }} | +
+
+ |
+ {{ 'labels.inputs.Share Product' | translate }} | +
+ |
+ {{ 'labels.inputs.Approved Shares' | translate }} | +{{ element.totalApprovedShares }} | +{{ 'labels.inputs.Pending For Approval Shares' | translate }} | +{{ element.totalPendingForApprovalShares }} | +{{ 'labels.inputs.Actions' | translate }} | ++ @if (element.status.submittedAndPendingApproval) { + + } + @if (!element.status.submittedAndPendingApproval && !element.status.active) { + + } + @if (!element.status.submittedAndPendingApproval && !element.status.active) { + + } + | +
|---|
| {{ 'labels.inputs.Account No' | translate }} | -
-
- |
- {{ 'labels.inputs.Share Product' | translate }} | -{{ element.productName }} | -{{ 'labels.inputs.Approved Shares' | translate }} | -{{ element.totalApprovedShares }} | -{{ 'labels.inputs.Pending For Approval Shares' | translate }} | -{{ element.totalPendingForApprovalShares }} | -{{ 'labels.inputs.Closed Date' | translate }} | -{{ element.timeline.closedOnDate | dateFormat }} | -
|---|
| {{ 'labels.inputs.Account No' | translate }} | +
+
+ |
+ {{ 'labels.inputs.Share Product' | translate }} | +{{ element.productName }} | +{{ 'labels.inputs.Approved Shares' | translate }} | +{{ element.totalApprovedShares }} | +{{ 'labels.inputs.Pending For Approval Shares' | translate }} | +{{ element.totalPendingForApprovalShares }} | +{{ 'labels.inputs.Closed Date' | translate }} | +{{ element.timeline.closedOnDate | dateFormat }} | +
|---|
diff --git a/src/app/clients/clients-view/general-tab/general-tab.component.ts b/src/app/clients/clients-view/general-tab/general-tab.component.ts
index f26c8926da..ee85021a91 100644
--- a/src/app/clients/clients-view/general-tab/general-tab.component.ts
+++ b/src/app/clients/clients-view/general-tab/general-tab.component.ts
@@ -1,5 +1,5 @@
/** Angular Imports */
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, inject } from '@angular/core';
import { Router, ActivatedRoute, RouterLink } from '@angular/router';
/** Custom Services. */
@@ -16,7 +16,7 @@ import {
MatRowDef,
MatRow
} from '@angular/material/table';
-import { NgClass, NgIf } from '@angular/common';
+import { NgClass } from '@angular/common';
import { AccountNumberComponent } from '../../../shared/account-number/account-number.component';
import { LongTextComponent } from '../../../shared/long-text/long-text.component';
import { MatTooltip } from '@angular/material/tooltip';
@@ -56,6 +56,10 @@ import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
]
})
export class GeneralTabComponent {
+ private route = inject(ActivatedRoute);
+ private clientService = inject(ClientsService);
+ private router = inject(Router);
+
/** Open Loan Accounts Columns */
openLoansColumns: string[] = [
'Account No',
@@ -159,11 +163,7 @@ export class GeneralTabComponent {
* @param {ClientsService} clientService Clients Service
* @param {Router} router Router
*/
- constructor(
- private route: ActivatedRoute,
- private clientService: ClientsService,
- private router: Router
- ) {
+ constructor() {
this.route.data.subscribe(
(data: { clientAccountsData: any; clientChargesData: any; clientSummary: any; clientCollateralData: any }) => {
this.clientAccountData = data.clientAccountsData;
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 46c3e5b4aa..f94c8872d2 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
@@ -37,14 +37,51 @@
{{ 'labels.inputs.Identity Documents' | translate }}
-
@@ -58,19 +95,12 @@
{{ 'labels.inputs.Actions' | translate }}
-
{{ fixedDepositsAccountData.interestCalculationDaysInYearType.value | translateKey: 'catalogs' }}
-
- {{ 'labels.inputs.Pre-cloure Penal' | translate }}
-
- {{ fixedDepositsAccountData.preClosurePenalInterest }} % on
- {{ fixedDepositsAccountData.preClosurePenalInterestOnType.value | translateKey: 'catalogs' }}
-
-
+ @if (fixedDepositsAccountData.preClosurePenalApplicable) {
+
+ {{ 'labels.inputs.Pre-cloure Penal' | translate }}
+
+ {{ fixedDepositsAccountData.preClosurePenalInterest }} % on
+ {{ fixedDepositsAccountData.preClosurePenalInterestOnType.value | translateKey: 'catalogs' }}
+
+
+ }
{{ 'labels.heading.Identities' | translate }}
- {{ document.name }}
-
+ @if (identity.documents?.length) {
+
+ @for (document of identity.documents; track trackByDocumentId($index, document)) {
+
+ } @else {
+ {{ 'labels.text.NoDocuments' | translate }}
+ }
+
+ }
+
+ @if (previewThumbnails[document.id]) {
+ ![]()
+ } @else {
+
+
+
+ }
+ @if (isPreviewable(document)) {
+
+ }
+
+
+ {{ document.name }}
+ @if (document.fileName) {
+
+ }
+ {{ 'labels.heading.Identities' | translate }}
-
+ @if (!fixedDepositsAccountData.status.rejected && !fixedDepositsAccountData.status.submittedAndPendingApproval) {
+
@@ -173,6 +189,6 @@
-
+ }
diff --git a/src/app/deposits/fixed-deposits/fixed-deposit-account-view/general-tab/general-tab.component.ts b/src/app/deposits/fixed-deposits/fixed-deposit-account-view/general-tab/general-tab.component.ts
index e099acfae8..8dcb5a4e80 100644
--- a/src/app/deposits/fixed-deposits/fixed-deposit-account-view/general-tab/general-tab.component.ts
+++ b/src/app/deposits/fixed-deposits/fixed-deposit-account-view/general-tab/general-tab.component.ts
@@ -1,7 +1,7 @@
-import { Component } from '@angular/core';
+import { Component, inject } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router';
import { Currency } from 'app/shared/models/general.model';
-import { NgIf, CurrencyPipe } from '@angular/common';
+import { CurrencyPipe } from '@angular/common';
import { ExternalIdentifierComponent } from '../../../../shared/external-identifier/external-identifier.component';
import { DateFormatPipe } from '../../../../pipes/date-format.pipe';
import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
@@ -18,14 +18,14 @@ import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
]
})
export class GeneralTabComponent {
+ private route = inject(ActivatedRoute);
+ private router = inject(Router);
+
fixedDepositsAccountData: any;
entityType: string;
currency: Currency;
- constructor(
- private route: ActivatedRoute,
- private router: Router
- ) {
+ constructor() {
this.route.parent.data.subscribe((data: { fixedDepositsAccountData: any }) => {
this.fixedDepositsAccountData = data.fixedDepositsAccountData;
this.currency = this.fixedDepositsAccountData.currency;
diff --git a/src/app/deposits/fixed-deposits/fixed-deposit-account-view/interest-rate-chart-tab/interest-rate-chart-tab.component.ts b/src/app/deposits/fixed-deposits/fixed-deposit-account-view/interest-rate-chart-tab/interest-rate-chart-tab.component.ts
index f17bfea1ec..daff3ab57e 100644
--- a/src/app/deposits/fixed-deposits/fixed-deposit-account-view/interest-rate-chart-tab/interest-rate-chart-tab.component.ts
+++ b/src/app/deposits/fixed-deposits/fixed-deposit-account-view/interest-rate-chart-tab/interest-rate-chart-tab.component.ts
@@ -1,5 +1,5 @@
// ** Angular Imports */
-import { Component } from '@angular/core';
+import { Component, inject } from '@angular/core';
import { ActivatedRoute } from '@angular/router';
import { animate, state, style, transition, trigger } from '@angular/animations';
import {
@@ -30,8 +30,8 @@ import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
trigger('expandChartSlab', [
state('collapsed', style({ height: '0px', minHeight: '0' })),
state('expanded', style({ height: '*' })),
- transition('expanded <=> collapsed', animate('225ms cubic-bezier(0.4, 0.0, 0.2, 1)'))])
-
+ transition('expanded <=> collapsed', animate('225ms cubic-bezier(0.4, 0.0, 0.2, 1)'))
+ ])
],
imports: [
...STANDALONE_SHARED_IMPORTS,
@@ -52,6 +52,8 @@ import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
]
})
export class InterestRateChartTabComponent {
+ private route = inject(ActivatedRoute);
+
/** Fixed Deposits Account Status */
status: any;
/** Interest Rate Chart Data */
@@ -82,7 +84,7 @@ export class InterestRateChartTabComponent {
* Retrieves fixed deposits account data from `resolve`.
* @param {ActivatedRoute} route Activated Route.
*/
- constructor(private route: ActivatedRoute) {
+ constructor() {
this.route.parent.data.subscribe((data: { fixedDepositsAccountData: any }) => {
this.interestRateChartData = data.fixedDepositsAccountData.accountChart.chartSlabs;
});
diff --git a/src/app/deposits/fixed-deposits/fixed-deposit-account-view/standing-instructions-tab/standing-instructions-tab.component.html b/src/app/deposits/fixed-deposits/fixed-deposit-account-view/standing-instructions-tab/standing-instructions-tab.component.html
index c2ffe6141b..53ed66d477 100644
--- a/src/app/deposits/fixed-deposits/fixed-deposit-account-view/standing-instructions-tab/standing-instructions-tab.component.html
+++ b/src/app/deposits/fixed-deposits/fixed-deposit-account-view/standing-instructions-tab/standing-instructions-tab.component.html
@@ -46,29 +46,33 @@
-
-
-
-
-
- {{ 'labels.heading.Performance History' | translate }}
-| {{ 'labels.inputs.Principal Amount' | translate }} | -- {{ fixedDepositsAccountData.depositAmount | currency: currency.code : 'symbol-narrow' : '1.2-2' }} - | -
| {{ 'labels.inputs.Maturity Amount' | translate }} | -- {{ fixedDepositsAccountData.maturityAmount | currency: currency.code : 'symbol-narrow' : '1.2-2' }} - | -
| {{ 'labels.inputs.Total Deposits' | translate }} | -- {{ fixedDepositsAccountData.summary.totalDeposits | currency: currency.code : 'symbol-narrow' : '1.2-2' }} - | -
| {{ 'labels.inputs.Total Withdrawals' | translate }} | -- {{ - fixedDepositsAccountData.summary.totalWithdrawals | currency: currency.code : 'symbol-narrow' : '1.2-2' - }} - | -
| {{ 'labels.inputs.Total Interest Earned' | translate }} | -- {{ - fixedDepositsAccountData.summary.totalInterestEarned - | currency: currency.code : 'symbol-narrow' : '1.2-2' - }} - | -
+
+
+
+
+ } @else {
{{ 'labels.heading.Performance History' | translate }}
+| {{ 'labels.inputs.Principal Amount' | translate }} | ++ {{ fixedDepositsAccountData.depositAmount | currency: currency.code : 'symbol-narrow' : '1.2-2' }} + | +
| {{ 'labels.inputs.Maturity Amount' | translate }} | ++ {{ fixedDepositsAccountData.maturityAmount | currency: currency.code : 'symbol-narrow' : '1.2-2' }} + | +
| {{ 'labels.inputs.Total Deposits' | translate }} | ++ {{ + fixedDepositsAccountData.summary.totalDeposits | currency: currency.code : 'symbol-narrow' : '1.2-2' + }} + | +
| {{ 'labels.inputs.Total Withdrawals' | translate }} | ++ {{ + fixedDepositsAccountData.summary.totalWithdrawals + | currency: currency.code : 'symbol-narrow' : '1.2-2' + }} + | +
| {{ 'labels.inputs.Total Interest Earned' | translate }} | ++ {{ + fixedDepositsAccountData.summary.totalInterestEarned + | currency: currency.code : 'symbol-narrow' : '1.2-2' + }} + | +