Browse code
Some more adjustments
Benjamin Roth authored on15/04/2024 16:14:33 Showing5 changed files
- contao/languages/de/default.xlf
- contao/languages/de/tl_vr_real_estate_assets.xlf
- contao/templates/exposePdfDefinition.html.twig
- contao/templates/frontend_module/vr_re_assets_reader.html.twig
- src/Controller/FrontendModule/RealEstateAssetsReaderController.php
| ... | ... |
@@ -24,6 +24,9 @@ |
| 24 | 24 |
<trans-unit id="MSC.re_energyConsumption"> |
| 25 | 25 |
<source>Energie&shy;verbrauch nach</source> |
| 26 | 26 |
</trans-unit> |
| 27 |
+ <trans-unit id="MSC.re_parking"> |
|
| 28 |
+ <source>Stellplatz</source> |
|
| 29 |
+ </trans-unit> |
|
| 27 | 30 |
<trans-unit id="MSC.re_properties"> |
| 28 | 31 |
<source>Eigenschaften</source> |
| 29 | 32 |
</trans-unit> |
| ... | ... |
@@ -136,7 +139,7 @@ |
| 136 | 139 |
<source>Außenstellplatz</source> |
| 137 | 140 |
</trans-unit> |
| 138 | 141 |
<trans-unit id="REF.re_parking.undergroundCarPark"> |
| 139 |
- <source>Tiefgaragenstellplatz</source> |
|
| 142 |
+ <source>Tiefgaragen&shy;stellplatz</source> |
|
| 140 | 143 |
</trans-unit> |
| 141 | 144 |
|
| 142 | 145 |
<trans-unit id="REF.re_filter.numberOfRooms"> |
| ... | ... |
@@ -152,6 +155,37 @@ |
| 152 | 155 |
<source>Wohnfläche</source> |
| 153 | 156 |
</trans-unit> |
| 154 | 157 |
|
| 158 |
+ <trans-unit id="REF.re_roomNumber.1"> |
|
| 159 |
+ <source>Ein</source> |
|
| 160 |
+ </trans-unit> |
|
| 161 |
+ <trans-unit id="REF.re_roomNumber.2"> |
|
| 162 |
+ <source>Zwei</source> |
|
| 163 |
+ </trans-unit> |
|
| 164 |
+ <trans-unit id="REF.re_roomNumber.3"> |
|
| 165 |
+ <source>Drei</source> |
|
| 166 |
+ </trans-unit> |
|
| 167 |
+ <trans-unit id="REF.re_roomNumber.4"> |
|
| 168 |
+ <source>Vier</source> |
|
| 169 |
+ </trans-unit> |
|
| 170 |
+ <trans-unit id="REF.re_roomNumber.5"> |
|
| 171 |
+ <source>Fünf</source> |
|
| 172 |
+ </trans-unit> |
|
| 173 |
+ <trans-unit id="REF.re_roomNumber.6"> |
|
| 174 |
+ <source>Sechs</source> |
|
| 175 |
+ </trans-unit> |
|
| 176 |
+ <trans-unit id="REF.re_roomNumber.7"> |
|
| 177 |
+ <source>Sieben</source> |
|
| 178 |
+ </trans-unit> |
|
| 179 |
+ <trans-unit id="REF.re_roomNumber.8"> |
|
| 180 |
+ <source>Acht</source> |
|
| 181 |
+ </trans-unit> |
|
| 182 |
+ <trans-unit id="REF.re_roomNumber.9"> |
|
| 183 |
+ <source>Neun</source> |
|
| 184 |
+ </trans-unit> |
|
| 185 |
+ <trans-unit id="REF.re_roomNumber.10"> |
|
| 186 |
+ <source>Zehn</source> |
|
| 187 |
+ </trans-unit> |
|
| 188 |
+ |
|
| 155 | 189 |
</body> |
| 156 | 190 |
</file> |
| 157 | 191 |
</xliff> |
| ... | ... |
@@ -33,10 +33,10 @@ |
| 33 | 33 |
<source>Die Adresse des Objekts.</source> |
| 34 | 34 |
</trans-unit> |
| 35 | 35 |
<trans-unit id="tl_vr_real_estate_assets.floor.0"> |
| 36 |
- <source>Geschoss</source> |
|
| 36 |
+ <source>Etage</source> |
|
| 37 | 37 |
</trans-unit> |
| 38 | 38 |
<trans-unit id="tl_vr_real_estate_assets.floor.1"> |
| 39 |
- <source>Die Geschossangabe des Objekts (z.B. 2. OG links).</source> |
|
| 39 |
+ <source>Die Etagenangabe des Objekts (z.B. 2. OG links).</source> |
|
| 40 | 40 |
</trans-unit> |
| 41 | 41 |
<trans-unit id="tl_vr_real_estate_assets.livingSpace.0"> |
| 42 | 42 |
<source>Wohnfläche</source> |
| ... | ... |
@@ -63,7 +63,7 @@ |
| 63 | 63 |
<source>Die Miete für Stellplätze in EUR.</source> |
| 64 | 64 |
</trans-unit> |
| 65 | 65 |
<trans-unit id="tl_vr_real_estate_assets.advanceOperatingCosts.0"> |
| 66 |
- <source>Nebenkosten&shy;voraus&shy;zahlung</source> |
|
| 66 |
+ <source>Nebenkosten&shy;vorauszahlung</source> |
|
| 67 | 67 |
</trans-unit> |
| 68 | 68 |
<trans-unit id="tl_vr_real_estate_assets.advanceOperatingCosts.1"> |
| 69 | 69 |
<source>Der Nebenkostenvorschuss in EUR.</source> |
| ... | ... |
@@ -223,8 +223,9 @@ |
| 223 | 223 |
table: {
|
| 224 | 224 |
widths: ['40%', '*'], |
| 225 | 225 |
body: [ |
| 226 |
- {{ _self.tableRow('tl_vr_real_estate_assets.coldRent.0'|trans({}, 'contao_default'),item.coldRent|number_format(2, ',', ''),{ append: ' €'}) }}
|
|
| 227 |
- {{ _self.tableRow('tl_vr_real_estate_assets.advanceOperatingCosts.0'|trans({}, 'contao_default')|replace({'­' : '-'}),item.advanceOperatingCosts|number_format(2, ',', ''),{ append: ' €'}) }}
|
|
| 226 |
+ {% if item.coldRent > 0 %}{{ _self.tableRow('tl_vr_real_estate_assets.coldRent.0'|trans({}, 'contao_default'),item.coldRent|number_format(2, ',', ''),{ append: ' €'}) }}{% endif %}
|
|
| 227 |
+ {% if item.advanceOperatingCosts > 0 %}{{ _self.tableRow('tl_vr_real_estate_assets.advanceOperatingCosts.0'|trans({}, 'contao_default')|replace({'­' : '-'}),item.advanceOperatingCosts|number_format(2, ',', ''),{ append: ' €'}) }}{% endif %}
|
|
| 228 |
+ {% if item.rent > 0 %}{{ _self.tableRow('tl_vr_real_estate_assets.rent.0'|trans({}, 'contao_default')|replace({'­' : '-'}),item.rent|number_format(2, ',', ''),{ append: ' €'}) }}{% endif %}
|
|
| 228 | 229 |
], |
| 229 | 230 |
}, |
| 230 | 231 |
layout: 'noBorders', |
| ... | ... |
@@ -251,11 +252,12 @@ |
| 251 | 252 |
}, |
| 252 | 253 |
], |
| 253 | 254 |
width: '*', |
| 254 |
- }{% if item.features is iterable and item.features|length > 0 %},
|
|
| 255 |
+ }{% if item.features is iterable and item.features|length > 0 or item.parking is iterable and item.parking|length > 0 %},
|
|
| 255 | 256 |
{
|
| 256 | 257 |
stack: [ |
| 258 |
+ {% if item.parking is iterable and item.parking|length > 0 %}
|
|
| 257 | 259 |
{
|
| 258 |
- text: '{{ 'MSC.re_features'|trans({}, 'contao_default') }}',
|
|
| 260 |
+ text: '{{ 'MSC.re_parking'|trans({}, 'contao_default') }}',
|
|
| 259 | 261 |
style: 'h3' |
| 260 | 262 |
}, |
| 261 | 263 |
{
|
| ... | ... |
@@ -269,8 +271,8 @@ |
| 269 | 271 |
table: {
|
| 270 | 272 |
widths: [10, '*'], |
| 271 | 273 |
body: [ |
| 272 |
- {% for feature in item.features %}
|
|
| 273 |
- {% set featureTrans = 'REF.re_features.' ~ feature %}
|
|
| 274 |
+ {% for spot in item.parking %}
|
|
| 275 |
+ {% set parkingTrans = 'REF.re_parking.' ~ spot %}
|
|
| 274 | 276 |
[ |
| 275 | 277 |
{
|
| 276 | 278 |
canvas: [ |
| ... | ... |
@@ -295,7 +297,7 @@ |
| 295 | 297 |
] |
| 296 | 298 |
}, |
| 297 | 299 |
{
|
| 298 |
- text: '{{ featureTrans|trans({}, 'contao_default') }}',
|
|
| 300 |
+ text: '{{ parkingTrans|trans({}, 'contao_default') }}',
|
|
| 299 | 301 |
// color: '#357792' |
| 300 | 302 |
} |
| 301 | 303 |
], |
| ... | ... |
@@ -312,7 +314,70 @@ |
| 312 | 314 |
}, |
| 313 | 315 |
fillColor: '#e6ebf1', |
| 314 | 316 |
layout: 'noBorders', |
| 317 |
+ margin: [0,0,0,10], |
|
| 315 | 318 |
}, |
| 319 |
+ {% endif %}
|
|
| 320 |
+ {% if item.features is iterable and item.features|length > 0 %}
|
|
| 321 |
+ {
|
|
| 322 |
+ text: '{{ 'MSC.re_features'|trans({}, 'contao_default') }}',
|
|
| 323 |
+ style: 'h3' |
|
| 324 |
+ }, |
|
| 325 |
+ {
|
|
| 326 |
+ table: {
|
|
| 327 |
+ widths: ['*'], |
|
| 328 |
+ body: [ |
|
| 329 |
+ [ |
|
| 330 |
+ {
|
|
| 331 |
+ stack: [ |
|
| 332 |
+ {
|
|
| 333 |
+ table: {
|
|
| 334 |
+ widths: [10, '*'], |
|
| 335 |
+ body: [ |
|
| 336 |
+ {% for feature in item.features %}
|
|
| 337 |
+ {% set featureTrans = 'REF.re_features.' ~ feature %}
|
|
| 338 |
+ [ |
|
| 339 |
+ {
|
|
| 340 |
+ canvas: [ |
|
| 341 |
+ {
|
|
| 342 |
+ type: 'ellipse', |
|
| 343 |
+ x: 5, y: 6, |
|
| 344 |
+ lineColor: 'black', |
|
| 345 |
+ lineWidth: 1, |
|
| 346 |
+ r1: 5, r2: 5 |
|
| 347 |
+ }, |
|
| 348 |
+ {
|
|
| 349 |
+ type: 'polyline', |
|
| 350 |
+ lineWidth: 1, |
|
| 351 |
+ closePath: false, |
|
| 352 |
+ points: [ |
|
| 353 |
+ {x: 3, y: 5},
|
|
| 354 |
+ {x: 5, y: 8},
|
|
| 355 |
+ {x: 10, y: 1}
|
|
| 356 |
+ ], |
|
| 357 |
+ lineColor: '#1476BB' |
|
| 358 |
+ } |
|
| 359 |
+ ] |
|
| 360 |
+ }, |
|
| 361 |
+ {
|
|
| 362 |
+ text: '{{ featureTrans|trans({}, 'contao_default') }}',
|
|
| 363 |
+ // color: '#357792' |
|
| 364 |
+ } |
|
| 365 |
+ ], |
|
| 366 |
+ {% endfor %}
|
|
| 367 |
+ ], |
|
| 368 |
+ }, |
|
| 369 |
+ layout: 'noBorders', |
|
| 370 |
+ margin: [15, 10, 15, 10], |
|
| 371 |
+ }, |
|
| 372 |
+ ] |
|
| 373 |
+ } |
|
| 374 |
+ ] |
|
| 375 |
+ ] |
|
| 376 |
+ }, |
|
| 377 |
+ fillColor: '#e6ebf1', |
|
| 378 |
+ layout: 'noBorders', |
|
| 379 |
+ }, |
|
| 380 |
+ {% endif %}
|
|
| 316 | 381 |
], |
| 317 | 382 |
width: '*' |
| 318 | 383 |
}{% endif %}
|
| ... | ... |
@@ -66,6 +66,16 @@ |
| 66 | 66 |
{% set passType = 'REF.re_energyPassType.' ~ item.energyPassType %}
|
| 67 | 67 |
{{ _self.listEntry('MSC.re_energyConsumption'|trans({}, 'contao_default') ~ ' ' ~ passType|trans({}, 'contao_default'),item.energyConsumption,{ append: ' kWh/(m²a)'}) }}
|
| 68 | 68 |
{% endif %}
|
| 69 |
+ {% if item.parking is not empty %}
|
|
| 70 |
+ <li> |
|
| 71 |
+ <span class="label">{{- 'tl_vr_real_estate_assets.parking.0'|trans({}, 'contao_default') -}}</span>
|
|
| 72 |
+ <span class="value"> |
|
| 73 |
+ {% for spot in item.parking -%}
|
|
| 74 |
+ {%- if loop.index > 1 -%}, {% endif -%}{{ ('REF.re_parking.' ~ spot)|trans({}, 'contao_default') }}
|
|
| 75 |
+ {%- endfor %}
|
|
| 76 |
+ </span> |
|
| 77 |
+ </li> |
|
| 78 |
+ {% endif %}
|
|
| 69 | 79 |
{% for feature in item.features %}
|
| 70 | 80 |
{% set featureTrans = 'REF.re_features.' ~ feature %}
|
| 71 | 81 |
{{ _self.listEntry(featureTrans|trans({}, 'contao_default'),'Ja') }}
|
| ... | ... |
@@ -70,6 +70,7 @@ class RealEstateAssetsReaderController extends RealEstateAssetsModuleController |
| 70 | 70 |
|
| 71 | 71 |
$arrItem = array_merge($this->asset->row(), [ |
| 72 | 72 |
'features' => StringUtil::deserialize($this->asset->features,true), |
| 73 |
+ 'parking' => StringUtil::deserialize($this->asset->parking,true), |
|
| 73 | 74 |
'availableFrom' => ($this->asset->availability == 'immediately' ? $this->translator->trans('REF.re_availability.immediately', [], 'contao_default') : Date::parse(Date::getNumericDateFormat(), $this->asset->availableFrom)),
|
| 74 | 75 |
'deadline' => ($this->asset->stop > 0 ? Date::parse(Date::getNumericDateFormat(), $this->asset->stop) : ''), |
| 75 | 76 |
'teaserFigure' => $this->getImageFigures($this->asset->gallerySRC, $figureBuilder, $this->asset->orderSRC, 1), |