@@ -2,7 +2,7 @@

     {% block filter %}

         <form hx-get="{{ pageUrl is defined ? pageUrl : '' }}" hx-push-url="true" hx-headers='{"VR-Ajax": "WaSlotsModule"}' hx-trigger="change, submit" hx-target="closest .content-wrapper" class="filter">

-            <div class="row">

+            <div class="row u-justify-center">

                 <div class="col-md-2 kapazitaet">

                     <select name="filter_kapazitaet">

                         <option value="">-- Kapazität --</option>

@@ -19,6 +19,14 @@

                         {% endfor %}

                     </select>

                 </div>

+                <div class="col-md-2 day">

+                    <select name="filter_tag">

+                        <option value="">-- Datum --</option>

+                        {% for key, option in filter.tag.options %}

+                            <option value="{{ key }}"{% if filter.tag.selected is defined and filter.tag.selected == key %} selected{% endif %}>{{ option }}</option>

+                        {% endfor %}

+                    </select>

+                </div>

                 {#<div class="col-md-2 ernteart">

                     <select name="filter_ernteart">

                         <option value="">-- Ernteart --</option>

@@ -24,6 +24,7 @@ use Contao\PageModel;

 use Contao\StringUtil;

 use Contao\System;

 use Contao\Template;

+use Doctrine\DBAL\Connection;

 use Symfony\Component\HttpFoundation\Request;

 use Symfony\Component\HttpFoundation\Response;

 use vonRotenberg\WeinanlieferungBundle\Model\WeinanlieferungLeseartModel;

@@ -41,9 +42,12 @@ class WeinanlieferungSlotsListModuleController extends AbstractFrontendModuleCon

     private $insertTagParser;

-    public function __construct(InsertTagParser $insertTagParser)

+    private $db;

+

+    public function __construct(InsertTagParser $insertTagParser, Connection $connection)

     {

         $this->insertTagParser = $insertTagParser;

+        $this->db = $connection;

     }

@@ -56,7 +60,7 @@ class WeinanlieferungSlotsListModuleController extends AbstractFrontendModuleCon

         $arrData = $template->getData();

         $arrOptions = [];

-        // Add filter values

+        // Add filter sql

         if (!empty($_GET['filter_kapazitaet']))

         {

             $arrData['filter']['kapazitaet']['selected'] = $_GET['filter_kapazitaet'];

@@ -69,6 +73,13 @@ class WeinanlieferungSlotsListModuleController extends AbstractFrontendModuleCon

             $arrOptions['column'][] = 'pid = ?';

             $arrOptions['value'][] = $_GET['filter_standort'];

         }

+        if (!empty($_GET['filter_tag']) && ($Tag = new Date($_GET['filter_tag'])))

+        {

+            $arrData['filter']['tag']['selected'] = $_GET['filter_tag'];

+            $arrOptions['column'][] = 'tl_vr_wa_slot.time BETWEEN ? and ?';

+            $arrOptions['value'][] = $Tag->dayBegin;

+            $arrOptions['value'][] = $Tag->dayEnd;

+        }

         if (!empty($_GET['filter_ernteart']))

         {

             $arrData['filter']['ernteart']['selected'] = $_GET['filter_ernteart'];

@@ -93,34 +104,11 @@ class WeinanlieferungSlotsListModuleController extends AbstractFrontendModuleCon

             }

         }

-        $arrData['filter']['kapazitaet']['options'] = range(1,30);

-

-        if (($Standorte = WeinanlieferungStandortModel::findBy(["id IN (".implode(',',$standortIds).")"],null,['order'=>'title ASC'])) !== null)

-        {

-            $arrData['filter']['standort']['options'] = array_combine($Standorte->fetchEach('id'),$Standorte->fetchEach('title'));

-        }

-

-        if (isset($GLOBALS['TL_DCA']['tl_vr_wa_slot']['fields']['ernteart']['options']))

