Feature/holiday timeframe multiselect

assets/admin/js/admin.js

@@ -229,6 +229,12 @@
         const REPETITION_WEEKLY = "w";
         const REPETITION_MONTHLY = "m";
         const REPETITION_YEARLY = "y";
+        const SELECTION_MANUAL = 0;
+        const SELECTION_CATEGORY = 1;
+        const SELECTION_ALL = 2;
+        const timeframeRepetitionInput = $("#timeframe-repetition");
+        const locationSelectionInput = $("#location-select");
+        const itemSelectionInput = $("#item-select");
         if (timeframeForm.length) {
             const timeframeRepetitionInput = $("#timeframe-repetition");
             const typeInput = $("#type");
@@ -251,6 +257,12 @@
             const linkSendEntireTimeframeCodes = $("#email-booking-codes-list-all");
             const linkSendCurrentMonth = $("#email-booking-codes-list-current");
             const linkSendNextMonth = $("#email-booking-codes-list-next");
+            const singleLocationSelection = $(".cmb2-id-location-id");
+            const multiLocationSelection = $(".cmb2-id-location-ids");
+            const singleItemSelection = $(".cmb2-id-item-id");
+            const multiItemSelection = $(".cmb2-id-item-ids");
+            const categoryLocationSelection = $(".cmb2-id-location-category-ids");
+            const categoryItemSelection = $(".cmb2-id-item-category-ids");
             const holidayField = $(".cmb2-id--cmb2-holiday");
             const holidayInput = $("#timeframe_manual_date");
             const manualDatePicker = $("#cmb2_multiselect_datepicker");
@@ -280,6 +292,28 @@
                     $(this).prop("checked", false);
                 });
             };
+            const migrateSingleSelection = () => {
+                if (typeInput.val() != HOLIDAYS_ID) {
+                    return;
+                }
+                const singleSelectionOption = singleItemSelection.find("option:selected");
+                if (singleSelectionOption.prop("value")) {
+                    const multiItemSelectionOption = multiItemSelection.find(`input[value=${singleSelectionOption.prop("value")}]`);
+                    if (multiItemSelectionOption) {
+                        multiItemSelectionOption.prop("checked", true);
+                    }
+                    singleSelectionOption.prop("selected", false);
+                }
+                const singleLocationSelectionOption = singleLocationSelection.find("option:selected");
+                if (singleLocationSelectionOption.prop("value")) {
+                    const multiLocationSelectionOption = multiLocationSelection.find(`input[value=${singleLocationSelectionOption.prop("value")}]`);
+                    if (multiLocationSelectionOption) {
+                        multiLocationSelectionOption.prop("checked", true);
+                    }
+                    singleLocationSelectionOption.prop("selected", false);
+                }
+            };
+            migrateSingleSelection();
             const handleTypeSelection = function() {
                 const selectedType = $("option:selected", typeInput).val();
                 const selectedRepetition = $("option:selected", timeframeRepetitionInput).val();
@@ -296,10 +330,70 @@
                         holidayField.hide();
                     }
                 }
