@@ -1,7 +1,7 @@

 <div hx-get="{{ insert_tag('env::request') }}" hx-headers='{"VR-Ajax": "WaSlotsModule"}' hx-trigger="updateWaList from:body, updateWaBooking from:body" class="{{ class }} content-wrapper block"{{ cssID }}{% if style is defined and style is not empty %} style="{{ style }}"{% endif %}>

     {% block filter %}

-        <form hx-get="{{ insert_tag('env::request') }}" hx-headers='{"VR-Ajax": "WaSlotsModule"}' hx-trigger="change, submit" hx-target="closest .content-wrapper" class="filter">

+        <form hx-get="{{ insert_tag('env::request') }}" 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="col-md-3 kapazitaet">

                     <select name="filter_kapazitaet">

@@ -27,7 +27,7 @@

                         {% endfor %}

                     </select>

                 </div>

-                <div class="col submit"><button>Filter übernehmen</button></div>

+                <div class="col submit"><button class="u-block w-100p">Filter übernehmen</button></div>

             </div>

         </form>

     {% endblock %}

@@ -58,18 +58,24 @@ class WeinanlieferungSlotsListModuleController extends AbstractFrontendModuleCon

             $arrOptions['column'][] = '(SELECT tl_vr_wa_slot.behaelter - IFNULL(SUM(tl_vr_wa_reservation.behaelter),0) FROM tl_vr_wa_reservation WHERE tl_vr_wa_reservation.pid = tl_vr_wa_slot.id) >= ?';

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

         }

-        if (!empty($_GET['filter_sorte']))

+        if (!empty($_GET['filter_sorte']) && !empty($_GET['filter_leseart']))

         {

             $arrData['filter']['sorte']['selected'] = $_GET['filter_sorte'];

-//            $arrOptions['column'][] = 'FIND_IN_SET(?,sorte)';

-            $arrOptions['column'][] = "REGEXP_LIKE(sorten,'\"sorte\";s:[0-9]+:\"" . intval($_GET['filter_sorte']) . "\"')";

-//            $arrOptions['value'][] = $_GET['filter_sorte'];

-        }

-        if (!empty($_GET['filter_leseart']))

-        {

             $arrData['filter']['leseart']['selected'] = $_GET['filter_leseart'];

-            $arrOptions['column'][] = "REGEXP_LIKE(sorten,'\"leseart\";s:[0-9]+:\"" . intval($_GET['filter_leseart']) . "\"')";

+            $arrOptions['column'][] = "REGEXP_LIKE(sorten,'\"sorte\";s:[0-9]+:\"" . intval($_GET['filter_sorte']) . "\"[^\}]+\"leseart\";s:[0-9]+:\"" . intval($_GET['filter_leseart']) . "\"')";

+        } else {

+            if (!empty($_GET['filter_sorte']))

+            {

+                $arrData['filter']['sorte']['selected'] = $_GET['filter_sorte'];

+                $arrOptions['column'][] = "REGEXP_LIKE(sorten,'\"sorte\";s:[0-9]+:\"" . intval($_GET['filter_sorte']) . "\"')";

+            }

+            if (!empty($_GET['filter_leseart']))

+            {

+                $arrData['filter']['leseart']['selected'] = $_GET['filter_leseart'];

+                $arrOptions['column'][] = "REGEXP_LIKE(sorten,'\"leseart\";s:[0-9]+:\"" . intval($_GET['filter_leseart']) . "\"')";

+            }

         }

+

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

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