-        {

-            foreach ($GLOBALS['TL_DCA']['tl_vr_wa_slot']['fields']['ernteart']['options'] as $ernteart)

-            {

-                $arrData['filter']['ernteart']['options'][$ernteart] = $GLOBALS['TL_LANG']['REF']['wa_ernteart'][$ernteart] ?? $ernteart;

-            }

-        }

-

-        if (($Sorten = WeinanlieferungRebsorteModel::findAll(['order'=>'title ASC'])) !== null)

-        {

-            $arrData['filter']['sorte']['options'] = array_combine($Sorten->fetchEach('id'),$Sorten->fetchEach('title'));

-        }

-

-        if (($Leseart = WeinanlieferungLeseartModel::findAll(['order'=>'title ASC'])) !== null)

-        {

-            $arrData['filter']['leseart']['options'] = array_combine($Leseart->fetchEach('id'),$Leseart->fetchEach('title'));

-        }

-

         // Get available slots

         if (($slots = WeinanlieferungSlotsModel::findMultiplePublishedByPids($standortIds,$arrOptions)) !== null)

         {

+            $slotIds = $slots->fetchEach('id');

+

             /** @var WeinanlieferungSlotsModel $slot */

             foreach ($slots as $slot)

             {

@@ -168,6 +156,43 @@ class WeinanlieferungSlotsListModuleController extends AbstractFrontendModuleCon

                     'gebucht' => (boolean) WeinanlieferungReservationModel::countBy(["uid = ?","pid = ?"],[FrontendUser::getInstance()->id,$slot->id])

                 ]);

             }

+

+            // Get filter values

+            $result = $this->db->executeQuery("SELECT MAX(behaelter) as 'kapazitaet' FROM tl_vr_wa_slot WHERE id IN (".implode(',',$slotIds).")");

+            $intMaxKapazitaet = $result->fetchOne();

+            $arrData['filter']['kapazitaet']['options'] = range(1,max(1,$intMaxKapazitaet));

+

+            if (($Standorte = WeinanlieferungStandortModel::findBy(["id IN (".implode(',',$standortIds).")","id IN (SELECT tl_vr_wa_slot.pid FROM tl_vr_wa_slot WHERE tl_vr_wa_slot.id IN (".implode(',',$slotIds)."))"],null,['order'=>'title ASC'])) !== null)

+            {

+                $arrData['filter']['standort']['options'] = array_combine($Standorte->fetchEach('id'),$Standorte->fetchEach('title'));

+            }

+

+            $slots->reset();

+            foreach ($slots as $slot)

+            {

+                $Tag = new Date($slot->time);

+                $arrData['filter']['tag']['options'][$Tag->dayBegin] = Date::parse(Date::getNumericDateFormat(),$Tag->dayBegin);

+            }

+

+            /*if (isset($GLOBALS['TL_DCA']['tl_vr_wa_slot']['fields']['ernteart']['options']))

+            {

+                foreach ($GLOBALS['TL_DCA']['tl_vr_wa_slot']['fields']['ernteart']['options'] as $ernteart)

+                {

+                    $arrData['filter']['ernteart']['options'][$ernteart] = $GLOBALS['TL_LANG']['REF']['wa_ernteart'][$ernteart] ?? $ernteart;

+                }

+            }

+

+            if (($Sorten = WeinanlieferungRebsorteModel::findAll(['order'=>'title ASC'])) !== null)

+            {

+                $arrData['filter']['sorte']['options'] = array_combine($Sorten->fetchEach('id'),$Sorten->fetchEach('title'));

+            }

+

+            if (($Leseart = WeinanlieferungLeseartModel::findAll(['order'=>'title ASC'])) !== null)

+            {

+                $arrData['filter']['leseart']['options'] = array_combine($Leseart->fetchEach('id'),$Leseart->fetchEach('title'));

+            }*/

+

+

         }

         // Add page URL