--- a/fhiiqm/raum_flist.php Mon Feb 06 13:44:00 2012 +0100
+++ b/fhiiqm/raum_flist.php Fri Mar 02 13:54:32 2012 +0100
@@ -133,8 +133,12 @@
tab_column(3,"Bezeichnung",$sort,$dir,0,$fnum,$filter,$start,$zeil);
tab_column(4,"Haus",$sort,$dir,4,$fnum,$filter,$start,$zeil);
tab_column(5,"Raum-Typ",$sort,$dir,5,$fnum,$filter,$start,$zeil);
- tab_column(8,"Reinigungs-Typ",$sort,$dir,8,$fnum,$filter,$start,$zeil);
- tab_column(6,"Fläche (m<sup>2</sup>)",$sort,$dir,0,$fnum,$filter,$start,$zeil);
+ tab_column(8,"Reinig.-Typ",$sort,$dir,8,$fnum,$filter,$start,$zeil);
+ tab_column(9,"Reinig.-Kat.",$sort,$dir,9,$fnum,$filter,$start,$zeil);
+ tab_column(10,"Reinig.-Turn.",$sort,$dir,10,$fnum,$filter,$start,$zeil);
+ tab_column(11,"Boden-Typ",$sort,$dir,11,$fnum,$filter,$start,$zeil);
+ tab_column(12,"Reinig.Fl.(m<sup>2</sup>)",$sort,$dir,0,$fnum,$filter,$start,$zeil);
+ tab_column(6,"Fläche(m<sup>2</sup>)",$sort,$dir,0,$fnum,$filter,$start,$zeil);
tab_column(7,"Raumplan",$sort,$dir,0,$fnum,$filter,$start,$zeil);
echo "<th> </th></tr>\n";
@@ -150,6 +154,18 @@
if ($row->reinigung_typ_ID)
echo "<td>$row->reinigung_typ_ID: $row->reinigung_typ_bez</td>";
else echo "<td> </td>";
+ if ($row->reinigung_kat)
+ echo "<td>$row->reinigung_kat</td>";
+ else echo "<td> </td>";
+ if ($row->reinigung_turnus_bez)
+ echo "<td>$row->reinigung_turnus_bez</td>";
+ else echo "<td> </td>";
+ if ($row->boden_typ_bez)
+ echo "<td>$row->boden_typ_bez</td>";
+ else echo "<td> </td>";
+ if ($row->reinigung_flaeche)
+ echo "<td class='right'>" . number_format($row->reinigung_flaeche,2,',','') . "</td>";
+ else echo "<td> </td>";
echo "<td class='right'>" . str_replace(".",",",$row->raum_flaeche) . "</td>";
if (file_exists("raeume/".$row->raum_file))
{