diff --git a/app/Actions/Generate/Tabellen/Nutzwertberechnung.php b/app/Actions/Generate/Tabellen/Nutzwertberechnung.php
index 794a1ad..f90f94e 100644
--- a/app/Actions/Generate/Tabellen/Nutzwertberechnung.php
+++ b/app/Actions/Generate/Tabellen/Nutzwertberechnung.php
@@ -38,12 +38,12 @@ class Nutzwertberechnung
$html .= '';
$summe_nutzwert = 0;
+ $faktor = 1;
/**
* Normale Wohnnutzflächen
*/
if (isset($methoden[1])) {
$flaeche = 0;
- $faktor = 0;
foreach ($methoden[1] as $komponente) {
$html .= '
';
@@ -53,7 +53,7 @@ class Nutzwertberechnung
$html .= Html::td($komponente['orientierung'], 'bl');
$html .= Html::td($komponente['type'], 'bl');
$html .= Html::td($komponente['raumart'], 'bl');
- $html .= Html::td(number_format($komponente['flaeche'], 2, ',', '.') . ' m²', 'right bl nowrap');
+ $html .= Html::td(number_format($komponente['flaeche'], 2, ',', '.').' m²', 'right bl nowrap');
$html .= Html::td('', 'bl br', 7);
$flaeche += $komponente['flaeche'];
$html .= '
';
@@ -62,14 +62,13 @@ class Nutzwertberechnung
$faktor = (100 + $komponente['objekt_nutzwert']) / 100;
}
-
$html .= '';
$html .= Html::td('', 'bl bg-user-set');
$html .= Html::td('', 'bl');
$html .= Html::td('', 'bl');
$html .= Html::td('', 'bl');
$html .= Html::td('', 'bl');
- $html .= Html::td(number_format($flaeche, 2, ',', '.') . ' m²', 'right bl nowrap');
+ $html .= Html::td(number_format($flaeche, 2, ',', '.').' m²', 'right bl nowrap');
$html .= Html::td('x', 'center bl');
$html .= Html::td(number_format($faktor, 3, ',', '.'), 'center bl');
$html .= Html::td('', 'bl');
@@ -82,27 +81,56 @@ class Nutzwertberechnung
}
/**
+ * METHODE 2b
* Wintergarten, Loggien, unter Stiegen
*/
- if (isset($methoden[2])) {
- foreach ($methoden[2] as $komponente) {
- $html .= '
';
- $html .= Html::td('', 'bl bg-user-set');
- $html .= Html::td($komponente['geschoss'], 'bl');
- $html .= Html::td('', 'bl');
- $html .= Html::td('', 'bl');
- $html .= Html::td($komponente['raumart'], 'bl');
- $html .= Html::td(number_format($komponente['flaeche'], 2, ',', '.') . ' m²', 'right bl');
- $html .= Html::td('', 'bl');
- $html .= Html::td('', 'bl');
- $html .= Html::td('x', 'center bl');
- $html .= Html::td(number_format($komponente['faktor'], 3), 'center bl');
- $html .= Html::td('=', 'center bl');
- $nutzwert = $komponente['flaeche'] * $komponente['faktor'];
- $summe_nutzwert += $nutzwert;
- $html .= Html::td(number_format($nutzwert, 3, ',', '.'), 'right bl');
- $html .= Html::td('', 'center bl br');
- $html .= '
';
+ if (isset($methoden[2]) || isset($methoden[8])) {
+ if (isset($methoden[2])) {
+ foreach ($methoden[2] as $komponente) {
+ $html .= '';
+ $html .= Html::td('', 'bl bg-user-set');
+ $html .= Html::td($komponente['geschoss'], 'bl');
+ $html .= Html::td('', 'bl');
+ $html .= Html::td('', 'bl');
+ $html .= Html::td($komponente['raumart'], 'bl');
+ $html .= Html::td(number_format($komponente['flaeche'], 2, ',', '.').' m²', 'right bl');
+ $html .= Html::td('x', 'center bl');
+ $html .= Html::td(number_format($faktor, 3, ',', '.'), 'center bl');
+ $html .= Html::td('x', 'center bl');
+ $html .= Html::td(number_format($komponente['faktor'], 3), 'center bl');
+ $html .= Html::td('=', 'center bl');
+ $nutzwert = $komponente['flaeche'] * $komponente['faktor'] * $faktor;
+ $summe_nutzwert += $nutzwert;
+ $html .= Html::td(number_format($nutzwert, 3, ',', '.'), 'right bl');
+ $html .= Html::td('', 'center bl br');
+ $html .= '
';
+ }
+ }
+
+ /**
+ * METHODE 2
+ * Loggien
+ */
+ if (isset($methoden[8])) {
+ foreach ($methoden[8] as $komponente) {
+ $html .= '';
+ $html .= Html::td('', 'bl bg-user-set');
+ $html .= Html::td($komponente['geschoss'], 'bl');
+ $html .= Html::td('', 'bl');
+ $html .= Html::td('', 'bl');
+ $html .= Html::td($komponente['raumart'], 'bl');
+ $html .= Html::td(number_format($komponente['flaeche'], 2, ',', '.').' m²', 'right bl');
+ $html .= Html::td('', 'bl');
+ $html .= Html::td('', 'bl');
+ $html .= Html::td('x', 'center bl');
+ $html .= Html::td(number_format($komponente['faktor'], 3), 'center bl');
+ $html .= Html::td('=', 'center bl');
+ $nutzwert = $komponente['flaeche'] * $komponente['faktor'];
+ $summe_nutzwert += $nutzwert;
+ $html .= Html::td(number_format($nutzwert, 3, ',', '.'), 'right bl');
+ $html .= Html::td('', 'center bl br');
+ $html .= '
';
+ }
}
$html .= '';
@@ -134,7 +162,7 @@ class Nutzwertberechnung
$html .= Html::td('', 'bl');
$html .= Html::td('', 'bl');
$html .= Html::td($komponente['raumart'], 'bl');
- $html .= Html::td(number_format($komponente['flaeche'], 2, ',', '.') . ' m²', 'right bl');
+ $html .= Html::td(number_format($komponente['flaeche'], 2, ',', '.').' m²', 'right bl');
$html .= Html::td('', 'bl');
$html .= Html::td('', 'bl');
$html .= Html::td('x', 'center bl');
@@ -161,7 +189,7 @@ class Nutzwertberechnung
$html .= Html::td('', 'bl');
$html .= Html::td('Zubehör', 'bl');
$html .= Html::td($komponente['raumart'], 'bl');
- $html .= Html::td(number_format($komponente['flaeche'], 2, ',', '.') . ' m²', 'right bl');
+ $html .= Html::td(number_format($komponente['flaeche'], 2, ',', '.').' m²', 'right bl');
$html .= Html::td('', 'bl');
$html .= Html::td('', 'bl');
$html .= Html::td('x', 'center bl');
@@ -207,7 +235,7 @@ class Nutzwertberechnung
$html .= Html::td($komponente['top_nummer'], 'bl bg-user-set');
$html .= Html::td($komponente['geschoss'], 'bl');
$html .= Html::td($komponente['raumart'], 'bl');
- $html .= Html::td(number_format($komponente['flaeche'], 2, ',', '.') . ' m²', 'right bl');
+ $html .= Html::td(number_format($komponente['flaeche'], 2, ',', '.').' m²', 'right bl');
$html .= Html::td('x', 'center bl');
$html .= Html::td(number_format($komponente['faktor'], 3), 'center bl');
$html .= Html::td('=', 'center bl');
diff --git a/composer.lock b/composer.lock
index ee66a0e..6e0d8f5 100644
--- a/composer.lock
+++ b/composer.lock
@@ -2098,16 +2098,16 @@
},
{
"name": "giggsey/libphonenumber-for-php-lite",
- "version": "9.0.35",
+ "version": "9.0.36",
"source": {
"type": "git",
"url": "https://github.com/giggsey/libphonenumber-for-php-lite.git",
- "reference": "2fcb98690acb17febf87c9f8f1ab846390e7574f"
+ "reference": "f21237b7df458b326cd5b1bac44d64cc7b1dcb2f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/giggsey/libphonenumber-for-php-lite/zipball/2fcb98690acb17febf87c9f8f1ab846390e7574f",
- "reference": "2fcb98690acb17febf87c9f8f1ab846390e7574f",
+ "url": "https://api.github.com/repos/giggsey/libphonenumber-for-php-lite/zipball/f21237b7df458b326cd5b1bac44d64cc7b1dcb2f",
+ "reference": "f21237b7df458b326cd5b1bac44d64cc7b1dcb2f",
"shasum": ""
},
"require": {
@@ -2172,7 +2172,7 @@
"issues": "https://github.com/giggsey/libphonenumber-for-php-lite/issues",
"source": "https://github.com/giggsey/libphonenumber-for-php-lite"
},
- "time": "2026-07-17T13:11:35+00:00"
+ "time": "2026-08-03T07:53:53+00:00"
},
{
"name": "graham-campbell/result-type",