diff --git a/build.gradle b/build.gradle index 779e241..a6c1b49 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ plugins { } group = 'de.jottyfan.bico' -version = '0.2.0' +version = '0.2.1' description = """BibleClassOrganizer""" @@ -47,7 +47,7 @@ war { } dependencies { - implementation 'de.jottyfan:bicolib:7' + implementation 'de.jottyfan:bicolib:8' implementation 'org.mnode.ical4j:ical4j:4.0.4' diff --git a/src/main/java/de/jottyfan/bico/modules/camp/RegistrationRepository.java b/src/main/java/de/jottyfan/bico/modules/camp/RegistrationRepository.java index 95c2cff..3b28b03 100644 --- a/src/main/java/de/jottyfan/bico/modules/camp/RegistrationRepository.java +++ b/src/main/java/de/jottyfan/bico/modules/camp/RegistrationRepository.java @@ -7,7 +7,7 @@ import java.util.List; import org.jooq.DSLContext; import org.jooq.DeleteConditionStep; -import org.jooq.InsertValuesStep17; +import org.jooq.InsertValuesStep20; import org.jooq.SelectConditionStep; import org.jooq.SelectSeekStep1; import org.jooq.UpdateConditionStep; @@ -42,7 +42,7 @@ public class RegistrationRepository { public void save(@Valid RegistrationBean bean, String registrator) { jooq.transaction(t -> { if (bean.getPkRegistration() == null) { - InsertValuesStep17 sql = DSL.using(t) + InsertValuesStep20 sql = DSL.using(t) // @formatter:off .insertInto(T_REGISTRATION, T_REGISTRATION.CAMP, @@ -61,10 +61,13 @@ public class RegistrationRepository { T_REGISTRATION.DAY1, T_REGISTRATION.DAY2, T_REGISTRATION.DAY3, - T_REGISTRATION.DAY4) + T_REGISTRATION.DAY4, + T_REGISTRATION.TOWELS, + T_REGISTRATION.BED_LINEN, + T_REGISTRATION.COT) .values(EnumCamp.Gemeindefreizeit_2025, registrator, bean.getForename(), bean.getSurname(), EnumSex.lookupLiteral(bean.getSex()), bean.getBarrierFree(), bean.getNutrition(), bean.getDriverProvidePlaces(), bean.getWantPlaceInCar(), bean.getDiseases(), bean.getRequirePayment(), - bean.getFkAge(), bean.getDay0(), bean.getDay1(), bean.getDay2(), bean.getDay3(), bean.getDay4()); + bean.getFkAge(), bean.getDay0(), bean.getDay1(), bean.getDay2(), bean.getDay3(), bean.getDay4(), bean.getTowels(), bean.getBedLinen(), bean.getCot()); // @formatter:on Main.LOGGER.trace(sql); sql.execute(); @@ -88,6 +91,9 @@ public class RegistrationRepository { .set(T_REGISTRATION.DAY2, bean.getDay2()) .set(T_REGISTRATION.DAY3, bean.getDay3()) .set(T_REGISTRATION.DAY4, bean.getDay4()) + .set(T_REGISTRATION.TOWELS, bean.getTowels()) + .set(T_REGISTRATION.BED_LINEN, bean.getBedLinen()) + .set(T_REGISTRATION.COT, bean.getCot()) .where(T_REGISTRATION.PK_REGISTRATION.eq(bean.getPkRegistration())); // @formatter:on Main.LOGGER.trace(sql); diff --git a/src/main/java/de/jottyfan/bico/modules/camp/model/RegistrationBean.java b/src/main/java/de/jottyfan/bico/modules/camp/model/RegistrationBean.java index 15c8fba..a7e8b97 100644 --- a/src/main/java/de/jottyfan/bico/modules/camp/model/RegistrationBean.java +++ b/src/main/java/de/jottyfan/bico/modules/camp/model/RegistrationBean.java @@ -29,6 +29,10 @@ public class RegistrationBean implements Serializable { private Boolean day3; private Boolean day4; + private Boolean towels; + private Boolean bedLinen; + private Boolean cot; + private String nutrition; private Integer driverProvidePlaces; private Boolean wantPlaceInCar; @@ -271,4 +275,46 @@ public class RegistrationBean implements Serializable { public void setDay4(Boolean day4) { this.day4 = day4; } + + /** + * @return the towels + */ + public Boolean getTowels() { + return towels; + } + + /** + * @param towels the towels to set + */ + public void setTowels(Boolean towels) { + this.towels = towels; + } + + /** + * @return the bedLinen + */ + public Boolean getBedLinen() { + return bedLinen; + } + + /** + * @param bedLinen the bedLinen to set + */ + public void setBedLinen(Boolean bedLinen) { + this.bedLinen = bedLinen; + } + + /** + * @return the cot + */ + public Boolean getCot() { + return cot; + } + + /** + * @param cot the cot to set + */ + public void setCot(Boolean cot) { + this.cot = cot; + } } diff --git a/src/main/resources/templates/camp/edit.html b/src/main/resources/templates/camp/edit.html index 1841d4f..26e660f 100644 --- a/src/main/resources/templates/camp/edit.html +++ b/src/main/resources/templates/camp/edit.html @@ -49,6 +49,15 @@ +
Sonderleistungen
+
+ +
+ +
+ + +
Barrierefrei
diff --git a/src/main/resources/templates/camp/registration.html b/src/main/resources/templates/camp/registration.html index 8603348..1a3d950 100644 --- a/src/main/resources/templates/camp/registration.html +++ b/src/main/resources/templates/camp/registration.html @@ -78,6 +78,15 @@
+
Sonderleistungen
+
+ +
+ +
+ + +
Barrierefrei