Colors for different Calendars/organizerDisplayName

master
Markus Kreth 7 years ago
parent af0d2e7c26
commit 9abfc98f0e
  1. 2
      src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/business/EventBusiness.java
  2. 5
      src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/data/ClubEvent.java
  3. 11
      src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/components/PersonEditDialog.java
  4. 24
      src/main/webapp/VAADIN/themes/vaadin-clubhelpertheme/styles.css
  5. 23
      src/main/webapp/VAADIN/themes/vaadin-clubhelpertheme/vaadin-clubhelpertheme.scss

@ -23,11 +23,9 @@ public class EventBusiness {
private ClubEvent current;
public synchronized List<ClubEvent> loadEvents() {
List<ClubEvent> list = dao.listAll();
log.trace("Returning events from database: {}", list);
return list;
}
public ClubEvent getCurrent() {

@ -82,6 +82,11 @@ public class ClubEvent extends BasicItem {
return organizerDisplayName;
}
@Override
public String getStyleName() {
return organizerDisplayName;
}
public Set<Person> getPersons() {
return persons;
}

@ -53,7 +53,6 @@ public class PersonEditDialog extends Window {
Switch sw = new Switch(g.getName());
sw.setData(g);
sw.setValue(selected.contains(g));
// sw.addValueChangeListener(ev -> groupChanged(ev));
glay.addComponent(sw);
binder.forField(sw).bind(p -> p.getGroups().contains(g), (bean, fieldvalue) -> {
@ -100,14 +99,4 @@ public class PersonEditDialog extends Window {
}
}
// private void groupChanged(ValueChangeEvent<Boolean> ev) {
// GroupDef group = (GroupDef) ((Switch) ev.getComponent()).getData();
// Set<GroupDef> pg = person.getPersongroups();
// if (ev.getValue()) {
// pg.add(group);
// } else {
// pg.remove(group);
// }
// }
}

@ -15633,3 +15633,27 @@ div.v-layout.v-horizontal.v-widget {
background-size: cover;
cursor: pointer;
}
.vaadin-clubhelpertheme .mtv_allgemein {
background: #ffff00;
}
.vaadin-clubhelpertheme .v-calendar-event-mtv_allgemein {
background: #ffff00;
}
.vaadin-clubhelpertheme .v-calendar-event-mtv_allgemein-all-day {
background: #ffff00;
}
.vaadin-clubhelpertheme .mtv_wettkampf {
background: #99ff33;
}
.vaadin-clubhelpertheme .v-calendar-event-mtv_wettkampf {
background: #99ff33;
}
.vaadin-clubhelpertheme .v-calendar-event-mtv_wettkampf-all-day {
background: #99ff33;
}

@ -59,5 +59,26 @@
background-size: cover;
cursor: pointer; /* Mouse pointer on hover */
}
.mtv_allgemein {
background:#ffff00;
}
.v-calendar-event-mtv_allgemein {
background:#ffff00;
}
.v-calendar-event-mtv_allgemein-all-day {
background:#ffff00;
}
.mtv_wettkampf {
background:#99ff33;
}
.v-calendar-event-mtv_wettkampf {
background:#99ff33;
}
.v-calendar-event-mtv_wettkampf-all-day {
background:#99ff33;
}
.Schulferien {
}
.v-calendar-event-Schulferien {
}
}

Loading…
Cancel
Save