Now showing entry details in ResourcesView after entry creation.

dlsc-software-consulting-gmbh · Sep 16, 2022 · e587158 · e587158
1 parent b058247
commit e587158
Show file tree

Hide file tree

Showing 10 changed files with 65 additions and 27 deletions.
diff --git a/CalendarFXSampler/src/main/java/com/calendarfx/demo/CalendarFXDateControlSample.java b/CalendarFXSampler/src/main/java/com/calendarfx/demo/CalendarFXDateControlSample.java
@@ -57,8 +57,7 @@ protected Node wrap(Node node) {
         outerPane.setStyle("-fx-padding: 20px;");
 
         StackPane stackPane = new StackPane();
-        stackPane.setStyle(
-                "-fx-background-color: white; -fx-border-color: gray; -fx-border-width: .25px; -fx-padding: 20px;");
+        stackPane.setStyle("-fx-background-color: white; -fx-border-color: gray; -fx-border-width: .25px; -fx-padding: 20px;");
         outerPane.getChildren().add(stackPane);
 
         StackPane.setAlignment(node, Pos.CENTER);

diff --git a/CalendarFXSampler/src/main/java/com/calendarfx/demo/views/resources/HelloResourcesView.java b/CalendarFXSampler/src/main/java/com/calendarfx/demo/views/resources/HelloResourcesView.java
@@ -21,6 +21,7 @@
 import com.calendarfx.model.Calendar.Style;
 import com.calendarfx.view.DateControl;
 import com.calendarfx.view.DayViewBase.AvailabilityEditingEntryBehaviour;
+import com.calendarfx.view.DayViewBase.EarlyLateHoursStrategy;
 import com.calendarfx.view.resources.Resource;
 import com.calendarfx.view.resources.ResourcesView;
 import javafx.scene.Node;
@@ -50,6 +51,11 @@ protected Class<?> getJavaDocClass() {
         return ResourcesView.class;
     }
 
+    @Override
+    protected boolean isSupportingDeveloperConsole() {
+        return false;
+    }
+
     @Override
     public Node getControlPanel() {
         ToggleButton availabilityButton = new ToggleButton("Edit Schedule");
@@ -78,8 +84,8 @@ public Node getControlPanel() {
     @Override
     protected DateControl createControl() {
         resourcesView = new ResourcesView();
-        resourcesView.setPrefHeight(800);
-        resourcesView.setPrefWidth(700);
+        resourcesView.setNumberOfDays(5);
+        resourcesView.setEarlyLateHoursStrategy(EarlyLateHoursStrategy.HIDE);
         resourcesView.getResources().addAll(create("Dirk", Style.STYLE1), create("Katja", Style.STYLE2), create("Philip", Style.STYLE3), create("Jule", Style.STYLE4), create("Armin", Style.STYLE5));
         return resourcesView;
     }

diff --git a/CalendarFXView/src/main/java/com/calendarfx/view/CreateDeleteHandler.java b/CalendarFXView/src/main/java/com/calendarfx/view/CreateDeleteHandler.java
@@ -77,7 +77,7 @@ private void createEntry(MouseEvent evt) {
                 Optional<Calendar> calendar = dateControl.getCalendarAt(evt.getX(), evt.getY());
                 if (time != null) {
                     Entry<?> entry = dateControl.createEntryAt(time, calendar.orElse(null));
-                    if (dateControl.isShowDetailsUponCreation()) {
+                    if (dateControl.isShowDetailsUponEntryCreation()) {
                         dateControl.fireEvent(new RequestEvent(dateControl, dateControl, entry));
                     }
                 }

diff --git a/CalendarFXView/src/main/java/com/calendarfx/view/DateControl.java b/CalendarFXView/src/main/java/com/calendarfx/view/DateControl.java
@@ -2564,10 +2564,10 @@ public final void setAvailabilityFill(Paint availabilityFill) {
         this.availabilityFill.set(availabilityFill);
     }
 
-    private final BooleanProperty showDetailsUponCreation = new SimpleBooleanProperty(this, "showDetailsUponCreation", true);
+    private final BooleanProperty showDetailsUponEntryCreation = new SimpleBooleanProperty(this, "showDetailsUponEntryCreation", true);
 
-    public final boolean isShowDetailsUponCreation() {
-        return showDetailsUponCreation.get();
+    public final boolean isShowDetailsUponEntryCreation() {
+        return showDetailsUponEntryCreation.get();
     }
 
     /**
@@ -2576,12 +2576,12 @@ public final boolean isShowDetailsUponCreation() {
      *
      * @return true if the date control shows a dialog immediately after a new entry was added by the user
      */
-    public final BooleanProperty showDetailsUponCreationProperty() {
-        return showDetailsUponCreation;
+    public final BooleanProperty showDetailsUponEntryCreationProperty() {
+        return showDetailsUponEntryCreation;
     }
 
-    public final void setShowDetailsUponCreation(boolean showDetailsUponCreation) {
-        this.showDetailsUponCreation.set(showDetailsUponCreation);
+    public final void setShowDetailsUponEntryCreation(boolean showDetailsUponEntryCreation) {
+        this.showDetailsUponEntryCreation.set(showDetailsUponEntryCreation);
     }
 
     /**
@@ -2632,7 +2632,7 @@ public final void bind(DateControl otherControl, boolean bindDate) {
         Bindings.bindBidirectional(otherControl.usagePolicyProperty(), usagePolicyProperty());
         Bindings.bindBidirectional(otherControl.availableZoneIdsProperty(), availableZoneIdsProperty());
         Bindings.bindBidirectional(otherControl.enableTimeZoneSupportProperty(), enableTimeZoneSupportProperty());
-        Bindings.bindBidirectional(otherControl.showDetailsUponCreationProperty(), showDetailsUponCreationProperty());
+        Bindings.bindBidirectional(otherControl.showDetailsUponEntryCreationProperty(), showDetailsUponEntryCreationProperty());
         Bindings.bindBidirectional(otherControl.showNoonMarkerProperty(), showNoonMarkerProperty());
         Bindings.bindBidirectional(otherControl.showTodayProperty(), showTodayProperty());
 
@@ -2702,7 +2702,7 @@ public final void unbind(DateControl otherControl) {
         Bindings.unbindBidirectional(otherControl.availabilityCalendarProperty(), availabilityCalendarProperty());
         Bindings.unbindBidirectional(otherControl.availabilityGridProperty(), availabilityGridProperty());
         Bindings.unbindBidirectional(otherControl.availabilityFillProperty(), availabilityFillProperty());
-        Bindings.unbindBidirectional(otherControl.showDetailsUponCreationProperty(), showDetailsUponCreationProperty());
+        Bindings.unbindBidirectional(otherControl.showDetailsUponEntryCreationProperty(), showDetailsUponEntryCreationProperty());
         Bindings.unbindBidirectional(otherControl.showNoonMarkerProperty(), showNoonMarkerProperty());
         Bindings.unbindBidirectional(otherControl.showTodayProperty(), showTodayProperty());
 
@@ -3458,17 +3458,17 @@ public String getCategory() {
 
             @Override
             public Optional<ObservableValue<?>> getObservableValue() {
-                return Optional.of(showDetailsUponCreationProperty());
+                return Optional.of(showDetailsUponEntryCreationProperty());
             }
 
             @Override
             public void setValue(Object value) {
-                setShowDetailsUponCreation((boolean) value);
+                setShowDetailsUponEntryCreation((boolean) value);
             }
 
             @Override
             public Object getValue() {
-                return isShowDetailsUponCreation();
+                return isShowDetailsUponEntryCreation();
             }
 
             @Override

diff --git a/CalendarFXView/src/main/java/com/calendarfx/view/DayViewBase.java b/CalendarFXView/src/main/java/com/calendarfx/view/DayViewBase.java
@@ -944,7 +944,7 @@ public final void setOnLassoFinished(BiConsumer<Instant, Instant> onLassoFinishe
         this.onLassoFinished.set(onLassoFinished);
     }
 
-    private final ObjectProperty<Paint> lassoColor = new SimpleObjectProperty<>(this, "lassoColor", Color.ALICEBLUE);
+    private final ObjectProperty<Paint> lassoColor = new SimpleObjectProperty<>(this, "lassoColor", Color.GREY);
 
     public final Paint getLassoColor() {
         return lassoColor.get();

diff --git a/CalendarFXView/src/main/java/com/calendarfx/view/resources/ResourcesView.java b/CalendarFXView/src/main/java/com/calendarfx/view/resources/ResourcesView.java
@@ -20,6 +20,7 @@
 import com.calendarfx.view.CalendarHeaderView;
 import com.calendarfx.view.DayView;
 import com.calendarfx.view.DayViewBase;
+import com.calendarfx.view.RequestEvent;
 import com.calendarfx.view.TimeScaleView;
 import com.calendarfx.view.WeekDayHeaderView;
 import com.calendarfx.view.WeekView;
@@ -41,6 +42,10 @@
 import javafx.scene.layout.Region;
 import javafx.util.Callback;
 
+import java.util.function.Consumer;
+
+import static com.calendarfx.view.RequestEvent.REQUEST_ENTRY;
+
 /**
  * The detailed day view is a composite control consisting of a {@link DayView},
  * an {@link AllDayView}, an {@link CalendarHeaderView}, and a
@@ -63,6 +68,15 @@ public class ResourcesView<T extends Resource<?>> extends DayViewBase {
     public ResourcesView() {
         getStyleClass().add(DEFAULT_STYLE);
         setShowToday(false);
+
+        addEventHandler(REQUEST_ENTRY, evt -> maybeRunAndConsume(evt, e -> editEntry(evt.getEntry())));
+    }
+
+    private void maybeRunAndConsume(RequestEvent evt, Consumer<RequestEvent> runnable) {
+        if (!evt.isConsumed()) {
+            runnable.accept(evt);
+            evt.consume();
+        }
     }
 
     @Override
@@ -273,7 +287,11 @@ public final boolean isShowScrollBar() {
         return showScrollBar.get();
     }
 
-    private final ObjectProperty<Callback<T, WeekView>> weekViewFactory = new SimpleObjectProperty<>(this, "weekViewFactory", resource -> new WeekView());
+    private final ObjectProperty<Callback<T, WeekView>> weekViewFactory = new SimpleObjectProperty<>(this, "weekViewFactory", resource -> {
+        WeekView view = new WeekView();
+        view.setAdjustToFirstDayOfWeek(false);
+        return view;
+    });
 
     public final Callback<T, WeekView> getWeekViewFactory() {
         return weekViewFactory.get();

diff --git a/CalendarFXView/src/main/java/impl/com/calendarfx/view/CalendarViewSkin.java b/CalendarFXView/src/main/java/impl/com/calendarfx/view/CalendarViewSkin.java
@@ -23,6 +23,7 @@
 import com.calendarfx.view.CalendarView.Page;
 import com.calendarfx.view.DeveloperConsole;
 import com.calendarfx.view.Messages;
+import com.calendarfx.view.RequestEvent;
 import com.calendarfx.view.SearchResultView;
 import com.calendarfx.view.SourceView;
 import com.calendarfx.view.YearMonthView;
@@ -65,6 +66,7 @@
 import org.kordamp.ikonli.javafx.FontIcon;
 
 import java.time.ZoneId;
+import java.util.function.Consumer;
 
 import static com.calendarfx.view.CalendarView.Page.DAY;
 import static com.calendarfx.view.CalendarView.Page.MONTH;
@@ -113,12 +115,12 @@ public CalendarViewSkin(CalendarView view) {
             });
         }
 
-        view.addEventHandler(REQUEST_DATE, evt -> view.showDate(evt.getDate()));
-        view.addEventHandler(REQUEST_DATE_TIME, evt -> view.showDateTime(evt.getDateTime()));
-        view.addEventHandler(REQUEST_WEEK, evt -> view.showWeek(evt.getYear(), evt.getWeekOfYear()));
-        view.addEventHandler(REQUEST_YEAR_MONTH, evt -> view.showYearMonth(evt.getYearMonth()));
-        view.addEventHandler(REQUEST_YEAR, evt -> view.showYear(evt.getYear()));
-        view.addEventHandler(REQUEST_ENTRY, evt -> view.getSelectedPageView().editEntry(evt.getEntry()));
+        view.addEventHandler(REQUEST_DATE, evt -> maybeRunAndConsume(evt, e -> view.showDate(evt.getDate())));
+        view.addEventHandler(REQUEST_DATE_TIME, evt -> maybeRunAndConsume(evt, e -> view.showDateTime(evt.getDateTime())));
+        view.addEventHandler(REQUEST_WEEK, evt -> maybeRunAndConsume(evt, e -> view.showWeek(evt.getYear(), evt.getWeekOfYear())));
+        view.addEventHandler(REQUEST_YEAR_MONTH, evt -> maybeRunAndConsume(evt, e -> view.showYearMonth(evt.getYearMonth())));
+        view.addEventHandler(REQUEST_YEAR, evt -> maybeRunAndConsume(evt, e -> view.showYear(evt.getYear())));
+        view.addEventHandler(REQUEST_ENTRY, evt -> maybeRunAndConsume(evt, e -> view.getSelectedPageView().editEntry(evt.getEntry())));
 
         view.getAvailablePages().addListener((Observable it) -> buildSwitcher());
 
@@ -344,6 +346,13 @@ public CalendarViewSkin(CalendarView view) {
         updateToggleButtons();
     }
 
+    private void maybeRunAndConsume(RequestEvent evt, Consumer<RequestEvent> runnable) {
+        if (!evt.isConsumed()) {
+            runnable.accept(evt);
+            evt.consume();
+        }
+    }
+
     private void openTray() {
         leftMasterDetailPane.resetDividerPosition();
         leftMasterDetailPane.setShowDetailNode(true);

diff --git a/CalendarFXView/src/main/java/impl/com/calendarfx/view/DayViewEditController.java b/CalendarFXView/src/main/java/impl/com/calendarfx/view/DayViewEditController.java
@@ -319,7 +319,7 @@ private void mouseReleased(MouseEvent evt) {
         if (draggedEntry != null) {
             entry.setInterval(draggedEntry.getInterval());
             dayViewBase.setDraggedEntry(null);
-            if (dayViewBase.isShowDetailsUponCreation() && showEntryDetails) {
+            if (dayViewBase.isShowDetailsUponEntryCreation() && showEntryDetails) {
                 dayViewBase.fireEvent(new RequestEvent(dayViewBase, dayViewBase, entry));
             }
         }

diff --git a/CalendarFXView/src/main/java/impl/com/calendarfx/view/WeekViewSkin.java b/CalendarFXView/src/main/java/impl/com/calendarfx/view/WeekViewSkin.java
@@ -40,6 +40,7 @@ public class WeekViewSkin extends SkinBase<WeekView> {
     public WeekViewSkin(WeekView view) {
         super(view);
 
+
         final InvalidationListener rebuildListener = it -> buildDays();
         view.numberOfDaysProperty().addListener(rebuildListener);
         view.adjustToFirstDayOfWeekProperty().addListener(rebuildListener);

diff --git a/CalendarFXView/src/main/java/impl/com/calendarfx/view/resources/ResourcesViewSkin.java b/CalendarFXView/src/main/java/impl/com/calendarfx/view/resources/ResourcesViewSkin.java
@@ -136,13 +136,17 @@ private void updateView() {
 
             if (view.isShowAllDayView()) {
                 AllDayView allDayView = new AllDayView();
+                allDayView.setAdjustToFirstDayOfWeek(false);
 
+                // bind AllDayView
                 view.bind(allDayView, true);
+                allDayView.numberOfDaysProperty().bind(view.numberOfDaysProperty());
+
+                // some unbindings for AllDayView
                 Bindings.unbindBidirectional(view.defaultCalendarProviderProperty(), allDayView.defaultCalendarProviderProperty());
                 Bindings.unbindBidirectional(view.draggedEntryProperty(), allDayView.draggedEntryProperty());
                 Bindings.unbindContentBidirectional(view.getCalendarSources(), allDayView.getCalendarSources());
 
-                allDayView.setNumberOfDays(1);
                 CalendarSource calendarSource = createCalendarSource(resource);
                 allDayView.getCalendarSources().setAll(calendarSource);
                 allDayView.setDefaultCalendarProvider(control -> calendarSource.getCalendars().get(0));
@@ -154,6 +158,7 @@ private void updateView() {
             HBox.setHgrow(resourceHeader, Priority.ALWAYS);
 
             WeekDayHeaderView weekDayHeaderView = view.getWeekDayHeaderViewFactory().call(resource);
+            weekDayHeaderView.setAdjustToFirstDayOfWeek(false);
             weekDayHeaderView.numberOfDaysProperty().bind(view.numberOfDaysProperty());
             view.bind(weekDayHeaderView, true);