mirror of
https://github.com/FH-Complete/FHC-Core.git
synced 2026-07-26 00:54:27 +00:00
This commit is contained in:
@@ -50,6 +50,7 @@ else
|
|||||||
<script type="application/x-javascript" src="<?php echo APP_ROOT; ?>content/fasoverlay.js.php" />
|
<script type="application/x-javascript" src="<?php echo APP_ROOT; ?>content/fasoverlay.js.php" />
|
||||||
<script type="application/x-javascript" src="<?php echo APP_ROOT; ?>content/phpRequest.js.php" />
|
<script type="application/x-javascript" src="<?php echo APP_ROOT; ?>content/phpRequest.js.php" />
|
||||||
|
|
||||||
|
|
||||||
<vbox id="betriebsmittel" style="margin:0px;" flex="1">
|
<vbox id="betriebsmittel" style="margin:0px;" flex="1">
|
||||||
<popupset>
|
<popupset>
|
||||||
<popup id="betriebsmittel-tree-popup">
|
<popup id="betriebsmittel-tree-popup">
|
||||||
@@ -216,4 +217,5 @@ else
|
|||||||
</hbox>
|
</hbox>
|
||||||
<spacer flex="1" />
|
<spacer flex="1" />
|
||||||
</vbox>
|
</vbox>
|
||||||
|
<!--<iframe src="cardReader.html" />-->
|
||||||
</window>
|
</window>
|
||||||
@@ -138,7 +138,7 @@
|
|||||||
|
|
||||||
// ---------- Eine Datei mit allen Studentent anlegen -------------------
|
// ---------- Eine Datei mit allen Studentent anlegen -------------------
|
||||||
$sql_query="SELECT studiengang_kz, bezeichnung, lower(typ::varchar(1) || kurzbz) as kurzbz,uid, nachname, vorname,
|
$sql_query="SELECT studiengang_kz, bezeichnung, lower(typ::varchar(1) || kurzbz) as kurzbz,uid, nachname, vorname,
|
||||||
semester, verband, gruppe FROM campus.vw_student JOIN tbl_studiengang USING (studiengang_kz)
|
semester, lower(verband) AS verband, gruppe FROM campus.vw_student JOIN tbl_studiengang USING (studiengang_kz)
|
||||||
WHERE uid NOT LIKE '\\\\_%' AND semester<10 AND semester>0 AND vw_student.aktiv AND (substring(uid from 1 for 1)<'0' OR substring(uid from 1 for 1)>'9')";
|
WHERE uid NOT LIKE '\\\\_%' AND semester<10 AND semester>0 AND vw_student.aktiv AND (substring(uid from 1 for 1)<'0' OR substring(uid from 1 for 1)>'9')";
|
||||||
echo $sql_query;
|
echo $sql_query;
|
||||||
if(!($result=pg_query($conn, $sql_query)))
|
if(!($result=pg_query($conn, $sql_query)))
|
||||||
|
|||||||
@@ -390,6 +390,10 @@
|
|||||||
<td width="10" nowrap> </td>
|
<td width="10" nowrap> </td>
|
||||||
<td nowrap><a class="MenuItem2" href="../cis/private/lvplan/index.html" target="main"><img src="../skin/images/menu_item.gif" width="7" height="9"> Stundenplan</a></td>
|
<td nowrap><a class="MenuItem2" href="../cis/private/lvplan/index.html" target="main"><img src="../skin/images/menu_item.gif" width="7" height="9"> Stundenplan</a></td>
|
||||||
</tr>
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td width="10" nowrap> </td>
|
||||||
|
<td nowrap><a class="MenuItem2" href="lehre/lvplanwartung.php" target="main"><img src="../skin/images/menu_item.gif" width="7" height="9"> Wartung</a></td>
|
||||||
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td width="10" nowrap> </td>
|
<td width="10" nowrap> </td>
|
||||||
<td nowrap><a class="MenuItem2" href="lehre/zeitwuensche.php" target="main"><img src="../skin/images/menu_item.gif" width="7" height="9"> Zeitwünsche</a></td>
|
<td nowrap><a class="MenuItem2" href="lehre/zeitwuensche.php" target="main"><img src="../skin/images/menu_item.gif" width="7" height="9"> Zeitwünsche</a></td>
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
<HEAD>
|
<HEAD>
|
||||||
<TITLE>Stundenplan-Check</TITLE>
|
<TITLE>Stundenplan-Check</TITLE>
|
||||||
<META http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
|
<META http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
|
||||||
<LINK rel="stylesheet" href="../../../include/styles.css" type="text/css">
|
<LINK rel="stylesheet" href="../../../skin/vilesci.css" type="text/css">
|
||||||
</HEAD>
|
</HEAD>
|
||||||
|
|
||||||
<BODY class="background_main">
|
<BODY class="background_main">
|
||||||
|
|||||||
@@ -7,7 +7,7 @@
|
|||||||
<head>
|
<head>
|
||||||
<title>Stundenplan Check</title>
|
<title>Stundenplan Check</title>
|
||||||
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
|
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
|
||||||
<LINK rel="stylesheet" href="../../../include/styles.css" type="text/css">
|
<LINK rel="stylesheet" href="../../../skin/vilesci.css" type="text/css">
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<H1>Mehrfachbelegungen in Reservierung</H1>
|
<H1>Mehrfachbelegungen in Reservierung</H1>
|
||||||
@@ -16,7 +16,7 @@
|
|||||||
<tr>
|
<tr>
|
||||||
<?php
|
<?php
|
||||||
//Reservierungsdaten ermitteln welche mehrfach vorkommen
|
//Reservierungsdaten ermitteln welche mehrfach vorkommen
|
||||||
$sql_query="SELECT count(*), datum, stunde, ort_kurzbz FROM tbl_reservierung GROUP BY datum, stunde, ort_kurzbz HAVING (count(*)>1) ORDER BY datum, stunde, ort_kurzbz LIMIT 20";
|
$sql_query="SELECT count(*), datum, stunde, ort_kurzbz FROM campus.tbl_reservierung GROUP BY datum, stunde, ort_kurzbz HAVING (count(*)>1) ORDER BY datum, stunde, ort_kurzbz LIMIT 20";
|
||||||
//echo $sql_query."<br>";
|
//echo $sql_query."<br>";
|
||||||
$result=pg_exec($conn, $sql_query);
|
$result=pg_exec($conn, $sql_query);
|
||||||
$num_rows=pg_numrows($result);
|
$num_rows=pg_numrows($result);
|
||||||
@@ -29,11 +29,9 @@
|
|||||||
for ($j=0; $j<$num_rows;$j++)
|
for ($j=0; $j<$num_rows;$j++)
|
||||||
{
|
{
|
||||||
$row=pg_fetch_row($result,$j);
|
$row=pg_fetch_row($result,$j);
|
||||||
$bgcolor = $cfgBgcolorOne;
|
echo "<tr class='liste".($j%2)."'>";
|
||||||
$foo % 2 ? 0: $bgcolor = $cfgBgcolorTwo;
|
|
||||||
echo "<tr bgcolor=$bgcolor>";
|
|
||||||
for ($i=0; $i<$num_fields; $i++)
|
for ($i=0; $i<$num_fields; $i++)
|
||||||
echo "<td bgcolor=$bgcolor>$row[$i]</td>";
|
echo "<td>$row[$i]</td>";
|
||||||
echo "<td><a href=\"res_check_det.php?datum=$row[1]&stunde=$row[2]&ort_kurzbz=$row[3]\">Details</a></td>";
|
echo "<td><a href=\"res_check_det.php?datum=$row[1]&stunde=$row[2]&ort_kurzbz=$row[3]\">Details</a></td>";
|
||||||
echo "</tr>\n";
|
echo "</tr>\n";
|
||||||
$foo++;
|
$foo++;
|
||||||
@@ -47,7 +45,7 @@
|
|||||||
<?php
|
<?php
|
||||||
flush();
|
flush();
|
||||||
//Reservierungsdaten ermitteln welche mit Stundenplan kollidieren
|
//Reservierungsdaten ermitteln welche mit Stundenplan kollidieren
|
||||||
$sql_query="SELECT reservierung_id, datum, stunde, ort_kurzbz, uid FROM tbl_reservierung ORDER BY datum, stunde, ort_kurzbz";
|
$sql_query="SELECT reservierung_id, datum, stunde, ort_kurzbz, uid FROM campus.tbl_reservierung WHERE datum>=now() ORDER BY datum, stunde, ort_kurzbz";
|
||||||
//echo $sql_query."<br>";
|
//echo $sql_query."<br>";
|
||||||
$result_res=pg_exec($conn, $sql_query);
|
$result_res=pg_exec($conn, $sql_query);
|
||||||
$num_rows_res=pg_numrows($result_res);
|
$num_rows_res=pg_numrows($result_res);
|
||||||
@@ -58,14 +56,14 @@
|
|||||||
for ($r=0;$r<$num_rows_res;$r++)
|
for ($r=0;$r<$num_rows_res;$r++)
|
||||||
{
|
{
|
||||||
$row_res=pg_fetch_object($result_res,$r);
|
$row_res=pg_fetch_object($result_res,$r);
|
||||||
$sql_query="SELECT * FROM vw_stundenplan WHERE datum='$row_res->datum' AND stunde=$row_res->stunde AND ort_kurzbz='$row_res->ort_kurzbz'";
|
$sql_query="SELECT * FROM lehre.vw_stundenplan WHERE datum='$row_res->datum' AND stunde=$row_res->stunde AND ort_kurzbz='$row_res->ort_kurzbz'";
|
||||||
//echo $sql_query."<br>";
|
//echo $sql_query."<br>";
|
||||||
$result=pg_exec($conn, $sql_query);
|
$result=pg_exec($conn, $sql_query);
|
||||||
$num_rows=pg_numrows($result);
|
$num_rows=pg_numrows($result);
|
||||||
//echo $num_rows;
|
//echo $num_rows;
|
||||||
if ($num_rows>0)
|
if ($num_rows>0)
|
||||||
{
|
{
|
||||||
echo '<table border="'.$cfgBorder.'"><tr>';
|
echo '<table border="0"><tr>';
|
||||||
$num_fields=pg_numfields($result);
|
$num_fields=pg_numfields($result);
|
||||||
echo "<th></th>";
|
echo "<th></th>";
|
||||||
for ($i=0;$i<$num_fields; $i++)
|
for ($i=0;$i<$num_fields; $i++)
|
||||||
@@ -75,12 +73,10 @@
|
|||||||
{
|
{
|
||||||
$row=pg_fetch_row($result,$j);
|
$row=pg_fetch_row($result,$j);
|
||||||
$rowo=pg_fetch_object($result,$j);
|
$rowo=pg_fetch_object($result,$j);
|
||||||
$bgcolor = $cfgBgcolorOne;
|
echo "<tr class='liste".($j%2)."'>";
|
||||||
$foo % 2 ? 0: $bgcolor = $cfgBgcolorTwo;
|
|
||||||
echo "<tr bgcolor=$bgcolor>";
|
|
||||||
echo "<td><a href=\"res_check_det.php?datum=$rowo->datum&stunde=$rowo->stunde&ort_kurzbz=$rowo->ort_kurzbz\">Reservierung</a></td>";
|
echo "<td><a href=\"res_check_det.php?datum=$rowo->datum&stunde=$rowo->stunde&ort_kurzbz=$rowo->ort_kurzbz\">Reservierung</a></td>";
|
||||||
for ($i=0; $i<$num_fields; $i++)
|
for ($i=0; $i<$num_fields; $i++)
|
||||||
echo "<td bgcolor=$bgcolor>$row[$i]</td>";
|
echo "<td>$row[$i]</td>";
|
||||||
echo "</tr>\n";
|
echo "</tr>\n";
|
||||||
$foo++;
|
$foo++;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,154 @@
|
|||||||
|
<?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]>,
|
||||||
|
* Rudolf Hangl <[email protected]> and
|
||||||
|
* Gerald Raab <[email protected]>.
|
||||||
|
*/
|
||||||
|
require_once('../config.inc.php');
|
||||||
|
require_once('../../include/studiengang.class.php');
|
||||||
|
require_once('../../include/functions.inc.php');
|
||||||
|
|
||||||
|
if(!$conn=pg_pconnect(CONN_STRING))
|
||||||
|
die("Konnte Verbindung zur Datenbank nicht herstellen");
|
||||||
|
|
||||||
|
$s=new studiengang($conn);
|
||||||
|
$s->getAll('typ, kurzbz', false);
|
||||||
|
$studiengang=$s->result;
|
||||||
|
|
||||||
|
$user = get_uid();
|
||||||
|
// Benutzerdefinierte Variablen laden
|
||||||
|
echo loadVariables($conn,$user);
|
||||||
|
|
||||||
|
// Bezeichnungen fuer Tabellen und Views
|
||||||
|
$lva_stpl_view=VIEW_BEGIN.'lva_'.$db_stpl_table;
|
||||||
|
|
||||||
|
$where=" studiensemester_kurzbz='WS2007'";
|
||||||
|
if ($sem>0)
|
||||||
|
$where.=" AND semester=$sem";
|
||||||
|
if (strlen($ver)>0 && $ver!=' ')
|
||||||
|
$where.=" AND verband='$ver'";
|
||||||
|
if (strlen($grp)>0 && $grp!=' ')
|
||||||
|
$where.=" AND gruppe='$grp' ";
|
||||||
|
}
|
||||||
|
|
||||||
|
if (isset($_GET['stg_kz']) || isset($_POST['stg_kz']))
|
||||||
|
$stg_kz=(isset($_GET['stg_kz'])?$_GET['stg_kz']:$_POST['stg_kz']);
|
||||||
|
else
|
||||||
|
$stg_kz=0;
|
||||||
|
if (isset($_GET['semester']) || isset($_POST['semester']))
|
||||||
|
$semester=(isset($_GET['semester'])?$_GET['semester']:$_POST['semester']);
|
||||||
|
else
|
||||||
|
$semester=0;
|
||||||
|
|
||||||
|
if(!is_numeric($stg_kz))
|
||||||
|
$stg_kz=0;
|
||||||
|
if(!is_numeric($semester))
|
||||||
|
$semester=0;
|
||||||
|
|
||||||
|
|
||||||
|
if(isset($_GET['lvid']) && is_numeric($_GET['lvid']))
|
||||||
|
{
|
||||||
|
|
||||||
|
//Lehrevz Speichern
|
||||||
|
if(isset($_POST['lehrevz']))
|
||||||
|
{
|
||||||
|
$qry = "UPDATE lehre.tbl_lehrveranstaltung SET lehreverzeichnis='".addslashes($_POST['lehrevz'])."' WHERE lehrveranstaltung_id='".$_GET['lvid']."'";
|
||||||
|
if(!pg_query($conn, $qry))
|
||||||
|
echo "Fehler beim Speichern!";
|
||||||
|
else
|
||||||
|
echo "Erfolgreich gespeichert";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$where=1;
|
||||||
|
$sql_query="SELECT *, planstunden-verplant::smallint AS offenestunden
|
||||||
|
FROM lehre.'.$lva_stpl_view.' JOIN lehre.tbl_lehrform ON '.$lva_stpl_view.'.lehrform=tbl_lehrform.lehrform_kurzbz
|
||||||
|
WHERE '.$where.' AND verplanen ORDER BY offenestunden DESC, lehrfach, lehrform, semester, verband, gruppe, gruppe_kurzbz;";
|
||||||
|
//echo $sql_query;
|
||||||
|
$result_lv=pg_query($conn, $sql_query);
|
||||||
|
if(!$result_lv) error("Lehrveranstaltung not found!");
|
||||||
|
$outp='';
|
||||||
|
$s=array();
|
||||||
|
$outp.="<SELECT name='stg_kz'>";
|
||||||
|
foreach ($studiengang as $stg)
|
||||||
|
{
|
||||||
|
$outp.="<OPTION onclick=\"window.location.href = '".$_SERVER['PHP_SELF']."?stg_kz=$stg->studiengang_kz&semester=$semester'\" ".($stg->studiengang_kz==$stg_kz?'selected':'').">$stg->kuerzel - $stg->bezeichnung</OPTION>";
|
||||||
|
//$outp.= '<A href="'.$_SERVER['PHP_SELF'].'?stg_kz='.$stg->studiengang_kz.'&semester='.$semester.'">'.$stg->kuerzel.'</A> - ';
|
||||||
|
$s[$stg->studiengang_kz]->max_sem=$stg->max_semester;
|
||||||
|
$s[$stg->studiengang_kz]->kurzbz=$stg->kurzbzlang;
|
||||||
|
}
|
||||||
|
$outp.='</SELECT>';
|
||||||
|
$outp.= '<BR> -- ';
|
||||||
|
for ($i=0;$i<=$s[$stg_kz]->max_sem;$i++)
|
||||||
|
$outp.= '<A href="'.$_SERVER['PHP_SELF'].'?stg_kz='.$stg_kz.'&semester='.$i.'">'.$i.'</A> -- ';
|
||||||
|
?>
|
||||||
|
|
||||||
|
<html>
|
||||||
|
<head>
|
||||||
|
<title>Lehrveranstaltung Verwaltung</title>
|
||||||
|
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
|
||||||
|
<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>
|
||||||
|
</head>
|
||||||
|
<body class="Background_main">
|
||||||
|
<?php
|
||||||
|
|
||||||
|
echo "<H2>LV-Plan Wartung (".$s[$stg_kz]->kurzbz." - ".$semester.") ($lva_stpl_view)</H2>";
|
||||||
|
|
||||||
|
echo '<table width="100%"><tr><td>';
|
||||||
|
echo $outp;
|
||||||
|
echo '</td><td>';
|
||||||
|
echo "<input type='button' onclick='parent.detail.location=\"lehrveranstaltung_details.php?neu=true&stg_kz=$stg_kz&semester=$semester\"' value='Neu'/>";
|
||||||
|
echo '</td></tr></table>';
|
||||||
|
|
||||||
|
echo "<h3>Übersicht</h3>
|
||||||
|
<table class='liste table-autosort:2 table-stripeclass:alternate table-autostripe'>
|
||||||
|
<thead>
|
||||||
|
<tr class='liste'>";
|
||||||
|
|
||||||
|
if ($result_lv!=0)
|
||||||
|
{
|
||||||
|
$num_rows=pg_num_rows($result_lv);
|
||||||
|
echo "<th class='table-sortable:default'>ID</th><th class='table-sortable:default'>Kurzbz</th><th class='table-sortable:default'>Bezeichnung</th><th class='table-sortable:default'>ECTS</th><th class='table-sortable:default'>Lehre</th><th class='table-sortable:default'>LehreVz</th><th class='table-sortable:default'>Aktiv</th><th class='table-sortable:numeric'>Sort</th><th class='table-sortable:default'>Zeugnis</th>\n";
|
||||||
|
echo "</tr></thead>";
|
||||||
|
echo "<tbody>";
|
||||||
|
for($i=0;$i<$num_rows;$i++)
|
||||||
|
{
|
||||||
|
$row=pg_fetch_object($result_lv);
|
||||||
|
echo "<tr>";
|
||||||
|
echo "<td align='right'>$row->lehrveranstaltung_id</td><td>$row->kurzbz</td><td><a href='lehrveranstaltung_details.php?lv_id=$row->lehrveranstaltung_id' target='detail'>$row->bezeichnung</a></td><td>$row->ects</td>";
|
||||||
|
echo "<td><a href='".$_SERVER['PHP_SELF']."?lvid=$row->lehrveranstaltung_id&stg_kz=$stg_kz&semester=$semester&lehre=$row->lehre'><img src='../../skin/images/".($row->lehre=='t'?'true.gif':'false.gif')."'></a></td>";
|
||||||
|
echo "<td><form action='?lvid=$row->lehrveranstaltung_id&stg_kz=$stg_kz&semester=$semester' method='POST'><input type='text' value='$row->lehreverzeichnis' size='4' name='lehrevz'><input type='submit' value='ok'></form></td>";
|
||||||
|
echo "<td><a href='".$_SERVER['PHP_SELF']."?lvid=$row->lehrveranstaltung_id&stg_kz=$stg_kz&semester=$semester&aktiv=$row->aktiv'><img src='../../skin/images/".($row->aktiv=='t'?'true.gif':'false.gif')."'></a></td>";
|
||||||
|
echo "<td>$row->sort</td>";
|
||||||
|
echo "<td><a href='".$_SERVER['PHP_SELF']."?lvid=$row->lehrveranstaltung_id&stg_kz=$stg_kz&semester=$semester&zeugnis=$row->zeugnis'><img src='../../skin/images/".($row->zeugnis=='t'?'true.gif':'false.gif')."'></a></td>";
|
||||||
|
echo "</tr>\n";
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
else
|
||||||
|
echo "Kein Eintrag gefunden!";
|
||||||
|
?>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
|
||||||
|
<br>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
@@ -27,7 +27,7 @@ $smax=0;
|
|||||||
}*/
|
}*/
|
||||||
|
|
||||||
$s=new studiengang($conn);
|
$s=new studiengang($conn);
|
||||||
$s->getAll(null,false);
|
$s->getAll('erhalter_kz,typ,kurzbzlang',false);
|
||||||
$studiengang=$s->result;
|
$studiengang=$s->result;
|
||||||
$user = get_uid();
|
$user = get_uid();
|
||||||
|
|
||||||
@@ -100,7 +100,7 @@ foreach ($studiengang as $stg)
|
|||||||
{
|
{
|
||||||
$s[$stg->studiengang_kz]->max_sem=$stg->max_semester;
|
$s[$stg->studiengang_kz]->max_sem=$stg->max_semester;
|
||||||
$s[$stg->studiengang_kz]->kurzbz=$stg->kurzbzlang;
|
$s[$stg->studiengang_kz]->kurzbz=$stg->kurzbzlang;
|
||||||
$outp.= '<A href="lv_wartung.php?stg_kz='.$stg->studiengang_kz.'&semester='.$semester.'&max='.$stg->max_semester.'">'.$stg->kurzbzlang.'</A> - ';
|
$outp.= '<A href="lv_wartung.php?stg_kz='.$stg->studiengang_kz.'&semester='.$semester.'&max='.$stg->max_semester.'">'.$stg->kurzbzlang.' ('.strtoupper($stg->typ.$stg->kurzbz).') </A> - ';
|
||||||
|
|
||||||
}
|
}
|
||||||
$outp.= '<BR> -- ';
|
$outp.= '<BR> -- ';
|
||||||
|
|||||||
Reference in New Issue
Block a user