mirror of
https://github.com/FH-Complete/FHC-Core.git
synced 2026-07-16 22:42:16 +00:00
- Bugfix Notebook Registration
- Bugfix für LV-Planung-Statistik im Excelformat für Lektoren - Überbuchungsprüfung für LV-Plan
This commit is contained in:
Andreas Österreicher
@@ -253,7 +253,7 @@
|
||||
else if ($error == 3)
|
||||
echo '<h3>Die MAC Adresse ist bereits in Verwendung, bitte melden Sie sich bei der ITS <a href="mailto:its@technikum-wien.at">its@technikum-wien.at</a></h3>';
|
||||
|
||||
if(isset($mac_result))
|
||||
if(isset($mac_result) && $mac_result!='')
|
||||
{
|
||||
if($mac_result == 0)
|
||||
{
|
||||
|
||||
@@ -805,7 +805,7 @@ function StatistikPrintLVPlanungExcel()
|
||||
var col;
|
||||
col = tree.columns ? tree.columns["uid"] : "uid";
|
||||
var uid=tree.view.getCellText(tree.currentIndex,col);
|
||||
var url = '<?php echo APP_ROOT ?>content/statistik/lvplanung..xls.php?uid='+uid+'&studiensemester_kurzbz='+studiensemester;
|
||||
var url = '<?php echo APP_ROOT ?>content/statistik/lvplanung.xls.php?uid='+uid+'&studiensemester_kurzbz='+studiensemester;
|
||||
}
|
||||
window.open(url,'LV-Planung');
|
||||
}
|
||||
|
||||
@@ -75,6 +75,7 @@ $menu=array
|
||||
'Stundenplan'=>array('name'=>'Stundenplan', 'link'=>'../cis/private/lvplan/index.html', 'target'=>'main'),
|
||||
'Zeitwuensche'=>array('name'=>'Zeitwünsche', 'link'=>'lehre/zeitwuensche.php', 'target'=>'main'),
|
||||
'LVPlanSync'=>array('name'=>'Sync', 'link'=>'../system/sync/index.html', 'target'=>'main'),
|
||||
'Ueberbuchungen'=>array('name'=>'Überbuchungen', 'link'=>'lehre/check/ueberbuchung.php', 'target'=>'main'),
|
||||
//'Studenten'=>array('name'=>'Studenten', 'link'=>'lehre/lehrveranstaltung_frameset.html', 'target'=>'main'),
|
||||
//'Insert'=>array('name'=>'Insert', 'link'=>'lehre/stdplan_insert.php', 'target'=>'main'),
|
||||
//'Delete'=>array('name'=>'Delete', 'link'=>'lehre/stdplan_delete.php', 'target'=>'main'),
|
||||
|
||||
@@ -0,0 +1,203 @@
|
||||
<?php
|
||||
/* Copyright (C) 2009 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 < christian.paminger@technikum-wien.at >
|
||||
* Andreas Oesterreicher < andreas.oesterreicher@technikum-wien.at >
|
||||
* Rudolf Hangl < rudolf.hangl@technikum-wien.at >
|
||||
* Gerald Simane-Sequens < gerald.simane-sequens@technikum-wien.at >
|
||||
*/
|
||||
|
||||
/*
|
||||
* Prueft im Stundenplan ob die Personen in den zugeteilten Räumen Platz haben
|
||||
*/
|
||||
require_once('../../../config/vilesci.config.inc.php');
|
||||
require_once('../../../include/studiensemester.class.php');
|
||||
require_once('../../../include/functions.inc.php');
|
||||
require_once('../../../include/studiengang.class.php');
|
||||
require_once('../../../include/ort.class.php');
|
||||
|
||||
if (!$db = new basis_db())
|
||||
die('Es konnte keine Verbindung zum Server aufgebaut werden.');
|
||||
|
||||
$beginn = (isset($_GET['beginn'])?$_GET['beginn']:'');
|
||||
$ende = (isset($_GET['ende'])?$_GET['ende']:'');
|
||||
$stg_kz = (isset($_GET['stg_kz'])?$_GET['stg_kz']:'');
|
||||
$dontloadcontent=false;
|
||||
|
||||
$user = get_uid();
|
||||
loadVariables($user);
|
||||
if (empty($db_stpl_table))
|
||||
die('Bitte die Variablen warten! db_stpl_table ist leer');
|
||||
|
||||
echo '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
|
||||
<html>
|
||||
<head>
|
||||
<title>LV-Plan - Überbuchungen</title>
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
|
||||
<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>
|
||||
<h2>LV-Plan Überbuchungen - '.$db_stpl_table.'</h2>
|
||||
';
|
||||
echo '<form action="'.$_SERVER['PHP_SELF'].'" method="GET">';
|
||||
|
||||
if($beginn=='' || $ende=='')
|
||||
{
|
||||
$stsem_obj = new studiensemester();
|
||||
$stsem_akt = $stsem_obj->getaktorNext();
|
||||
$stsem_obj->load($stsem_akt);
|
||||
|
||||
$beginn = $stsem_obj->start;
|
||||
$ende = $stsem_obj->ende;
|
||||
$dontloadcontent=true;
|
||||
}
|
||||
|
||||
echo " Beginn <INPUT type='text' size='10' id='beginn' name='beginn' value='$beginn'>";
|
||||
echo " Ende <INPUT type='text' size='10' id='ende' name='ende' value='$ende'>";
|
||||
|
||||
$stg = new studiengang();
|
||||
$stg->getAll('typ, kurzbzlang', true);
|
||||
|
||||
echo ' Studiengang <SELECT name="stg_kz">';
|
||||
echo '<option value="">-- Alle --</option>';
|
||||
foreach ($stg->result as $row)
|
||||
{
|
||||
if($stg_kz==$row->studiengang_kz)
|
||||
$selected='selected';
|
||||
else
|
||||
$selected='';
|
||||
|
||||
echo '<option value="'.$row->studiengang_kz.'" '.$selected.'>'.$row->kuerzel.'</option>';
|
||||
}
|
||||
echo '</SELECT>';
|
||||
|
||||
echo " <INPUT type='submit' value='OK'>";
|
||||
echo '</form>';
|
||||
|
||||
if($dontloadcontent)
|
||||
exit;
|
||||
|
||||
|
||||
$ort_obj = new ort();
|
||||
$ort_obj->getAll();
|
||||
$ort = array();
|
||||
|
||||
foreach ($ort_obj->result as $row)
|
||||
{
|
||||
$ort[$row->ort_kurzbz]->max_person = $row->max_person;
|
||||
}
|
||||
$qry = "SELECT distinct datum, stunde, ort_kurzbz, studiensemester_kurzbz, vw_".$db_stpl_table.".studiengang_kz, vw_".$db_stpl_table.".semester, verband, gruppe, gruppe_kurzbz, UPPER(stg_typ || stg_kurzbz) as stg_kurzbz
|
||||
FROM lehre.vw_".$db_stpl_table." JOIN lehre.tbl_lehreinheit USING(lehreinheit_id) JOIN lehre.tbl_lehrveranstaltung ON(tbl_lehreinheit.lehrveranstaltung_id=tbl_lehrveranstaltung.lehrveranstaltung_id)
|
||||
WHERE datum>='".addslashes($beginn)."' AND datum<='".addslashes($ende)."'";
|
||||
if($stg_kz!='')
|
||||
$qry.=" AND tbl_lehrveranstaltung.studiengang_kz='".addslashes($stg_kz)."'";
|
||||
|
||||
$qry.=" ORDER BY datum, stunde, ort_kurzbz, studiensemester_kurzbz, studiengang_kz, semester, verband, gruppe, gruppe_kurzbz, stg_kurzbz";
|
||||
|
||||
echo '<table class="liste table-autosort: table-stripeclass:alternate table-autostripe">
|
||||
<thead>
|
||||
<tr>
|
||||
<th class="table-sortable:default">Datum</th>
|
||||
<th class="table-sortable:default">Stunde</th>
|
||||
<th class="table-sortable:default">Ort</th>
|
||||
<th class="table-sortable:default">Studenten aktuell (Plätze maximal)</th>
|
||||
<th class="table-sortable:default">Gruppen (Studenten aktuell)</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>';
|
||||
|
||||
//echo $qry;
|
||||
$lastdatum=0;
|
||||
$laststunde=0;
|
||||
$lastort=0;
|
||||
$anzahl_studenten=0;
|
||||
|
||||
function getAnzahl($studiengang_kz, $semester, $verband, $gruppe, $gruppe_kurzbz, $studiensemester_kurzbz)
|
||||
{
|
||||
global $db;
|
||||
if($gruppe_kurzbz=='')
|
||||
{
|
||||
$qry = "SELECT count(*) as anzahl FROM public.tbl_studentlehrverband
|
||||
WHERE studiensemester_kurzbz='".addslashes($studiensemester_kurzbz)."'
|
||||
AND studiengang_kz='".addslashes($studiengang_kz)."' AND
|
||||
semester='".addslashes($semester)."'";
|
||||
if($verband!='')
|
||||
$qry.=" AND verband='".addslashes($verband)."'";
|
||||
if($gruppe!='')
|
||||
$qry.=" AND gruppe='".addslashes($gruppe)."'";
|
||||
}
|
||||
else
|
||||
{
|
||||
$qry = "SELECT count(*) as anzahl FROM public.tbl_benutzergruppe
|
||||
WHERE studiensemester_kurzbz='".addslashes($studiensemester_kurzbz)."'
|
||||
AND gruppe_kurzbz='".addslashes($gruppe_kurzbz)."'";
|
||||
}
|
||||
if($res_anz = $db->db_query($qry))
|
||||
{
|
||||
if($row_anz = $db->db_fetch_object($res_anz))
|
||||
{
|
||||
return $row_anz->anzahl;
|
||||
}
|
||||
}
|
||||
}
|
||||
$gruppen='';
|
||||
if($result = $db->db_query($qry))
|
||||
{
|
||||
while($row = $db->db_fetch_object($result))
|
||||
{
|
||||
if($lastdatum==$row->datum && $laststunde==$row->stunde && $lastort==$row->ort_kurzbz)
|
||||
{
|
||||
//Solange alles gleich ist zusammenzaehlen
|
||||
$anzahl = getAnzahl($row->studiengang_kz, $row->semester, $row->verband, $row->gruppe, $row->gruppe_kurzbz, $row->studiensemester_kurzbz);
|
||||
$anzahl_studenten += $anzahl;
|
||||
$gruppen .=($row->gruppe_kurzbz==''?$row->stg_kurzbz.$row->semester.$row->verband.$row->gruppe:$row->gruppe_kurzbz)." ($anzahl), ";
|
||||
}
|
||||
else
|
||||
{
|
||||
if($lastdatum!=0)
|
||||
{
|
||||
// wenn sich der Raum, Datum oder Stunde aendert, dann pruefen ob die Anzahl in den Raum passt
|
||||
// und ggf eine Meldung ausgeben
|
||||
$gruppen = mb_substr($gruppen, 0, mb_strlen($gruppen)-2);
|
||||
if($anzahl_studenten>$ort[$lastort]->max_person)
|
||||
{
|
||||
echo "<tr><td>$lastdatum</td><td>$laststunde</td><td>$lastort</td><td>$anzahl_studenten (".$ort[$lastort]->max_person.")</td><td>$gruppen</td></tr>";
|
||||
}
|
||||
$anzahl_studenten=0;
|
||||
$gruppen='';
|
||||
}
|
||||
|
||||
$anzahl = getAnzahl($row->studiengang_kz, $row->semester, $row->verband, $row->gruppe, $row->gruppe_kurzbz, $row->studiensemester_kurzbz);
|
||||
$anzahl_studenten += $anzahl;
|
||||
$gruppen .=($row->gruppe_kurzbz==''?$row->stg_kurzbz.$row->semester.$row->verband.$row->gruppe:$row->gruppe_kurzbz)." ($anzahl), ";
|
||||
}
|
||||
$lastdatum = $row->datum;
|
||||
$laststunde = $row->stunde;
|
||||
$lastort = $row->ort_kurzbz;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
echo "Fehler:".$qry;
|
||||
}
|
||||
|
||||
echo '</tbody></table>';
|
||||
?>
|
||||
</body>
|
||||
</html>
|
||||
Reference in New Issue
Block a user