From be5b28e1209be4dc50abef540a09c6927a1aad41 Mon Sep 17 00:00:00 2001 From: Jottyfan Date: Sat, 15 Oct 2022 19:02:56 +0200 Subject: [PATCH] eye candy --- .../module/common/BookingBean.java | 11 +- .../module/common/IndexGateway.java | 14 +++ src/main/resources/static/css/style.css | 4 + src/main/resources/templates/dashboard.html | 116 ++++++++++-------- 4 files changed, 92 insertions(+), 53 deletions(-) diff --git a/src/main/java/de/jottyfan/camporganizer/module/common/BookingBean.java b/src/main/java/de/jottyfan/camporganizer/module/common/BookingBean.java index f679ba1..b42fa6f 100644 --- a/src/main/java/de/jottyfan/camporganizer/module/common/BookingBean.java +++ b/src/main/java/de/jottyfan/camporganizer/module/common/BookingBean.java @@ -13,7 +13,7 @@ import de.jottyfan.camporganizer.db.jooq.enums.EnumSex; * */ public class BookingBean implements Serializable { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = 2L; private Integer pk; private String forename; @@ -38,6 +38,7 @@ public class BookingBean implements Serializable { private String url; private Boolean isOver; private String campName; + private String registrator; /** * @return the forename @@ -349,4 +350,12 @@ public class BookingBean implements Serializable { this.campName = campName; } + public String getRegistrator() { + return registrator; + } + + public void setRegistrator(String registrator) { + this.registrator = registrator; + } + } 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 b4b5347..eee2129 100644 --- a/src/main/java/de/jottyfan/camporganizer/module/common/IndexGateway.java +++ b/src/main/java/de/jottyfan/camporganizer/module/common/IndexGateway.java @@ -14,10 +14,12 @@ import org.jooq.Condition; import org.jooq.DSLContext; import org.jooq.Record; import org.jooq.SelectConditionStep; +import org.jooq.impl.DSL; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; +import de.jottyfan.camporganizer.db.jooq.tables.TProfile; import de.jottyfan.camporganizer.db.jooq.tables.records.VCampRecord; /** @@ -40,6 +42,7 @@ public class IndexGateway { } public List getAllBookings(String username) { + TProfile REGISTRATOR = TProfile.T_PROFILE.as("registrator"); SelectConditionStep sql = jooq // @formatter:off .select(T_PERSON.PK, @@ -56,6 +59,8 @@ public class IndexGateway { T_PERSON.CREATED, T_PERSON.EMAIL, T_PERSON.SEX, + REGISTRATOR.FORENAME, + REGISTRATOR.SURNAME, V_CAMP.NAME, V_CAMP.LOCATION_NAME, V_CAMP.PRICE, @@ -67,6 +72,7 @@ public class IndexGateway { V_CAMP.IS_OVER) .from(T_PROFILE) .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)); // @formatter:on @@ -97,6 +103,14 @@ public class IndexGateway { bean.setUrl(r.get(V_CAMP.URL)); bean.setIsOver(r.get(V_CAMP.IS_OVER)); bean.setCampName(r.get(V_CAMP.NAME)); + StringBuilder buf = new StringBuilder(); + String forename = r.get(REGISTRATOR.FORENAME); + String surname = r.get(REGISTRATOR.SURNAME); + if (forename != null) { + buf.append(forename).append(" "); + } + buf.append(surname != null ? surname : ""); + bean.setRegistrator(buf.toString()); list.add(bean); } return list; diff --git a/src/main/resources/static/css/style.css b/src/main/resources/static/css/style.css index c34d940..dd339e8 100644 --- a/src/main/resources/static/css/style.css +++ b/src/main/resources/static/css/style.css @@ -167,6 +167,10 @@ body { background-color: rgba(255, 255, 255, 0.8) !important; } +.nomaxwidth { + max-width: none !important; +} + .mytoggle_collapsed { display: none; } diff --git a/src/main/resources/templates/dashboard.html b/src/main/resources/templates/dashboard.html index d009ac5..fe89cd0 100644 --- a/src/main/resources/templates/dashboard.html +++ b/src/main/resources/templates/dashboard.html @@ -14,61 +14,73 @@
-
-
-  in  -
-
-
-
-
Zeit:
-
- +
+
+
+
+
+  in  + +
+ +
+
+ angemeldet am +
+
+ bearbeitet von +
+ Die Freizeit ist bereits vorbei.
-
Preis:
-
-
Ferien:
-
-
-
-
-
Rolle:
- -
ID:
- -
Vorname:
- -
Nachname:
- -
Straße:
- -
PLZ:
- -
Ort:
- -
Telefon:
- -
Geburtstag:
- -
E-Mail:
- -
Geschlecht:
- -
Foto-Einverständnis:
- -
Kommentar:
- -
-
-
-
-
- angemeldet am -
- Die Freizeit ist bereits vorbei.