@@ -20,19 +20,19 @@

                 </div>

                 <div class="tl_filter tl_subpanel">

                     <strong>Filter:</strong>

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

+                    <select name="tl_day" id="tl_day" class="tl_select tl_chosen{% if filter.day.selected is defined %} active{% endif %}">

                         <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">

+                    {#<select name="tl_month" id="tl_month" class="tl_select tl_chosen{% if filter.month.selected is defined %} active{% endif %}">

                         <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">

+                    <select name="tl_standort" id="tl_standort" class="tl_select tl_chosen{% if filter.standort.selected is defined %} active{% endif %}">

                         <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>

@@ -23,6 +23,7 @@ use Contao\System;

 use Doctrine\DBAL\Connection;

 use Symfony\Component\HttpFoundation\RequestStack;

 use Symfony\Component\HttpFoundation\Response;

+use Symfony\Component\HttpFoundation\Session\SessionInterface;

 use Symfony\Component\Routing\Annotation\Route;

 use Twig\Environment as TwigEnvironment;

 use vonRotenberg\WeinanlieferungBundle\Model\WeinanlieferungLeseartModel;

@@ -68,50 +69,70 @@ class WeinanlieferungBookingsController extends AbstractController

         System::loadLanguageFile('default');

         // Filter

-        if (Input::post('FORM_SUBMIT') === 'tl_filters' && Input::post('filter_reset') === null)

+        /** @var SessionInterface $objSession */

+        $objSession = \System::getContainer()->get('session');

+

+        $session = $objSession->get('filter');

+

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

         {

-            $queryBuilder = $this->db->createQueryBuilder()

-                ->select('id')

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

+            $arrFilterFields = ['tl_day', 'tl_standort', 'tl_status'];

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

+            foreach ($arrFilterFields as $v)

             {

-                $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 ($v == Input::post($v) || Input::post('filter_reset') == '1')

+                {

+                    unset($session['tl_vr_wa_reservation'][$v]);

+                } // Apply the filter

+                else

+                {

+                    $session['tl_vr_wa_reservation'][$v] = Input::post($v);

+                }

             }

+            $objSession->set('filter', $session);

+        }

-            /*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');

-                $queryBuilder->andWhere('date BETWEEN :month_start AND :month_end')

-                    ->setParameter('month_start', $Month->monthBegin)

-                    ->setParameter('month_end', $Month->monthEnd);

-            } else {

-                $Today = new Date();

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

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

-            }*/

+        $queryBuilder = $this->db->createQueryBuilder()

+            ->select('id')

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

-            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'));

-            }

+        if (!empty($session['tl_vr_wa_reservation']['tl_day']) && is_numeric($session['tl_vr_wa_reservation']['tl_day']))

+        {

+            $Day = new Date($session['tl_vr_wa_reservation']['tl_day']);

+            $arrData['filter']['day']['selected'] = $session['tl_vr_wa_reservation']['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);

+        }

-            $arrSlots = $queryBuilder->fetchFirstColumn();

+        /*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');

+            $queryBuilder->andWhere('date BETWEEN :month_start AND :month_end')

+                ->setParameter('month_start', $Month->monthBegin)

+                ->setParameter('month_end', $Month->monthEnd);

+        } else {

+            $Today = new Date();

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

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

+        }*/

+        if (!empty($session['tl_vr_wa_reservation']['tl_standort']) && is_numeric($session['tl_vr_wa_reservation']['tl_standort']))

+        {

+            $Month = new Date($session['tl_vr_wa_reservation']['tl_standort']);

+            $arrData['filter']['standort']['selected'] = $session['tl_vr_wa_reservation']['tl_standort'];

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

+                ->setParameter('pid', (int) $session['tl_vr_wa_reservation']['tl_standort']);

         }

+        $arrSlots = $queryBuilder->fetchFirstColumn();

+

+

         $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 DESC");