Disabled person view for Calendar view only

master
Markus Kreth 7 years ago
parent f4af25afa3
commit d370efc900
  1. 14
      src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/MainUi.java
  2. 11
      src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/components/PersonGrid.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;
@ -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);
}

@ -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) {

Loading…
Cancel
Save