+                if (selectedType == HOLIDAYS_ID) {
+                    itemSelectionInput.show();
+                    locationSelectionInput.show();
+                    migrateSingleSelection();
+                } else {
+                    itemSelectionInput.hide();
+                    locationSelectionInput.hide();
+                }
             };
             handleTypeSelection();
             typeInput.change(function() {
                 handleTypeSelection();
+                handleItemSelection();
+                handleLocationSelection();
+            });
+            const handleLocationSelection = function() {
+                const selectedType = $("option:selected", typeInput).val();
+                if (selectedType == HOLIDAYS_ID) {
+                    singleLocationSelection.hide();
+                    const selectedOption = $("option:selected", locationSelectionInput).val();
+                    if (selectedOption == SELECTION_MANUAL) {
+                        multiLocationSelection.show();
+                        categoryLocationSelection.hide();
+                    } else if (selectedOption == SELECTION_CATEGORY) {
+                        categoryLocationSelection.show();
+                        multiLocationSelection.hide();
+                    } else if (selectedOption == SELECTION_ALL) {
+                        multiLocationSelection.hide();
+                        categoryLocationSelection.hide();
+                    }
+                } else {
+                    singleLocationSelection.show();
+                    multiLocationSelection.hide();
+                    categoryLocationSelection.hide();
+                }
+            };
+            handleLocationSelection();
+            locationSelectionInput.change(function() {
+                handleLocationSelection();
+            });
+            const handleItemSelection = function() {
+                const selectedType = $("option:selected", typeInput).val();
+                if (selectedType == HOLIDAYS_ID) {
+                    singleItemSelection.hide();
+                    const selectedOption = $("option:selected", itemSelectionInput).val();
+                    if (selectedOption == SELECTION_MANUAL) {
+                        multiItemSelection.show();
+                        categoryItemSelection.hide();
+                    } else if (selectedOption == SELECTION_CATEGORY) {
+                        categoryItemSelection.show();
+                        multiItemSelection.hide();
+                    } else if (selectedOption == SELECTION_ALL) {
+                        multiItemSelection.hide();
+                        categoryItemSelection.hide();
+                    }
+                } else {
+                    singleItemSelection.show();
+                    multiItemSelection.hide();
+                    categoryItemSelection.hide();
+                }
+            };
+            handleItemSelection();
+            itemSelectionInput.change(function() {
+                handleItemSelection();
             });
             const handleFullDaySelection = function() {
                 const selectedRep = $("option:selected", timeframeRepetitionInput).val();

assets/admin/js/src/timeframe.js

@@ -44,6 +44,15 @@
         const REPETITION_MONTHLY = "m";
         const REPETITION_YEARLY = "y";
 
+        // the assigned numbers for the location selection input
+        const SELECTION_MANUAL = 0;
+        const SELECTION_CATEGORY = 1;
+        const SELECTION_ALL = 2;
+
+        const timeframeRepetitionInput = $('#timeframe-repetition');
+        const locationSelectionInput = $('#location-select');
+        const itemSelectionInput = $('#item-select');
+
         if (timeframeForm.length) {
             const timeframeRepetitionInput = $('#timeframe-repetition');
             const typeInput = $('#type');
@@ -72,14 +81,19 @@
             const linkSendNextMonth = $('#email-booking-codes-list-next');
 
 
+            const singleLocationSelection = $('.cmb2-id-location-id');
+            const multiLocationSelection = $(".cmb2-id-location-ids");
+            const singleItemSelection = $('.cmb2-id-item-id');
+            const multiItemSelection = $(".cmb2-id-item-ids");
+            const categoryLocationSelection = $('.cmb2-id-location-category-ids');
+            const categoryItemSelection = $('.cmb2-id-item-category-ids');
             const holidayField = $('.cmb2-id--cmb2-holiday');
             const holidayInput = $('#timeframe_manual_date');
             const manualDatePicker = $("#cmb2_multiselect_datepicker");
             const manualDateField = $('.cmb2-id-timeframe-manual-date');
             const maxDaysSelect = $('#timeframe-max-days');
             const advanceBookingDays = $('#timeframe-advance-booking-days');
-            const bookingStartDayOffset = $('#booking-startday-offset');
-            const bookingConfigurationTitle = $('#title-bookings-config');
+            const bookingStartDayOffset = $('#booking-startday-offset');const bookingConfigurationTitle = $('#title-bookings-config');
             const allowUserRoles = $('#allowed_user_roles');
             const repSet = [repConfigTitle, fullDayInput, startTimeInput, endTimeInput, weekdaysInput, repetitionStartInput, repetitionEndInput, gridInput];
             const noRepSet = [fullDayInput, startTimeInput, endTimeInput, gridInput, repetitionStartInput, repetitionEndInput];
@@ -116,6 +130,38 @@
                 });
             }
 
+            /**
+             * "Moves" selection from single item /location selection to multiselect.
+             * Currently only for holidays.
+             */
+            const migrateSingleSelection = () => {
+
+                if (typeInput.val() != HOLIDAYS_ID) {
+                    return;
+                }
+                // get single selection
+                const singleSelectionOption = singleItemSelection.find('option:selected');
+
+                // if it has a value, remove selection from single select and activate checkbox in multiselect
+                if(singleSelectionOption.prop('value')) {
+                    const multiItemSelectionOption = multiItemSelection.find(`input[value=${singleSelectionOption.prop('value')}]`);
+                    if(multiItemSelectionOption) {
+                        multiItemSelectionOption.prop('checked', true);
+                    }
+                    singleSelectionOption.prop('selected', false);
+                }
+
+                const singleLocationSelectionOption = singleLocationSelection.find('option:selected');
+                if (singleLocationSelectionOption.prop('value')) {
+                    const multiLocationSelectionOption = multiLocationSelection.find(`input[value=${singleLocationSelectionOption.prop('value')}]`);
+                    if(multiLocationSelectionOption) {
+                        multiLocationSelectionOption.prop('checked', true);
+                    }
+                    singleLocationSelectionOption.prop('selected', false);
+                }
+            }
+            migrateSingleSelection();
+
             /**
              * Shows/hides max day selection and user role restriction depending on timeframe type (for bookings).
              */
@@ -135,10 +181,88 @@
                         holidayField.hide();
                     }
                 }
