diff --git a/.classpath b/.classpath
index 607b789..f3bdce0 100644
--- a/.classpath
+++ b/.classpath
@@ -12,13 +12,6 @@
-
-
-
-
-
-
-
diff --git a/.settings/org.eclipse.buildship.core.prefs b/.settings/org.eclipse.buildship.core.prefs
index e889521..e479558 100644
--- a/.settings/org.eclipse.buildship.core.prefs
+++ b/.settings/org.eclipse.buildship.core.prefs
@@ -1,2 +1,13 @@
+arguments=
+auto.sync=false
+build.scans.enabled=false
+connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER)
connection.project.dir=
eclipse.preferences.version=1
+gradle.user.home=
+java.home=
+jvm.arguments=
+offline.mode=false
+override.workspace.settings=false
+show.console.view=false
+show.executions.view=false
diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index 31a62d0..a2ed0c0 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -1,14 +1,8 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
diff --git a/build.gradle b/build.gradle
index b7f575c..393eab9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -18,7 +18,7 @@ apply plugin: 'war'
apply plugin: 'application'
group = 'de.jottyfan.camporganizer'
-version = '0.0.5'
+version = '0.0.6'
sourceCompatibility = 17
mainClassName = "de.jottyfan.camporganizer.Main"
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 b42fa6f..fa3d32a 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 = 2L;
+ private static final long serialVersionUID = 4L;
private Integer pk;
private String forename;
@@ -39,6 +39,8 @@ public class BookingBean implements Serializable {
private Boolean isOver;
private String campName;
private String registrator;
+ private Boolean accept;
+ private String subscriber;
/**
* @return the forename
@@ -358,4 +360,20 @@ public class BookingBean implements Serializable {
this.registrator = registrator;
}
+ public Boolean getAccept() {
+ return accept;
+ }
+
+ public void setAccept(Boolean accept) {
+ this.accept = accept;
+ }
+
+ public String getSubscriber() {
+ return subscriber;
+ }
+
+ public void setSubscriber(String subscriber) {
+ this.subscriber = subscriber;
+ }
+
}
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 eee2129..293af85 100644
--- a/src/main/java/de/jottyfan/camporganizer/module/common/IndexGateway.java
+++ b/src/main/java/de/jottyfan/camporganizer/module/common/IndexGateway.java
@@ -14,7 +14,6 @@ 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;
@@ -59,6 +58,9 @@ public class IndexGateway {
T_PERSON.CREATED,
T_PERSON.EMAIL,
T_PERSON.SEX,
+ T_PERSON.ACCEPT,
+ T_PROFILE.FORENAME,
+ T_PROFILE.SURNAME,
REGISTRATOR.FORENAME,
REGISTRATOR.SURNAME,
V_CAMP.NAME,
@@ -103,6 +105,7 @@ 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));
+ bean.setAccept(r.get(T_PERSON.ACCEPT));
StringBuilder buf = new StringBuilder();
String forename = r.get(REGISTRATOR.FORENAME);
String surname = r.get(REGISTRATOR.SURNAME);
@@ -111,6 +114,14 @@ public class IndexGateway {
}
buf.append(surname != null ? surname : "");
bean.setRegistrator(buf.toString());
+ buf = new StringBuilder();
+ String regForename = r.get(T_PROFILE.FORENAME);
+ String regSurname = r.get(T_PROFILE.SURNAME);
+ if (regForename != null) {
+ buf.append(regForename).append(" ");
+ }
+ buf.append(regSurname != null ? regSurname : "");
+ bean.setSubscriber(buf.toString());
list.add(bean);
}
return list;
diff --git a/src/main/resources/templates/business/booker.html b/src/main/resources/templates/business/booker.html
index ae37429..afc4d6d 100644
--- a/src/main/resources/templates/business/booker.html
+++ b/src/main/resources/templates/business/booker.html
@@ -52,7 +52,7 @@
Kontostand |
-
+ |
|
diff --git a/src/main/resources/templates/business/bookings.html b/src/main/resources/templates/business/bookings.html
index 6f3b434..77f5762 100644
--- a/src/main/resources/templates/business/bookings.html
+++ b/src/main/resources/templates/business/bookings.html
@@ -35,7 +35,7 @@
|
|
|
-
+ |
|
diff --git a/src/main/resources/templates/business/business.html b/src/main/resources/templates/business/business.html
index 80fe54e..92c4406 100644
--- a/src/main/resources/templates/business/business.html
+++ b/src/main/resources/templates/business/business.html
@@ -30,7 +30,7 @@
|
|
- |
+ |
diff --git a/src/main/resources/templates/business/camp.html b/src/main/resources/templates/business/camp.html
index dd7f782..0c7872e 100644
--- a/src/main/resources/templates/business/camp.html
+++ b/src/main/resources/templates/business/camp.html
@@ -52,7 +52,7 @@
Beiträge |
- |
+ |
@@ -79,7 +79,7 @@
|
|
|
- |
+ |
|
|
diff --git a/src/main/resources/templates/dashboard.html b/src/main/resources/templates/dashboard.html
index fe89cd0..7e8dcd6 100644
--- a/src/main/resources/templates/dashboard.html
+++ b/src/main/resources/templates/dashboard.html
@@ -72,10 +72,10 @@