diff --git a/projects/organization-management/src/app/components/cost-center-budget/cost-center-budget.component.html b/projects/organization-management/src/app/components/cost-center-budget/cost-center-budget.component.html index d59d35800e..f8eef700fc 100644 --- a/projects/organization-management/src/app/components/cost-center-budget/cost-center-budget.component.html +++ b/projects/organization-management/src/app/components/cost-center-budget/cost-center-budget.component.html @@ -6,7 +6,7 @@ [ngClass]="{ 'bg-danger': spentBudgetPercentage * 100 > 90 }" [ngStyle]="{ width: progressBarWidth | percent }" role="progressbar" - [attr.aria-label]="'Spent budget of cost center ' + costCenter.name" + [attr.aria-label]="'account.budget.already_spent.costcenter.aria_label' | translate : { '0': costCenter.name }" [attr.aria-valuetext]="spentBudgetPercentage | percent" > {{ spentBudgetPercentage | percent }} diff --git a/projects/organization-management/src/app/components/cost-center-budget/cost-center-budget.component.spec.ts b/projects/organization-management/src/app/components/cost-center-budget/cost-center-budget.component.spec.ts index d6b09f43b8..4c074ceee4 100644 --- a/projects/organization-management/src/app/components/cost-center-budget/cost-center-budget.component.spec.ts +++ b/projects/organization-management/src/app/components/cost-center-budget/cost-center-budget.component.spec.ts @@ -1,6 +1,7 @@ import { SimpleChange, SimpleChanges } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { NgbPopoverModule } from '@ng-bootstrap/ng-bootstrap'; +import { TranslateModule } from '@ngx-translate/core'; import { CostCenter } from 'ish-core/models/cost-center/cost-center.model'; @@ -14,7 +15,7 @@ describe('Cost Center Budget Component', () => { beforeEach(async () => { await TestBed.configureTestingModule({ - imports: [NgbPopoverModule], + imports: [NgbPopoverModule, TranslateModule.forRoot()], declarations: [CostCenterBudgetComponent], }).compileComponents(); }); @@ -58,23 +59,6 @@ describe('Cost Center Budget Component', () => { it('should display budget progress bar when rendering', () => { component.ngOnChanges(basketChange); fixture.detectChanges(); - - expect(element).toMatchInlineSnapshot(` -
-
-
-
- 40% -
-
-
-
- `); + expect(element.querySelector('[data-testing-id="cost-center-budget-popover"]')).toBeTruthy(); }); }); diff --git a/projects/organization-management/src/app/components/cost-center-buyer-edit-dialog/cost-center-buyer-edit-dialog.component.html b/projects/organization-management/src/app/components/cost-center-buyer-edit-dialog/cost-center-buyer-edit-dialog.component.html index a593f7490c..e45afbc5ba 100644 --- a/projects/organization-management/src/app/components/cost-center-buyer-edit-dialog/cost-center-buyer-edit-dialog.component.html +++ b/projects/organization-management/src/app/components/cost-center-buyer-edit-dialog/cost-center-buyer-edit-dialog.component.html @@ -1,13 +1,7 @@ diff --git a/projects/organization-management/src/app/components/user-budget/user-budget.component.html b/projects/organization-management/src/app/components/user-budget/user-budget.component.html index 5b4c33a7b0..c813ad28fd 100644 --- a/projects/organization-management/src/app/components/user-budget/user-budget.component.html +++ b/projects/organization-management/src/app/components/user-budget/user-budget.component.html @@ -25,7 +25,7 @@ [ngClass]="{ 'bg-danger': usedBudgetPercentage * 100 > 90 }" [ngStyle]="{ width: usedBudgetPercentage | percent }" role="progressbar" - aria-label="Spent budget" + [attr.aria-label]="'account.budget.already_spent.label' | translate" [attr.aria-valuetext]="usedBudgetPercentage | percent" > {{ usedBudgetPercentage | percent }} diff --git a/projects/organization-management/src/app/components/user-budget/user-budget.component.spec.ts b/projects/organization-management/src/app/components/user-budget/user-budget.component.spec.ts index 574f1e41bb..f726a035f5 100644 --- a/projects/organization-management/src/app/components/user-budget/user-budget.component.spec.ts +++ b/projects/organization-management/src/app/components/user-budget/user-budget.component.spec.ts @@ -61,35 +61,9 @@ describe('User Budget Component', () => { component.ngOnChanges(); fixture.detectChanges(); - expect(element).toMatchInlineSnapshot(` -
-
-
account.user.new.order_spend_limit.label
-
USD 100
-
-
-
account.budget.label
-
USD 5000
-
-
-
account.budget.already_spent.label
-
USD 2500
-
-
-
-
- 50% -
-
-
-
- `); + expect(element.textContent).toContain( + 'account.user.new.order_spend_limit.label USD 100 account.budget.labelUSD 5000account.budget.already_spent.labelUSD 250050%' + ); }); it('should return 2500 used budget when remaining budget is 2500', () => { diff --git a/projects/organization-management/src/app/pages/cost-center-buyers/cost-center-buyers-page.component.ts b/projects/organization-management/src/app/pages/cost-center-buyers/cost-center-buyers-page.component.ts index 65b759446b..7edcb0a8cc 100644 --- a/projects/organization-management/src/app/pages/cost-center-buyers/cost-center-buyers-page.component.ts +++ b/projects/organization-management/src/app/pages/cost-center-buyers/cost-center-buyers-page.component.ts @@ -105,6 +105,7 @@ export class CostCenterBuyersPageComponent implements OnDestroy, OnInit { className: 'col-1 col-md-2 list-item pb-0', props: { fieldClass: 'offset-md-2 col-2 mt-1', + ariaLabel: 'Select buyer to add to costcenter', }, }, { @@ -125,6 +126,7 @@ export class CostCenterBuyersPageComponent implements OnDestroy, OnInit { addonLeft: { text: this.appFacade.currencySymbol$(), }, + ariaLabel: 'Buyer budget', }, validators: { validation: [SpecialValidators.moneyAmount], diff --git a/projects/requisition-management/src/app/components/requisitions-list/requisitions-list.component.html b/projects/requisition-management/src/app/components/requisitions-list/requisitions-list.component.html index 98c5c1de68..77aa060eac 100644 --- a/projects/requisition-management/src/app/components/requisitions-list/requisitions-list.component.html +++ b/projects/requisition-management/src/app/components/requisitions-list/requisitions-list.component.html @@ -15,7 +15,10 @@ *cdkCellDef="let requisition" [attr.data-label]="'account.approvallist.table.id_of_order' | translate" > - + {{ requisition.requisitionNo }} diff --git a/projects/requisition-management/src/app/pages/requisition-detail/requisition-reject-dialog/requisition-reject-dialog.component.html b/projects/requisition-management/src/app/pages/requisition-detail/requisition-reject-dialog/requisition-reject-dialog.component.html index 131ea5a4ab..f65659ee25 100644 --- a/projects/requisition-management/src/app/pages/requisition-detail/requisition-reject-dialog/requisition-reject-dialog.component.html +++ b/projects/requisition-management/src/app/pages/requisition-detail/requisition-reject-dialog/requisition-reject-dialog.component.html @@ -2,13 +2,7 @@