@@ -65,10 +65,10 @@ class RealEstateAssetsListController extends RealEstateAssetsModuleController

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

                     {

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

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

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

                     } else {

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

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

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

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

                     }

                 }

             }

@@ -109,29 +109,47 @@ class RealEstateAssetsListController extends RealEstateAssetsModuleController

             } else {

                 $arrGroups['nogroup']['items'][] = $arrItem;

             }

+        }

+        // Populate filters

+        $filterAssets = $this->getRealEstateAssets(StringUtil::deserialize($model->vr_re_categories));

+        foreach ($filterAssets as $asset)

+        {

             // Filter options

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

             {

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

+                $tmpOptions = $arrAssetsOptions;

+                $tmpOptions['column'] = array_merge((isset($arrAssetsOptions['column']) ? $arrAssetsOptions['column'] : []),['numberOfRooms'=>'numberOfRooms = ?']);

+                $tmpOptions['value'] = array_merge((isset($arrAssetsOptions['value']) ? $arrAssetsOptions['value'] : []),['numberOfRooms'=>$asset->numberOfRooms]);

+                $count = $this->countRealEstateAssets(StringUtil::deserialize($model->vr_re_categories),$tmpOptions);

+                $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')) . ' ('.$count.')';

             }

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

             {

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

+                $tmpOptions = $arrAssetsOptions;

+                $tmpOptions['column'] = array_merge((isset($arrAssetsOptions['column']) ? $arrAssetsOptions['column'] : []),['city'=>'city = ?']);

+                $tmpOptions['value'] = array_merge((isset($arrAssetsOptions['value']) ? $arrAssetsOptions['value'] : []),['city'=>$asset->city]);

+                $count = $this->countRealEstateAssets(StringUtil::deserialize($model->vr_re_categories),$tmpOptions);

+                $arrFilterOptions['city'][$asset->city] = $asset->city . ' ('.$count.')';

             }

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

             {

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

                 $rangeEnd = $rangeStart + 99;

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

+                $tmpOptions = $arrAssetsOptions;

+                $tmpOptions['column'] = array_merge((isset($arrAssetsOptions['column']) ? $arrAssetsOptions['column'] : []),['coldRent'=>"coldRent BETWEEN $rangeStart AND $rangeEnd"]);

+                $count = $this->countRealEstateAssets(StringUtil::deserialize($model->vr_re_categories),$tmpOptions);

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

             }

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

             {

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

                 $rangeEnd = $rangeStart + 9;

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

+                $tmpOptions = $arrAssetsOptions;

+                $tmpOptions['column'] = array_merge((isset($arrAssetsOptions['column']) ? $arrAssetsOptions['column'] : []),['livingSpace'=>"livingSpace BETWEEN $rangeStart AND $rangeEnd"]);

+                $count = $this->countRealEstateAssets(StringUtil::deserialize($model->vr_re_categories),$tmpOptions);

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

             }

-

         }

         foreach (array_keys($arrFilterOptions) as $filterName)

@@ -139,6 +157,7 @@ class RealEstateAssetsListController extends RealEstateAssetsModuleController

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

         }

+        // Set template data

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

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

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

@@ -194,11 +194,13 @@ class RealEstateAssetsModel extends Model

         if (isset($arrOptions['column']))

         {

-            $arrColumns = array_merge($arrColumns,$arrOptions['column']);

+            $arrColumns = array_merge($arrColumns,array_values($arrOptions['column']));

+            unset($arrOptions['column']);

         }

         if (isset($arrOptions['value']))

         {

-            $arrValues = array_merge($arrValues,$arrOptions['value']);

+            $arrValues = array_merge($arrValues,array_values($arrOptions['value']));

+            unset($arrOptions['value']);

         }

         return static::findBy($arrColumns, $arrValues, $arrOptions);

@@ -231,13 +233,14 @@ class RealEstateAssetsModel extends Model

         if (isset($arrOptions['column']))

         {

-            $arrColumns = array_merge($arrColumns,$arrOptions['column']);

+            $arrColumns = array_merge($arrColumns,array_values($arrOptions['column']));

+            unset($arrOptions['column']);

         }

         if (isset($arrOptions['value']))

         {

-            $arrValues = array_merge($arrValues,$arrOptions['value']);

+            $arrValues = array_merge($arrValues,array_values($arrOptions['value']));

+            unset($arrOptions['value']);

         }

-

         return static::countBy($arrColumns, $arrValues, $arrOptions);

     }

 }