@@ -8,6 +8,7 @@

  * @license commercial

  */

+use vonRotenberg\WeinanlieferungBundle\Model\WeinanlieferungSlottypesModel;

 use vonRotenberg\WeinanlieferungBundle\Model\WeinanlieferungUnitsModel;

 use vonRotenberg\WeinanlieferungBundle\Model\WeinanlieferungLageModel;

 use vonRotenberg\WeinanlieferungBundle\Model\WeinanlieferungRebsorteModel;

@@ -32,6 +33,7 @@ ArrayUtil::arrayInsert($GLOBALS['BE_MOD'],1,[

 $GLOBALS['TL_MODELS']['tl_vr_wa_units'] = WeinanlieferungUnitsModel::class;

+$GLOBALS['TL_MODELS']['tl_vr_wa_slottypes'] = WeinanlieferungSlottypesModel::class;

 $GLOBALS['TL_MODELS']['tl_vr_wa_slot'] = WeinanlieferungSlotsModel::class;

 $GLOBALS['TL_MODELS']['tl_vr_wa_standort'] = WeinanlieferungStandortModel::class;

 $GLOBALS['TL_MODELS']['tl_vr_wa_rebsorte'] = WeinanlieferungRebsorteModel::class;

@@ -92,7 +92,8 @@ $GLOBALS['TL_DCA']['tl_vr_wa_slot'] = array

     'palettes' => array

     (

         '__selector__' => array('addEnclosure'),

-        'default' => '{time_legend},date,time;{type_legend},behaelter,sorten,lage,ernteart;{info_legend},anmerkungen,addEnclosure;{booking_legend},published,buchbar_ab,buchbar_bis'

+//        'default' => '{time_legend},date,time,duration;{type_legend},behaelter,sorten,lage,ernteart;{info_legend},anmerkungen,addEnclosure;{booking_legend},published,buchbar_ab,buchbar_bis'

+        'default' => '{time_legend},date,time,duration;{type_legend},behaelter;{info_legend},anmerkungen,addEnclosure;{booking_legend},published,buchbar_ab,buchbar_bis'

     ),

     // Subpalettes

@@ -138,6 +139,21 @@ $GLOBALS['TL_DCA']['tl_vr_wa_slot'] = array

             'eval'      => array('rgxp' => 'time', 'mandatory' => true, 'tl_class' => 'w50'),

             'sql'       => "int(10) NULL"

         ),

+        'duration' => array

+        (

+            'exclude'                 => true,

+            'inputType'               => 'text',

+            'eval'                    => array

+            (

+                'mandatory' => true,

+                'maxlength' => 4,

+                'maxval'    => 1440,

+                'minval'    => 1,

+                'rgxp'      => 'natural',

+                'tl_class' => 'w50'

+            ),

+            'sql'                     => "int(4) NOT NULL default 0"

+        ),

         'lage'   => array

         (

             'exclude'   => true,

@@ -149,18 +165,18 @@ $GLOBALS['TL_DCA']['tl_vr_wa_slot'] = array

         ),

         'behaelter'   => array

         (

-            'exclude'   => true,

-            'inputType' => 'select',

-            'options_callback'   => function () {

-                $range = [];

-                for ($i = 1; $i <= 30; $i++)

-                {

-                    $range[] = $i;

-                }

-                return $range;

-            },

-            'eval'      => array('rgxp' => 'natural', 'mandatory' => true, 'includeBlankOption' => true, 'tl_class' => 'w50'),

-            'sql'       => "smallint(3) unsigned NOT NULL default 0"

+            'exclude'                 => true,

+            'inputType'               => 'text',

+            'eval'                    => array

+            (

+                'mandatory' => true,

+                'maxlength' => 4,

+                'maxval'    => 9999,

+                'minval'    => 1,

+                'rgxp'      => 'natural',

+                'tl_class' => 'w50'

+            ),

+            'sql'                     => "int(4) NOT NULL default 0"

         ),

         'sorten'       => array

         (

@@ -104,7 +104,8 @@ $GLOBALS['TL_DCA']['tl_vr_wa_slottypes'] = array

         'pid' => array

         (

             'foreignKey'              => "tl_vr_wa_standort.title",

-            'sql'                     => "int(10) unsigned NOT NULL default 0"

+            'sql'                     => "int(10) unsigned NOT NULL default 0",

+            'relation'                => array('type'=>'belongsTo', 'load'=>'lazy')

         ),

         'tstamp' => array

         (

@@ -71,7 +71,7 @@ $GLOBALS['TL_DCA']['tl_vr_wa_standort'] = array

             'edit' => array

             (

                 'href'                => 'table=tl_vr_wa_slot',

-                'icon'                => 'edit.gif',

+                'icon'                => '/bundles/vonrotenbergweinanlieferung/images/icons/calendar.svg',

             ),

             'slottypes' => array

             (

@@ -12,6 +12,8 @@ $GLOBALS['TL_LANG']['tl_vr_wa_slot']['date'][0] = 'Datum';

 $GLOBALS['TL_LANG']['tl_vr_wa_slot']['date'][1] = 'Der Tag der Anlieferung.';

 $GLOBALS['TL_LANG']['tl_vr_wa_slot']['time'][0] = 'Uhrzeit';

 $GLOBALS['TL_LANG']['tl_vr_wa_slot']['time'][1] = 'Uhrzeit dieses Anlieferungsslots.';

+$GLOBALS['TL_LANG']['tl_vr_wa_slot']['duration'][0] = 'Dauer in min.';

+$GLOBALS['TL_LANG']['tl_vr_wa_slot']['duration'][1] = 'Die Dauer des Slots.';

 $GLOBALS['TL_LANG']['tl_vr_wa_slot']['behaelter'][0] = 'Behälter';

 $GLOBALS['TL_LANG']['tl_vr_wa_slot']['behaelter'][1] = 'Anzahl der Behälter, die verarbeitet werden können.';

 $GLOBALS['TL_LANG']['tl_vr_wa_slot']['lage'][0] = 'Lage';

@@ -43,6 +43,7 @@ use vonRotenberg\WeinanlieferungBundle\Model\WeinanlieferungLeseartModel;

 use vonRotenberg\WeinanlieferungBundle\Model\WeinanlieferungRebsorteModel;

 use vonRotenberg\WeinanlieferungBundle\Model\WeinanlieferungReservationModel;

 use vonRotenberg\WeinanlieferungBundle\Model\WeinanlieferungSlotsModel;

+use vonRotenberg\WeinanlieferungBundle\Model\WeinanlieferungSlottypesModel;

 /**

  * @Route("%contao.backend.route_prefix%/weinanlieferung/slotassistant", name=self::class, defaults={"_scope" = "backend"})

@@ -77,28 +78,33 @@ class WeinanlieferungSlotAssistantController extends AbstractController

     public function __invoke(): Response

     {

-        // Handle ajax request

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

-        {

-            $this->objAjax = new Ajax(Input::post('action'));

-            $this->objAjax->executePreActions();

-        }

+        System::loadLanguageFile('default');

+        System::loadLanguageFile('tl_vr_wa_slotassistant');

+        Controller::loadDataContainer('tl_vr_wa_slot');

+        Controller::loadDataContainer('tl_vr_wa_slotassistant');

         $GLOBALS['TL_CSS']['cirrus'] = 'bundles/vonrotenbergweinanlieferung/css/backend.css|static';

         $arrData = [

             'request_token' => $this->tokenManager->getDefaultTokenValue(),

             'ref'           => $this->request->attributes->get('_contao_referer_id')

         ];

-        System::loadLanguageFile('default');

-        System::loadLanguageFile('tl_vr_wa_slotassistant');

-        Controller::loadDataContainer('tl_vr_wa_slot');

-        Controller::loadDataContainer('tl_vr_wa_slotassistant');

-//        dump($this->getWidgets());

+        // Handle ajax request pre actions

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

+        {

+            $this->objAjax = new Ajax(Input::post('action'));

+            $this->objAjax->executePreActions();

+        }

+

+        // Form submitted

+        if (Input::post('FORM_SUBMIT') == 'wa_slotassistant')

+        {

+            $this->generateSlots();

+        }

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

-        // AJAX request

+        // Handle ajax request post actions

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

         {

             $dc = new DC_File('tl_vr_wa_slotassistant');

@@ -227,7 +233,7 @@ class WeinanlieferungSlotAssistantController extends AbstractController

                     'help'   => 'Anmerkungen zum Zeitslot. Diese werden bei der Buchung angezeigt.',

                     'widget' => new TextArea([

                         'name'      => 'annotation',

-                        'mandatory' => true,

+                        'mandatory' => false,

                         'label'     => 'Anmerkungen',

                         'rte'       => 'tinyMCE'

                     ])

@@ -237,7 +243,7 @@ class WeinanlieferungSlotAssistantController extends AbstractController

                     'help'   => 'Anmerkungen zum Zeitslot. Diese werden bei der Buchung angezeigt.',

                     'widget' => new FileTree([

                         'name'        => 'enclosure',

-                        'mandatory'   => true,

+                        'mandatory'   => false,

                         'label'       => 'Anmerkungen',

                         'multiple'    => true,

                         'fieldType'   => 'checkbox',

@@ -341,11 +347,6 @@ class WeinanlieferungSlotAssistantController extends AbstractController

                     unset($file, $type, $pickerBuilder, $fileBrowserTypes, $fileBrowserType);

                 }

-

-                if (Input::post('FORM_SUBMIT') == 'wa_slotassistant')

-                {

-                    dump($field['widget']->validate());

-                }

             }

         }

@@ -371,4 +372,97 @@ class WeinanlieferungSlotAssistantController extends AbstractController

         return $arrOptions;

     }

+

+    protected function validateForm()

+    {

+        $blnSubmit = false;

+        if (Input::post('FORM_SUBMIT') == 'wa_slotassistant')

+        {

+            $blnSubmit = true;

+            foreach ($this->getWidgets() as $group => $fields)

+            {

+                foreach ($fields as $field)

+                {

+                    $field['widget']->validate();

+                    if ($field['widget']->hasErrors())

+                    {

+                        $blnSubmit = false;

+                    }

+                }

+            }

+        }

+        return $blnSubmit;

+    }

+

+    protected function generateSlots()

+    {

+        if (!Input::post('FORM_SUBMIT') == 'wa_slotassistant' || !$this->validateForm())

+        {

+            return;

+        }

+

+        if (

+            ($SlotType = WeinanlieferungSlottypesModel::findByPk(Input::post('slotType'))) === null

+            || ($Standort = $SlotType->getRelated('pid')) === null

+            || !\is_array(Input::post('timeframe'))

+        )

+        {

+            return;

+        }

+

+        // Get timespans

+        foreach (Input::post('timeframe') as $timeframe)

+        {

+            if (

+                !isset($timeframe['date_start'])

+                || !isset($timeframe['date_end'])

+            )

+            {

+                continue;

+            }

+

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

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

+

+            $intStart  = $StartDate->tstamp;

+            $intEnd  = $EndDate->tstamp;

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

+            $intDuration = (int) $SlotType->duration*60;

+            $arrTimes = [];

+            $arrStartTimes = [];

+            $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")

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

+

+            if ($ExistingSlots->rowCount())

+            {

+                foreach ($ExistingSlots->fetchAllAssociative() as $slot)

+                {

+                    $arrTimes[$slot['start']] = [

+                        'start' => $slot['start'],

+                        'end'  => $slot['end']

+                    ];

+                    $arrStartTimes[] = $slot['start'];

+                    $arrEndTimes[] = $slot['end'];

+                }

+            }

+

+            $intTime = $intStart;

+            while ($intTime < $intEnd-$intDuration)

+            {

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

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

+

+                /** 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.

+                 */

+            }

+

+            //$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 <= ?)")

+

+        }

+    }

 }

new file mode 100644

@@ -0,0 +1,24 @@

+<?php

+

+declare(strict_types=1);

+

+/*

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

+ *

+ * (c) vonRotenberg

+ *

+ * @license commercial

+ */

+

+namespace vonRotenberg\WeinanlieferungBundle\Model;

+

+use Contao\Model;

+

+class WeinanlieferungSlottypesModel extends Model

+{

+    /**

+     * Table name

+     * @var string

+     */

+    protected static $strTable = 'tl_vr_wa_slottypes';

+}