wip
This commit is contained in:
salam committed
1 parent
9ea516347c
commit
4a4929f52e
2 files changed
+39
-33
No files matched your search
@@ -9,7 +9,7 @@ class LadeProjekt
|
||||
{
|
||||
public static $methoden = [];
|
||||
|
||||
public static function project($projekte_id, $nicht_in_orientierung)
|
||||
public static function project(int $projekte_id, int $nicht_in_orientierung)
|
||||
{
|
||||
$objekte = ProjektObjekte::with('orientierung')
|
||||
->where('projekte_id', $projekte_id)
|
||||
@@ -17,38 +17,35 @@ class LadeProjekt
|
||||
->orderBy('top_nummer')
|
||||
->get();
|
||||
|
||||
// dd($objekte);
|
||||
|
||||
$tmp = [];
|
||||
foreach ($objekte as $objekt) {
|
||||
$orientierung = $objekt->orientierung->name ?? '';
|
||||
$type = $objekt->type;
|
||||
|
||||
$elemente = ProjektObjekteImDetail::with('methode')->where('projekt_objekte_id', $objekt->id)->get();
|
||||
|
||||
// if ($objekt->id == 1782) {
|
||||
// dd($elemente);
|
||||
// }
|
||||
|
||||
foreach ($elemente as $key => $element) {
|
||||
|
||||
// if (! $element->methode) {
|
||||
// dd($element);
|
||||
// }
|
||||
$methode_id = $element->methode->methode_id;
|
||||
$methode_name = $element->methode->raumart;
|
||||
$methode_faktor = $element->methode->faktor;
|
||||
$methode_aufstellung_id = $element->methode->aufstellung_id;
|
||||
|
||||
$orientierung = $objekt['orientierung']['name'] ?? '';
|
||||
if ($key > 0 && $methode_id == 1) {
|
||||
$orientierung = '';
|
||||
}
|
||||
|
||||
$geschoss = $element['geschoss'] ?? '';
|
||||
if ($key > 0 && $methode_id <= 1) {
|
||||
$geschoss = '';
|
||||
}
|
||||
$geschoss = $element->geschoss ?? '';
|
||||
|
||||
$t = [];
|
||||
$t['id'] = $objekt->id;
|
||||
$t['type'] = ! $key ? $objekt->type : '';
|
||||
$t['type'] = $type;
|
||||
$t['geschoss'] = $geschoss;
|
||||
$t['orientierung'] = $orientierung;
|
||||
$t['raumart'] = $methode_name;
|
||||
$t['flaeche'] = $element['flaeche'];
|
||||
$t['nutzwert'] = $element['nutzwert'];
|
||||
$t['flaeche'] = $element->flaeche;
|
||||
$t['nutzwert'] = $element->nutzwert;
|
||||
$t['top_nummer'] = ! $key ? $objekt->top_nummer : '';
|
||||
$t['objekt_nutzwert'] = $objekt->nutzwert;
|
||||
$t['faktor'] = $methode_faktor;
|
||||
@@ -56,7 +53,6 @@ class LadeProjekt
|
||||
$tmp[$objekt->top_nummer][$methode_id][] = $t;
|
||||
}
|
||||
}
|
||||
|
||||
return $tmp;
|
||||
}
|
||||
}
|
||||
@@ -45,15 +45,22 @@ class Nutzwertberechnung
|
||||
if (isset($methoden[1])) {
|
||||
$flaeche = 0;
|
||||
|
||||
foreach ($methoden[1] as $komponente) {
|
||||
foreach ($methoden[1] as $key => $komponente) {
|
||||
$html .= '<tr>';
|
||||
// $html .= Html::td($komponente['top_nummer'], 'bl bg-user-set');
|
||||
$html .= Html::td($topnr, 'bl bg-user-set');
|
||||
$html .= Html::td($komponente['geschoss'], 'bl');
|
||||
$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');
|
||||
if (!$key) {
|
||||
$html .= Html::td($komponente['geschoss'], 'bl');
|
||||
$html .= Html::td($komponente['orientierung'], 'bl');
|
||||
$html .= Html::td($komponente['type'], 'bl');
|
||||
$html .= Html::td($komponente['raumart'], 'bl');
|
||||
} else {
|
||||
$html .= Html::td('', 'bl');
|
||||
$html .= Html::td('', 'bl');
|
||||
$html .= Html::td('', 'bl');
|
||||
$html .= Html::td('', 'bl');
|
||||
}
|
||||
$html .= Html::td(number_format($komponente['flaeche'], 2, ',', '.') . ' m²', 'right bl nowrap');
|
||||
$html .= Html::td('', 'bl br', 7);
|
||||
$flaeche += $komponente['flaeche'];
|
||||
$html .= '</tr>';
|
||||
@@ -68,7 +75,7 @@ class Nutzwertberechnung
|
||||
$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');
|
||||
@@ -86,14 +93,17 @@ class Nutzwertberechnung
|
||||
*/
|
||||
if (isset($methoden[2]) || isset($methoden[8])) {
|
||||
if (isset($methoden[2])) {
|
||||
foreach ($methoden[2] as $komponente) {
|
||||
foreach ($methoden[2] as $key => $komponente) {
|
||||
$html .= '<tr>';
|
||||
$html .= Html::td('', 'bl bg-user-set');
|
||||
$html .= Html::td($komponente['geschoss'], 'bl');
|
||||
if (!$key)
|
||||
$html .= Html::td($komponente['geschoss'], 'bl');
|
||||
else
|
||||
$html .= Html::td('', '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(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');
|
||||
@@ -119,7 +129,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');
|
||||
@@ -163,7 +173,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');
|
||||
@@ -190,7 +200,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');
|
||||
@@ -236,7 +246,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');
|
||||
@@ -255,7 +265,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');
|
||||
|
||||
Reference in new issue
Block a user