Browse code

Only display applicable filter values in assets list

Benjamin Roth authored on08/08/2024 10:18:29
Showing1 changed files
... ...
@@ -132,7 +132,10 @@ class RealEstateAssetsListController extends RealEstateAssetsModuleController
132 132
                 $tmpOptions['column'] = array_merge((isset($arrAssetsOptions['column']) ? $arrAssetsOptions['column'] : []),['numberOfRooms'=>'numberOfRooms = ?']);
133 133
                 $tmpOptions['value'] = array_merge((isset($arrAssetsOptions['value']) ? $arrAssetsOptions['value'] : []),['numberOfRooms'=>$asset->numberOfRooms]);
134 134
                 $count = $this->countRealEstateAssets(StringUtil::deserialize($model->vr_re_categories),$tmpOptions);
135
-                $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.')';
135
+                if ($count > 0)
136
+                {
137
+                    $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.')';
138
+                }
136 139
             }
137 140
             if (!empty($asset->city))
138 141
             {
... ...
@@ -147,7 +150,10 @@ class RealEstateAssetsListController extends RealEstateAssetsModuleController
147 150
                 $tmpOptions['column'] = array_merge((isset($arrAssetsOptions['column']) ? $arrAssetsOptions['column'] : []),['city'=>'(city = ? AND managedPropertyId < 1) OR ? IN (SELECT p.city FROM tl_vr_re_managedProperties p WHERE p.id = managedPropertyId)']);
148 151
                 $tmpOptions['value'] = array_merge((isset($arrAssetsOptions['value']) ? $arrAssetsOptions['value'] : []),[$strCity,$strCity]);
149 152
                 $count = $this->countRealEstateAssets(StringUtil::deserialize($model->vr_re_categories),$tmpOptions);
150
-                $arrFilterOptions['city'][$strCity] = $strCity . ' ('.$count.')';
153
+                if ($count > 0)
154
+                {
155
+                    $arrFilterOptions['city'][$strCity] = $strCity . ' (' . $count . ')';
156
+                }
151 157
             }
152 158
             if (!empty($asset->coldRent))
153 159
             {
... ...
@@ -156,7 +162,10 @@ class RealEstateAssetsListController extends RealEstateAssetsModuleController
156 162
                 $tmpOptions = $arrAssetsOptions;
157 163
                 $tmpOptions['column'] = array_merge((isset($arrAssetsOptions['column']) ? $arrAssetsOptions['column'] : []),['coldRent'=>"coldRent BETWEEN $rangeStart AND $rangeEnd"]);
158 164
                 $count = $this->countRealEstateAssets(StringUtil::deserialize($model->vr_re_categories),$tmpOptions);
159
-                $arrFilterOptions['coldRent'][$rangeStart.'<>'.$rangeEnd] = $rangeStart . ' - ' . $rangeEnd . ' €' . ' ('.$count.')';
165
+                if ($count > 0)
166
+                {
167
+                    $arrFilterOptions['coldRent'][$rangeStart.'<>'.$rangeEnd] = $rangeStart . ' - ' . $rangeEnd . ' €' . ' ('.$count.')';
168
+                }
160 169
             }
161 170
             if (!empty($asset->livingSpace))
162 171
             {
... ...
@@ -165,7 +174,10 @@ class RealEstateAssetsListController extends RealEstateAssetsModuleController
165 174
                 $tmpOptions = $arrAssetsOptions;
166 175
                 $tmpOptions['column'] = array_merge((isset($arrAssetsOptions['column']) ? $arrAssetsOptions['column'] : []),['livingSpace'=>"livingSpace BETWEEN $rangeStart AND $rangeEnd"]);
167 176
                 $count = $this->countRealEstateAssets(StringUtil::deserialize($model->vr_re_categories),$tmpOptions);
168
-                $arrFilterOptions['livingSpace'][$rangeStart.'<>'.$rangeEnd] = $rangeStart . ' - ' . $rangeEnd . ' m²' . ' ('.$count.')';
177
+                if ($count > 0)
178
+                {
179
+                    $arrFilterOptions['livingSpace'][$rangeStart.'<>'.$rangeEnd] = $rangeStart . ' - ' . $rangeEnd . ' m²' . ' ('.$count.')';
180
+                }
169 181
             }
170 182
         }
171 183