+
+                //we migrate the single selection to the multiselect (new holiday timeframes do not have a single selection anymore)
+                if (selectedType == HOLIDAYS_ID) {
+                    itemSelectionInput.show();
+                    locationSelectionInput.show();
+                    migrateSingleSelection();
+                } else {
+                    itemSelectionInput.hide();
+                    locationSelectionInput.hide();
+                }
             }
             handleTypeSelection();
             typeInput.change(function () {
                 handleTypeSelection();
+                handleItemSelection();
+                handleLocationSelection();
+            });
+
+            /**
+             * Shows/hides selection options for locations
+             */
+            const handleLocationSelection = function () {
+                const selectedType = $("option:selected", typeInput).val();
+                //disable the mass selection for all timeframes except holidays
+                if (selectedType == HOLIDAYS_ID) {
+                    singleLocationSelection.hide();
+                    //handle different selection types
+                    const selectedOption = $("option:selected", locationSelectionInput).val();
+                    if (selectedOption == SELECTION_MANUAL) {
+                        multiLocationSelection.show();
+                        categoryLocationSelection.hide();
+                    } else if (selectedOption == SELECTION_CATEGORY){
+                        categoryLocationSelection.show();
+                        multiLocationSelection.hide();
+                    }
+                    else if (selectedOption == SELECTION_ALL) {
+                        multiLocationSelection.hide();
+                        categoryLocationSelection.hide();
+                    }
+                }
+                else {
+                    singleLocationSelection.show();
+                    multiLocationSelection.hide();
+                    categoryLocationSelection.hide();
+                }
+            };
+            handleLocationSelection();
+            locationSelectionInput.change(function () {
+                handleLocationSelection();
+            });
+
+            /**
+             * Shows/hides selection options for items
+             */
+            const handleItemSelection = function () {
+                const selectedType = $("option:selected", typeInput).val();
+                //disable the mass selection for all timeframes except holidays (for now)
+                if (selectedType == HOLIDAYS_ID) {
+                    singleItemSelection.hide();
+                    //handle different selection types
+                    const selectedOption = $("option:selected", itemSelectionInput).val();
+                    if (selectedOption == SELECTION_MANUAL) {
+                        multiItemSelection.show();
+                        categoryItemSelection.hide();
+                    } else if (selectedOption == SELECTION_CATEGORY){
+                        categoryItemSelection.show();
+                        multiItemSelection.hide();
+                    }
+                    else if (selectedOption == SELECTION_ALL) {
+                        multiItemSelection.hide();
+                        categoryItemSelection.hide();
+                    }
+                }
+                else {
+                    singleItemSelection.show();
+                    multiItemSelection.hide();
+                    categoryItemSelection.hide();
+                }
+            };
+            handleItemSelection();
+            itemSelectionInput.change(function () {
+                handleItemSelection();
             });
 
             /**

src/Helper/Wordpress.php

@@ -144,11 +144,14 @@ public static function getRelatedPostsIdsForTimeframe($postId): array {
 		$timeframe = new Timeframe($postId);
 		$ids = [$postId];
 
-		if($timeframe->getItem()) {
-			$ids[] = $timeframe->getItem()->ID;
+		$items = $timeframe->getItems();
+		if( $items ) {
+			foreach ($items as $item) $ids[] = $item->ID;
 		}
-		if($timeframe->getLocation()) {
-			$ids[] = $timeframe->getLocation()->ID;
+
+		$locations = $timeframe->getLocations();
+		if( $locations ) {
+			foreach ($locations as $location) $ids[] = $location->ID;
 		}
 
 		return $ids;
@@ -246,16 +249,29 @@ public static function getTags($posts, array $items = [], array $locations = [])
 	public static function getLocationAndItemIdsFromPosts($posts): array {
 		$itemsAndLocations = [];
 		array_walk($posts, function ($timeframe) use (&$itemsAndLocations) {
-			$itemsAndLocations[] = get_post_meta(
+			$items = get_post_meta(
 				$timeframe->ID,
 				Timeframe::META_ITEM_ID,
 				true
 			);
-			$itemsAndLocations[] = get_post_meta(
+			// depends on single or multiselect
+			if(is_array($items)) {
+				foreach ($items as $item) $itemsAndLocations[] = $item;
+			} else {
+				$itemsAndLocations[] = $items;
+			}
+
+			$locations = get_post_meta(
 				$timeframe->ID,
 				Timeframe::META_LOCATION_ID,
 				true
 			);
+			// depends on single or multiselect
+			if(is_array($locations)) {
+				foreach ($locations as $location) $itemsAndLocations[] = $location;
+			} else {
+				$itemsAndLocations[] = $locations;
+			}
 		});
 		return array_map('intval', $itemsAndLocations);
 	}