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:
@@ -1,52 +1,72 @@
|
||||
<mat-form-field appearance="fill" class="flex-100 input-container" *ngIf="isRequired">
|
||||
<mat-label>{{ 'labels.inputs.' + inputLabel | translate }}</mat-label>
|
||||
<div class="input-group">
|
||||
<span>{{ currency.code }}</span>
|
||||
@if (isRequired) {
|
||||
<mat-form-field appearance="fill" class="flex-100 input-container">
|
||||
<mat-label>{{ 'labels.inputs.' + inputLabel | translate }}</mat-label>
|
||||
<div class="input-group">
|
||||
<span>{{ currency.code }}</span>
|
||||
<input
|
||||
mifosxFormatAmount="{{ currency.code }}:{{ currency.displaySymbol }}"
|
||||
class="right-input"
|
||||
[formControl]="inputFormControl"
|
||||
(keypress)="numberOnly($event)"
|
||||
required
|
||||
matInput
|
||||
(blur)="displayHint = false"
|
||||
(focus)="displayHint = true"
|
||||
/>
|
||||
</div>
|
||||
@if (inputFormControl.hasError('required')) {
|
||||
<mat-error>
|
||||
{{ 'labels.inputs.' + inputLabel | translate }} {{ 'labels.commons.is' | translate }}
|
||||
<strong>{{ 'labels.commons.required' | translate }}</strong>
|
||||
</mat-error>
|
||||
}
|
||||
@if (displayHint) {
|
||||
<mat-hint class="right-hint">{{
|
||||
inputFormControl.value | currency: currency.code : currency.displaySymbol : '1.2-2'
|
||||
}}</mat-hint>
|
||||
}
|
||||
@if (minVal && inputFormControl.hasError('min')) {
|
||||
<mat-error>
|
||||
{{ 'labels.inputs.Amount' | translate }} {{ 'labels.commons.Must be at least' | translate }} {{ minVal }}
|
||||
</mat-error>
|
||||
}
|
||||
@if (maxVal && inputFormControl.hasError('max')) {
|
||||
<mat-error>
|
||||
{{ 'labels.inputs.Amount' | translate }} {{ 'labels.commons.Must be less or equal to' | translate }}
|
||||
{{ maxVal }}
|
||||
</mat-error>
|
||||
}
|
||||
</mat-form-field>
|
||||
}
|
||||
@if (!isRequired) {
|
||||
<mat-form-field appearance="fill" class="flex-100">
|
||||
<mat-label>{{ 'labels.inputs.' + inputLabel | translate }}</mat-label>
|
||||
<span matTextSuffix class="m-l-10">{{ currency.code }}</span>
|
||||
<span class="flex-auto"></span>
|
||||
<input
|
||||
mifosxFormatAmount="{{ currency.code }}:{{ currency.displaySymbol }}"
|
||||
class="right-input"
|
||||
[formControl]="inputFormControl"
|
||||
(keypress)="numberOnly($event)"
|
||||
required
|
||||
matInput
|
||||
(blur)="displayHint = false"
|
||||
(focus)="displayHint = true"
|
||||
/>
|
||||
</div>
|
||||
<mat-error *ngIf="inputFormControl.hasError('required')">
|
||||
{{ 'labels.inputs.' + inputLabel | translate }} {{ 'labels.commons.is' | translate }}
|
||||
<strong>{{ 'labels.commons.required' | translate }}</strong>
|
||||
</mat-error>
|
||||
<mat-hint class="right-hint" *ngIf="displayHint">{{
|
||||
inputFormControl.value | currency: currency.code : currency.displaySymbol : '1.2-2'
|
||||
}}</mat-hint>
|
||||
<mat-error *ngIf="minVal && inputFormControl.hasError('min')">
|
||||
{{ 'labels.inputs.Amount' | translate }} {{ 'labels.commons.Must be at least' | translate }} {{ minVal }}
|
||||
</mat-error>
|
||||
<mat-error *ngIf="maxVal && inputFormControl.hasError('max')">
|
||||
{{ 'labels.inputs.Amount' | translate }} {{ 'labels.commons.Must be less or equal to' | translate }} {{ maxVal }}
|
||||
</mat-error>
|
||||
</mat-form-field>
|
||||
<mat-form-field appearance="fill" class="flex-100" *ngIf="!isRequired">
|
||||
<mat-label>{{ 'labels.inputs.' + inputLabel | translate }}</mat-label>
|
||||
<span matTextSuffix class="m-l-10">{{ currency.code }}</span>
|
||||
<span class="flex-auto"></span>
|
||||
<input
|
||||
mifosxFormatAmount="{{ currency.code }}:{{ currency.displaySymbol }}"
|
||||
class="right-input"
|
||||
[formControl]="inputFormControl"
|
||||
(keypress)="numberOnly($event)"
|
||||
matInput
|
||||
(blur)="displayHint = false"
|
||||
(focus)="displayHint = true"
|
||||
/>
|
||||
<mat-hint class="right-hint" *ngIf="displayHint">{{
|
||||
inputFormControl.value | currency: currency.code : currency.displaySymbol : '1.2-2'
|
||||
}}</mat-hint>
|
||||
<mat-error *ngIf="minVal && inputFormControl.hasError('min')">
|
||||
{{ 'labels.inputs.Amount' | translate }} {{ 'labels.commons.Must be at least' | translate }} {{ minVal }}
|
||||
</mat-error>
|
||||
<mat-error *ngIf="maxVal && inputFormControl.hasError('max')">
|
||||
{{ 'labels.inputs.Amount' | translate }} {{ 'labels.commons.Must be less or equal to' | translate }} {{ maxVal }}
|
||||
</mat-error>
|
||||
</mat-form-field>
|
||||
@if (displayHint) {
|
||||
<mat-hint class="right-hint">{{
|
||||
inputFormControl.value | currency: currency.code : currency.displaySymbol : '1.2-2'
|
||||
}}</mat-hint>
|
||||
}
|
||||
@if (minVal && inputFormControl.hasError('min')) {
|
||||
<mat-error>
|
||||
{{ 'labels.inputs.Amount' | translate }} {{ 'labels.commons.Must be at least' | translate }} {{ minVal }}
|
||||
</mat-error>
|
||||
}
|
||||
@if (maxVal && inputFormControl.hasError('max')) {
|
||||
<mat-error>
|
||||
{{ 'labels.inputs.Amount' | translate }} {{ 'labels.commons.Must be less or equal to' | translate }}
|
||||
{{ maxVal }}
|
||||
</mat-error>
|
||||
}
|
||||
</mat-form-field>
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user