Format name differently

[misc/kostenrechnung] / masks / overview_stunden.php

diff --git a/masks/overview_stunden.php b/masks/overview_stunden.php
index 9c6cabc..5bce405 100644 (file)
--- a/masks/overview_stunden.php
+++ b/masks/overview_stunden.php
@@ -5,12 +5,13 @@ include_once($_SESSION['sys']['basedir'].'/lib/overview_utils.php');
 if (empty($_SESSION['overview_stunden.year'])) $_SESSION['overview_stunden.year'] = 0;
 
 $details = <<<EOC
-<div style="padding-left: 3px;">
+<div style="padding-left: 3px; margin-top: -10px;">
 <b>Gebiet</b>: <span id="detail_gebiet"></span><br>
 <b>Länge</b>: <span id="detail_laenge"></span><br>
 <b>Gesamtstunden</b>: <span id="detail_gewaesserstunden"></span><br>
 <b>Personalstunden</b>: <span id="detail_personalstunden"></span><br>
-<b>Gerätestunden</b>: <span id="detail_geraetestunden"></span>
+<b>Gerätestunden</b>: <span id="detail_geraetestunden"></span><br>
+<b>Gewässer gereinigt</b>: <span id="detail_gereinigt"></span>
 </div>
 EOC;
 
@@ -71,7 +72,7 @@ $mask = array(
                                            ),
                              'personal' => array(
                                            'name' => 'Mitarbeiter',
-                                           'sql' => "personal.vorname || ' ' || personal.name",
+                                           'sql' => "personal.name || ', ' || personal.vorname",
                                            'width' => 150,
                                            'specs' => "filterUI: 's'",
                                            ),
@@ -124,6 +125,7 @@ $mask = array(
                                                 'gewaesserstunden' => array('fetch' => fetch_gewaesserstunden),
                                                 'personalstunden' => array('fetch' => fetch_personalstunden),
                                                 'geraetestunden' => array('fetch' => fetch_geraetestunden),
+                                                'gereinigt' => array('fetch' => fetch_gereinigt),
                                                 ),
 
                              ),
@@ -197,4 +199,22 @@ EOC;
   return sprintf('%.2f', $res[0]['gesamt']);
 }
 
+function fetch_gereinigt()
+{
+  $sql = <<<EOC
+  SELECT count(*) AS count
+  FROM gereinigt
+  JOIN kostenstellen ON gereinigt.kostenstelle = kostenstellen.id
+  JOIN einsatz ON einsatz.kostenstelle = kostenstellen.id
+  WHERE jahr = %d AND einsatz.id = %d
+EOC;
+
+  $sql = sprintf($sql, $_SESSION['overview_kosten.year'], $_POST['id']);
+
+  $res = query_db($sql);
+  if ($res === false) return '';
+
+  return $res[0]['count'] == 0 ? 'nein' : 'ja';
+}
+
 ?>