diff --git a/src/main/java/de/jottyfan/camporganizer/module/common/IndexGateway.java b/src/main/java/de/jottyfan/camporganizer/module/common/IndexGateway.java index 39feb4d..f35052c 100644 --- a/src/main/java/de/jottyfan/camporganizer/module/common/IndexGateway.java +++ b/src/main/java/de/jottyfan/camporganizer/module/common/IndexGateway.java @@ -80,7 +80,8 @@ public class IndexGateway { .leftJoin(T_PERSON).on(T_PERSON.FK_PROFILE.eq(T_PROFILE.PK)) .leftJoin(REGISTRATOR).on(REGISTRATOR.PK.eq(T_PERSON.FK_REGISTRATOR)) .leftJoin(V_CAMP).on(V_CAMP.PK.eq(T_PERSON.FK_CAMP)) - .where(T_PROFILE.USERNAME.eq(username)); + .where(T_PROFILE.USERNAME.eq(username)) + .and(T_PERSON.PK.isNotNull()); // @formatter:on LOGGER.debug(sql.toString()); List list = new ArrayList<>(); diff --git a/src/main/resources/static/css/style.css b/src/main/resources/static/css/style.css index bd679ef..d3f4376 100644 --- a/src/main/resources/static/css/style.css +++ b/src/main/resources/static/css/style.css @@ -96,6 +96,10 @@ div { /* 60 px is the current height of the headline; TODO: calculate it */ } +.acc_over { + background-image: linear-gradient(to bottom right, #ccc, #aaa) !important; +} + .acc_true { background-image: linear-gradient(to bottom right, #cfc, #afa) !important; } diff --git a/src/main/resources/templates/dashboard.html b/src/main/resources/templates/dashboard.html index b08553a..d667d4c 100644 --- a/src/main/resources/templates/dashboard.html +++ b/src/main/resources/templates/dashboard.html @@ -26,10 +26,11 @@ $(e).css("background", "orange"); } -
+
Es wurden noch keine Anmeldungen für eine Freizeit hinterlegt.
+

-

-
+
Freizeitdaten
@@ -124,7 +125,7 @@
diff --git a/src/test/java/de/jottyfan/camporganizer/module/registration/TestKeycloakRepository.java b/src/test/java/de/jottyfan/camporganizer/module/registration/TestKeycloakRepository.java index 3ff4a8b..b990c92 100644 --- a/src/test/java/de/jottyfan/camporganizer/module/registration/TestKeycloakRepository.java +++ b/src/test/java/de/jottyfan/camporganizer/module/registration/TestKeycloakRepository.java @@ -19,7 +19,7 @@ public class TestKeycloakRepository { @Test public void testRegister() { KeycloakRepository repository = new KeycloakRepository(); - UserRepresentation user = repository.getUserRepresentation("Hans", "Dampf", "hans@dampf.org"); + UserRepresentation user = repository.getUserRepresentation("Hans", "Dampf", "hans", "password", "hans@dampf.org"); UsersResource resource = repository.getUsersResource("http://localhost:8080", "ow", "owadmin", "password", "biblecamp"); assertTrue(repository.register(resource, user)); }