Onkel-Werner-Freizeiten/CampOrganizer2
1
1
Fork 0
Code Issues 7 Pull Requests Packages Projects Releases Wiki Activity

eye candy

Browse Source
This commit is contained in:
jotty
2022-10-16 17:19:26 +02:00
parent be5b28e120
commit 8344186ad2
12 changed files with 59 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/java/de/jottyfan/camporganizer/module/common/BookingBean.java
View File

@@ -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;
}
}

13
src/main/java/de/jottyfan/camporganizer/module/common/IndexGateway.java
View File

@@ -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;