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,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 AccountingRuleResolver {
|
||||
/**
|
||||
* @param {AccountingService} accountingService Accounting service.
|
||||
*/
|
||||
constructor(private accountingService: AccountingService) {}
|
||||
private accountingService = inject(AccountingService);
|
||||
|
||||
/**
|
||||
* Returns the accounting rule data.
|
||||
|
||||
@@ -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 AccountingRulesTemplateResolver {
|
||||
/**
|
||||
* @param {AccountingService} accountingService Accounting service.
|
||||
*/
|
||||
constructor(private accountingService: AccountingService) {}
|
||||
private accountingService = inject(AccountingService);
|
||||
|
||||
/**
|
||||
* Returns the accounting rules template data.
|
||||
|
||||
@@ -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 {
|
||||
@@ -45,6 +45,8 @@ import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
|
||||
]
|
||||
})
|
||||
export class AccountingRulesComponent implements OnInit {
|
||||
private route = inject(ActivatedRoute);
|
||||
|
||||
/** Accounting rule data. */
|
||||
accountingRuleData: any;
|
||||
/** Columns to be displayed in accounting rules table. */
|
||||
@@ -68,7 +70,7 @@ export class AccountingRulesComponent implements OnInit {
|
||||
* Retrieves the accounting rules data from `resolve`.
|
||||
* @param {ActivatedRoute} route Activated Route.
|
||||
*/
|
||||
constructor(private route: ActivatedRoute) {
|
||||
constructor() {
|
||||
this.route.data.subscribe((data: { accountingRules: any }) => {
|
||||
this.accountingRuleData = data.accountingRules;
|
||||
});
|
||||
|
||||
@@ -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 AccountingRulesResolver {
|
||||
/**
|
||||
* @param {AccountingService} accountingService Accounting service.
|
||||
*/
|
||||
constructor(private accountingService: AccountingService) {}
|
||||
private accountingService = inject(AccountingService);
|
||||
|
||||
/**
|
||||
* Returns the accounting rules data.
|
||||
|
||||
@@ -6,23 +6,29 @@
|
||||
<mat-form-field class="flex-48">
|
||||
<mat-label>{{ 'labels.inputs.Accounting Rule Name' | translate }}</mat-label>
|
||||
<input matInput required formControlName="name" />
|
||||
<mat-error *ngIf="accountingRuleForm.controls.name.hasError('required')">
|
||||
{{ 'labels.inputs.Accounting Rule Name' | translate }} {{ 'labels.commons.is' | translate }}
|
||||
<strong>{{ 'labels.commons.required' | translate }}</strong>
|
||||
</mat-error>
|
||||
@if (accountingRuleForm.controls.name.hasError('required')) {
|
||||
<mat-error>
|
||||
{{ 'labels.inputs.Accounting Rule Name' | translate }} {{ 'labels.commons.is' | translate }}
|
||||
<strong>{{ 'labels.commons.required' | translate }}</strong>
|
||||
</mat-error>
|
||||
}
|
||||
</mat-form-field>
|
||||
|
||||
<mat-form-field class="flex-48">
|
||||
<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="accountingRuleForm.controls.officeId.hasError('required')">
|
||||
{{ 'labels.inputs.Office' | translate }} {{ 'labels.commons.is' | translate }}
|
||||
<strong>{{ 'labels.commons.required' | translate }}</strong>
|
||||
</mat-error>
|
||||
@if (accountingRuleForm.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 class="rule-wrapper flex-48 layout-row responsive-column">
|
||||
@@ -40,34 +46,38 @@
|
||||
</mat-radio-group>
|
||||
</div>
|
||||
|
||||
<mat-form-field class="flex-48" *ngIf="accountingRuleForm.controls.debitRuleType.value === 'fixedAccount'">
|
||||
<mat-label>{{ 'labels.inputs.Account to Debit' | translate }}</mat-label>
|
||||
<mat-select formControlName="accountToDebit">
|
||||
<mat-option *ngFor="let glAccount of glAccountData" [value]="glAccount.id">
|
||||
{{ glAccount.name }}
|
||||
</mat-option>
|
||||
</mat-select>
|
||||
</mat-form-field>
|
||||
|
||||
<div
|
||||
class="flex-48 layout-row gap-2percent responsive-column"
|
||||
*ngIf="accountingRuleForm.controls.debitRuleType.value === 'listOfAccounts'"
|
||||
>
|
||||
<mat-form-field class="flex-50">
|
||||
<mat-label>{{ 'labels.inputs.Debit Tags' | translate }}</mat-label>
|
||||
<mat-select formControlName="debitTags" multiple>
|
||||
<mat-option *ngFor="let debitTag of debitTagData" [value]="debitTag.id">
|
||||
{{ debitTag.name }}
|
||||
</mat-option>
|
||||
@if (accountingRuleForm.controls.debitRuleType.value === 'fixedAccount') {
|
||||
<mat-form-field class="flex-48">
|
||||
<mat-label>{{ 'labels.inputs.Account to Debit' | translate }}</mat-label>
|
||||
<mat-select formControlName="accountToDebit">
|
||||
@for (glAccount of glAccountData; track glAccount) {
|
||||
<mat-option [value]="glAccount.id">
|
||||
{{ glAccount.name }}
|
||||
</mat-option>
|
||||
}
|
||||
</mat-select>
|
||||
</mat-form-field>
|
||||
}
|
||||
|
||||
<div class="flex-50" ngClass.gt-md="entries-wrapper">
|
||||
<mat-checkbox labelPosition="before" formControlName="allowMultipleDebitEntries" class="entries">
|
||||
{{ 'labels.inputs.Multiple Debit Entries Allowed' | translate }}
|
||||
</mat-checkbox>
|
||||
@if (accountingRuleForm.controls.debitRuleType.value === 'listOfAccounts') {
|
||||
<div class="flex-48 layout-row gap-2percent responsive-column">
|
||||
<mat-form-field class="flex-50">
|
||||
<mat-label>{{ 'labels.inputs.Debit Tags' | translate }}</mat-label>
|
||||
<mat-select formControlName="debitTags" multiple>
|
||||
@for (debitTag of debitTagData; track debitTag) {
|
||||
<mat-option [value]="debitTag.id">
|
||||
{{ debitTag.name }}
|
||||
</mat-option>
|
||||
}
|
||||
</mat-select>
|
||||
</mat-form-field>
|
||||
<div class="flex-50" ngClass.gt-md="entries-wrapper">
|
||||
<mat-checkbox labelPosition="before" formControlName="allowMultipleDebitEntries" class="entries">
|
||||
{{ 'labels.inputs.Multiple Debit Entries Allowed' | translate }}
|
||||
</mat-checkbox>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
}
|
||||
|
||||
<div class="rule-wrapper flex-48 layout-row responsive-column">
|
||||
<mat-label class="flex-50"
|
||||
@@ -84,34 +94,38 @@
|
||||
</mat-radio-group>
|
||||
</div>
|
||||
|
||||
<mat-form-field class="flex-48" *ngIf="accountingRuleForm.controls.creditRuleType.value === 'fixedAccount'">
|
||||
<mat-label>{{ 'labels.inputs.Account to Credit' | translate }}</mat-label>
|
||||
<mat-select formControlName="accountToCredit">
|
||||
<mat-option *ngFor="let glAccount of glAccountData" [value]="glAccount.id">
|
||||
{{ glAccount.name }}
|
||||
</mat-option>
|
||||
</mat-select>
|
||||
</mat-form-field>
|
||||
|
||||
<div
|
||||
class="flex-48 layout-row gap-2percent responsive-column"
|
||||
*ngIf="accountingRuleForm.controls.creditRuleType.value === 'listOfAccounts'"
|
||||
>
|
||||
<mat-form-field class="flex-50">
|
||||
<mat-label>{{ 'labels.inputs.Credit Tags' | translate }}</mat-label>
|
||||
<mat-select formControlName="creditTags" multiple>
|
||||
<mat-option *ngFor="let creditTag of creditTagData" [value]="creditTag.id">
|
||||
{{ creditTag.name }}
|
||||
</mat-option>
|
||||
@if (accountingRuleForm.controls.creditRuleType.value === 'fixedAccount') {
|
||||
<mat-form-field class="flex-48">
|
||||
<mat-label>{{ 'labels.inputs.Account to Credit' | translate }}</mat-label>
|
||||
<mat-select formControlName="accountToCredit">
|
||||
@for (glAccount of glAccountData; track glAccount) {
|
||||
<mat-option [value]="glAccount.id">
|
||||
{{ glAccount.name }}
|
||||
</mat-option>
|
||||
}
|
||||
</mat-select>
|
||||
</mat-form-field>
|
||||
}
|
||||
|
||||
<div class="flex-50" ngClass.gt-md="entries-wrapper">
|
||||
<mat-checkbox labelPosition="before" formControlName="allowMultipleCreditEntries" class="entries">
|
||||
{{ 'labels.inputs.Multiple Credit Entries Allowed' | translate }}
|
||||
</mat-checkbox>
|
||||
@if (accountingRuleForm.controls.creditRuleType.value === 'listOfAccounts') {
|
||||
<div class="flex-48 layout-row gap-2percent responsive-column">
|
||||
<mat-form-field class="flex-50">
|
||||
<mat-label>{{ 'labels.inputs.Credit Tags' | translate }}</mat-label>
|
||||
<mat-select formControlName="creditTags" multiple>
|
||||
@for (creditTag of creditTagData; track creditTag) {
|
||||
<mat-option [value]="creditTag.id">
|
||||
{{ creditTag.name }}
|
||||
</mat-option>
|
||||
}
|
||||
</mat-select>
|
||||
</mat-form-field>
|
||||
<div class="flex-50" ngClass.gt-md="entries-wrapper">
|
||||
<mat-checkbox labelPosition="before" formControlName="allowMultipleCreditEntries" class="entries">
|
||||
{{ 'labels.inputs.Multiple Credit Entries Allowed' | translate }}
|
||||
</mat-checkbox>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
}
|
||||
|
||||
<mat-form-field class="flex-98">
|
||||
<mat-label>{{ 'labels.inputs.Description' | translate }}</mat-label>
|
||||
|
||||
@@ -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';
|
||||
|
||||
@@ -29,6 +29,11 @@ import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
|
||||
]
|
||||
})
|
||||
export class CreateRuleComponent implements OnInit {
|
||||
private formBuilder = inject(UntypedFormBuilder);
|
||||
private accountingService = inject(AccountingService);
|
||||
private route = inject(ActivatedRoute);
|
||||
private router = inject(Router);
|
||||
|
||||
/** Accounting rule form. */
|
||||
accountingRuleForm: UntypedFormGroup;
|
||||
/** Office data. */
|
||||
@@ -47,12 +52,7 @@ export class CreateRuleComponent 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: { accountingRulesTemplate: any }) => {
|
||||
this.officeData = data.accountingRulesTemplate.allowedOffices;
|
||||
this.glAccountData = data.accountingRulesTemplate.allowedAccounts;
|
||||
|
||||
@@ -6,23 +6,29 @@
|
||||
<mat-form-field class="flex-48">
|
||||
<mat-label>{{ 'labels.inputs.Accounting Rule Name' | translate }}</mat-label>
|
||||
<input matInput required formControlName="name" />
|
||||
<mat-error *ngIf="accountingRuleForm.controls.name.hasError('required')">
|
||||
{{ 'labels.inputs.Accounting Rule Name' | translate }} {{ 'labels.commons.is' | translate }}
|
||||
<strong>{{ 'labels.commons.required' | translate }}</strong>
|
||||
</mat-error>
|
||||
@if (accountingRuleForm.controls.name.hasError('required')) {
|
||||
<mat-error>
|
||||
{{ 'labels.inputs.Accounting Rule Name' | translate }} {{ 'labels.commons.is' | translate }}
|
||||
<strong>{{ 'labels.commons.required' | translate }}</strong>
|
||||
</mat-error>
|
||||
}
|
||||
</mat-form-field>
|
||||
|
||||
<mat-form-field class="flex-48">
|
||||
<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="accountingRuleForm.controls.officeId.hasError('required')">
|
||||
{{ 'labels.inputs.Office' | translate }} {{ 'labels.commons.is' | translate }}
|
||||
<strong>{{ 'labels.commons.required' | translate }}</strong>
|
||||
</mat-error>
|
||||
@if (accountingRuleForm.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 class="rule-wrapper flex-48 layout-row responsive-column">
|
||||
@@ -40,34 +46,38 @@
|
||||
</mat-radio-group>
|
||||
</div>
|
||||
|
||||
<mat-form-field class="flex-48" *ngIf="accountingRuleForm.controls.debitRuleType.value === 'fixedAccount'">
|
||||
<mat-label>{{ 'labels.inputs.Account to Debit' | translate }}</mat-label>
|
||||
<mat-select formControlName="accountToDebit">
|
||||
<mat-option *ngFor="let glAccount of glAccountData" [value]="glAccount.id">
|
||||
{{ glAccount.name }}
|
||||
</mat-option>
|
||||
</mat-select>
|
||||
</mat-form-field>
|
||||
|
||||
<div
|
||||
class="flex-48 layout-row gap-2percent responsive-column"
|
||||
*ngIf="accountingRuleForm.controls.debitRuleType.value === 'listOfAccounts'"
|
||||
>
|
||||
<mat-form-field class="flex-50">
|
||||
<mat-label>{{ 'labels.inputs.Debit Tags' | translate }}</mat-label>
|
||||
<mat-select formControlName="debitTags" multiple>
|
||||
<mat-option *ngFor="let debitTag of debitTagData" [value]="debitTag.id">
|
||||
{{ debitTag.name }}
|
||||
</mat-option>
|
||||
@if (accountingRuleForm.controls.debitRuleType.value === 'fixedAccount') {
|
||||
<mat-form-field class="flex-48">
|
||||
<mat-label>{{ 'labels.inputs.Account to Debit' | translate }}</mat-label>
|
||||
<mat-select formControlName="accountToDebit">
|
||||
@for (glAccount of glAccountData; track glAccount) {
|
||||
<mat-option [value]="glAccount.id">
|
||||
{{ glAccount.name }}
|
||||
</mat-option>
|
||||
}
|
||||
</mat-select>
|
||||
</mat-form-field>
|
||||
}
|
||||
|
||||
<div class="flex-50 entries-wrapper">
|
||||
<mat-checkbox labelPosition="before" formControlName="allowMultipleDebitEntries" class="entries">
|
||||
{{ 'labels.inputs.Multiple Debit Entries Allowed' | translate }}
|
||||
</mat-checkbox>
|
||||
@if (accountingRuleForm.controls.debitRuleType.value === 'listOfAccounts') {
|
||||
<div class="flex-48 layout-row gap-2percent responsive-column">
|
||||
<mat-form-field class="flex-50">
|
||||
<mat-label>{{ 'labels.inputs.Debit Tags' | translate }}</mat-label>
|
||||
<mat-select formControlName="debitTags" multiple>
|
||||
@for (debitTag of debitTagData; track debitTag) {
|
||||
<mat-option [value]="debitTag.id">
|
||||
{{ debitTag.name }}
|
||||
</mat-option>
|
||||
}
|
||||
</mat-select>
|
||||
</mat-form-field>
|
||||
<div class="flex-50 entries-wrapper">
|
||||
<mat-checkbox labelPosition="before" formControlName="allowMultipleDebitEntries" class="entries">
|
||||
{{ 'labels.inputs.Multiple Debit Entries Allowed' | translate }}
|
||||
</mat-checkbox>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
}
|
||||
|
||||
<div class="rule-wrapper flex-48 layout-row responsive-column">
|
||||
<mat-label class="flex-50"
|
||||
@@ -84,34 +94,38 @@
|
||||
</mat-radio-group>
|
||||
</div>
|
||||
|
||||
<mat-form-field class="flex-48" *ngIf="accountingRuleForm.controls.creditRuleType.value === 'fixedAccount'">
|
||||
<mat-label>{{ 'labels.inputs.Account to Credit' | translate }}</mat-label>
|
||||
<mat-select formControlName="accountToCredit">
|
||||
<mat-option *ngFor="let glAccount of glAccountData" [value]="glAccount.id">
|
||||
{{ glAccount.name }}
|
||||
</mat-option>
|
||||
</mat-select>
|
||||
</mat-form-field>
|
||||
|
||||
<div
|
||||
class="flex-48 layout-row gap-2percent responsive-column"
|
||||
*ngIf="accountingRuleForm.controls.creditRuleType.value === 'listOfAccounts'"
|
||||
>
|
||||
<mat-form-field class="flex-50">
|
||||
<mat-label>{{ 'labels.inputs.Credit Tags' | translate }}</mat-label>
|
||||
<mat-select formControlName="creditTags" multiple>
|
||||
<mat-option *ngFor="let creditTag of creditTagData" [value]="creditTag.id">
|
||||
{{ creditTag.name }}
|
||||
</mat-option>
|
||||
@if (accountingRuleForm.controls.creditRuleType.value === 'fixedAccount') {
|
||||
<mat-form-field class="flex-48">
|
||||
<mat-label>{{ 'labels.inputs.Account to Credit' | translate }}</mat-label>
|
||||
<mat-select formControlName="accountToCredit">
|
||||
@for (glAccount of glAccountData; track glAccount) {
|
||||
<mat-option [value]="glAccount.id">
|
||||
{{ glAccount.name }}
|
||||
</mat-option>
|
||||
}
|
||||
</mat-select>
|
||||
</mat-form-field>
|
||||
}
|
||||
|
||||
<div class="flex-50 entries-wrapper">
|
||||
<mat-checkbox labelPosition="before" formControlName="allowMultipleCreditEntries" class="entries">
|
||||
{{ 'labels.inputs.Multiple Credit Entries Allowed' | translate }}
|
||||
</mat-checkbox>
|
||||
@if (accountingRuleForm.controls.creditRuleType.value === 'listOfAccounts') {
|
||||
<div class="flex-48 layout-row gap-2percent responsive-column">
|
||||
<mat-form-field class="flex-50">
|
||||
<mat-label>{{ 'labels.inputs.Credit Tags' | translate }}</mat-label>
|
||||
<mat-select formControlName="creditTags" multiple>
|
||||
@for (creditTag of creditTagData; track creditTag) {
|
||||
<mat-option [value]="creditTag.id">
|
||||
{{ creditTag.name }}
|
||||
</mat-option>
|
||||
}
|
||||
</mat-select>
|
||||
</mat-form-field>
|
||||
<div class="flex-50 entries-wrapper">
|
||||
<mat-checkbox labelPosition="before" formControlName="allowMultipleCreditEntries" class="entries">
|
||||
{{ 'labels.inputs.Multiple Credit Entries Allowed' | translate }}
|
||||
</mat-checkbox>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
}
|
||||
|
||||
<mat-form-field class="flex-98">
|
||||
<mat-label>{{ 'labels.inputs.Description' | translate }}</mat-label>
|
||||
|
||||
@@ -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';
|
||||
|
||||
@@ -29,6 +29,11 @@ import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
|
||||
]
|
||||
})
|
||||
export class EditRuleComponent implements OnInit {
|
||||
private formBuilder = inject(UntypedFormBuilder);
|
||||
private accountingService = inject(AccountingService);
|
||||
private route = inject(ActivatedRoute);
|
||||
private router = inject(Router);
|
||||
|
||||
/** Accounting rule form. */
|
||||
accountingRuleForm: UntypedFormGroup;
|
||||
/** Accounting rule. */
|
||||
@@ -49,12 +54,7 @@ export class EditRuleComponent 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: { accountingRulesTemplate: any; accountingRule: any }) => {
|
||||
this.officeData = data.accountingRulesTemplate.allowedOffices;
|
||||
this.glAccountData = data.accountingRulesTemplate.allowedAccounts;
|
||||
|
||||
@@ -22,10 +22,12 @@
|
||||
<div class="value">{{ accountingRule.officeName }}</div>
|
||||
</div>
|
||||
|
||||
<div class="content-row" *ngIf="accountingRule.description">
|
||||
<div class="label">{{ 'labels.inputs.Description' | translate }}</div>
|
||||
<div class="value">{{ accountingRule.description }}</div>
|
||||
</div>
|
||||
@if (accountingRule.description) {
|
||||
<div class="content-row">
|
||||
<div class="label">{{ 'labels.inputs.Description' | translate }}</div>
|
||||
<div class="value">{{ accountingRule.description }}</div>
|
||||
</div>
|
||||
}
|
||||
|
||||
<div class="content-row">
|
||||
<div class="label">{{ 'labels.inputs.Multiple Debit Entries Allowed' | translate }}</div>
|
||||
@@ -41,37 +43,49 @@
|
||||
|
||||
<mat-card>
|
||||
<mat-card-content class="content-rows">
|
||||
<div class="content-row" *ngIf="accountingRule.debitTags?.length">
|
||||
<div class="label">{{ 'labels.inputs.Debit Tags' | translate }}</div>
|
||||
<div class="value">
|
||||
<span *ngFor="let debitTag of accountingRule.debitTags">{{ debitTag.tag.name }}</span>
|
||||
@if (accountingRule.debitTags?.length) {
|
||||
<div class="content-row">
|
||||
<div class="label">{{ 'labels.inputs.Debit Tags' | translate }}</div>
|
||||
<div class="value">
|
||||
@for (debitTag of accountingRule.debitTags; track debitTag) {
|
||||
<span>{{ debitTag.tag.name }}</span>
|
||||
}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
}
|
||||
|
||||
<div class="content-row" *ngIf="accountingRule.debitAccounts?.length">
|
||||
<div class="label">{{ 'labels.inputs.Debit Account Name' | translate }}</div>
|
||||
<div class="value">
|
||||
<span *ngFor="let debitAccount of accountingRule.debitAccounts">{{
|
||||
debitAccount.name + ' (' + debitAccount.glCode + ')'
|
||||
}}</span>
|
||||
@if (accountingRule.debitAccounts?.length) {
|
||||
<div class="content-row">
|
||||
<div class="label">{{ 'labels.inputs.Debit Account Name' | translate }}</div>
|
||||
<div class="value">
|
||||
@for (debitAccount of accountingRule.debitAccounts; track debitAccount) {
|
||||
<span>{{ debitAccount.name + ' (' + debitAccount.glCode + ')' }}</span>
|
||||
}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
}
|
||||
|
||||
<div class="content-row" *ngIf="accountingRule.creditTags?.length">
|
||||
<div class="label">{{ 'labels.inputs.Credit Tags' | translate }}</div>
|
||||
<div class="value">
|
||||
<span *ngFor="let creditTag of accountingRule.creditTags">{{ creditTag.tag.name }}</span>
|
||||
@if (accountingRule.creditTags?.length) {
|
||||
<div class="content-row">
|
||||
<div class="label">{{ 'labels.inputs.Credit Tags' | translate }}</div>
|
||||
<div class="value">
|
||||
@for (creditTag of accountingRule.creditTags; track creditTag) {
|
||||
<span>{{ creditTag.tag.name }}</span>
|
||||
}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
}
|
||||
|
||||
<div class="content-row" *ngIf="accountingRule.creditAccounts?.length">
|
||||
<div class="label">{{ 'labels.inputs.Credit Account Name' | translate }}</div>
|
||||
<div class="value">
|
||||
<span *ngFor="let creditAccount of accountingRule.creditAccounts">{{
|
||||
creditAccount.name + ' (' + creditAccount.glCode + ')'
|
||||
}}</span>
|
||||
@if (accountingRule.creditAccounts?.length) {
|
||||
<div class="content-row">
|
||||
<div class="label">{{ 'labels.inputs.Credit Account Name' | translate }}</div>
|
||||
<div class="value">
|
||||
@for (creditAccount of accountingRule.creditAccounts; track creditAccount) {
|
||||
<span>{{ creditAccount.name + ' (' + creditAccount.glCode + ')' }}</span>
|
||||
}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
}
|
||||
</mat-card-content>
|
||||
</mat-card>
|
||||
</div>
|
||||
|
||||
@@ -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 ViewRuleComponent {
|
||||
private accountingService = inject(AccountingService);
|
||||
private route = inject(ActivatedRoute);
|
||||
private router = inject(Router);
|
||||
dialog = inject(MatDialog);
|
||||
|
||||
/** Accounting rule. */
|
||||
accountingRule: any;
|
||||
|
||||
@@ -34,12 +39,7 @@ export class ViewRuleComponent {
|
||||
* @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: { accountingRule: any }) => {
|
||||
this.accountingRule = data.accountingRule;
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user