Jahresübersicht angepasst

This commit is contained in:
aschwarz
2023-07-10 14:09:45 +02:00
parent 1d0d52f302
commit e8aa064048
12 changed files with 3036 additions and 33 deletions

View File

@ -270,6 +270,7 @@ if ($action == '') {
$result7 = $db->query($query7) or die("Cannot execute query7a");
$ln_zaehler = 0;
while ($row7 = $result7->fetch_array()) {
unset($inner1);
$value_bz = '';
if ($ln_zaehler == 0) {
$last_did = $row7['did'];
@ -295,6 +296,10 @@ if ($action == '') {
ORDER BY b.art, doz_name asc, lbbzid asc";
$result8 = $db->query($query8) or die("Cannot execute query8");
$ln2 = 0;
# inner
$fikt_not_edit='';
while ($row8 = $result8->fetch_array()) {
if ($row8['art'] == 'F') {
@ -361,15 +366,18 @@ if ($action == '') {
// }
$wert_neu = number_format($row8['wert'], 2, ',', '.');
$row8['edit'] = $edit;
$row8['fikt_not_edit'] = $fikt_not_edit;
$row8['farbe'] = $farbe;
$row8['delta_art'] = $art;
$row8['bz_del'] = $bz_del;
$row8['wert'] = $wert_neu;
$row8['startdat'] = $startdat;
$row8['enddat'] = $enddat;
$value_bz[] = $row8;
$inner1[$ln2]['edit'] = $edit;
$inner1[$ln2]['fikt_not_edit'] = $fikt_not_edit;
$inner1[$ln2]['farbe'] = $farbe;
$inner1[$ln2]['delta_art'] = $art;
$inner1[$ln2]['bz_del'] = $bz_del;
$inner1[$ln2]['wert'] = $wert_neu;
$inner1[$ln2]['startdat'] = $startdat;
$inner1[$ln2]['enddat'] = $enddat;
$inner1[$ln2]['doz_name'] = $row8['doz_name'];
$inner1[$ln2]['doz_vorname'] = $row8['doz_vorname'];
$value_bz = $inner1;
$ln2++;
}
$row7['inner'] = $value_bz;
@ -377,9 +385,9 @@ if ($action == '') {
$value_7[] = $row7;
}
// echo "<pre>";
// print_r($value_7);
// echo "</pre>";
//echo "<pre>";
//print_r($value_7);
//echo "</pre>";
$smarty->assign('outer_loop_bz', $value_7);
@ -435,6 +443,9 @@ if ($action == '') {
$result4 = $db->query($query4) or die("Cannot execute query4");
$ln3 = 0;
# inner
while ($row4 = $result4->fetch_array()) {
if ($row4['art'] == 'F') {
@ -502,15 +513,19 @@ if ($action == '') {
// }
$wert_neu = number_format($row4['wert'], 2, ',', '.');
$row4['edit'] = $edit;
$row4['fikt_not_edit_lz'] = $fikt_not_edit_lz;
$row4['farbe'] = $farbe;
$row4['delta_art'] = $art;
$row4['lz_del'] = $lz_del;
$row4['wert'] = $wert_neu;
$row4['startdat'] = $startdat;
$row4['enddat'] = $enddat;
$value_delta[] = $row4;
$inner2[$ln3]['edit'] = $edit;
$inner2[$ln3]['fikt_not_edit_lz'] = $fikt_not_edit_lz;
$inner2[$ln3]['farbe'] = $farbe;
$inner2[$ln3]['delta_art'] = $art;
$inner2[$ln3]['lz_del'] = $lz_del;
$inner2[$ln3]['wert'] = $wert_neu;
$inner2[$ln3]['startdat'] = $startdat;
$inner2[$ln3]['enddat'] = $enddat;
$inner2[$ln3]['doz_name'] = $row4['doz_name'];
$inner2[$ln3]['doz_vorname'] = $row4['doz_vorname'];
$inner2[$ln3]['stufe'] = $row4['stufe'];
$value_delta = $inner2;
$ln3++;
}
$row3['inner'] = $value_delta;
@ -561,6 +576,8 @@ if ($action == '') {
GROUP BY a.lbfzid, b.kfid, a.did
ORDER BY bezeichnung asc, monat asc";
$result6 = $db->query($query6) or die("Cannot execute query6");
$ln5 = 0;
#inner
while ($row6 = $result6->fetch_array()) {
if ($row6['art'] == 'F') {
$art = 'Fiktiver Wert';
@ -604,13 +621,14 @@ if ($action == '') {
}
$wert_neu = number_format($row6['wert'], 2, ',', '.');
$row6['fz_art'] = $art;
$row6['edit'] = $edit;
$row6['wert'] = $wert_neu;
$row6['name'] = $name;
$row6['startdat'] = $startdat;
$row6['enddat'] = $enddat;
$value_funktion[] = $row6;
$inner4[$ln5]['fz_art'] = $art;
$inner4[$ln5]['edit'] = $edit;
$inner4[$ln5]['wert'] = $wert_neu;
$inner4[$ln5]['name'] = $name;
$inner4[$ln5]['startdat'] = $startdat;
$inner4[$ln5]['enddat'] = $enddat;
$value_funktion = $inner4;
$ln5++;
}
$row5['inner'] = $value_funktion;