From d370efc9001382c820fd1181fa27edb793e432b7 Mon Sep 17 00:00:00 2001
From: Markus Kreth <markus.kreth@web.de>
Date: Mon, 10 Dec 2018 16:22:15 +0100
Subject: [PATCH] Disabled person view for Calendar view only

---
 .../vaadinclubhelper/ui/MainUi.java           | 22 +++++++++----------
 .../ui/components/PersonGrid.java             | 11 +++++-----
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/MainUi.java b/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/MainUi.java
index f7fc60d..5123848 100644
--- a/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/MainUi.java
+++ b/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/MainUi.java
@@ -30,7 +30,7 @@ import de.kreth.vaadin.clubhelper.vaadinclubhelper.ui.components.PersonGrid;
 
 @Theme("vaadin-clubhelpertheme")
 @SpringUI
-@Push(value=PushMode.MANUAL)
+@Push(value = PushMode.MANUAL)
 public class MainUi extends UI {
 
 	private static final long serialVersionUID = 7581634188909841919L;
@@ -41,7 +41,7 @@ public class MainUi extends UI {
 
 	@Autowired
 	GroupDao groupDao;
-	
+
 	@Autowired
 	EventBusiness eventBusiness;
 
@@ -70,7 +70,7 @@ public class MainUi extends UI {
 		contentLayout = new HorizontalLayout();
 		contentLayout.setSizeFull();
 		contentLayout.addComponents(calendar);
-		
+
 		setContent(contentLayout);
 		setSizeFull();
 
@@ -84,7 +84,7 @@ public class MainUi extends UI {
 				calendar.setItems(events);
 				ui.push();
 			});
-			
+
 		});
 		exec.shutdown();
 		LOGGER.info("Loaded UI and started fetch of Events");
@@ -94,7 +94,7 @@ public class MainUi extends UI {
 		PersonEditDialog dlg = new PersonEditDialog(groupDao.listAll(), p, personDao);
 		getUI().addWindow(dlg);
 	}
-	
+
 	private void personSelectionChange(SelectionEvent<Person> ev) {
 		Set<Person> selected = ev.getAllSelectedItems();
 		LOGGER.debug("Selection changed to: {}", selected);
@@ -110,14 +110,14 @@ public class MainUi extends UI {
 		ClubEvent ev = (ClubEvent) event.getCalendarItem();
 		LOGGER.debug("Opening detail view for {}", ev);
 
-		contentLayout.removeComponent(personGrid);
-		contentLayout.addComponent(personGrid);
+//		contentLayout.removeComponent(personGrid);
+//		contentLayout.addComponent(personGrid);
 
 		eventBusiness.setSelected(null);
-		personGrid.setEnabled(false);
-		personGrid.setEvent(ev);
-		personGrid.setVisible(true);
-		personGrid.setEnabled(true);
+//		personGrid.setEnabled(false);
+//		personGrid.setEvent(ev);
+//		personGrid.setVisible(true);
+//		personGrid.setEnabled(true);
 		eventBusiness.setSelected(ev);
 	}
 
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 bd3dd70..959b67b 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
@@ -41,23 +41,22 @@ import de.kreth.vaadin.clubhelper.vaadinclubhelper.data.Person;
 public class PersonGrid extends CustomComponent {
 
 	private static final long serialVersionUID = -8148097982839343673L;
-	private transient final Logger log = LoggerFactory.getLogger(getClass());
+	private final transient Logger log = LoggerFactory.getLogger(getClass());
 
-	private final DateTimeFormatter birthFormat = DateTimeFormatter.ofLocalizedDate(FormatStyle.MEDIUM);
+	private final transient DateTimeFormatter birthFormat = DateTimeFormatter.ofLocalizedDate(FormatStyle.MEDIUM);
+	private final ConfigurableFilterDataProvider<Person, Void, SerializablePredicate<Person>> dataProvider;
 
 	private final Grid<Person> grid;
-
 	private final CheckBox checkIncluded;
 	private final ComboBox<GroupDef> comboGroups;
-
 	private final TextField textTitle;
 
 	private transient ClosedFunction closedFunction = null;
-	private ConfigurableFilterDataProvider<Person, Void, SerializablePredicate<Person>> dataProvider;
+	private transient Consumer<Person> onPersonEdit;
 	private Boolean selectedOnlyFilter;
+
 	private Set<GroupDef> groupMemberFilter;
 	private List<GroupDef> allGroups;
-	private Consumer<Person> onPersonEdit;
 
 	public PersonGrid(GroupDao groupDao) {