@@ -18,3 +18,9 @@ services:

         arguments:

             - "@database_connection"

             - "@logger"

+

+    vonrotenberg.wa.slot_checker:

+        class: vonRotenberg\WeinanlieferungBundle\SlotChecker

+        public: true

+        arguments:

+            - "@database_connection"

@@ -41,3 +41,7 @@ $GLOBALS['TL_LANG']['tl_vr_wa_slot']['info_legend'] = 'Zusätzliche Informatione

 $GLOBALS['TL_LANG']['tl_vr_wa_slot']['booking_legend'] = 'Buchbarkeits-Einstellungen';

 $GLOBALS['TL_LANG']['tl_vr_wa_slot']['back'] = 'Zurück';

+

+

+$GLOBALS['TL_LANG']['ERR']['wa_slot_nodate'] = 'Sie müssen ein gültiges Datum angeben';

+$GLOBALS['TL_LANG']['ERR']['wa_slot_conflict'] = 'Es besteht ein Konflikt mit einem bereits bestehenden Zeitslot';

@@ -15,11 +15,14 @@ namespace vonRotenberg\WeinanlieferungBundle\EventListener\DataContainer;

 use Contao\CoreBundle\ServiceAnnotation\Callback;

 use Contao\DataContainer;

 use Contao\Date;

+use Contao\Input;

 use Contao\StringUtil;

+use Contao\System;

 use Doctrine\DBAL\Connection;

 use vonRotenberg\WeinanlieferungBundle\Model\WeinanlieferungLeseartModel;

 use vonRotenberg\WeinanlieferungBundle\Model\WeinanlieferungRebsorteModel;

 use vonRotenberg\WeinanlieferungBundle\Model\WeinanlieferungSlotsModel;

+use vonRotenberg\WeinanlieferungBundle\SlotChecker;

 class WeinanlieferungSlotContainerListener

 {

@@ -65,18 +68,27 @@ class WeinanlieferungSlotContainerListener

     }

     /**

-     * @Callback(table="tl_vr_wa_slot", target="config.onsubmit")

+     * @Callback(table="tl_vr_wa_slot", target="fields.time.save", priority=1)

      */

-    public function adjustTime(DataContainer $dc)

+    public function checkAndAdjustTime($varValue, DataContainer $dc)

     {

+        /** @var SlotChecker $slotchecker */

+        $slotchecker = System::getContainer()->get('vonrotenberg.wa.slot_checker');

+

         // Return if there is no active record (override all) or no start date has been set yet

         if (!$dc->activeRecord || empty($dc->activeRecord->date))

         {

-            return;

+            throw new \Exception($this->translator->trans('ERR.wa_slot_nodate', [], 'contao_tl_vr_wa_slot'));

         }

-        $arrSet['time'] = strtotime(date('Y-m-d', $dc->activeRecord->date) . ' ' . date('H:i:s', $dc->activeRecord->time));

+        $start = strtotime(date('Y-m-d', $dc->activeRecord->date) . ' ' . date('H:i:s', $varValue));

+        $duration = \intval(Input::post('duration')) !== null ? intval(Input::post('duration'))*60 : $dc->activeRecord->duration*60;

+

+        if ($slotchecker->checkTimeApplicableForSite($dc->activeRecord->pid,$start,$start+$duration,0,\intval($dc->id)))

+        {

+            throw new \Exception($this->translator->trans('ERR.wa_slot_conflict', [], 'contao_tl_vr_wa_slot'));

+        }

-        $this->db->update("tl_vr_wa_slot",$arrSet,['id' => $dc->id]);

+        return $start;

     }

 }

new file mode 100644

@@ -0,0 +1,60 @@

+<?php

+

+declare(strict_types=1);

+

+/*

+ * This file is part of contao-weinanlieferung-bundle.

+ *

+ * (c) vonRotenberg

+ *

+ * @license commercial

+ */

+

+namespace vonRotenberg\WeinanlieferungBundle;

+

+use Doctrine\DBAL\Connection;

+

+class SlotChecker {

+

+    private $db;

+

+    public function __construct(Connection $connection) {

+        $this->db = $connection;

+    }

+

+    public function checkTimeApplicableForSite(int $siteId, int $startTime, int $endTime, int $buffer=0,int $exceptionId=0): bool {

+        // Get existing slots in the timeframe

+        $sql = "SELECT COUNT(id) FROM tl_vr_wa_slot

+WHERE

+	pid = :pid

+	AND

+	(

+		(

+			time >= :start

+			AND time <= :end

+		)

+		OR

+		(

+			time+duration*60 > :start

+			AND time+duration*60 <= :end

+		)

+		OR

+		(

+			time < :start

+			AND time+duration*60 > :end

+		)

+	)";

+        $values = ['pid' => $siteId, 'start' => $startTime-$buffer, 'end' => $endTime+$buffer];

+

+        if ($exceptionId > 0)

+        {

+            $sql .= " AND id != :exceptionId";

+            $values['exceptionId'] = $exceptionId;

+        }

+

+        $ConflictingSlots = $this->db->prepare($sql)->executeQuery($values);

+

+        return $ConflictingSlots->fetchOne() == true;

+    }

+

+}