@@ -7,6 +7,9 @@

 {% endblock %}

 {% block main %}

+    <div class="tl_message">

+        {{ messages|raw }}

+    </div>

     <div id="tl_buttons">

         <a href="#" class="header_back" title="" accesskey="b" onclick="Backend.getScrollOffset()">Zurück</a>

     </div>

@@ -26,6 +26,7 @@ use Contao\FileTree;

 use Contao\FrontendUser;

 use Contao\Image;

 use Contao\Input;

+use Contao\Message;

 use Contao\SelectMenu;

 use Contao\StringUtil;

 use Contao\System;

@@ -103,6 +104,7 @@ class WeinanlieferungSlotAssistantController extends AbstractController

         }

         $arrData['fields'] = $this->getWidgets();

+        $arrData['messages'] = Message::generateUnwrapped() . Backend::getSystemMessages();

         // Handle ajax request post actions

         if ($_POST && Environment::get('isAjaxRequest'))

@@ -424,6 +426,8 @@ class WeinanlieferungSlotAssistantController extends AbstractController

             $StartDate = new Date($timeframe['date_start'], Date::getNumericDatimFormat());

             $EndDate = new Date($timeframe['date_end'], Date::getNumericDatimFormat());

+            $now = time();

+            $intNewSlots = 0;

             $intStart  = $StartDate->tstamp;

             $intEnd  = $EndDate->tstamp;

             $intBuffer = intval(Input::post('buffer')) * 60;

@@ -433,7 +437,7 @@ class WeinanlieferungSlotAssistantController extends AbstractController

             $arrEndTimes = [];

             // Get existing slots in the timeframe

-            $ExistingSlots = $this->db->prepare("SELECT id, date, time as 'start', time+duration as 'end', duration FROM tl_vr_wa_slot WHERE pid = ? AND (time >= ? OR time+$intDuration+$intBuffer >= ?) AND (time <= ? OR time+$intDuration+$intBuffer <= ?) ORDER BY time")

+            $ExistingSlots = $this->db->prepare("SELECT id, date, time as 'start', (time+duration*60) as 'end', duration FROM tl_vr_wa_slot WHERE pid = ? AND (time >= ? OR time+$intDuration+$intBuffer >= ?) AND (time <= ? OR time+$intDuration+$intBuffer <= ?) ORDER BY time")

                                       ->executeQuery([$Standort->id, $intStart, $intStart, $intEnd, $intEnd]);

             if ($ExistingSlots->rowCount())

@@ -449,20 +453,70 @@ class WeinanlieferungSlotAssistantController extends AbstractController

                 }

             }

+            // Create all possible timeslots for given timeframe

             $intTime = $intStart;

             while ($intTime < $intEnd-$intDuration)

             {

-                dump(Date::parse(Date::getNumericDatimFormat(),$intTime));

-                $intTime = $intTime + $intDuration + $intBuffer;

+                $arrConflicts = [];

-                /** Todo:

-                 * Check time against start and stop times and take buffer into account.

-                 * If theres a conflict, determine the next possible start time and check again.

-                 */

-            }

+                foreach ($arrStartTimes as $check_start)

+                {

+                    $checkslot = $arrTimes[$check_start];

+                    if (

+                        (

+                            $intTime >= $checkslot['start']

+                            && $intTime <= $checkslot['end']

+                        )

+                        || (

+                            $intTime + $intDuration + $intBuffer > $checkslot['start']

+                            && $intTime + $intDuration + $intBuffer < $checkslot['end']

+                        )

+                    ) {

+//                        dump('Konflikt Start: ' . Date::parse(Date::getNumericDatimFormat(),$checkslot['start']));

+//                        dump('Konflikt Ende: ' . Date::parse(Date::getNumericDatimFormat(),$checkslot['end']));

+

+                        $arrConflicts[] = $checkslot['end'];

+                    }

+                }

-            //$ExistingSlots = $this->db->prepare("SELECT id, date, time, duration FROM tl_vr_wa_slot WHERE pid = ? AND (time >= ? OR time+duration*60+$intBuffer >= ?) AND (time <= ? OR time+duration*60+$intBuffer <= ?)")

+                if (\count($arrConflicts) > 0)

+                {

+                    $intTime = max($arrConflicts) + $intBuffer;

+                    continue;

+                }

+//                dump(Date::parse(Date::getNumericDatimFormat(),$intTime));

+

+                $NewDateTime = new Date($intTime);

+                $NewSlot = new WeinanlieferungSlotsModel();

+                $NewSlot->setRow([

+                    'pid' => $SlotType->pid,

+                    'tstamp' => $now,

+                    'date' => $NewDateTime->dayBegin,

+                    'time' => $intTime,

+                    'duration' => $intDuration/3600,

+                    'behaelter' => $SlotType->containers,

+                    'anmerkungen' => Input::post('annotation'),

+                    'buchbar_ab' => (int) $intTime-intval(Input::post('bookableFrom'))*3600,

+                    'buchbar_bis' => (int) $intTime-intval(Input::post('bookableTill'))*3600,

+                    'published' => '1'

+                ]);

+

+                if (Input::post('enclosure'))

+                {

+                    $NewSlot->addEnclosure = '1';

+                    $NewSlot->enclosure = explode(',',Input::post('enclosure'));

+                }

+

+                $NewSlot->save();

+                $intNewSlots++;

+

+                $intTime = $intTime + $intDuration + $intBuffer;

+

+            }

         }

+

+        Message::addConfirmation(sprintf('Es wurden %s neue Zeitslots angelegt.',$intNewSlots));

+//        Backend::reload();

     }

 }