Grid selection working - disabled selection listener while switching event.

master
Markus Kreth 7 years ago
parent 3943e3a228
commit 304dc77941
  1. 24
      .project
  2. 5
      src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/MainUi.java
  3. 10
      src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/components/CalendarComponent.java
  4. 1
      src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/components/PersonEditDialog.java
  5. 18
      src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/components/PersonGrid.java
  6. 2
      src/main/resources/hibernate.cfg.xml
  7. 1
      src/main/resources/simplelogger.properties
  8. 5
      src/test/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/VaadinClubhelperApplicationTests.java
  9. 5
      src/test/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/dao/ClubEventDaoTest.java
  10. 1
      src/test/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/dao/DatabaseTestBean.java

@ -15,48 +15,34 @@
<arguments> <arguments>
</arguments> </arguments>
</buildCommand> </buildCommand>
<buildCommand>
<name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
<triggers>full,incremental,</triggers>
<arguments>
<dictionary>
<key>LaunchConfigHandle</key>
<value>&lt;project&gt;/.externalToolBuilders/org.eclipse.babel.editor.rbeBuilder.launch</value>
</dictionary>
</arguments>
</buildCommand>
<buildCommand> <buildCommand>
<name>org.eclipse.wst.validation.validationbuilder</name> <name>org.eclipse.wst.validation.validationbuilder</name>
<arguments> <arguments>
</arguments> </arguments>
</buildCommand> </buildCommand>
<buildCommand> <buildCommand>
<name>org.eclipse.ui.externaltools.ExternalToolBuilder</name> <name>org.springframework.ide.eclipse.boot.validation.springbootbuilder</name>
<triggers>full,incremental,</triggers>
<arguments> <arguments>
<dictionary>
<key>LaunchConfigHandle</key>
<value>&lt;project&gt;/.externalToolBuilders/org.hibernate.eclipse.console.hibernateBuilder.launch</value>
</dictionary>
</arguments> </arguments>
</buildCommand> </buildCommand>
<buildCommand> <buildCommand>
<name>org.springframework.ide.eclipse.boot.validation.springbootbuilder</name> <name>org.springframework.ide.eclipse.core.springbuilder</name>
<arguments> <arguments>
</arguments> </arguments>
</buildCommand> </buildCommand>
<buildCommand> <buildCommand>
<name>org.springframework.ide.eclipse.core.springbuilder</name> <name>org.eclipse.m2e.core.maven2Builder</name>
<arguments> <arguments>
</arguments> </arguments>
</buildCommand> </buildCommand>
<buildCommand> <buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name> <name>org.fusesource.ide.project.RiderProjectBuilder</name>
<arguments> <arguments>
</arguments> </arguments>
</buildCommand> </buildCommand>
</buildSpec> </buildSpec>
<natures> <natures>
<nature>org.fusesource.ide.project.RiderProjectNature</nature>
<nature>org.springframework.ide.eclipse.core.springnature</nature> <nature>org.springframework.ide.eclipse.core.springnature</nature>
<nature>org.eclipse.jem.workbench.JavaEMFNature</nature> <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature> <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>

@ -113,10 +113,9 @@ public class MainUi extends UI {
contentLayout.removeComponent(personGrid); contentLayout.removeComponent(personGrid);
contentLayout.addComponent(personGrid); contentLayout.addComponent(personGrid);
personGrid.setCaption(ev.getCaption()); eventBusiness.setSelected(null);
personGrid.setTitle(ev.getCaption());
personGrid.setEnabled(false); personGrid.setEnabled(false);
personGrid.selectItems(ev.getPersons()); personGrid.setEvent(ev);
personGrid.setVisible(true); personGrid.setVisible(true);
personGrid.setEnabled(true); personGrid.setEnabled(true);
eventBusiness.setSelected(ev); eventBusiness.setSelected(ev);

@ -8,10 +8,8 @@ import java.util.Collection;
import org.vaadin.addon.calendar.Calendar; import org.vaadin.addon.calendar.Calendar;
import org.vaadin.addon.calendar.item.BasicItemProvider; import org.vaadin.addon.calendar.item.BasicItemProvider;
import org.vaadin.addon.calendar.ui.CalendarComponentEvents.BackwardEvent;
import org.vaadin.addon.calendar.ui.CalendarComponentEvents.BackwardHandler; import org.vaadin.addon.calendar.ui.CalendarComponentEvents.BackwardHandler;
import org.vaadin.addon.calendar.ui.CalendarComponentEvents.DateClickHandler; import org.vaadin.addon.calendar.ui.CalendarComponentEvents.DateClickHandler;
import org.vaadin.addon.calendar.ui.CalendarComponentEvents.ForwardEvent;
import org.vaadin.addon.calendar.ui.CalendarComponentEvents.ForwardHandler; import org.vaadin.addon.calendar.ui.CalendarComponentEvents.ForwardHandler;
import org.vaadin.addon.calendar.ui.CalendarComponentEvents.ItemClickHandler; import org.vaadin.addon.calendar.ui.CalendarComponentEvents.ItemClickHandler;
@ -53,14 +51,6 @@ public class CalendarComponent extends CustomComponent {
setCompositionRoot(layout); setCompositionRoot(layout);
} }
private void onNextMonth(ForwardEvent h) {
updateMonthText(h.getComponent().getStartDate());
}
private void onPrevMonth(BackwardEvent h) {
updateMonthText(h.getComponent().getStartDate());
}
private void updateMonthText(ZonedDateTime startDate) { private void updateMonthText(ZonedDateTime startDate) {
monthName.setValue(dfMonth.format(startDate)); monthName.setValue(dfMonth.format(startDate));
} }

