Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bug/1143 aktuell on current quarter #1156

Merged
merged 28 commits into from
Nov 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
6fe4f9a
update config
kcinay055679 Oct 15, 2024
60857dd
jar is now debuggable
kcinay055679 Oct 15, 2024
99134e9
add jar debug dev tools only on profile
kcinay055679 Oct 15, 2024
e89883c
change log levels
kcinay055679 Oct 15, 2024
764b2f9
try to fix autorestart of spring
kcinay055679 Oct 15, 2024
b804341
rename intelij config and change log level of spring to debug in stag…
kcinay055679 Oct 17, 2024
bb12321
exclude formatter plugin in build for docker
kcinay055679 Oct 18, 2024
4edaac1
use external profile to disable formatter
kcinay055679 Oct 18, 2024
9ee3141
clean up
kcinay055679 Oct 18, 2024
6cbad7f
fix display of tangram
kcinay055679 Oct 18, 2024
510a846
update test and change const cname
kcinay055679 Oct 18, 2024
c50cffe
add a Observable that triggers a refresh when called (#1041)
nevio18324 Oct 23, 2024
dac23cb
Feature/624 Dialog creation refactoring using a service (#1045)
kcinay055679 Oct 25, 2024
363ac9d
create tests for dialog-service (#1112)
nevio18324 Oct 31, 2024
62e7ada
Get current quarter from backend (#1039)
kcinay055679 Nov 4, 2024
f87b588
Fix/fix git history (#1125)
kcinay055679 Nov 4, 2024
17124c9
refactor styles of dialogs (#1072)
kcinay055679 Nov 6, 2024
34f88f5
Bug/1013 routing to overview (#1084)
nevio18324 Nov 6, 2024
042d498
Feature/624 refactor objective menu (#1078)
kcinay055679 Nov 8, 2024
af217d6
Bug/845-chf-label (#1106)
Miguel7373 Nov 8, 2024
65b9610
Feature/977 HTML structure (#1040)
ManuelMoeri Nov 8, 2024
48b21a6
Fix bug with checked item (#1138)
ManuelMoeri Nov 8, 2024
e63100c
fix isCurrent method
nevio18324 Nov 14, 2024
e93fcfc
add test to test if aktuell label is shown
nevio18324 Nov 14, 2024
2e7136c
make test check if the quarter with aktuell label is actually the cur…
nevio18324 Nov 14, 2024
b10883f
fix e2e test
kcinay055679 Nov 15, 2024
ed66653
update e2e intelij config version
kcinay055679 Nov 15, 2024
d9e942e
restore pom.xml
kcinay055679 Nov 15, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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();
}
}
Loading