Skip to content

BookingPool 48018: Redirect to Post-Booking Information #11737

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
matheuszych wants to merge 1 commit into
base: release_11
Choose a base branch
from
Open

BookingPool 48018: Redirect to Post-Booking Information #11737

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
247 changes: 175 additions & 72 deletions components/ILIAS/BookingManager/BookingProcess/class.ProcessUtilGUI.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,11 @@ public function back(): void
return;
}

if ($retCmd === 'render') {
$this->redirectToRender();
return;
}

if ($retCmd !== "") {
$this->ctrl->redirectByClass(get_class($this->parent_gui), $retCmd);
} else {
Expand Down Expand Up @@ -184,107 +189,205 @@ public function displayPostInfo(
int $user_id,
string $file_deliver_cmd
): void {
$this->log->debug("displayPostInfo");
$main_tpl = $this->gui->mainTemplate();
$ctrl = $this->gui->ctrl();
$lng = $this->domain->lng();
$id = $book_obj_id;
$request = $this->gui->standardRequest();
$this->log->debug('displayPostInfo');
$booking_ids = $this->request->getReservationIdsFromString();

if (!$id) {
$objects_with_periods = $this->resolveObjectsWithPeriodsForPostInfo(
$book_obj_id,
$user_id,
$booking_ids
);

if ($objects_with_periods === []) {
$this->ctrl->redirect($this->parent_gui, 'back');
return;
}

$rsv_ids = $request->getReservationIdsFromString();

$tmp = [];
if ($rsv_ids === [] && $request->getReservationId() !== '') {
$reservationIdParts = explode('_', $request->getReservationId());
$booking_objects = [];
$booking_info_filenames = [];

$user_id = (int) ($reservationIdParts[1] ?? 0);
$from = (int) ($reservationIdParts[2] ?? 0);
$objects_with_info = [];
foreach ($objects_with_periods as $object_id => $periods) {
$booking_objects[$object_id] = new \ilBookingObject($object_id);
$booking_info_filenames[$object_id] = trim($this->objects_manager->getBookingInfoFilename($object_id));

if ($from > time()) {
$to = (int) ($reservationIdParts[3] ?? 0);
$tmp["$from-" . ($to + 1)] = 1;
if (
trim($booking_objects[$object_id]->getPostText()) === ''
&& $booking_info_filenames[$object_id] === ''
) {
continue;
}
$rsv_ids = [0];

$objects_with_info[$object_id] = $periods;
}

// placeholder
if ($objects_with_info === []) {
$this->ctrl->redirect($this->parent_gui, 'back');
return;
}

$book_ids = \ilBookingReservation::getObjectReservationForUser($id, $user_id);
foreach ($book_ids as $book_id) {
if (in_array($book_id, $rsv_ids) || count($rsv_ids) === 0) {
$obj = new \ilBookingReservation($book_id);
$from = $obj->getFrom();
$to = $obj->getTo();
if ($from > time()) {
$tmp[$from . "-" . $to + 1] = $tmp[$from . "-" . $to + 1] ?? 0;
$tmp[$from . "-" . $to + 1]++;
}
$template = new \ilTemplate(
'tpl.booking_reservation_post.html',
true,
true,
'components/ILIAS/BookingManager/BookingProcess'
);
$multiple_objects = count($objects_with_info) > 1;
$submit_url = $this->ctrl->getLinkTarget($this->parent_gui, 'back');

foreach ($objects_with_info as $object_id => $periods) {
$booking_object = $booking_objects[$object_id];
$post_text = trim($booking_object->getPostText());

$template->setCurrentBlock('info_block');
$title = $multiple_objects
? sprintf($this->lng->txt('book_post_booking_information_for'), $booking_object->getTitle())
: $this->lng->txt('book_post_booking_information');
$template->setVariable('TITLE', $title);

if ($post_text !== '') {
$post_text = str_replace(
['[OBJECT]', '[PERIOD]'],
[$booking_object->getTitle(), implode('<br />', $periods)],
$post_text
);
$template->setVariable('POST_TEXT', nl2br($post_text));
}

if ($booking_info_filenames[$object_id] === '') {
$template->parseCurrentBlock();
continue;
}

$this->ctrl->setParameter($this->parent_gui, 'object_id', $object_id);
$url = $this->ctrl->getLinkTarget($this->parent_gui, $file_deliver_cmd);
$this->ctrl->clearParameterByClass($this->parent_gui::class, 'object_id');

$template->setCurrentBlock('download');
$template->setVariable('DOWNLOAD', $this->lng->txt('download'));
$template->setVariable('URL_FILE', $url);
$template->setVariable('TXT_FILE', $booking_info_filenames[$object_id]);
$template->parseCurrentBlock();
$template->setCurrentBlock('info_block');

$template->parseCurrentBlock();
}

$olddt = \ilDatePresentation::useRelativeDates();
\ilDatePresentation::setUseRelativeDates(false);
$template->setCurrentBlock('submit');
$template->setVariable('TXT_SUBMIT', $this->lng->txt('ok'));
$template->setVariable('URL_SUBMIT', $submit_url);
$template->parseCurrentBlock();

$period = array();
ksort($tmp);
foreach ($tmp as $time => $counter) {
$time = explode("-", $time);
$time = \ilDatePresentation::formatPeriod(
new \ilDateTime($time[0], IL_CAL_UNIX),
new \ilDateTime($time[1], IL_CAL_UNIX)
);
if ($counter > 1) {
$time .= " (" . $counter . ")";
$this->tpl->setContent($template->get());
}

/**
* @return array<int, string[]>
*/
protected function resolveObjectsWithPeriodsForPostInfo(
int $book_obj_id,
int $user_id,
array $booking_ids
): array {
if ($booking_ids !== []) {
return $this->resolvePeriodsFromReservationIds($booking_ids);
}

if ($book_obj_id <= 0) {
return [];
}

$period_slots = [];
if ($this->request->getReservationId() !== '') {
$reservation_id_parts = explode('_', $this->request->getReservationId());
$user_id = (int) ($reservation_id_parts[1] ?? 0);
$from = (int) ($reservation_id_parts[2] ?? 0);

if ($from > time()) {
$to = (int) ($reservation_id_parts[3] ?? 0);
$period_slots["$from-$to"] = 1;
}
$period[] = $time;
$booking_ids = [0];
}
$book_id = array_shift($book_ids);

\ilDatePresentation::setUseRelativeDates($olddt);
$book_ids = \ilBookingReservation::getObjectReservationForUser($book_obj_id, $user_id);
foreach ($book_ids as $book_id) {
if (!in_array($book_id, $booking_ids, true) && $booking_ids !== []) {
continue;
}

/*
#23578 since Booking pool participants.
$obj = new ilBookingReservation($book_id);
if ($obj->getUserId() != $ilUser->getId())
{
return;
$reservation = new \ilBookingReservation($book_id);
$from = $reservation->getFrom();
$to = $reservation->getTo();
if ($from > time()) {
$key = "$from-$to";
$period_slots[$key] = ($period_slots[$key] ?? 0) + 1;
}
}
*/

$obj = new \ilBookingObject($id);
$pfile = $this->objects_manager->getBookingInfoFilename($id);
$ptext = $obj->getPostText();
return $period_slots === []
? []
: [$book_obj_id => $this->formatPeriodSlots($period_slots)];
}

$mytpl = new \ilTemplate('tpl.booking_reservation_post.html', true, true, 'components/ILIAS/BookingManager/BookingProcess');
$mytpl->setVariable("TITLE", $lng->txt('book_post_booking_information'));
/**
* @param string[] $booking_ids
* @return array<int, string[]>
*/
protected function resolvePeriodsFromReservationIds(array $booking_ids): array
{
$period_slots_by_object = [];

if ($ptext) {
// placeholder
$ptext = str_replace(
["[OBJECT]", "[PERIOD]"],
[$obj->getTitle(), implode("<br />", $period)],
$ptext
);
foreach ($booking_ids as $booking_id) {
$booking_id = (int) $booking_id;
if ($booking_id <= 0) {
continue;
}

$mytpl->setVariable("POST_TEXT", nl2br($ptext));
$reservation = new \ilBookingReservation($booking_id);
$object_id = $reservation->getObjectId();
$key = "{$reservation->getFrom()}-{$reservation->getTo()}";
$period_slots_by_object[$object_id][$key] = ($period_slots_by_object[$object_id][$key] ?? 0) + 1;
}

if ($pfile) {
$url = $ctrl->getLinkTarget($this->parent_gui, $file_deliver_cmd);
$objects_with_periods = [];
foreach ($period_slots_by_object as $object_id => $period_slots) {
$objects_with_periods[$object_id] = $this->formatPeriodSlots($period_slots);
}

ksort($objects_with_periods);

return $objects_with_periods;
}

/**
* @param array<string, int> $period_slots
* @return string[]
*/
protected function formatPeriodSlots(array $period_slots): array
{
$olddt = \ilDatePresentation::useRelativeDates();
\ilDatePresentation::setUseRelativeDates(false);

$period = [];
ksort($period_slots);
foreach ($period_slots as $time => $counter) {
$time_parts = explode('-', $time);
$formatted = \ilDatePresentation::formatPeriod(
new \ilDateTime((int) $time_parts[0], IL_CAL_UNIX),
new \ilDateTime((int) $time_parts[1], IL_CAL_UNIX)
);

$mytpl->setVariable("DOWNLOAD", $lng->txt('download'));
$mytpl->setVariable("URL_FILE", $url);
$mytpl->setVariable("TXT_FILE", $pfile);
if ($counter > 1) {
$formatted .= " ($counter)";
}

$period[] = $formatted;
}

$mytpl->setVariable("TXT_SUBMIT", $lng->txt('ok'));
$mytpl->setVariable("URL_SUBMIT", $ctrl->getLinkTarget($this->parent_gui, "back"));
\ilDatePresentation::setUseRelativeDates($olddt);

$main_tpl->setContent($mytpl->get());
return $period;
}

/**
Expand Down
14 changes: 8 additions & 6 deletions ...s/ILIAS/BookingManager/BookingProcess/templates/default/tpl.booking_reservation_post.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
<!-- BEGIN info_block -->
<div class="panel panel-primary">
<div class="panel-heading ilHeader">
<h3>{TITLE}</h3>
Expand All @@ -13,9 +14,10 @@ <h3>{TITLE}</h3>
</div>
<!-- END download -->
</div>
<div class="panel-footer ilBlockInfo">
<form action="{URL_SUBMIT}" method="POST">
<input type="submit" class="btn btn-default" value="{TXT_SUBMIT}" />
</form>
</div>
</div>
</div>
<!-- END info_block -->
<!-- BEGIN submit -->
<div class="ilRight">
<a href="{URL_SUBMIT}" class="btn btn-default">{TXT_SUBMIT}</a>
</div>
<!-- END submit -->
17 changes: 15 additions & 2 deletions ...onents/ILIAS/BookingManager/src/BookableItem/Table/Action/BookableItemTableBookAction.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
namespace ILIAS\BookingManager\BookableItem\Table\Action;

use ilBookingObjectGUI;
use ilBookingProcessWithScheduleGUI;
use ilBookingProcessWithoutScheduleGUI;
use ilBookingReservation;
use ilCtrlInterface;
use ilDatePresentation;
Expand All @@ -43,8 +45,6 @@
use ilBookingObject;
use ILIAS\BookingManager\BookingProcess\BookingProcessManager;
use ilObjUser;
use DateTimeZone;
use DateTime;

class BookableItemTableBookAction implements TableAction
{
Expand Down Expand Up @@ -290,6 +290,7 @@ public function onSubmit(

$booked_total = 0;
$unavailable = [];
$booking_ids = [];

foreach ($data as $object_id => $section) {
$message = $section['message'] ?? '';
Expand Down Expand Up @@ -318,6 +319,9 @@ public function onSubmit(

if ($booked !== []) {
$booked_total += count($booked);
foreach ($booked as $booking_id) {
$booking_ids[] = $booking_id;
}
continue;
}

Expand Down Expand Up @@ -347,6 +351,15 @@ public function onSubmit(
$this->lng->txt('book_reservation_confirmed'),
true
);

$booking_process_gui_class = $this->pool->getScheduleType() === ilObjBookingPool::TYPE_FIX_SCHEDULE
? ilBookingProcessWithScheduleGUI::class
: ilBookingProcessWithoutScheduleGUI::class;

$this->ctrl->setParameterByClass($booking_process_gui_class, 'rsv_ids', implode(';', array_unique($booking_ids)));
$this->ctrl->setParameterByClass($booking_process_gui_class, 'returnCmd', 'render');
$this->ctrl->redirectByClass($booking_process_gui_class, 'displayPostInfo');
return null;
}

$this->ctrl->redirectByClass(ilBookingObjectGUI::class, 'render');
Expand Down
Loading
Loading