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.
This commit is contained in:
Felix van Hove
+122
-122
@@ -8,14 +8,18 @@
|
||||
<mat-form-field class="flex-96">
|
||||
<mat-label>{{ 'labels.inputs.Office' | translate }}</mat-label>
|
||||
<mat-select required formControlName="officeId">
|
||||
<mat-option *ngFor="let office of officeData" [value]="office.id">
|
||||
{{ office.name }}
|
||||
</mat-option>
|
||||
@for (office of officeData; track office) {
|
||||
<mat-option [value]="office.id">
|
||||
{{ office.name }}
|
||||
</mat-option>
|
||||
}
|
||||
</mat-select>
|
||||
<mat-error *ngIf="openingBalancesForm.controls.officeId.hasError('required')">
|
||||
{{ 'labels.inputs.Office' | translate }} {{ 'labels.commons.is' | translate }}
|
||||
<strong>{{ 'labels.commons.required' | translate }}</strong>
|
||||
</mat-error>
|
||||
@if (openingBalancesForm.controls.officeId.hasError('required')) {
|
||||
<mat-error>
|
||||
{{ 'labels.inputs.Office' | translate }} {{ 'labels.commons.is' | translate }}
|
||||
<strong>{{ 'labels.commons.required' | translate }}</strong>
|
||||
</mat-error>
|
||||
}
|
||||
</mat-form-field>
|
||||
</div>
|
||||
|
||||
@@ -26,125 +30,121 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="layout-row-wrap gap-2percent responsive-column" *ngIf="openingBalancesData">
|
||||
<mifosx-gl-account-display
|
||||
class="flex-100"
|
||||
[accountTitle]="'Opening Balances Contra Account'"
|
||||
[glAccount]="openingBalancesData.contraAccount"
|
||||
[withTitle]="'50%'"
|
||||
>
|
||||
</mifosx-gl-account-display>
|
||||
|
||||
<mat-form-field class="flex-48">
|
||||
<mat-label>{{ 'labels.inputs.Currency' | translate }}</mat-label>
|
||||
<mat-select required formControlName="currencyCode">
|
||||
<mat-option *ngFor="let currency of currencyData" [value]="currency.code">
|
||||
{{ currency.displayLabel }}
|
||||
</mat-option>
|
||||
</mat-select>
|
||||
<mat-error *ngIf="openingBalancesForm.controls.currencyCode.hasError('required')">
|
||||
{{ 'labels.inputs.Currency' | translate }} {{ 'labels.commons.is' | translate }}
|
||||
<strong>{{ 'labels.commons.required' | translate }}</strong>
|
||||
</mat-error>
|
||||
</mat-form-field>
|
||||
|
||||
<mat-form-field class="flex-48" (click)="openingBalancesDatePicker.open()">
|
||||
<mat-label>{{ 'labels.inputs.Opening Balances Date' | translate }}</mat-label>
|
||||
<input
|
||||
matInput
|
||||
[min]="minDate"
|
||||
[max]="maxDate"
|
||||
[matDatepicker]="openingBalancesDatePicker"
|
||||
required
|
||||
formControlName="transactionDate"
|
||||
/>
|
||||
<mat-datepicker-toggle matSuffix [for]="openingBalancesDatePicker"></mat-datepicker-toggle>
|
||||
<mat-datepicker #openingBalancesDatePicker></mat-datepicker>
|
||||
<mat-error *ngIf="openingBalancesForm.controls.transactionDate.hasError('required')">
|
||||
{{ 'labels.inputs.Opening Balances Date' | translate }} {{ 'labels.commons.is' | translate }}
|
||||
<strong>{{ 'labels.commons.required' | translate }}</strong>
|
||||
</mat-error>
|
||||
</mat-form-field>
|
||||
|
||||
<div class="layout-row-wrap gap-2percent responsive-column flex-100 content">
|
||||
<div class="header flex-8">
|
||||
{{ 'labels.inputs.Type' | translate }}
|
||||
</div>
|
||||
|
||||
<div class="header flex-18">
|
||||
{{ 'labels.inputs.GL Code' | translate }}
|
||||
</div>
|
||||
|
||||
<div class="header flex-18">
|
||||
{{ 'labels.inputs.GL Name' | translate }}
|
||||
{{ 'labels.inputs.Account' | translate }}
|
||||
</div>
|
||||
|
||||
<div class="header r-amount flex-18">
|
||||
{{ 'labels.inputs.Total Debit' | translate }}:
|
||||
{{ debitsSum | currency: currencyCode : 'symbol-narrow' : '1.2-2' }}
|
||||
</div>
|
||||
|
||||
<div class="header r-amount flex-23">
|
||||
{{ 'labels.inputs.Total Credit' | translate }}:
|
||||
{{ creditsSum | currency: currencyCode : 'symbol-narrow' : '1.2-2' }}
|
||||
@if (openingBalancesData) {
|
||||
<div class="layout-row-wrap gap-2percent responsive-column">
|
||||
<mifosx-gl-account-display
|
||||
class="flex-100"
|
||||
[accountTitle]="'Opening Balances Contra Account'"
|
||||
[glAccount]="openingBalancesData.contraAccount"
|
||||
[withTitle]="'50%'"
|
||||
>
|
||||
</mifosx-gl-account-display>
|
||||
<mat-form-field class="flex-48">
|
||||
<mat-label>{{ 'labels.inputs.Currency' | translate }}</mat-label>
|
||||
<mat-select required formControlName="currencyCode">
|
||||
@for (currency of currencyData; track currency) {
|
||||
<mat-option [value]="currency.code">
|
||||
{{ currency.displayLabel }}
|
||||
</mat-option>
|
||||
}
|
||||
</mat-select>
|
||||
@if (openingBalancesForm.controls.currencyCode.hasError('required')) {
|
||||
<mat-error>
|
||||
{{ 'labels.inputs.Currency' | translate }} {{ 'labels.commons.is' | translate }}
|
||||
<strong>{{ 'labels.commons.required' | translate }}</strong>
|
||||
</mat-error>
|
||||
}
|
||||
</mat-form-field>
|
||||
<mat-form-field class="flex-48" (click)="openingBalancesDatePicker.open()">
|
||||
<mat-label>{{ 'labels.inputs.Opening Balances Date' | translate }}</mat-label>
|
||||
<input
|
||||
matInput
|
||||
[min]="minDate"
|
||||
[max]="maxDate"
|
||||
[matDatepicker]="openingBalancesDatePicker"
|
||||
required
|
||||
formControlName="transactionDate"
|
||||
/>
|
||||
<mat-datepicker-toggle matSuffix [for]="openingBalancesDatePicker"></mat-datepicker-toggle>
|
||||
<mat-datepicker #openingBalancesDatePicker></mat-datepicker>
|
||||
@if (openingBalancesForm.controls.transactionDate.hasError('required')) {
|
||||
<mat-error>
|
||||
{{ 'labels.inputs.Opening Balances Date' | translate }} {{ 'labels.commons.is' | translate }}
|
||||
<strong>{{ 'labels.commons.required' | translate }}</strong>
|
||||
</mat-error>
|
||||
}
|
||||
</mat-form-field>
|
||||
<div class="layout-row-wrap gap-2percent responsive-column flex-100 content">
|
||||
<div class="header flex-8">
|
||||
{{ 'labels.inputs.Type' | translate }}
|
||||
</div>
|
||||
<div class="header flex-18">
|
||||
{{ 'labels.inputs.GL Code' | translate }}
|
||||
</div>
|
||||
<div class="header flex-18">
|
||||
{{ 'labels.inputs.GL Name' | translate }}
|
||||
{{ 'labels.inputs.Account' | translate }}
|
||||
</div>
|
||||
<div class="header r-amount flex-18">
|
||||
{{ 'labels.inputs.Total Debit' | translate }}:
|
||||
{{ debitsSum | currency: currencyCode : 'symbol-narrow' : '1.2-2' }}
|
||||
</div>
|
||||
<div class="header r-amount flex-23">
|
||||
{{ 'labels.inputs.Total Credit' | translate }}:
|
||||
{{ creditsSum | currency: currencyCode : 'symbol-narrow' : '1.2-2' }}
|
||||
</div>
|
||||
</div>
|
||||
@for (credit of glAccountEntries.controls; track credit; let i = $index) {
|
||||
<div class="flex-fill layout-row-wrap responsive-column content" formArrayName="glAccountEntries">
|
||||
<div class="flex-fill layout-row-wrap gap-2percent responsive-column" [formGroupName]="i">
|
||||
<div class="flex-8">
|
||||
{{
|
||||
openingBalancesData.glAccounts[i].glAccountType.value !==
|
||||
openingBalancesData.glAccounts[i - 1]?.glAccountType.value
|
||||
? glAccountTypeLabel(openingBalancesData.glAccounts[i].glAccountType.value)
|
||||
: ''
|
||||
}}
|
||||
</div>
|
||||
<div class="flex-13">
|
||||
{{ openingBalancesData.glAccounts[i].glAccountCode }}
|
||||
</div>
|
||||
<div class="flex-29">
|
||||
{{ openingBalancesData.glAccounts[i].glAccountName }}
|
||||
</div>
|
||||
<div class="flex-20">
|
||||
<mat-form-field>
|
||||
<mat-label>{{ 'labels.inputs.Debit' | translate }}</mat-label>
|
||||
<input matInput type="number" formControlName="debit" />
|
||||
</mat-form-field>
|
||||
</div>
|
||||
<div class="flex-20">
|
||||
<mat-form-field>
|
||||
<mat-label>{{ 'labels.inputs.Credit' | translate }}</mat-label>
|
||||
<input matInput type="number" formControlName="credit" />
|
||||
</mat-form-field>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
}
|
||||
</div>
|
||||
|
||||
<div
|
||||
class="flex-fill layout-row-wrap responsive-column content"
|
||||
formArrayName="glAccountEntries"
|
||||
*ngFor="let credit of glAccountEntries.controls; let i = index"
|
||||
>
|
||||
<div class="flex-fill layout-row-wrap gap-2percent responsive-column" [formGroupName]="i">
|
||||
<div class="flex-8">
|
||||
{{
|
||||
openingBalancesData.glAccounts[i].glAccountType.value !==
|
||||
openingBalancesData.glAccounts[i - 1]?.glAccountType.value
|
||||
? glAccountTypeLabel(openingBalancesData.glAccounts[i].glAccountType.value)
|
||||
: ''
|
||||
}}
|
||||
</div>
|
||||
|
||||
<div class="flex-13">
|
||||
{{ openingBalancesData.glAccounts[i].glAccountCode }}
|
||||
</div>
|
||||
|
||||
<div class="flex-29">
|
||||
{{ openingBalancesData.glAccounts[i].glAccountName }}
|
||||
</div>
|
||||
|
||||
<div class="flex-20">
|
||||
<mat-form-field>
|
||||
<mat-label>{{ 'labels.inputs.Debit' | translate }}</mat-label>
|
||||
<input matInput type="number" formControlName="debit" />
|
||||
</mat-form-field>
|
||||
</div>
|
||||
|
||||
<div class="flex-20">
|
||||
<mat-form-field>
|
||||
<mat-label>{{ 'labels.inputs.Credit' | translate }}</mat-label>
|
||||
<input matInput type="number" formControlName="credit" />
|
||||
</mat-form-field>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
}
|
||||
</mat-card-content>
|
||||
|
||||
<mat-card-actions class="layout-row gap-5px align-center responsive-column" *ngIf="openingBalancesData">
|
||||
<button type="button" mat-raised-button [routerLink]="['../']">
|
||||
{{ 'labels.buttons.Cancel' | translate }}
|
||||
</button>
|
||||
<button
|
||||
mat-raised-button
|
||||
color="primary"
|
||||
[disabled]="!openingBalancesForm.valid"
|
||||
*mifosxHasPermission="'DEFINEOPENINGBALANCE_JOURNALENTRY'"
|
||||
>
|
||||
{{ 'labels.buttons.Submit' | translate }}
|
||||
</button>
|
||||
</mat-card-actions>
|
||||
@if (openingBalancesData) {
|
||||
<mat-card-actions class="layout-row gap-5px align-center responsive-column">
|
||||
<button type="button" mat-raised-button [routerLink]="['../']">
|
||||
{{ 'labels.buttons.Cancel' | translate }}
|
||||
</button>
|
||||
<button
|
||||
mat-raised-button
|
||||
color="primary"
|
||||
[disabled]="!openingBalancesForm.valid"
|
||||
*mifosxHasPermission="'DEFINEOPENINGBALANCE_JOURNALENTRY'"
|
||||
>
|
||||
{{ 'labels.buttons.Submit' | translate }}
|
||||
</button>
|
||||
</mat-card-actions>
|
||||
}
|
||||
</form>
|
||||
</mat-card>
|
||||
</div>
|
||||
|
||||
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user