--- a/fhiiqm/form/vertragmf_form.inc.php Fri Dec 20 15:19:32 2013 +0100
+++ b/fhiiqm/form/vertragmf_form.inc.php Fri Jan 17 08:50:55 2014 +0100
@@ -154,13 +154,14 @@
$select = null;
if (is_array($vtr['cpers'])) $select = in_array( "-1", $vtr['cpers'] ) ? ' selected' : null;
echo "<option $select value=\"-1\"></option>\n";
- $sql = "SELECT persknr, CONCAT (nachname, ', ',IFNULL(vorname,''),' (',CASE aktiv WHEN 1 THEN 'aktiv' ELSE 'inaktiv' END, ')') as pname FROM fhiiqm.Mitarbeiter WHERE aktiv < 2 ORDER BY 2";
+ $sql = "SELECT persknr, CONCAT (nachname, ', ',IFNULL(vorname,''),' (',CASE aktiv WHEN 1 THEN 'aktiv' ELSE (CASE aktiv WHEN -1 THEN 'Gast' ELSE 'inaktiv' END) END, ')') as pname FROM fhiiqm.Mitarbeiter WHERE aktiv < 2 ORDER BY 2";
if ($result = $dbc->queryObjectArray($sql))
{
foreach ($result as $row)
{
if (is_array($vtr['cpers'])) $select = in_array( $row->persknr, $vtr['cpers'] ) ? ' selected' : null;
- echo "<option $select value=\"$row->persknr\">$row->pname</option>\n";
+ if (strpos($row->pname,"inaktiv") || strpos($row->pname,"Gast")) $class=" class='red'"; else $class="";
+ echo "<option$class $select value=\"$row->persknr\">$row->pname</option>\n";
}
}
?>
@@ -173,6 +174,9 @@
echo "<tr>
<td>jährliche Teilbrutto-Kosten (€)</td><br />
<td>";
+ $dat = $vtr['bdat'];
+ $bdate = new DateTime("$dat");
+ $bjahr = $bdate->format("Y");
$j=0;
if ($vtr['edat'])
{
@@ -186,9 +190,6 @@
$ejahr = null;
if ($ejahr)
{
- $dat = $vtr['bdat'];
- $bdate = new DateTime("$dat");
- $bjahr = $bdate->format("Y");
for ($i=(int)$bjahr; $i<(int)$ejahr+1; $i++ )
{
echo "<input name=\"vertrag[kjahr][$j]\" type=\"text\" size=\"4\" value=\"$i\"/> ";
@@ -198,7 +199,7 @@
}
else
{
- echo "<input name=\"vertrag[kjahr][$j]\" type=\"text\" size=\"4\" value=\"" . $vtr['bjahr'] . "\"/> ";
+ echo "<input name=\"vertrag[kjahr][$j]\" type=\"text\" size=\"4\" value=\"" . $bjahr . "\"/> ";
echo "<input class='right' name=\"vertrag[kost][$j]\" type=\"text\" value=\"" . $vtr['kost'][$j] . "\"/>";
}