This commit is contained in:
Andreas Österreicher
2008-02-27 12:00:41 +00:00
parent f9f224ac65
commit 3f398ba3fa
2 changed files with 332 additions and 158 deletions
+167 -158
View File
@@ -12,58 +12,58 @@
$menu=array $menu=array
( (
//'Admin'=> array('name'=>'Admin', 'link'=>'admin/menu.html', 'target'=>'main'), //'Admin'=> array('name'=>'Admin', 'link'=>'admin/menu.html', 'target'=>'main'),
'Lehre'=> array 'Lehre'=> array
( (
'name'=>'Lehre', 'name'=>'Lehre',
'Lehrveranstaltung'=>array 'Lehrveranstaltung'=>array
( (
'name'=>'Lehrveranstaltung', 'name'=>'Lehrveranstaltung',
'Verwaltung'=>array('name'=>'Verwaltung', 'link'=>'lehre/lehrveranstaltung_frameset.html', 'target'=>'main'), 'Verwaltung'=>array('name'=>'Verwaltung', 'link'=>'lehre/lehrveranstaltung_frameset.html', 'target'=>'main'),
'Wartung'=>array('name'=>'Wartung', 'link'=>'stammdaten/lv_wartung.php', 'target'=>'main') 'Wartung'=>array('name'=>'Wartung', 'link'=>'stammdaten/lv_wartung.php', 'target'=>'main')
), ),
'Lehrfach'=>array 'Lehrfach'=>array
( (
'name'=>'Lehrfach', 'name'=>'Lehrfach',
'Verwaltung'=>array('name'=>'Verwaltung', 'link'=>'lehre/lehrfach.php', 'target'=>'main'), 'Verwaltung'=>array('name'=>'Verwaltung', 'link'=>'lehre/lehrfach.php', 'target'=>'main'),
'Wartung'=>array('name'=>'Wartung', 'link'=>'lehre/lehrfach/wartung.php', 'target'=>'main') 'Wartung'=>array('name'=>'Wartung', 'link'=>'lehre/lehrfach/wartung.php', 'target'=>'main')
), ),
'Lehreinheit'=>array 'Lehreinheit'=>array
( (
'name'=>'Lehreinheit', 'name'=>'Lehreinheit',
'Verwaltung'=>array('name'=>'Verwaltung', 'link'=>'lehre/lv_verteilung/lv_verteilung.php', 'target'=>'main'), 'Verwaltung'=>array('name'=>'Verwaltung', 'link'=>'lehre/lv_verteilung/lv_verteilung.php', 'target'=>'main'),
'Wartung'=>array('name'=>'Wartung', 'link'=>'stammdaten/le_wartung.php', 'target'=>'main'), 'Wartung'=>array('name'=>'Wartung', 'link'=>'stammdaten/le_wartung.php', 'target'=>'main'),
'Vorrueckung'=>array('name'=>'Vorrueckung', 'link'=>'lehre/lehreinheiten_vorrueckung.php', 'target'=>'main') 'Vorrueckung'=>array('name'=>'Vorrueckung', 'link'=>'lehre/lehreinheiten_vorrueckung.php', 'target'=>'main')
), ),
'Freifach'=>array 'Freifach'=>array
( (
'name'=>'Freifach', 'name'=>'Freifach',
'Studenten'=>array('name'=>'Studenten', 'link'=>'lehre/freifach.php', 'target'=>'main'), 'Studenten'=>array('name'=>'Studenten', 'link'=>'lehre/freifach.php', 'target'=>'main'),
'Lektoren'=>array('name'=>'Lektoren', 'link'=>'lehre/freifach_lektoren.php', 'target'=>'main') 'Lektoren'=>array('name'=>'Lektoren', 'link'=>'lehre/freifach_lektoren.php', 'target'=>'main')
), ),
'LV-Planung'=>array 'LV-Planung'=>array
( (
'name'=>'LV-Planung', 'name'=>'LV-Planung',
'Wartung'=>array('name'=>'Verwaltung', 'link'=>'lehre/lehrveranstaltung_frameset.html', 'target'=>'main'), 'Wartung'=>array('name'=>'Verwaltung', 'link'=>'lehre/lehrveranstaltung_frameset.html', 'target'=>'main'),
'Check'=>array('name'=>'Studenten', 'link'=>'lehre/lehrveranstaltung_frameset.html', 'target'=>'main'), 'Check'=>array('name'=>'Studenten', 'link'=>'lehre/lehrveranstaltung_frameset.html', 'target'=>'main'),
'Kollision'=>array('name'=>'Studenten', 'link'=>'lehre/lehrveranstaltung_frameset.html', 'target'=>'main'), 'Kollision'=>array('name'=>'Studenten', 'link'=>'lehre/lehrveranstaltung_frameset.html', 'target'=>'main'),
'Stundenplan'=>array('name'=>'Studenten', 'link'=>'lehre/lehrveranstaltung_frameset.html', 'target'=>'main'), 'Stundenplan'=>array('name'=>'Studenten', 'link'=>'lehre/lehrveranstaltung_frameset.html', 'target'=>'main'),
'Studenten'=>array('name'=>'Studenten', 'link'=>'lehre/lehrveranstaltung_frameset.html', 'target'=>'main'), 'Studenten'=>array('name'=>'Studenten', 'link'=>'lehre/lehrveranstaltung_frameset.html', 'target'=>'main'),
'Studenten'=>array('name'=>'Studenten', 'link'=>'lehre/lehrveranstaltung_frameset.html', 'target'=>'main') 'Studenten'=>array('name'=>'Studenten', 'link'=>'lehre/lehrveranstaltung_frameset.html', 'target'=>'main')
) )
), ),
'Personen'=> array 'Personen'=> array
( (
'name'=>'Personen', 'link'=>'admin/menu.html', 'target'=>'main', 'opener'=>'true', 'hide'=>'true', 'name'=>'Personen', 'link'=>'admin/menu.html', 'target'=>'main', 'opener'=>'true', 'hide'=>'true',
'Personen'=>array('name'=>'Personen', 'link'=>'lehre/lehrveranstaltung_frameset.html', 'target'=>'main'), 'Personen'=>array('name'=>'Personen', 'link'=>'lehre/lehrveranstaltung_frameset.html', 'target'=>'main'),
'Benutzer'=>array('name'=>'Benutzer', 'link'=>'lehre/lehrveranstaltung_frameset.html', 'target'=>'main'), 'Benutzer'=>array('name'=>'Benutzer', 'link'=>'lehre/lehrveranstaltung_frameset.html', 'target'=>'main'),
'Mitarbeiter'=>array('name'=>'Mitarbeiter', 'link'=>'lehre/lehrveranstaltung_frameset.html', 'target'=>'main'), 'Mitarbeiter'=>array('name'=>'Mitarbeiter', 'link'=>'lehre/lehrveranstaltung_frameset.html', 'target'=>'main'),
'Studenten'=>array('name'=>'Studenten', 'link'=>'lehre/lehrveranstaltung_frameset.html', 'target'=>'main') 'Studenten'=>array('name'=>'Studenten', 'link'=>'lehre/lehrveranstaltung_frameset.html', 'target'=>'main')
), ),
'Stammdaten'=> array('name'=>'Stammdaten', 'link'=>'admin/menu.html', 'target'=>'main'), 'Stammdaten'=> array('name'=>'Stammdaten', 'link'=>'admin/menu.html', 'target'=>'main'),
'Vorrueckung'=> array('name'=>'Vorrueckung', 'link'=>'admin/menu.html', 'target'=>'main', 'opener'=>'true', 'hide'=>'true'), 'Vorrueckung'=> array('name'=>'Vorrueckung', 'link'=>'admin/menu.html', 'target'=>'main', 'opener'=>'true', 'hide'=>'true'),
'Auswertung'=> array('name'=>'Auswertung', 'link'=>'admin/menu.html', 'target'=>'main') 'Auswertung'=> array('name'=>'Auswertung', 'link'=>'admin/menu.html', 'target'=>'main')
); );
?> ?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd"> "http://www.w3.org/TR/html4/loose.dtd">
<html> <html>
@@ -71,25 +71,30 @@
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<title>VileSci Men&uuml;</title> <title>VileSci Men&uuml;</title>
<link href="../skin/vilesci.css" rel="stylesheet" type="text/css"> <link href="../skin/vilesci.css" rel="stylesheet" type="text/css">
<style type="text/css"> <style type="text/css">
</style> </style>
<script language="JavaScript" type="text/javascript"> <script language="JavaScript" type="text/javascript">
<!-- <!--
function js_toggle_container(conid) function js_toggle_container(conid)
{ {
//alert(conid); //alert(conid);
//var display = document.getElementById(conid).style.display; //var display = document.getElementById(conid).style.display;
if (document.getElementById(conid).style.display=='none') try
{ {
document.getElementById(conid).style.display='block'; if (document.getElementById(conid).style.display=='none')
document.getElementById(conid+'_dot').innerHTML='&#8211; '; {
} document.getElementById(conid).style.display='block';
else //document.getElementById(conid+'_dot').innerHTML='&#8211; ';
{ }
document.getElementById(conid).style.display='none'; else
document.getElementById(conid+'_dot').innerHTML='+ '; {
} document.getElementById(conid).style.display='none';
//document.getElementById(conid+'_dot').innerHTML='+ ';
}
}
catch(e){alert(e)}
return false;
} }
//--> //-->
</script> </script>
@@ -101,107 +106,107 @@
<img src="../skin/images/logo.png" width="200" height="50" alt="VileSci (FASonline)" title="VileSci" /> <img src="../skin/images/logo.png" width="200" height="50" alt="VileSci (FASonline)" title="VileSci" />
</a> </a>
</div> </div>
<?php <?php
if ($berechtigung->isBerechtigt('admin')) if ($berechtigung->isBerechtigt('admin'))
echo '<div> echo '<div>
<a href="admin/menu.html" target="main">Admin</a> <a href="admin/menu.html" target="main">Admin</a>
</div><hr>'; </div><hr>';
/*foreach($menu AS $m) /*foreach($menu AS $m)
{ {
$opener=false; $opener=false;
$hide=false; $hide=false;
if (isset($m['opener'])) if (isset($m['opener']))
if ($m['opener']=='true') if ($m['opener']=='true')
$opener=true; $opener=true;
if (isset($m['hide'])) if (isset($m['hide']))
if ($m['hide']=='true') if ($m['hide']=='true')
$hide=true; $hide=true;
if ($opener) if ($opener)
{ {
echo '<SPAN id="'.$m['name'].'_dot" onclick="js_toggle_container('."'".$m['name']."'".')" style="font-weight:bold">'; echo '<SPAN id="'.$m['name'].'_dot" onclick="js_toggle_container('."'".$m['name']."'".')" style="font-weight:bold">';
if ($hide) if ($hide)
echo '+ '; echo '+ ';
else else
echo '&#8211; '; echo '&#8211; ';
echo '</SPAN>'; echo '</SPAN>';
} }
else else
echo '&curren; '; echo '&curren; ';
if (isset($m['link'])) if (isset($m['link']))
echo '<a href="'.$m['link'].'" '; echo '<a href="'.$m['link'].'" ';
if (isset($m['target'])) if (isset($m['target']))
echo 'target="'.$m['target'].'" '; echo 'target="'.$m['target'].'" ';
if (isset($m['link'])) if (isset($m['link']))
echo '>'; echo '>';
if (isset($m['name'])) if (isset($m['name']))
echo '<u><strong>'.$m['name'].'</strong></u>'; echo '<u><strong>'.$m['name'].'</strong></u>';
if (isset($m['link'])) if (isset($m['link']))
echo '</a>'; echo '</a>';
if ($hide) if ($hide)
$display='none'; $display='none';
else else
$display='block'; $display='block';
echo "\n<DIV>\n".'<SPAN id="'.$m['name'].'" style="display:'.$display.'">'; echo "\n<DIV>\n".'<SPAN id="'.$m['name'].'" style="display:'.$display.'">';
foreach($m AS $m1) foreach($m AS $m1)
if (is_array($m1)) if (is_array($m1))
{ {
$opener=false; $opener=false;
$hide=false; $hide=false;
if (isset($m1['opener'])) if (isset($m1['opener']))
if ($m1['opener']=='true') if ($m1['opener']=='true')
$opener=true; $opener=true;
if (isset($m1['hide'])) if (isset($m1['hide']))
if ($m1['hide']=='true') if ($m1['hide']=='true')
$hide=true; $hide=true;
if ($opener) if ($opener)
{ {
echo "\n\t".'<SPAN onclick="js_toggle_container('."'".$m1['name']."'".')">'; echo "\n\t".'<SPAN onclick="js_toggle_container('."'".$m1['name']."'".')">';
if ($hide) if ($hide)
echo '+ '; echo '+ ';
else else
echo '&#8211; '; echo '&#8211; ';
echo "\n\t\t</SPAN>"; echo "\n\t\t</SPAN>";
} }
else else
echo "\t &nbsp;&nbsp;&nbsp;&nbsp;&middot; "; echo "\t &nbsp;&nbsp;&nbsp;&nbsp;&middot; ";
if (isset($m1['link'])) if (isset($m1['link']))
echo '<a href="'.$m1['link'].'" '; echo '<a href="'.$m1['link'].'" ';
if (isset($m1['target'])) if (isset($m1['target']))
echo 'target="'.$m1['target'].'" '; echo 'target="'.$m1['target'].'" ';
if (isset($m1['link'])) if (isset($m1['link']))
echo '>'; echo '>';
if (isset($m1['name'])) if (isset($m1['name']))
echo '<strong>'.$m1['name'].'</strong>'; echo '<strong>'.$m1['name'].'</strong>';
if (isset($m1['link'])) if (isset($m1['link']))
echo '</a>'; echo '</a>';
if ($hide) if ($hide)
$display='none'; $display='none';
else else
$display='block'; $display='block';
echo "\n\t<DIV>\n\t".'<SPAN id="'.$m1['name'].'" style="display:'.$display.'">'; echo "\n\t<DIV>\n\t".'<SPAN id="'.$m1['name'].'" style="display:'.$display.'">';
foreach($m1 AS $m2) foreach($m1 AS $m2)
if (is_array($m2)) if (is_array($m2))
{ {
if (isset($m2['link'])) if (isset($m2['link']))
echo "\n\t\t".'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&middot; <a href="'.$m2['link'].'" '; echo "\n\t\t".'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&middot; <a href="'.$m2['link'].'" ';
if (isset($m2['target'])) if (isset($m2['target']))
echo 'target="'.$m2['target'].'" '; echo 'target="'.$m2['target'].'" ';
if (isset($m2['link'])) if (isset($m2['link']))
echo '>'; echo '>';
if (isset($m2['name'])) if (isset($m2['name']))
echo $m2['name']; echo $m2['name'];
if (isset($m2['link'])) if (isset($m2['link']))
echo '</a><BR />'; echo '</a><BR />';
} }
echo "\n\t</SPAN>\n\t</DIV>\n"; echo "\n\t</SPAN>\n\t</DIV>\n";
} }
echo "\n</SPAN>\n</DIV>\n"; echo "\n</SPAN>\n</DIV>\n";
}*/ }*/
?> ?>
@@ -321,7 +326,7 @@ if ($berechtigung->isBerechtigt('admin'))
<tr> <tr>
<td width="10" nowrap>&nbsp;</td> <td width="10" nowrap>&nbsp;</td>
<td nowrap><a class="MenuItem2" href="lehre/freifach.php" target="main"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Studierende</a></td> <td nowrap><a class="MenuItem2" href="lehre/freifach.php" target="main"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Studierende</a></td>
</tr> </tr>
<tr> <tr>
<td width="10" nowrap>&nbsp;</td> <td width="10" nowrap>&nbsp;</td>
<td nowrap><a class="MenuItem2" href="lehre/freifach_studentenvorrueckung.php" target="main"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Studierende vorr&uuml;cken</a></td> <td nowrap><a class="MenuItem2" href="lehre/freifach_studentenvorrueckung.php" target="main"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Studierende vorr&uuml;cken</a></td>
@@ -447,6 +452,10 @@ if ($berechtigung->isBerechtigt('admin'))
<td width="10" nowrap>&nbsp;</td> <td width="10" nowrap>&nbsp;</td>
<td nowrap><a class="MenuItem2" href="personen/institutsliste.php" target="main"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Institute</a></td> <td nowrap><a class="MenuItem2" href="personen/institutsliste.php" target="main"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Institute</a></td>
</tr> </tr>
<tr>
<td width="10" nowrap>&nbsp;</td>
<td nowrap><a class="MenuItem2" href="personen/resturlaub.php" target="main"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Urlaub</a></td>
</tr>
</table> </table>
</td> </td>
</tr> </tr>
@@ -572,4 +581,4 @@ if ($berechtigung->isBerechtigt('admin'))
</div> </div>
</body> </body>
</html> </html>
+165
View File
@@ -0,0 +1,165 @@
<?php
/* Copyright (C) 2006 Technikum-Wien
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 2 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
*
* Authors: Christian Paminger <[email protected]>,
* Andreas Oesterreicher <[email protected]> and
* Rudolf Hangl <[email protected]>.
*/
require_once('../config.inc.php');
require_once('../../include/functions.inc.php');
require_once('../../include/person.class.php');
require_once('../../include/benutzer.class.php');
require_once('../../include/mitarbeiter.class.php');
require_once('../../include/studiengang.class.php');
require_once('../../include/resturlaub.class.php');
if(!$conn=pg_pconnect(CONN_STRING))
die("Fehler beim Connecten zur Datenbank");
echo '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<html>
<head>
<title>Resturlaub</title>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-15">
<link rel="stylesheet" href="../../skin/vilesci.css" type="text/css">
<link rel="stylesheet" href="../../include/js/tablesort/table.css" type="text/css">
<script src="../../include/js/tablesort/table.js" type="text/javascript"></script>
<script language="Javascript">
function gesamt()
{
document.getElementById("gesamturlaub").value=parseInt(document.getElementById("resturlaubstage").value)+parseInt(document.getElementById("anspruch").value);
}
</script>
</head>
<body class="background_main">
<h2>Resturlaubstage</h2>
<br><br>
';
$user = get_uid();
if(isset($_GET['type']) && $_GET['type']=='edit' && isset($_GET['uid']))
{
$ma = new mitarbeiter($conn);
$ma->load($_GET['uid']);
$resturlaub = new resturlaub($conn);
$resturlaub->load($_GET['uid']);
echo 'Resturlaubstabe von <b>'.$ma->nachname.' '.$ma->vorname.'</b>:<br><br>';
echo '<form action="'.$_SERVER['PHP_SELF'].'?type=save&uid='.$ma->uid.'" method="POST">
<table>
<tr>
<td>Resturlaubstage</td>
<td><input type="text" id="resturlaubstage" oninput="gesamt()" name="resturlaubstage" value="'.$resturlaub->resturlaubstage.'"></td>
</tr>
<tr>
<td>Anspruch</td>
<td><input type="text" id="anspruch" oninput="gesamt()" name="anspruch" value="'.$resturlaub->urlaubstageprojahr.'"></td>
</tr>
<tr>
<td>Gesamturlaub</td>
<td><input type="text" name="gesamturlaub" id="gesamturlaub" value="'.($resturlaub->resturlaubstage+$resturlaub->urlaubstageprojahr).'"></td>
</tr>
<tr>
<td>Mehrarbeitsstunden</td>
<td><input type="text" name="mehrarbeitsstunden" value="'.$resturlaub->mehrarbeitsstunden.'"></td>
</tr>
<tr>
<td></td>
<td><input type="submit" value="Speichern"></td>
</tr>
</table>
</form>';
exit;
}
if(isset($_GET['type']) && $_GET['type']=='save')
{
$resturlaub = new resturlaub($conn);
if($resturlaub->load($_GET['uid']))
{
$resturlaub->new = false;
}
else
{
$resturlaub->new = true;
$resturlaub->insertamum = date('Y-m-d H:i:s');
$resturlaub->insertvon = $user;
$resturlaub->mitarbeiter_uid=$_GET['uid'];
}
$resturlaub->mehrarbeitsstunden = $_POST['mehrarbeitsstunden'];
if($resturlaub->mehrarbeitsstunden=='')
$resturlaub->mehrarbeitsstunden=0;
$resturlaub->resturlaubstage = $_POST['resturlaubstage'];
if($resturlaub->resturlaubstage=='')
$resturlaub->resturlaubstage=0;
$resturlaub->urlaubstageprojahr = $_POST['anspruch'];
if($resturlaub->urlaubstageprojahr=='')
$resturlaub->urlaubstageprojahr=0;
$resturlaub->udpateamum = date('Y-m-d H:i:s');
$resturlaub->udpatevon = $user;
if($resturlaub->save())
{
echo '<b>Daten wurden gespeichert</b><br><br>';
}
else
{
die('Fehler beim Speichern der Daten: '.$resturlaub->errormsg.'<br><a href="javascript:history.back()">Zurück</a><br>');
}
}
$qry = "SELECT * FROM campus.vw_mitarbeiter LEFT JOIN campus.tbl_resturlaub ON(uid=mitarbeiter_uid)
WHERE aktiv AND fixangestellt ORDER BY nachname, vorname";
echo "<table class='liste table-autosort:0 table-stripeclass:alternate table-autostripe'>";
echo "<thead>
<tr>
<th class='table-sortable:default'>Nachname</th>
<th class='table-sortable:default'>Vorname</th>
<th class='table-sortable:default'>Resturlaubstage</th>
<th class='table-sortable:default'>Anspruch</th>
<th class='table-sortable:default'>Gesamturlaub</th>
<th class='table-sortable:default'>Mehrarbeitsstunden</th>
<th class='table-sortable:default'>Aktion</th>
</tr>
</thead>";
if($result = pg_query($conn, $qry))
{
while($row = pg_fetch_object($result))
{
echo '<tr>';
echo "<td>$row->nachname</td>";
echo "<td>$row->vorname</td>";
echo "<td align='center'>$row->resturlaubstage</td>";
echo "<td align='center'>$row->urlaubstageprojahr</td>";
echo "<td align='center'>".($row->resturlaubstage+$row->urlaubstageprojahr)."</td>";
echo "<td align='center'>$row->mehrarbeitsstunden</td>";
echo "<td><a href='".$_SERVER['PHP_SELF']."?type=edit&uid=$row->uid'>Bearbeiten</a></td>";
echo '</tr>';
}
}
echo '</table>';
?>
</body>
</html>