Upgrading to Angular 20:

Replaced checked in package-lock.json by regenerated one. Ran ng update @angular/core@20 @angular/cli@20 Ran npm install @angular-builders/jest@^20.0.0 @fortawesome/angular-fontawesome@^3.0.0 @swimlane/ngx-graph@^11 Ran npm install ngx-mat-select-search@^8.0.2. Ran ng update @angular/material@20. Updated all eslint and typescript to the latest versions. Removed @angular-devkit/schematics. Updated fontawesome. Updated rxjs and tslib. Moved required node version from 16 to 20. Updated jest-preset-angular. Set preserveWhitespaces to false. Corrected two type declarations in two typescript files to make ng serve run without errors. Removed unused angular-devkit/schematics from view-user.component.ts . Updated list of supported browsers. Upgraded prettier. Ran prettier . --write the first time. Ran prettier . --write the second time. Ran ng generate @angular/core:inject with defaults, excepted a handful of files. Fixed remaining eslint problems. Added dist directory to ignores in eslint.config.js. Let prettier fix formatting, almost everything is just line breaks. Made htmlhint ignore @if and @for Angular constructs. Updated node version in Github workflow to 22.12.0 (build.yml). Updated .env.ts. Updated Angular datetime format strings from YYYY-MM-DD to yyyy-MM-dd. Merged changes from dev into angular20 branch.
2025-12-08 11:01:01 +01:00
parent f1b4ec2cf2
commit 7fd1486c08
1516 changed files with 39367 additions and 36037 deletions
@@ -1,150 +1,159 @@
 <div class="layout-row-wrap responsive-column">
-  <div *ngIf="accountingRule" class="layout-row responsive-column flex-100">
-    <span class="flex-40">{{ 'labels.inputs.Type' | translate }}:</span>
-    <span class="flex-60">{{ 'labels.accounting.' + getAccountingRuleName(accountingRule.value) | translate }}</span>
-  </div>
+  @if (accountingRule) {
+    <div class="layout-row responsive-column flex-100">
+      <span class="flex-40">{{ 'labels.inputs.Type' | translate }}:</span>
+      <span class="flex-60">{{ 'labels.accounting.' + getAccountingRuleName(accountingRule.value) | translate }}</span>
+    </div>
+  }

  <div class="layout-row-wrap responsive-column flex-100">
