salam/nutzwerte_fi4
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of http://gitea.nuhodds.com:3000/salam/nutzwerte_fi4

Browse Source
This commit is contained in:
salam committed 2026-08-03 16:51:37 +02:00
2 parents a0dc3d71f0 523f4352f0
commit fdfd0feb0c
2 files changed
+59 -10
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/Actions/Generate/Tabellen/Nutzwertberechnung.php
+58 -10
View File
@@ -38,12 +38,12 @@ class Nutzwertberechnung
$html .= '</tr></thead>'; $html .= '</tr></thead>';
$summe_nutzwert = 0; $summe_nutzwert = 0;
$faktor = 1;
/** /**
* Normale Wohnnutzflächen * Normale Wohnnutzflächen
*/ */
if (isset($methoden[1])) { if (isset($methoden[1])) {
$flaeche = 0; $flaeche = 0;
$faktor = 0;
foreach ($methoden[1] as $komponente) { foreach ($methoden[1] as $komponente) {
$html .= '<tr>'; $html .= '<tr>';
@@ -53,7 +53,7 @@ class Nutzwertberechnung
$html .= Html::td($komponente['orientierung'], 'bl'); $html .= Html::td($komponente['orientierung'], 'bl');
$html .= Html::td($komponente['type'], 'bl'); $html .= Html::td($komponente['type'], 'bl');
$html .= Html::td($komponente['raumart'], 'bl'); $html .= Html::td($komponente['raumart'], 'bl');
$html .= Html::td(number_format($komponente['flaeche'], 2, ',', '.') . ' m&sup2;', 'right bl nowrap'); $html .= Html::td(number_format($komponente['flaeche'], 2, ',', '.').' m&sup2;', 'right bl nowrap');
$html .= Html::td('', 'bl br', 7); $html .= Html::td('', 'bl br', 7);
$flaeche += $komponente['flaeche']; $flaeche += $komponente['flaeche'];
$html .= '</tr>'; $html .= '</tr>';
@@ -62,14 +62,13 @@ class Nutzwertberechnung
$faktor = (100 + $komponente['objekt_nutzwert']) / 100; $faktor = (100 + $komponente['objekt_nutzwert']) / 100;
} }
$html .= '<tr>'; $html .= '<tr>';
$html .= Html::td('', 'bl bg-user-set'); $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('', 'bl'); $html .= Html::td('', 'bl');
$html .= Html::td('', 'bl'); $html .= Html::td('', 'bl');
$html .= Html::td(number_format($flaeche, 2, ',', '.') . ' m&sup2;', 'right bl nowrap'); $html .= Html::td(number_format($flaeche, 2, ',', '.').' m&sup2;', 'right bl nowrap');
$html .= Html::td('x', 'center bl'); $html .= Html::td('x', 'center bl');
$html .= Html::td(number_format($faktor, 3, ',', '.'), 'center bl'); $html .= Html::td(number_format($faktor, 3, ',', '.'), 'center bl');
$html .= Html::td('', 'bl'); $html .= Html::td('', 'bl');
@@ -82,8 +81,10 @@ class Nutzwertberechnung
} }
/** /**
* METHODE 2b
* Wintergarten, Loggien, unter Stiegen * Wintergarten, Loggien, unter Stiegen
*/ */
if (isset($methoden[2]) || isset($methoden[8])) {
if (isset($methoden[2])) { if (isset($methoden[2])) {
foreach ($methoden[2] as $komponente) { foreach ($methoden[2] as $komponente) {
$html .= '<tr>'; $html .= '<tr>';
@@ -92,7 +93,33 @@ class Nutzwertberechnung
$html .= Html::td('', 'bl'); $html .= Html::td('', 'bl');
$html .= Html::td('', 'bl'); $html .= Html::td('', 'bl');
$html .= Html::td($komponente['raumart'], 'bl'); $html .= Html::td($komponente['raumart'], 'bl');
$html .= Html::td(number_format($komponente['flaeche'], 2, ',', '.') . ' m&sup2;', 'right bl'); $html .= Html::td(number_format($komponente['flaeche'], 2, ',', '.').' m&sup2;', '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 .= '</tr>';
}
}
/**
* METHODE 2
* Loggien
*/
if (isset($methoden[8])) {
foreach ($methoden[8] as $komponente) {
$html .= '<tr>';
$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&sup2;', 'right bl');
$html .= Html::td('', 'bl'); $html .= Html::td('', 'bl');
$html .= Html::td('', 'bl'); $html .= Html::td('', 'bl');
$html .= Html::td('x', 'center bl'); $html .= Html::td('x', 'center bl');
@@ -104,6 +131,7 @@ class Nutzwertberechnung
$html .= Html::td('', 'center bl br'); $html .= Html::td('', 'center bl br');
$html .= '</tr>'; $html .= '</tr>';
} }
}
$html .= '<tr>'; $html .= '<tr>';
$html .= Html::td('', 'bl bg-user-set'); $html .= Html::td('', 'bl bg-user-set');
@@ -124,17 +152,18 @@ class Nutzwertberechnung
$summe_nutzwert = round($summe_nutzwert); $summe_nutzwert = round($summe_nutzwert);
/** /**
* METHODE 3b (die Methode 3 ist nicht in Verwendung)
* Terasse, Balkon * Terasse, Balkon
*/ */
if (isset($methoden[3])) { if (isset($methoden[7])) {
foreach ($methoden[3] as $komponente) { foreach ($methoden[7] as $komponente) {
$html .= '<tr>'; $html .= '<tr>';
$html .= Html::td('', 'bl bg-user-set'); $html .= Html::td('', 'bl bg-user-set');
$html .= Html::td($komponente['geschoss'], 'bl'); $html .= Html::td($komponente['geschoss'], 'bl');
$html .= Html::td('', 'bl'); $html .= Html::td('', 'bl');
$html .= Html::td('', 'bl'); $html .= Html::td('', 'bl');
$html .= Html::td($komponente['raumart'], 'bl'); $html .= Html::td($komponente['raumart'], 'bl');
$html .= Html::td(number_format($komponente['flaeche'], 2, ',', '.') . ' m&sup2;', 'right bl'); $html .= Html::td(number_format($komponente['flaeche'], 2, ',', '.').' m&sup2;', 'right bl');
$html .= Html::td('', 'bl'); $html .= Html::td('', 'bl');
$html .= Html::td('', 'bl'); $html .= Html::td('', 'bl');
$html .= Html::td('x', 'center bl'); $html .= Html::td('x', 'center bl');
@@ -161,7 +190,7 @@ class Nutzwertberechnung
$html .= Html::td('', 'bl'); $html .= Html::td('', 'bl');
$html .= Html::td('Zubehör', 'bl'); $html .= Html::td('Zubehör', 'bl');
$html .= Html::td($komponente['raumart'], 'bl'); $html .= Html::td($komponente['raumart'], 'bl');
$html .= Html::td(number_format($komponente['flaeche'], 2, ',', '.') . ' m&sup2;', 'right bl'); $html .= Html::td(number_format($komponente['flaeche'], 2, ',', '.').' m&sup2;', 'right bl');
$html .= Html::td('', 'bl'); $html .= Html::td('', 'bl');
$html .= Html::td('', 'bl'); $html .= Html::td('', 'bl');
$html .= Html::td('x', 'center bl'); $html .= Html::td('x', 'center bl');
@@ -207,7 +236,26 @@ class Nutzwertberechnung
$html .= Html::td($komponente['top_nummer'], 'bl bg-user-set'); $html .= Html::td($komponente['top_nummer'], 'bl bg-user-set');
$html .= Html::td($komponente['geschoss'], 'bl'); $html .= Html::td($komponente['geschoss'], 'bl');
$html .= Html::td($komponente['raumart'], 'bl'); $html .= Html::td($komponente['raumart'], 'bl');
$html .= Html::td(number_format($komponente['flaeche'], 2, ',', '.') . ' m&sup2;', 'right bl'); $html .= Html::td(number_format($komponente['flaeche'], 2, ',', '.').' m&sup2;', 'right bl');
$html .= Html::td('x', 'center bl');
$html .= Html::td(number_format($komponente['faktor'], 3), 'center bl');
$html .= Html::td('=', 'center bl');
$flaeche = $komponente['flaeche'] * $komponente['faktor'];
$html .= Html::td(number_format($flaeche, 3, ',', '.'), 'right bl');
$tmp = round($flaeche) < 1 ? 1 : round($flaeche);
$html .= Html::td($tmp, 'center bl br');
$nutzwert += $tmp;
$html .= '</tr>';
}
}
if (isset($methoden[9])) {
foreach ($methoden[9] as $komponente) {
$html .= '<tr>';
$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&sup2;', 'right bl');
$html .= Html::td('x', 'center bl'); $html .= Html::td('x', 'center bl');
$html .= Html::td(number_format($komponente['faktor'], 3), 'center bl'); $html .= Html::td(number_format($komponente['faktor'], 3), 'center bl');
$html .= Html::td('=', 'center bl'); $html .= Html::td('=', 'center bl');
app/Filament/Resources/Projektes/RelationManagers/ProjektObjekteImDetailRelationManager.php
+1
View File
@@ -111,6 +111,7 @@ class ProjektObjekteImDetailRelationManager extends RelationManager
->filters([ ->filters([
SelectFilter::make('top_nummer') SelectFilter::make('top_nummer')
->label('Top Nummer') ->label('Top Nummer')
->searchable()
->relationship('top_nummer', 'top_nummer', fn (Builder $query) => $query->where('projekte_id', $this->getOwnerRecord()->id)) ->relationship('top_nummer', 'top_nummer', fn (Builder $query) => $query->where('projekte_id', $this->getOwnerRecord()->id))
->preload(), ->preload(),
SelectFilter::make('geschoss') SelectFilter::make('geschoss')