From c64e697036b04129cd759a304ae88fdecc67877a Mon Sep 17 00:00:00 2001
From: Markus Kreth <markus.kreth@web.de>
Date: Sat, 26 Jan 2019 05:08:21 +0100
Subject: [PATCH] Startpass showing string only

---
 .../vaadinclubhelper/ui/components/PersonGrid.java    | 11 +++++++++--
 src/main/resources/application.properties             |  2 +-
 .../de/kreth/vaadin/clubhelper/HibernateHolder.java   |  2 +-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/components/PersonGrid.java b/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/components/PersonGrid.java
index 2f28594..da21697 100644
--- a/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/components/PersonGrid.java
+++ b/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/components/PersonGrid.java
@@ -50,7 +50,7 @@ public class PersonGrid extends VerticalLayout {
 	private List<GroupDef> allGroups;
 	private PersonFilter filter;
 	private ClubEvent currentEvent;
-	private Column<Person, Startpass> startpassColumn;
+	private Column<Person, String> startpassColumn;
 	private Layout filters;
 	private SelectionMode currentSelectionMode;
 	private Column<Person, String> genderColumn;
@@ -94,7 +94,14 @@ public class PersonGrid extends VerticalLayout {
 		grid.addColumn(Person::getSurname).setCaption("Nachname");
 		grid.addColumn(Person::getBirth, b -> b != null ? birthFormat.format(b) : "").setCaption("Geburtstag");
 
-		startpassColumn = grid.addColumn(Person::getStartpass).setCaption("Startpass Nr.");
+		startpassColumn = grid.addColumn(p -> {
+			Startpass startpass = p.getStartpass();
+			if (startpass != null) {
+				return startpass.getStartpassNr();
+			} else {
+				return null;
+			}
+		}).setCaption("Startpass Nr.");
 
 		genderColumn = grid.addColumn(p -> {
 
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 4cd3dc5..f7fad49 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -1,7 +1,7 @@
 spring.datasource.jndi-name=jdbc/clubhelperbackend
 
-spring.jpa.properties.hibernate.enable_lazy_load_no_trans=true
 spring.jpa.open-in-view=false
+spring.jpa.properties.hibernate.enable_lazy_load_no_trans=true
 spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL8Dialect
 spring.jpa.hibernate.naming-strategy = org.hibernate.cfg.ImprovedNamingStrategy
 spring.jpa.hibernate.naming.physical-strategy=org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
diff --git a/src/test/java/de/kreth/vaadin/clubhelper/HibernateHolder.java b/src/test/java/de/kreth/vaadin/clubhelper/HibernateHolder.java
index 9e19bb6..bfe55a4 100644
--- a/src/test/java/de/kreth/vaadin/clubhelper/HibernateHolder.java
+++ b/src/test/java/de/kreth/vaadin/clubhelper/HibernateHolder.java
@@ -12,7 +12,7 @@ public enum HibernateHolder {
 
 	private HibernateHolder() {
 		configuration = new Configuration();
-		HibernateConfiguration config = new MysqlLocalConfiguration();
+		HibernateConfiguration config = new H2MemoryConfiguration();
 		config.configure(configuration);
 	}