Skip to content

Commit

Permalink
Bug/1143 aktuell on current quarter (#1156)
Browse files Browse the repository at this point in the history
* update config

* jar is now debuggable

* add jar debug dev tools only on profile

* change log levels

* try to fix autorestart of spring

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

* exclude formatter plugin in build for docker

* use external profile to disable formatter

* clean up

* fix display of tangram

* update test and change const cname

* add a Observable that triggers a refresh when called (#1041)

* jar is now debuggable

* rename folder

* add a Observable that triggers a refresh when called

* add destroy observable to stop subscription of reloadKeySubject

* add tests to observables

---------

Co-authored-by: Yanick Minder <minder@puzzle.ch>

* Feature/624 Dialog creation refactoring using a service (#1045)

* add jar debug dev tools only on profile

* refactor dialog calls with config by introducing a service

* convert all confirmation dialog texts to i18n texts

* use refactored  confirmation component

* fix string and use interface for confirm dialog data

* Update title of delete confirmation

* clean up dialog service

* refactor frontend tests related to dialogService

* display correct dialog in objective

* fix objective release dialog

* refactor dialog responsiveness

* clean up dialog service

* remove backend/pom.xml from branch

* update translations and fix release dialog

* update dialog.service.ts

* create tests for dialog-service (#1112)

* Get current quarter from backend (#1039)

* add auto data-migration

* jar is now debuggable

* add jar debug dev tools only on profile

* change log levels

* try to fix autorestart of spring

* complete auto restart of container

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

* rename folder

* update docker compose file

* use external profile to disable formatter

* clean up

* add jar debug dev tools only on profile

* add api endpoint

* use api to get current quarter

* convert quarter to a class instead of an interface

* use class syntax

* update specs to use the class syntax for quarters

* mock new class function in test

* add integratin test for current quarter endpoint

* fix default quarter for new objective selection

* use v2 for quarter url and update tests accoridingly

* change merhod to fakeAsync

* try to override provider mid test

* Dispatch change instead of input event in onSubmit create test and get element by test id instead of id

* Remove duplicate profile in pom

* Update swagger annotations of get current quarter and fix usage of wrong implementation class for get current quarters

* Remove unused import in common.ts

* add dependency for hot reload in again

* [FM] Automated formating frontend

* readd local debug run config

---------

Co-authored-by: Miguel Lehmann <lehmann@puzzle.ch>
Co-authored-by: Jannik Pulfer <pulfer@puzzle.ch>
Co-authored-by: GitHub Actions <actions@github.com>

* Fix/fix git history (#1125)

* fix history

* fix hist

* refactor styles of dialogs (#1072)

* add jar debug dev tools only on profile

* change log levels

* try to fix autorestart of spring

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

* rename folder

* use external profile to disable formatter

* remove backend/pom.xml from branch

* refactor styles of dialogs

* remove useless tabindex

* refactor styling of dialog-content and dialog-actions

* refactor dialog header

* clean up

* fix invite members test

* change default width of dialog

* set cypress viewport

* remove it.only from cy tests

* use diffrent classes for default and small dialogs

* remove useless config

* clean up styling

* remove scroll-shaddow

* change height sizing strategie

* refactor styling of keyresult edit component

* introduce dialog-template-core-component

* create base template for dialogs

* align close button

* comment in dialog component

* fix scrolling of dialog

* refactor kr-type-form

* finish styling of kr-type select

* fix scrolling by setting height of action buttons

* clean up dialog content size

* clean up styles.scss

* refactor styles

* refactor styles of generic component

* move core component to shared module

* fix design because of scrollbar

* change keyresult type tabs to butotns

* delete cancel dialog and refactor related files

* refactor confirm dialog component to use template dialog core

* refactor styling

* refactor style of okr-label

* refactor example dialog

* refactor objective form component to use template dialog core

* refactor objective form dialog

* refactor dialog width

* refactor keyresult component

* fix responsive dialog

* refactor objective complete dialog

* clean up

* refactor objective form component

* minder out

* fix objective form component

* use priority to fetch logos

* refactor dialog history compoennt

* add spinner to dialog core

* refactor dialog history component

* refactor check-in componentn

* refactor metric check in component

* clean up keyresult dialog

* clean up

* fix kr type component

* finish dialog refactoring

* remove header component

* refactor css classes

* refactor styling

* insert okr-form-label-input-container

* fix dialog service tests

* fix jest of objective form compoennt

* fix tests of keyresult form

* fix pom

* fix tests of add-edit team dialog

* fix tests keyresult-dialog tests

* fix tests of complete dialog

* fix jest tests

* readd cancel button for check-in create

* fix check-in e2e tests

* fix e2e tests

* remove only from cypress tests

* fix teammanagement e2e test

* fix duplicate scorring

* clean up check-in tests

* fix objective duplicate tests

* clean up

* clean up styles

* create a dialog-data-show class

* fix check in metric

* fix keyresult type

* clean up

* implement todo

---------

Co-authored-by: peggimann <peggimann@puzzle.com>

* Bug/1013 routing to overview (#1084)

* Add permanent teamverwaltung button and make logo route to /

* Make router links leading to homepage preserve query params

* Change tag around logo from span to a

* Add e2e tests that test if route is preserved

---------

Co-authored-by: Jannik Pulfer <pulfer@puzzle.ch>
Co-authored-by: GitHub Actions <actions@github.com>

* Feature/624 refactor objective menu  (#1078)

* Fix/fix git history (#1125)

* fix history

* fix hist

* jar is now debuggable

* add jar debug dev tools only on profile

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

* rename folder

* update docker compose file

* use external profile to disable formatter

* clean up

* refactor dialog calls with config by introducing a service

* refactor frontend tests related to dialogService

* remove backend/pom.xml from branch

* introduce new objective menu action service to simplify dialog creation of dialog actions

* refactor objective

* reimplement generic menu

* use pipe with map to generate menu entries

* introduce afterAction property

* add ObjectiveAfterActionFactory

* introduce objectiveMenuAction file

* refactor objective status tooltip

* clean up objective menu action service

* rename objective actions file

* Try to fix frontend unit tests

* restore staging.properties

* fix angular build

* place functions in related files instead of common.ts

* restore angular config files

* fix action service tests

* add test for actions service

* clean up

* display correct options for draft and use replay subject

* fix check-in tests

* fix objective backlog tests

* fix objective e2e tests

* fix tabbing tests

* fix tabbing tests

* schtibitz e2e strategy from pulfer

* remove console.log

* restore focus

* restore old frontend-test-action

* clean pup

* remove application.staging from pr

* clean up tests of objective

* fix e2e tests

* check for focues of threedot menu after dialog closes

---------

Co-authored-by: Manuel <moeri@puzzle.ch>

* Bug/845-chf-label (#1106)

* 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>

* Feature/977 HTML structure (#1040)

* Implement html structure and fix tests

* Shorten logic in component

* Remove unwanted styling that broke every dialog

* Add styling to headings and fix obvious mistakes

* Fix font size in banner and alignment of stretch star

* Fix e2e test

* Remove files that do not belong to my PR

* Fix bug with checked item (#1138)

* fix isCurrent method

* add test to test if aktuell label is shown

* make test check if the quarter with aktuell label is actually the current quarter

* fix e2e test

* update e2e intelij config version

* restore pom.xml

---------

Co-authored-by: nevio18324 <141240169+nevio18324@users.noreply.github.com>
Co-authored-by: Miguel Lehmann <lehmann@puzzle.ch>
Co-authored-by: Jannik Pulfer <pulfer@puzzle.ch>
Co-authored-by: GitHub Actions <actions@github.com>
Co-authored-by: peggimann <peggimann@puzzle.com>
Co-authored-by: Manuel <moeri@puzzle.ch>
Co-authored-by: Miguel <141239860+Miguel7373@users.noreply.github.com>
Co-authored-by: Lias Kleisa <kleisa@puzzle.ch>
Co-authored-by: Manuel <109959820+ManuelMoeri@users.noreply.github.com>
Co-authored-by: Nevio Di Gennaro <digennaro@puzzle.ch>
  • Loading branch information
11 people authored Nov 15, 2024
1 parent 504e4a6 commit db80fb3
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .run/OkrApplication-E2E.run.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="OkrApplication-E2E" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
<option name="ACTIVE_PROFILES" value="integration-test" />
<option name="ALTERNATIVE_JRE_PATH" value="azul-17" />
<option name="ALTERNATIVE_JRE_PATH" value="temurin-21" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
<module name="backend" />
<option name="SPRING_BOOT_MAIN_CLASS" value="ch.puzzle.okr.OkrApplication" />
Expand Down
5 changes: 5 additions & 0 deletions frontend/cypress/e2e/overview.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@ describe('OKR Overview', () => {
cy.loginAsUser(users.gl);
});

it('should have the current quarter with label Aktuell', () => {
cy.visit('/?quarter=2');
cy.getByTestId('quarterFilter').contains('Aktuell');
});

it('Check order of teams', () => {
cy.intercept('GET', '**/overview*').as('overview');

Expand Down
2 changes: 1 addition & 1 deletion frontend/src/app/shared/types/model/Quarter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@ export class Quarter {
if (this.startDate === null || this.endDate === null) {
return false;
}
return this.startDate <= new Date() && this.endDate >= new Date();
return new Date(this.startDate) <= new Date() && new Date(this.endDate) >= new Date();
}
}

0 comments on commit db80fb3

Please sign in to comment.