@ -66,6 +66,7 @@ public class PersonEditDialog extends Window {
ok.addClickListener(ev -> { ok.addClickListener(ev -> {
binder.writeBeanIfValid(person); binder.writeBeanIfValid(person);
dao.update(person); dao.update(person);
PersonEditDialog.this.close();
}); });
VerticalLayout layout = new VerticalLayout(); VerticalLayout layout = new VerticalLayout();
layout.addComponents(textPrename, textSureName, birthday, groupPanel, close, ok); layout.addComponents(textPrename, textSureName, birthday, groupPanel, close, ok);

@ -2,6 +2,7 @@ package de.kreth.vaadin.clubhelper.vaadinclubhelper.ui.components;
import java.text.DateFormat; import java.text.DateFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection; import java.util.Collection;
import java.util.HashSet; import java.util.HashSet;
import java.util.List; import java.util.List;
@ -32,6 +33,7 @@ import com.vaadin.ui.VerticalLayout;
import com.vaadin.ui.themes.ValoTheme; import com.vaadin.ui.themes.ValoTheme;
import de.kreth.vaadin.clubhelper.vaadinclubhelper.dao.GroupDao; import de.kreth.vaadin.clubhelper.vaadinclubhelper.dao.GroupDao;
import de.kreth.vaadin.clubhelper.vaadinclubhelper.data.ClubEvent;
import de.kreth.vaadin.clubhelper.vaadinclubhelper.data.GroupDef; import de.kreth.vaadin.clubhelper.vaadinclubhelper.data.GroupDef;
import de.kreth.vaadin.clubhelper.vaadinclubhelper.data.Person; import de.kreth.vaadin.clubhelper.vaadinclubhelper.data.Person;
@ -160,7 +162,8 @@ public class PersonGrid extends CustomComponent {
grid.addSelectionListener(listener); grid.addSelectionListener(listener);
} }
public void selectItems(Person... items) { private void selectItems(Person... items) {
log.debug("Selecting Persons: {}", Arrays.asList(items));
MultiSelect<Person> asMultiSelect = grid.asMultiSelect(); MultiSelect<Person> asMultiSelect = grid.asMultiSelect();
asMultiSelect.deselectAll(); asMultiSelect.deselectAll();
asMultiSelect.select(items); asMultiSelect.select(items);
@ -188,7 +191,7 @@ public class PersonGrid extends CustomComponent {
updateFilter(); updateFilter();
} }
public void setTitle(String value) { private void setTitle(String value) {
if (value == null) { if (value == null) {
value = ""; value = "";
} }
@ -207,13 +210,14 @@ public class PersonGrid extends CustomComponent {
void closed(); void closed();
} }
public void selectItems(Collection<Person> persons) {
log.debug("Selecting now: {}" + persons);
selectItems(persons.toArray(new Person[0]));
}
public void onPersonEdit(Consumer<Person> function) { public void onPersonEdit(Consumer<Person> function) {
this.onPersonEdit = function; this.onPersonEdit = function;
} }
public void setEvent(ClubEvent ev) {
setCaption(ev.getCaption());
setTitle(ev.getCaption());
selectItems(ev.getPersons().toArray(new Person[0]));
}
} }

@ -13,6 +13,8 @@
<property name="hibernate.connection.datasource">java:comp/env/jdbc/clubhelperbackend</property> <property name="hibernate.connection.datasource">java:comp/env/jdbc/clubhelperbackend</property>
<property name="cache.providerclass">org.hibernate.NoCacheProvider</property> <property name="cache.providerclass">org.hibernate.NoCacheProvider</property>
<property name="show_sql">true</property> <property name="show_sql">true</property>
<property name="format_sql">true</property>
<property name="use_sql_comments">true</property>
<!-- Specifying Session Context --> <!-- Specifying Session Context -->
<property name="hibernate.current_session_context_class">org.hibernate.context.internal.ThreadLocalSessionContext</property> <property name="hibernate.current_session_context_class">org.hibernate.context.internal.ThreadLocalSessionContext</property>

@ -1 +1,2 @@
org.slf4j.simpleLogger.defaultLogLevel = trace org.slf4j.simpleLogger.defaultLogLevel = trace
log4j.logger.org.hibernate.type=trace

@ -1,10 +1,5 @@
package de.kreth.vaadin.clubhelper.vaadinclubhelper; package de.kreth.vaadin.clubhelper.vaadinclubhelper;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.junit4.SpringRunner;
//@RunWith(SpringRunner.class) //@RunWith(SpringRunner.class)
//@SpringBootTest //@SpringBootTest
public class VaadinClubhelperApplicationTests { public class VaadinClubhelperApplicationTests {

@ -13,7 +13,6 @@ import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest; import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
import org.springframework.boot.test.autoconfigure.orm.jpa.TestEntityManager;
import org.springframework.test.context.junit4.SpringRunner; import org.springframework.test.context.junit4.SpringRunner;
import de.kreth.vaadin.clubhelper.vaadinclubhelper.data.ClubEvent; import de.kreth.vaadin.clubhelper.vaadinclubhelper.data.ClubEvent;
@ -28,8 +27,8 @@ public class ClubEventDaoTest extends AbstractDatabaseTest {
@Autowired @Autowired
private ClubEventDao dao; private ClubEventDao dao;
@Autowired // @Autowired
private TestEntityManager entityManager; // private TestEntityManager entityManager;
@Test @Test
public void storeEvent() { public void storeEvent() {

@ -8,7 +8,6 @@ import org.hibernate.cfg.Configuration;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.SpringBootConfiguration; import org.springframework.boot.SpringBootConfiguration;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.test.autoconfigure.orm.jpa.TestEntityManager;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.core.io.Resource; import org.springframework.core.io.Resource;
import org.springframework.core.io.ResourceLoader; import org.springframework.core.io.ResourceLoader;

Loading…
Cancel
Save