-    <div *ngIf="isCashOrAccrualAccounting()" class="layout-row-wrap responsive-column flex-100">
-      <h4 class="mat-h4 flex-100">{{ 'labels.heading.Assets' | translate }}</h4>
-      <div class="flex-100 layout-row-wrap responsive-column">
-        <mifosx-gl-account-display
-          class="flex-100"
-          [accountTitle]="'Saving reference'"
-          [glAccount]="accountingMappings.savingsReferenceAccount"
-          [withTitle]="'40%'"
-        >
-        </mifosx-gl-account-display>
-      </div>
-      <div class="flex-100 layout-row-wrap responsive-column">
-        <mifosx-gl-account-display
-          class="flex-100"
-          [accountTitle]="'Overdraft portfolio'"
-          *ngIf="accountingMappings.overdraftPortfolioControl"
-          [glAccount]="accountingMappings.overdraftPortfolioControl"
-          [withTitle]="'40%'"
-        >
-        </mifosx-gl-account-display>
-      </div>
-      <div class="flex-100 layout-row-wrap responsive-column">
-        <mifosx-gl-account-display
-          class="flex-100"
-          [accountTitle]="'Fees Receivable'"
-          *ngIf="isAccrualAccounting()"
-          [glAccount]="accountingMappings.feeReceivableAccount"
-          [withTitle]="'40%'"
-        >
-        </mifosx-gl-account-display>
-      </div>
-      <div class="flex-100 layout-row-wrap responsive-column">
-        <mifosx-gl-account-display
-          class="flex-100"
-          [accountTitle]="'Penalties Receivable'"
-          *ngIf="isAccrualAccounting()"
-          [glAccount]="accountingMappings.penaltyReceivableAccount"
-          [withTitle]="'40%'"
-        >
-        </mifosx-gl-account-display>
-        <mifosx-gl-account-display
-          class="flex-100"
-          [accountTitle]="'Interest Receivable'"
-          *ngIf="isAccrualAccounting()"
-          [glAccount]="accountingMappings.interestReceivableAccount"
-          [withTitle]="'40%'"
-        >
-        </mifosx-gl-account-display>
-
-        <h4 class="mat-h4 flex-100">{{ 'labels.heading.Liabilities' | translate }}</h4>
+    @if (isCashOrAccrualAccounting()) {
+      <div class="layout-row-wrap responsive-column flex-100">
+        <h4 class="mat-h4 flex-100">{{ 'labels.heading.Assets' | translate }}</h4>
        <div class="flex-100 layout-row-wrap responsive-column">
          <mifosx-gl-account-display
            class="flex-100"
-            [accountTitle]="'Saving control'"
-            [glAccount]="accountingMappings.savingsControlAccount"
+            [accountTitle]="'Saving reference'"
+            [glAccount]="accountingMappings.savingsReferenceAccount"
            [withTitle]="'40%'"
          >
          </mifosx-gl-account-display>
        </div>
        <div class="flex-100 layout-row-wrap responsive-column">
-          <mifosx-gl-account-display
-            class="flex-100"
-            [accountTitle]="'Savings transfers in suspense'"
-            [glAccount]="accountingMappings.transfersInSuspenseAccount"
-            [withTitle]="'40%'"
-          >
-          </mifosx-gl-account-display>
+          @if (accountingMappings.overdraftPortfolioControl) {
+            <mifosx-gl-account-display
+              class="flex-100"
+              [accountTitle]="'Overdraft portfolio'"
+              [glAccount]="accountingMappings.overdraftPortfolioControl"
+              [withTitle]="'40%'"
+            >
+            </mifosx-gl-account-display>
+          }
        </div>
        <div class="flex-100 layout-row-wrap responsive-column">
-          <mifosx-gl-account-display
-            class="flex-100"
-            [accountTitle]="'Interest Payable'"
-            *ngIf="isAccrualAccounting()"
-            [glAccount]="accountingMappings.interestPayableAccount"
-            [withTitle]="'40%'"
-          >
-          </mifosx-gl-account-display>
+          @if (isAccrualAccounting()) {
+            <mifosx-gl-account-display
+              class="flex-100"
+              [accountTitle]="'Fees Receivable'"
+              [glAccount]="accountingMappings.feeReceivableAccount"
+              [withTitle]="'40%'"
+            >
+            </mifosx-gl-account-display>
+          }
        </div>
        <div class="flex-100 layout-row-wrap responsive-column">
-          <mifosx-gl-account-display
-            class="flex-100"
-            [accountTitle]="'Escheat liability'"
-            *ngIf="accountingMappings.escheatLiabilityAccount"
-            [glAccount]="accountingMappings.escheatLiabilityAccount"
-            [withTitle]="'40%'"
-          >
-          </mifosx-gl-account-display>
-        </div>
-
-        <h4 class="mat-h4 flex-100">{{ 'labels.heading.Income' | translate }}</h4>
-        <div class="flex-100 layout-row-wrap responsive-column">
-          <mifosx-gl-account-display
-            class="flex-100"
-            [accountTitle]="'Income from fees'"
-            [glAccount]="accountingMappings.incomeFromFeeAccount"
-            [withTitle]="'40%'"
-          >
-          </mifosx-gl-account-display>
-        </div>
-        <div class="flex-100 layout-row-wrap responsive-column">
-          <mifosx-gl-account-display
-            class="flex-100"
-            [accountTitle]="'Income from penalties'"
-            [glAccount]="accountingMappings.incomeFromPenaltyAccount"
-            [withTitle]="'40%'"
-          >
-          </mifosx-gl-account-display>
-        </div>
-        <div class="flex-100 layout-row-wrap responsive-column">
-          <mifosx-gl-account-display
-            class="flex-100"
-            [accountTitle]="'Income from Interest'"
-            *ngIf="accountingMappings.incomeFromInterest"
-            [glAccount]="accountingMappings.incomeFromInterest"
-            [withTitle]="'40%'"
-          >
-          </mifosx-gl-account-display>
-        </div>
-
-        <h4 class="mat-h4 flex-100">{{ 'labels.heading.Expenses' | translate }}</h4>
-        <div class="flex-100 layout-row-wrap responsive-column">
-          <mifosx-gl-account-display
-            class="flex-100"
-            [accountTitle]="'Interest on savings'"
-            [glAccount]="accountingMappings.interestOnSavingsAccount"
-            [withTitle]="'40%'"
-          >
-          </mifosx-gl-account-display>
-        </div>
-        <div class="flex-100 layout-row-wrap responsive-column">
-          <mifosx-gl-account-display
-            class="flex-100"
-            [accountTitle]="'Write-off'"
-            *ngIf="accountingMappings.writeOffAccount"
-            [glAccount]="accountingMappings.writeOffAccount"
-            [withTitle]="'40%'"
-          >
-          </mifosx-gl-account-display>
+          @if (isAccrualAccounting()) {
+            <mifosx-gl-account-display
+              class="flex-100"
+              [accountTitle]="'Penalties Receivable'"
+              [glAccount]="accountingMappings.penaltyReceivableAccount"
+              [withTitle]="'40%'"
+            >
+            </mifosx-gl-account-display>
+          }
+          @if (isAccrualAccounting()) {
+            <mifosx-gl-account-display
+              class="flex-100"
+              [accountTitle]="'Interest Receivable'"
+              [glAccount]="accountingMappings.interestReceivableAccount"
+              [withTitle]="'40%'"
+            >
+            </mifosx-gl-account-display>
+          }
+          <h4 class="mat-h4 flex-100">{{ 'labels.heading.Liabilities' | translate }}</h4>
+          <div class="flex-100 layout-row-wrap responsive-column">
+            <mifosx-gl-account-display
+              class="flex-100"
+              [accountTitle]="'Saving control'"
+              [glAccount]="accountingMappings.savingsControlAccount"
+              [withTitle]="'40%'"
+            >
+            </mifosx-gl-account-display>
+          </div>
+          <div class="flex-100 layout-row-wrap responsive-column">
+            <mifosx-gl-account-display
+              class="flex-100"
+              [accountTitle]="'Savings transfers in suspense'"
+              [glAccount]="accountingMappings.transfersInSuspenseAccount"
+              [withTitle]="'40%'"
+            >
+            </mifosx-gl-account-display>
+          </div>
+          <div class="flex-100 layout-row-wrap responsive-column">
+            @if (isAccrualAccounting()) {
+              <mifosx-gl-account-display
+                class="flex-100"
+                [accountTitle]="'Interest Payable'"
+                [glAccount]="accountingMappings.interestPayableAccount"
+                [withTitle]="'40%'"
+              >
+              </mifosx-gl-account-display>
+            }
+          </div>
+          <div class="flex-100 layout-row-wrap responsive-column">
+            @if (accountingMappings.escheatLiabilityAccount) {
+              <mifosx-gl-account-display
+                class="flex-100"
+                [accountTitle]="'Escheat liability'"
+                [glAccount]="accountingMappings.escheatLiabilityAccount"
+                [withTitle]="'40%'"
+              >
+              </mifosx-gl-account-display>
+            }
+          </div>
+          <h4 class="mat-h4 flex-100">{{ 'labels.heading.Income' | translate }}</h4>
+          <div class="flex-100 layout-row-wrap responsive-column">
+            <mifosx-gl-account-display
+              class="flex-100"
+              [accountTitle]="'Income from fees'"
+              [glAccount]="accountingMappings.incomeFromFeeAccount"
+              [withTitle]="'40%'"
+            >
+            </mifosx-gl-account-display>
+          </div>
+          <div class="flex-100 layout-row-wrap responsive-column">
+            <mifosx-gl-account-display
+              class="flex-100"
+              [accountTitle]="'Income from penalties'"
+              [glAccount]="accountingMappings.incomeFromPenaltyAccount"
+              [withTitle]="'40%'"
+            >
+            </mifosx-gl-account-display>
+          </div>
+          <div class="flex-100 layout-row-wrap responsive-column">
+            @if (accountingMappings.incomeFromInterest) {
+              <mifosx-gl-account-display
+                class="flex-100"
+                [accountTitle]="'Income from Interest'"
+                [glAccount]="accountingMappings.incomeFromInterest"
+                [withTitle]="'40%'"
+              >
+              </mifosx-gl-account-display>
+            }
+          </div>
+          <h4 class="mat-h4 flex-100">{{ 'labels.heading.Expenses' | translate }}</h4>
+          <div class="flex-100 layout-row-wrap responsive-column">
+            <mifosx-gl-account-display
+              class="flex-100"
+              [accountTitle]="'Interest on savings'"
+              [glAccount]="accountingMappings.interestOnSavingsAccount"
+              [withTitle]="'40%'"
+            >
+            </mifosx-gl-account-display>
+          </div>
+          <div class="flex-100 layout-row-wrap responsive-column">
+            @if (accountingMappings.writeOffAccount) {
+              <mifosx-gl-account-display
+                class="flex-100"
+                [accountTitle]="'Write-off'"
+                [glAccount]="accountingMappings.writeOffAccount"
+                [withTitle]="'40%'"
+              >
+              </mifosx-gl-account-display>
+            }
+          </div>
        </div>
      </div>
-    </div>
+    }
  </div>
 </div>
@@ -1,4 +1,4 @@
-import { Component, Input } from '@angular/core';
+import { Component, Input, inject } from '@angular/core';
 import { Accounting } from 'app/core/utils/accounting';
 import { OptionData } from 'app/shared/models/option-data.model';
 import { GlAccountDisplayComponent } from '../gl-account-display/gl-account-display.component';
@@ -14,11 +14,11 @@ import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
  ]
 })
 export class ViewSavingsAccountingDetailsComponent {
+  private accounting = inject(Accounting);
+
  @Input() accountingRule: OptionData;
  @Input() accountingMappings: any[] = [];

-  constructor(private accounting: Accounting) {}
-
  isCashOrAccrualAccounting(): boolean {
    if (this.accountingRule) {
      return this.accounting.isCashOrAccrualAccounting(this.accountingRule);