@@ -18,13 +18,25 @@

                     <button name="filter" id="filter" class="tl_img_submit filter_apply" title="">Anwenden</button>

                     <button name="filter_reset" id="filter_reset" value="1" class="tl_img_submit filter_reset" title="">Zurücksetzen</button>

                 </div>

-                <div class="tl_sorting tl_subpanel">

+                <div class="tl_filter tl_subpanel">

                     <strong>Filter:</strong>

-                    <select name="tl_month" id="tl_month" class="tl_select tl_chosen">

+                    <select name="tl_day" id="tl_day" class="tl_select tl_chosen">

+                        <option value=""{{ filter.day.selected is not defined or not filter.day.selected ? ' selected' : '' }}>Tag</option>

+                        {% for value, label in filter.day.options %}

+                            <option value="{{ value }}"{{ filter.day.selected is defined and filter.day.selected == value ? ' selected' : '' }}>{{ label }}</option>

+                        {% endfor %}

+                    </select>

+                    {#<select name="tl_month" id="tl_month" class="tl_select tl_chosen">

                         <option value=""{{ filter.month.selected is not defined or not filter.month.selected ? ' selected' : '' }}>Monat</option>

                         {% for value, label in filter.month.options %}

                             <option value="{{ value }}"{{ filter.month.selected is defined and filter.month.selected == value ? ' selected' : '' }}>{{ label }}</option>

                         {% endfor %}

+                    </select>#}

+                    <select name="tl_standort" id="tl_standort" class="tl_select tl_chosen">

+                        <option value=""{{ filter.standort.selected is not defined or not filter.standort.selected ? ' selected' : '' }}>Standort</option>

+                        {% for value, label in filter.standort.options %}

+                            <option value="{{ value }}"{{ filter.standort.selected is defined and filter.standort.selected == value ? ' selected' : '' }}>{{ label }}</option>

+                        {% endfor %}

                     </select>

                 </div>

             </div>

@@ -74,7 +74,20 @@ class WeinanlieferungBookingsController extends AbstractController

                 ->select('id')

                 ->from(WeinanlieferungSlotsModel::getTable());

-            if (!empty(Input::post('tl_month')) && is_numeric(Input::post('tl_month')))

+            if (!empty(Input::post('tl_day')) && is_numeric(Input::post('tl_day')))

+            {

+                $Day = new Date(Input::post('tl_day'));

+                $arrData['filter']['day']['selected'] = Input::post('tl_day');

+                $queryBuilder->andWhere('date BETWEEN :day_start AND :day_end')

+                    ->setParameter('day_start', $Day->dayBegin)

+                    ->setParameter('day_end', $Day->dayEnd);

+            } else {

+                $Today = new Date();

+                $queryBuilder->andWhere("time >= :today")

+                    ->setParameter('today',$Today->dayBegin);

+            }

+

+            /*if (!empty(Input::post('tl_month')) && is_numeric(Input::post('tl_month')))

             {

                 $Month = new Date(Input::post('tl_month'));

                 $arrData['filter']['month']['selected'] = Input::post('tl_month');

@@ -85,20 +98,46 @@ class WeinanlieferungBookingsController extends AbstractController

                 $Today = new Date();

                 $queryBuilder->andWhere("time >= :today")

                     ->setParameter('today',$Today->dayBegin);

+            }*/

+

+            if (!empty(Input::post('tl_standort')) && is_numeric(Input::post('tl_standort')))

+            {

+                $Month = new Date(Input::post('tl_standort'));

+                $arrData['filter']['standort']['selected'] = Input::post('tl_standort');

+                $queryBuilder->andWhere('pid = :pid')

+                    ->setParameter('pid', (int) Input::post('tl_standort'));

             }

             $arrSlots = $queryBuilder->fetchFirstColumn();

         }

-        $arrMonthOptions = [];

+

+        $arrDayOptions = [];

+        $DayRequest = $this->db->executeQuery("SELECT s.date, DATE_FORMAT(FROM_UNIXTIME(s.date),'%d.%m.%Y') as 'day_label' FROM tl_vr_wa_reservation r INNER JOIN tl_vr_wa_slot s ON s.id = r.pid GROUP BY day_label ORDER BY s.date ASC");

+

+        foreach ($DayRequest->iterateAssociative() as $day)

+        {

+            $arrDayOptions[$day['date']] = $day['day_label'];

+        }

+

+        /*$arrMonthOptions = [];

         $MonthRequest = $this->db->executeQuery("SELECT s.date, DATE_FORMAT(FROM_UNIXTIME(s.date),'%m/%Y') as 'month_label' FROM tl_vr_wa_reservation r INNER JOIN tl_vr_wa_slot s ON s.id = r.pid GROUP BY month_label ORDER BY s.date ASC");

         foreach ($MonthRequest->iterateAssociative() as $month)

         {

             $arrMonthOptions[$month['date']] = $month['month_label'];

+        }*/

+

+        $arrStandortOptions = [];

+        $StandortRequest = $this->db->executeQuery("SELECT l.id, l.title FROM tl_vr_wa_reservation r INNER JOIN tl_vr_wa_slot s ON s.id = r.pid INNER JOIN tl_vr_wa_standort l ON l.id = s.pid GROUP BY l.id ORDER BY l.title ASC");

+        foreach ($StandortRequest->iterateAssociative() as $standort)

+        {

+            $arrStandortOptions[$standort['id']] = $standort['title'];

         }

-        $arrData['filter']['month']['options'] = $arrMonthOptions;

+        $arrData['filter']['day']['options'] = $arrDayOptions;

+//        $arrData['filter']['month']['options'] = $arrMonthOptions;

+        $arrData['filter']['standort']['options'] = $arrStandortOptions;

         // Get bookings