@@ -133,6 +133,19 @@

                 <source>Tiefgaragenstellplatz</source>

             </trans-unit>

+            <trans-unit id="REF.re_filter.numberOfRooms">

+                <source>Zimmeranzahl</source>

+            </trans-unit>

+            <trans-unit id="REF.re_filter.city">

+                <source>Ort</source>

+            </trans-unit>

+            <trans-unit id="REF.re_filter.coldRent">

+                <source>Kaltmiete</source>

+            </trans-unit>

+            <trans-unit id="REF.re_filter.livingSpace">

+                <source>Wohnfläche</source>

+            </trans-unit>

+

         </body>

     </file>

 </xliff>

@@ -14,15 +14,17 @@

                     <div class="content-grid">

                         <div class="fragments">

                             <form class="assets-list-filter" hx-get="{{ pageUrl is defined ? pageUrl : '' }}" hx-push-url="true" hx-headers='{"VR-Ajax": "ReAssetsList"}' hx-trigger="change, submit" hx-target="closest .module-vr-re-assets-list" hx-target="" class="filter">

-                                {% if filterOptions.rooms is defined %}

-                                    <div class="filter-wrapper">

-                                        <select name="filter_zimmer">

-                                            <option value="">Anzahl Zimmer</option>

-                                            {% for option in filterOptions.rooms %}

-                                                <option value="{{ option.value }}"{% if filter.rooms is defined and filter.rooms == option.value %} selected{% endif %}>{{ option.label }}</option>

-                                            {% endfor %}

-                                        </select>

-                                    </div>

+                                {% if filterOptions is defined and filterOptions is iterable %}

+                                    {% for key, options in filterOptions %}

+                                        <div class="filter-wrapper">

+                                            <select name="filter[{{ key }}]">

+                                                <option value="">{{ ('REF.re_filter.' ~ key)|trans({}, 'contao_default') }}</option>

+                                                {% for value, label in options %}

+                                                    <option value="{{ value }}"{% if filter[key] is defined and filter[key] == value %} selected{% endif %}>{{ label }}</option>

+                                                {% endfor %}

+                                            </select>

+                                        </div>

+                                    {% endfor %}

                                 {% endif %}

                             </form>

                         </div>

@@ -13,6 +13,7 @@ use Contao\CoreBundle\DependencyInjection\Attribute\AsFrontendModule;

 use Contao\CoreBundle\Exception\ResponseException;

 use Contao\CoreBundle\Image\Studio\Studio;

 use Contao\CoreBundle\Twig\FragmentTemplate;

+use Contao\Input;

 use Contao\ModuleModel;

 use Contao\PageModel;

 use Contao\StringUtil;

@@ -36,17 +37,44 @@ class RealEstateAssetsListController extends RealEstateAssetsModuleController

         $this->translator = $translator;

     }

-

     protected function getResponse(FragmentTemplate $template, ModuleModel $model, Request $request): Response

     {

         $arrGroups = [];

-        $arrFilterOptions = [];

+        $arrFilterOptions = [

+            'numberOfRooms' => [],

+            'coldRent' => [],

+            'livingSpace' => [],

+            'city' => []

+        ];

+        $arrFilterSelected = [];

+        $arrAssetsOptions = [];

         $jumpTo = PageModel::findByPk($model->jumpTo);

         $urlGenerator = System::getContainer()->get('contao.routing.content_url_generator');

+        // Filter

+        if (isset($_GET['filter']) && \is_array(Input::get('filter')))

+        {

+            foreach (Input::get('filter') as $filter=>$value)

+            {

+                if (in_array($filter, array_keys($arrFilterOptions)) && !empty($value))

+                {

+                    $rawValue = StringUtil::decodeEntities($value);

+                    $arrFilterSelected[$filter] = $rawValue;

+

+                    if (preg_match('/^.*<>.*$/',$rawValue))

+                    {

+                        list($start,$stop) = preg_split('/<>/',$rawValue, 2);

+                        $arrAssetsOptions['column'][] = "$filter BETWEEN $start AND $stop";

+                    } else {

+                        $arrAssetsOptions['column'][] = "$filter = ?";

+                        $arrAssetsOptions['value'][] = $rawValue;

+                    }

+                }

+            }

+        }

-        if (($assets = $this->getRealEstateAssets(StringUtil::deserialize($model->vr_re_categories))) === null)

+        if (($assets = $this->getRealEstateAssets(StringUtil::deserialize($model->vr_re_categories),$arrAssetsOptions)) === null)

         {

             return $template->getResponse();

         }

@@ -85,14 +113,34 @@ class RealEstateAssetsListController extends RealEstateAssetsModuleController

             // Filter options

             if (!empty($asset->numberOfRooms))

             {

-                $arrFilterOptions['rooms'][] = ['value'=>$asset->numberOfRooms, 'label'=>$asset->numberOfRooms . ' ' . ($asset->numberOfRooms > 1 ? $this->translator->trans('MSC.re_rooms', [], 'contao_default') : $this->translator->trans('MSC.re_room', [], 'contao_default'))];

+                $arrFilterOptions['numberOfRooms'][$asset->numberOfRooms] = $asset->numberOfRooms . ' ' . ($asset->numberOfRooms > 1 ? $this->translator->trans('MSC.re_rooms', [], 'contao_default') : $this->translator->trans('MSC.re_room', [], 'contao_default'));

+            }

+            if (!empty($asset->city))

+            {

+                $arrFilterOptions['city'][$asset->city] = $asset->city;

+            }

+            if (!empty($asset->coldRent))

+            {

+                $rangeStart = floor($asset->coldRent / 100) * 100;

+                $rangeEnd = $rangeStart + 99;

+                $arrFilterOptions['coldRent'][$rangeStart.'<>'.$rangeEnd] = $rangeStart . ' - ' . $rangeEnd . ' €';

+            }

+            if (!empty($asset->livingSpace))

+            {

+                $rangeStart = floor($asset->livingSpace / 10) * 10;

+                $rangeEnd = $rangeStart + 9;

+                $arrFilterOptions['livingSpace'][$rangeStart.'<>'.$rangeEnd] = $rangeStart . ' - ' . $rangeEnd . ' m²';

             }

         }

-        $arrFilterOptions = array_unique($arrFilterOptions);

+        foreach (array_keys($arrFilterOptions) as $filterName)

+        {

+            $arrFilterOptions[$filterName] = array_unique($arrFilterOptions[$filterName]);

+        }

         $template->set('filterOptions',$arrFilterOptions);

+        $template->set('filter',$arrFilterSelected);

         $template->set('groups',$arrGroups);

         // Handle ajax

@@ -21,14 +21,14 @@ abstract class RealEstateAssetsModuleController extends AbstractFrontendModuleCo

    *

    * @return RealEstateAssetsModel|RealEstateAssetsModel[]|Collection|null

    */

-  public function getRealEstateAssets($arrCategories)

+  public function getRealEstateAssets($arrCategories, array $arrOptions=array())

   {

     if (empty($arrCategories) || !\is_array($arrCategories))

     {

       return null;

     }

-    return RealEstateAssetsModel::findPublishedByParent($arrCategories);

+    return RealEstateAssetsModel::findPublishedByParent($arrCategories, 0,0,$arrOptions);

   }

   /**