kroepelin-projekte
diff --git a/‎Modules/BookingManager/BookingProcess/class.ProcessUtilGUI.php‎
Lines changed: 14 additions & 8 deletions b/‎Modules/BookingManager/BookingProcess/class.ProcessUtilGUI.php‎
Lines changed: 14 additions & 8 deletions
diff --git a/‎Modules/BookingManager/Participants/class.ilBookingParticipant.php‎
Lines changed: 15 additions & 12 deletions b/‎Modules/BookingManager/Participants/class.ilBookingParticipant.php‎
Lines changed: 15 additions & 12 deletions
diff --git a/‎Modules/BookingManager/Participants/class.ilBookingParticipantGUI.php‎
Lines changed: 1 addition & 1 deletion b/‎Modules/BookingManager/Participants/class.ilBookingParticipantGUI.php‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎Modules/BookingManager/Participants/class.ilBookingParticipantsTableGUI.php‎
Lines changed: 6 additions & 6 deletions b/‎Modules/BookingManager/Participants/class.ilBookingParticipantsTableGUI.php‎
Lines changed: 6 additions & 6 deletions
diff --git a/‎Modules/BookingManager/Schedule/class.ilBookingScheduleGUI.php‎
Lines changed: 1 addition & 0 deletions b/‎Modules/BookingManager/Schedule/class.ilBookingScheduleGUI.php‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎Modules/BookingManager/classes/class.ilObjBookingPoolAccess.php‎
Lines changed: 1 addition & 1 deletion b/‎Modules/BookingManager/classes/class.ilObjBookingPoolAccess.php‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎Modules/BookingManager/classes/class.ilObjBookingPoolListGUI.php‎
Lines changed: 1 addition & 0 deletions b/‎Modules/BookingManager/classes/class.ilObjBookingPoolListGUI.php‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎Modules/Course/classes/class.ilObjCourseGUI.php‎
Lines changed: 0 additions & 4 deletions b/‎Modules/Course/classes/class.ilObjCourseGUI.php‎
Lines changed: 0 additions & 4 deletions
diff --git a/‎Modules/DataCollection/classes/Content/class.ilDclRecordEditGUI.php‎
Lines changed: 1 addition & 1 deletion b/‎Modules/DataCollection/classes/Content/class.ilDclRecordEditGUI.php‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎Modules/DataCollection/classes/Content/class.ilDclRecordListGUI.php‎
Lines changed: 2 additions & 1 deletion b/‎Modules/DataCollection/classes/Content/class.ilDclRecordListGUI.php‎
Lines changed: 2 additions & 1 deletion
@@ -1,20 +1,23 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of ILIAS, a powerful learning management system
  * published by ILIAS open source e-Learning e.V.
+ *
  * ILIAS is licensed with the GPL-3.0,
  * see https://www.gnu.org/licenses/gpl-3.0.en.html
  * You should have received a copy of said license along with the
  * source code, too.
+ *
  * If this is not the case or you just want to try ILIAS, you'll find
  * us at:
  * https://www.ilias.de
  * https://github.com/ILIAS-eLearning
+ *
  *********************************************************************/
 
+declare(strict_types=1);
+
 namespace ILIAS\BookingManager\BookingProcess;
 
 use ILIAS\BookingManager\InternalDomainService;
