fixes #4320, fixes #1871

Closes #4320 and #1871

Merge request studip/studip!3125

3 files changed, 20 insertions, 10 deletions

diff --git a/app/controllers/consultation/admin.php b/app/controllers/consultation/admin.php
index 8ee7575..13451d2 100644
--- a/app/controllers/consultation/admin.php
+++ b/app/controllers/consultation/admin.php
@@ -165,13 +165,19 @@ class Consultation_AdminController extends ConsultationController
         CSRFProtection::verifyUnsafeRequest();
 
         try {
+            $interval = Request::int('interval');
             $start = $this->getDateAndTime('start');
-            $end = $this->getDateAndTime('end');
+            $end = $this->getDateAndTime($interval === 0 ? 'start' : 'end', 'end');
 
             if (date('Hi', $end) <= date('Hi', $start)) {
                 throw new InvalidArgumentException(_('Die Endzeit liegt vor der Startzeit!'));
             }
 
+            $dow = Request::int('day-of-week');
+            if ($interval === 0) {
+                $dow = date('w', $start);
+            }
+
             // Determine duration of a slot and pause times
             $duration = Request::int('duration');
             $pause_time = Request::bool('pause') ? Request::int('pause_time') : null;
@@ -187,8 +193,8 @@ class Consultation_AdminController extends ConsultationController
             $slot_count = ConsultationBlock::countSlots(
                 $start,
                 $end,
-                Request::int('day-of-week'),
-                Request::int('interval'),
+                $dow,
+                $interval,
                 $duration,
                 $pause_time,
                 $pause_duration
@@ -202,8 +208,8 @@ class Consultation_AdminController extends ConsultationController
                 $this->range,
                 $start,
                 $end,
-                Request::int('day-of-week'),
-                Request::int('interval')
+                $dow,
+                $interval
             );
 
             $stored = 0;
@@ -872,15 +878,19 @@ class Consultation_AdminController extends ConsultationController
         }
     }
 
-    private function getDateAndTime($index)
+    private function getDateAndTime(string $index, string $index_time = null)
     {
-        if (!Request::submitted("{$index}-date") || !Request::submitted("{$index}-time")) {
+        if ($index_time === null) {
+            $index_time = $index;
+        }
+
+        if (!Request::submitted("{$index}-date") || !Request::submitted("{$index_time}-time")) {
             throw new Exception("Date with index '{$index}' was not submitted properly");
         }
 
         return strtotime(implode(' ', [
             Request::get("{$index}-date"),
-            Request::get("{$index}-time")
+            Request::get("{$index_time}-time")
         ]));
     }
 
diff --git a/app/views/consultation/overview/index.php b/app/views/consultation/overview/index.php
index dcad608..ef7f208 100644
--- a/app/views/consultation/overview/index.php
+++ b/app/views/consultation/overview/index.php
@@ -61,7 +61,7 @@
                     <?= Icon::create('add')->asImg(tooltip2(_('Termin reservieren'))) ?>
                 </a>
             <? else: ?>
-                <?= Icon::create('add', Icon::ROLE_INACTIVE)->asImg(tooltip2(_('Dieser Termin ist für Buchungen gesperrt.'))) ?>
+                <?= Icon::create('decline', Icon::ROLE_INACTIVE)->asImg(tooltip2(_('Dieser Termin ist für Buchungen gesperrt.'))) ?>
             <? endif; ?>
             </td>
         </tr>
diff --git a/app/views/consultation/overview/ungrouped.php b/app/views/consultation/overview/ungrouped.php
index 147f588..c9eb519 100644
--- a/app/views/consultation/overview/ungrouped.php
+++ b/app/views/consultation/overview/ungrouped.php
@@ -91,7 +91,7 @@
                     <?= Icon::create('add')->asImg(tooltip2(_('Termin reservieren'))) ?>
                 </a>
             <? else: ?>
-                <?= Icon::create('add', Icon::ROLE_INACTIVE)->asImg(tooltip2(_('Dieser Termin ist für Buchungen gesperrt.'))) ?>
+                <?= Icon::create('decline', Icon::ROLE_INACTIVE)->asImg(tooltip2(_('Dieser Termin ist für Buchungen gesperrt.'))) ?>
             <? endif; ?>
             </td>
         </tr>