Skip to content

Commit

Permalink
Bug/845-chf-label (#1106)
Browse files Browse the repository at this point in the history
* jar is now debuggable

* rename intelij config and change log level of spring to debug in staging config

* Fix bug with double label in check in history

* delete unused pipe and edit the CHF output

* edit e2e and frontend tests to work with the new format

* remove lable pipe in dialog

* add second pipe back in and edit to suffix

* fix tests and refactor value pipe

* fix spec tests for pipes

* fix e2e tests

* remove space before percent

* fix unit-lable spec and e2e tests

* fix spaceing of percent in tests

* add testId

---------

Co-authored-by: Yanick Minder <minder@puzzle.ch>
Co-authored-by: Lias Kleisa <kleisa@puzzle.ch>
  • Loading branch information
3 people committed Nov 15, 2024
1 parent f96719d commit 5a4b752
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion frontend/cypress/e2e/checkIn.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -374,7 +374,7 @@ describe('OKR Check-in e2e tests', () => {
cy.wait('@getKeyResultsAfterSave');

cy.getByTestId('add-check-in').first().click();
cy.contains('Letzter Wert').siblings('div').contains('10 %');
cy.contains('Letzter Wert').siblings('div').contains('10%');
});
});
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@
<h4 class="col-auto">Wert:</h4>
<div class="col">
<ng-container *ngIf="keyResult.keyResultType === 'metric'">
{{ getMetricKeyResult().unit | unitLabelTransformation }}
{{ +checkIn.value! | unitValueTransformation: getMetricKeyResult().unit }}
{{ +checkIn.value! | unitValueTransformation }}{{ getMetricKeyResult().unit | unitLabelTransformation }}
</ng-container>
<ng-container *ngIf="keyResult.keyResultType === 'ordinal'">
{{ checkIn.value }}
Expand All @@ -49,7 +48,7 @@ <h4 class="col-3">Massnahmen:</h4>

<ng-container actions>
<div class="col-auto">
<button mat-flat-button color="primary" mat-dialog-close>Schliessen</button>
<button [attr.data-testId]="'closeButton'" mat-flat-button color="primary" mat-dialog-close>Schliessen</button>
</div>
</ng-container>
</app-dialog-template-core>
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<div *ngIf="checkIn.value" class="okr-form-row okr-form-label-input-container">
<p class="okr-form-label okr-form-col">Letzter Wert</p>
<div class="okr-form-col text-black">
<div class="dialog-data-show dialog-form-field py-2">{{ checkIn.value }} {{ generateUnitLabel() }}</div>
<div class="dialog-data-show dialog-form-field py-2">{{ checkIn.value }}{{ generateUnitLabel() }}</div>
</div>
</div>
</div>
Expand Down
1 change: 1 addition & 0 deletions frontend/src/app/shared/shared.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import { SpinnerComponent } from './custom/spinner/spinner.component';
import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
import { DialogTemplateCoreComponent } from './custom/dialog-template-core/dialog-template-core.component';
import { MatDividerModule } from '@angular/material/divider';
import { UnitLabelTransformationPipe } from './pipes/unit-label-transformation/unit-label-transformation.pipe';

@NgModule({
declarations: [
Expand Down

0 comments on commit 5a4b752

Please sign in to comment.