@@ -166,14 +169,17 @@ public function displayPostInfo(
 
         $rsv_ids = $request->getReservationIdsFromString();
 
-        $tmp = array();
-        if (count($rsv_ids) === 0 && $request->getReservationId() !== "") {
-            [$obj_id, $user_id, $from, $to] = explode("_", $request->getReservationId());
+        $tmp = [];
+        if ($rsv_ids === [] && $request->getReservationId() !== '') {
+            $reservationIdParts = explode('_', $request->getReservationId());
+
+            $user_id = (int) ($reservationIdParts[1] ?? 0);
+            $from = (int) ($reservationIdParts[2] ?? 0);
+
             if ($from > time()) {
-                $tmp[$from . "-" . $to + 1] = $tmp[$from . "-" . $to + 1] ?? 0;
-                $tmp[$from . "-" . $to + 1]++;
+                $to = (int) ($reservationIdParts[3] ?? 0);
+                $tmp["$from-" . ($to + 1)] = 1;
             }
-            $user_id = (int) $user_id;
             $rsv_ids = [0];
         }
 
 
@@ -182,26 +182,28 @@ public static function getList(
             $user_name = ilObjUser::_lookupName($row['user_id']);
             $name = $user_name['lastname'] . ", " . $user_name['firstname'];
             $index = $a_booking_pool . "_" . $row['user_id'];
-            $actions = array();
 
+            $title = (string) ($row['title'] ?? '');
+            $object_id = (int) ($row['object_id'] ?? -1);
             if (!isset($res[$index])) {
-                $res[$index] = array(
-                    "object_title" => array(),
-                    "name" => $name
-                );
-
-                if ($status != ilBookingReservation::STATUS_CANCELLED && $row['title'] !== "") {
-                    $res[$index]['object_title'] = array($row['title']);
+                $res[$index] = ['object_title' => [], 'obj_count' => 0, 'object_ids' => [], 'name' => $name];
+
+                if (
+                    $status !== ilBookingReservation::STATUS_CANCELLED
+                    && $title !== ''
+                    && $object_id !== -1
+                ) {
+                    $res[$index]['object_title'] = [$title];
                     $res[$index]['obj_count'] = 1;
-                    $res[$index]['object_ids'][] = $row['object_id'];
+                    $res[$index]['object_ids'][] = $object_id;
                 }
-            } elseif ($row['title'] !== "" && (!in_array($row['title'], $res[$index]['object_title'], true) && $status != ilBookingReservation::STATUS_CANCELLED)) {
-                $res[$index]['object_title'][] = $row['title'];
+            } elseif ($title !== '' && (!in_array($title, $res[$index]['object_title'], true) && $status !== ilBookingReservation::STATUS_CANCELLED)) {
+                $res[$index]['object_title'][] = $title;
                 if (!isset($res[$index]['obj_count'])) {
                     $res[$index]['obj_count'] = 0;
                 }
                 $res[$index]['obj_count'] += 1;
-                $res[$index]['object_ids'][] = $row['object_id'];
+                $res[$index]['object_ids'][] = $object_id;
             }
             $res[$index]['user_id'] = $row['user_id'];
         }
@@ -211,6 +213,7 @@ public static function getList(
                 $res[$index]['object_ids'][] = $row['object_id'];
             }
         }
+
         return $res;
     }
 
 
@@ -153,7 +153,7 @@ public function addParticipantObject(
                 if ($participant_obj->getIsNew()) {
                     $this->tpl->setOnScreenMessage('success', $this->lng->txt("book_participant_assigned"), true);
                 } else {
-                    $this->tpl->setOnScreenMessage('failure', $this->lng->txt("book_participant_already_assigned"));
+                    $this->tpl->setOnScreenMessage('failure', $this->lng->txt("book_participant_already_assigned"), true);
                 }
             } else {
                 $this->tpl->setOnScreenMessage('failure', "dummy error message, change me");
 
@@ -127,12 +127,12 @@ public function getItems(array $filter): void
     {
         $filter_object = (int) ($filter["object"] ?? 0);
         if ($filter_object > 0) {
-            $data = ilBookingParticipant::getList($this->pool_id, $filter, $filter["object"]);
-        } elseif ($filter_object == -1) {
-            $data = ilBookingParticipant::getList($this->pool_id, $filter);
-            $data = array_filter($data, static function ($item) {
-                return ($item["obj_count"] ?? 0) == 0;
-            });
+            $data = ilBookingParticipant::getList($this->pool_id, $filter, $filter_object);
+        } elseif ($filter_object === -1) {
+            $data = array_filter(
+                ilBookingParticipant::getList($this->pool_id, $filter),
+                static fn(array $item): bool => ($item["obj_count"] ?? 0) === 0
+            );
         } else {
             $data = ilBookingParticipant::getList($this->pool_id, $filter);
         }
 
@@ -184,6 +184,7 @@ public function initForm(
         $deadline->setMinValue(1);
         $deadline->setSize(3);
         $deadline->setMaxLength(3);
+        $deadline->setRequired(true);
         $deadline_time->addSubItem($deadline);
 
         $deadline_start = new ilRadioOption($lng->txt("book_deadline_slot_start"), "slot_start");
 
@@ -36,7 +36,7 @@ public static function _getCommands(): array
     {
         $commands = array();
         $commands[] = array("permission" => "read", "cmd" => "render", "lang_var" => "show", "default" => true);
-        $commands[] = array("permission" => "write", "cmd" => "render", "lang_var" => "edit_content");
+        $commands[] = array("permission" => "write", "cmd" => "render", "lang_var" => "book_booking_objects");
         $commands[] = array("permission" => "write", "cmd" => "edit", "lang_var" => "settings");
 
         return $commands;
 
@@ -50,6 +50,7 @@ public function init(): void
 
         // general commands array
         $this->commands = ilObjBookingPoolAccess::_getCommands();
+        $this->lng->loadLanguageModule('book');
     }
 
     public function getCommandLink(string $cmd): string
 
@@ -834,7 +834,6 @@ public function updateObject(): void
         $this->object->enableSubscriptionMembershipLimitation((bool) $form->getInput('subscription_membership_limitation'));
         $this->object->setSubscriptionMaxMembers((int) $form->getInput('subscription_max'));
         $this->object->setSubscriptionMinMembers((int) $form->getInput('subscription_min'));
-        $old_autofill = $this->object->hasWaitingListAutoFill();
         switch ((int) $form->getInput('waiting_list')) {
             case 2:
                 $this->object->enableWaitingList(true);
@@ -908,9 +907,6 @@ public function updateObject(): void
             }
         }
 
-        if (!$old_autofill && $this->object->hasWaitingListAutoFill()) {
-            $this->object->handleAutoFill();
-        }
         $this->object->update();
 
         ilObjectServiceSettingsGUI::updateServiceSettingsForm(
 
@@ -650,7 +650,7 @@ public function save(): void
             $dispatchEvent = "create";
             $ref_id = $this->http->wrapper()->query()->retrieve('ref_id', $this->refinery->kindlyTo()->int());
             $objDataCollection = new ilObjDataCollection($ref_id);
-            $objDataCollection->sendNotification("new_record", $this->table_id, $record_obj->getId());
+            $objDataCollection->sendRecordNotification(ilDataCollectionMailNotification::TYPE_RECORD_CREATE, $record_obj);
         } else {
             $dispatchEventData['prev_record'] = $unchanged_obj;
         }
 
@@ -228,6 +228,7 @@ public function initImportForm(): ilPropertyFormGUI
         $form->addItem($item);
 
         $file = new ilFileInputGUI($this->lng->txt("import_file"), "import_file");
+        $file->setSuffixes(['xlsx']);
         $file->setRequired(true);
         $form->addItem($file);
 
@@ -543,7 +544,7 @@ protected function createSwitchers(): void
         );
 
         $switcher->addViewSwitcherToToolbar(
-            $this->table_obj->getVisibleTableViews($this->parent_obj->getRefId()),
+            $this->table_obj->getVisibleTableViews(),
             $this->getTableId(),
             self::class,
             self::CMD_SHOW
Original file line number	Diff line number	Diff line change
`@@ -153,7 +153,7 @@ public function addParticipantObject(`
`153`	`153`	`if ($participant_obj->getIsNew()) {`
`154`	`154`	`$this->tpl->setOnScreenMessage('success', $this->lng->txt("book_participant_assigned"), true);`
`155`	`155`	`} else {`
`156`		`- $this->tpl->setOnScreenMessage('failure', $this->lng->txt("book_participant_already_assigned"));`
	`156`	`+ $this->tpl->setOnScreenMessage('failure', $this->lng->txt("book_participant_already_assigned"), true);`
`157`	`157`	`}`
`158`	`158`	`} else {`
`159`	`159`	`$this->tpl->setOnScreenMessage('failure', "dummy error message, change me");`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ public static function _getCommands(): array`
`36`	`36`	`{`
`37`	`37`	`$commands = array();`
`38`	`38`	`$commands[] = array("permission" => "read", "cmd" => "render", "lang_var" => "show", "default" => true);`
`39`		`- $commands[] = array("permission" => "write", "cmd" => "render", "lang_var" => "edit_content");`
	`39`	`+ $commands[] = array("permission" => "write", "cmd" => "render", "lang_var" => "book_booking_objects");`
`40`	`40`	`$commands[] = array("permission" => "write", "cmd" => "edit", "lang_var" => "settings");`
`41`	`41`
`42`	`42`	`return $commands;`
Original file line number	Diff line number	Diff line change
`@@ -50,6 +50,7 @@ public function init(): void`
`50`	`50`
`51`	`51`	`// general commands array`
`52`	`52`	`$this->commands = ilObjBookingPoolAccess::_getCommands();`
	`53`	`+ $this->lng->loadLanguageModule('book');`
`53`	`54`	`}`
`54`	`55`
`55`	`56`	`public function getCommandLink(string $cmd): string`
Original file line number	Diff line number	Diff line change
`@@ -650,7 +650,7 @@ public function save(): void`
`650`	`650`	`$dispatchEvent = "create";`
`651`	`651`	`$ref_id = $this->http->wrapper()->query()->retrieve('ref_id', $this->refinery->kindlyTo()->int());`
`652`	`652`	`$objDataCollection = new ilObjDataCollection($ref_id);`
`653`		`- $objDataCollection->sendNotification("new_record", $this->table_id, $record_obj->getId());`
	`653`	`+ $objDataCollection->sendRecordNotification(ilDataCollectionMailNotification::TYPE_RECORD_CREATE, $record_obj);`
`654`	`654`	`} else {`
`655`	`655`	`$dispatchEventData['prev_record'] = $unchanged_obj;`
`656`	`656`	`}`