diff --git a/app/views/resources/booking/_add_edit_form.php b/app/views/resources/booking/_add_edit_form.php index 202d0d15a4401b15f77f7a5f9ecfe56cc80408fb..fc59350201cb47015d32569740865906607d6444 100644 --- a/app/views/resources/booking/_add_edit_form.php +++ b/app/views/resources/booking/_add_edit_form.php @@ -208,29 +208,41 @@ <section class="fieldset-row inner-row"> <fieldset id="BookingTypeFieldset"> <legend><?= _('Art des Termins') ?></legend> - <div class="booking-type-item"> - <label> - <input type="radio" name="booking_style" value="single" - <?= empty($block_booking) || $booking_style == 'single' - ? 'checked="checked"' - : '' ?> - class="booking-type-item"> + <? if ($mode == 'add'): ?> + <div class="booking-type-item"> + <label> + <input type="radio" name="booking_style" value="single" + <?= empty($block_booking) || $booking_style == 'single' + ? 'checked="checked"' + : '' ?> + class="booking-type-item"> + <?= _('Einzeltermin') ?> + </label> + <label title="<?= _('Konvolut'); ?>"> + <input type="radio" name="booking_style" value="block" + <?= !empty($block_booking) || $booking_style == 'block' ? 'checked="checked"' : '' ?> + class="booking-type-item"> + <?= _('Terminblock') ?> + </label> + <label> + <input type="radio" name="booking_style" value="repeat" + <?= $booking_style == 'repeat' ? 'checked="checked"' : '' ?> + class="booking-type-item"> + <?= _('Wiederholungstermine') ?> + </label> + </div> + <? else: ?> + <? if ($booking_style == 'single'): ?> + <input type="hidden" name="booking_style" value="single"> <?= _('Einzeltermin') ?> - </label> - <label title="<?= _('Konvolut'); ?>"> - <input type="radio" name="booking_style" value="block" - <?= !empty($block_booking) || $booking_style == 'block' ? 'checked="checked"' : '' ?> - class="booking-type-item"> + <? elseif ($booking_style == 'block'): ?> + <input type="hidden" name="booking_style" value="block"> <?= _('Terminblock') ?> - </label> - <label> - <input type="radio" name="booking_style" value="repeat" - <?= $booking_style == 'repeat' ? 'checked="checked"' : '' ?> - class="booking-type-item"> + <? elseif ($booking_style == 'repeat'): ?> + <input type="hidden" name="booking_style" value="repeat"> <?= _('Wiederholungstermine') ?> - </label> - - </div> + <? endif ?> + <? endif ?> </fieldset> <fieldset id="BlockBookingFieldset" diff --git a/resources/assets/javascripts/bootstrap/resources.js b/resources/assets/javascripts/bootstrap/resources.js index 31c42341f2e8df343d4b426c54b51d551e5349d3..53a70159b8fd94e82383e9e766f76f1943c0743d 100644 --- a/resources/assets/javascripts/bootstrap/resources.js +++ b/resources/assets/javascripts/bootstrap/resources.js @@ -54,8 +54,12 @@ STUDIP.ready(function () { //Dialog for adding/editing bookings: - if (jQuery('form.create-booking-form').length) { - STUDIP.Resources.moveTimeOptions(jQuery('input[name="booking_style"]:checked').val()); + if (jQuery('form.create-booking-form')) { + let time_option = jQuery('input[name="booking_style"]:checked').val(); + if (!time_option) { + time_option = jQuery('input[name="booking_style"]').val(); + } + STUDIP.Resources.moveTimeOptions(time_option); } //Set the date selector in the sidebar to the date from the session,