mirror of
https://github.com/FH-Complete/FHC-Core.git
synced 2026-07-02 03:19:27 +00:00
- QM Dokumente aktualisiert
- Kreuzerltool Anweseheitsliste enthaelt nun auch die gruppe - log.class.php erstellt für LOG und UNDO Einträge - RDF für UNDO Befehle erstellt
This commit is contained in:
@@ -128,6 +128,8 @@ if(isset($_GET['output']) && $_GET['output']=='xls')
|
||||
$maxlength[$i]=strlen('Nachname');
|
||||
$worksheet->write(1,++$i,"Matrikelnr", $format_title);
|
||||
$maxlength[$i]=strlen('Matrikelnr');
|
||||
$worksheet->write(1,++$i,"Gruppe", $format_title);
|
||||
$maxlength[$i]=strlen('Gruppe');
|
||||
$ueb_obj = new uebung($conn);
|
||||
$ueb_obj->load_uebung($lehreinheit_id);
|
||||
foreach($ueb_obj->uebungen as $row_ueb)
|
||||
@@ -182,12 +184,12 @@ if(isset($_GET['output']) && $_GET['output']=='xls')
|
||||
$lehreinheit_id = $_GET['lehreinheit_id'];
|
||||
$gruppe_bez = 'Alle Studienrende';
|
||||
//Alle Studenten die dieser Lehreinheit zugeordnet sind
|
||||
$qry_stud = "SELECT vw_student.uid, vorname, nachname, matrikelnr FROM campus.vw_student, public.tbl_benutzergruppe, lehre.tbl_lehreinheitgruppe
|
||||
$qry_stud = "SELECT vw_student.uid, vorname, nachname, matrikelnr, vw_student.semester, vw_student.verband, vw_student.gruppe FROM campus.vw_student, public.tbl_benutzergruppe, lehre.tbl_lehreinheitgruppe
|
||||
WHERE tbl_lehreinheitgruppe.lehreinheit_id='$lehreinheit_id' AND
|
||||
vw_student.uid = tbl_benutzergruppe.uid AND
|
||||
tbl_benutzergruppe.gruppe_kurzbz = tbl_lehreinheitgruppe.gruppe_kurzbz
|
||||
UNION
|
||||
SELECT vw_student.uid, vorname, nachname, matrikelnr FROM campus.vw_student, lehre.tbl_lehreinheitgruppe WHERE
|
||||
SELECT vw_student.uid, vorname, nachname, matrikelnr, vw_student.semester, vw_student.verband, vw_student.gruppe FROM campus.vw_student, lehre.tbl_lehreinheitgruppe WHERE
|
||||
tbl_lehreinheitgruppe.lehreinheit_id='$lehreinheit_id' AND
|
||||
tbl_lehreinheitgruppe.studiengang_kz=vw_student.studiengang_kz AND
|
||||
tbl_lehreinheitgruppe.semester = vw_student.semester AND
|
||||
@@ -227,8 +229,12 @@ if(isset($_GET['output']) && $_GET['output']=='xls')
|
||||
//matrikelnr
|
||||
$worksheet->write($zeile,++$spalte,'="'.$row_stud->matrikelnr.'"');
|
||||
if(strlen($row_stud->matrikelnr)>$maxlength[$spalte])
|
||||
$maxlength[$spalte]=strlen($row_stud->matrikelnr);
|
||||
|
||||
$maxlength[$spalte]=strlen($row_stud->matrikelnr);
|
||||
//Gruppe
|
||||
$worksheet->write($zeile,++$spalte,$row_stud->semester.$row_stud->verband.$row_stud->gruppe);
|
||||
if(strlen($row_stud->semester.$row_stud->verband.$row_stud->gruppe)>$maxlength[$spalte])
|
||||
$maxlength[$spalte]=strlen($row_stud->semester.$row_stud->verband.$row_stud->gruppe);
|
||||
|
||||
foreach($ueb_obj->uebungen as $row_ueb)
|
||||
{
|
||||
$qry = "SELECT sum(punkte) as punkte FROM campus.tbl_studentbeispiel JOIN campus.tbl_beispiel USING(beispiel_id) WHERE uebung_id='$row_ueb->uebung_id' AND student_uid='$row_stud->uid' AND vorbereitet=true";
|
||||
@@ -307,6 +313,8 @@ if(isset($_GET['output']) && $_GET['output']=='xls')
|
||||
$maxlength[$i]=strlen('Nachname');
|
||||
$worksheet->write(1,++$i,"Matrikelnr", $format_title);
|
||||
$maxlength[$i]=strlen('Matrikelnr');
|
||||
$worksheet->write(1,++$i,"Gruppe", $format_title);
|
||||
$maxlength[$i]=strlen('Gruppe');
|
||||
$beispiel_obj = new beispiel($conn);
|
||||
$beispiel_obj->load_beispiel($uebung_id);
|
||||
foreach($beispiel_obj->beispiele as $row_bsp)
|
||||
@@ -336,12 +344,12 @@ if(isset($_GET['output']) && $_GET['output']=='xls')
|
||||
if($row->gruppe_kurzbz!='')
|
||||
{
|
||||
$gruppe_bez = 'Gruppe '.$row->gruppe_kurzbz;
|
||||
$qry_stud = "SELECT uid, vorname, nachname, matrikelnr FROM campus.vw_student JOIN public.tbl_benutzergruppe USING(uid) WHERE gruppe_kurzbz='".addslashes($row->gruppe_kurzbz)."' ORDER BY nachname, vorname";
|
||||
$qry_stud = "SELECT uid, vorname, nachname, matrikelnr, vw_student.semester, vw_student.verband, vw_student.gruppe FROM campus.vw_student JOIN public.tbl_benutzergruppe USING(uid) WHERE gruppe_kurzbz='".addslashes($row->gruppe_kurzbz)."' ORDER BY nachname, vorname";
|
||||
}
|
||||
else
|
||||
{
|
||||
$gruppe_bez = 'Gruppe '.$row->verband.$row->gruppe;
|
||||
$qry_stud = "SELECT uid, vorname, nachname, matrikelnr FROM campus.vw_student
|
||||
$qry_stud = "SELECT uid, vorname, nachname, matrikelnr, vw_student.semester, vw_student.verband, vw_student.gruppe FROM campus.vw_student
|
||||
WHERE studiengang_kz='$row->studiengang_kz'
|
||||
AND semester='$row->semester' ".
|
||||
($row->verband!=''?" AND verband='$row->verband'":'').
|
||||
@@ -366,12 +374,12 @@ if(isset($_GET['output']) && $_GET['output']=='xls')
|
||||
$lehreinheit_id = $_GET['lehreinheit_id'];
|
||||
$gruppe_bez = 'Alle Studienrende';
|
||||
//Alle Studenten die dieser Lehreinheit zugeordnet sind
|
||||
$qry_stud = "SELECT vw_student.uid, vorname, nachname, matrikelnr FROM campus.vw_student, public.tbl_benutzergruppe, lehre.tbl_lehreinheitgruppe
|
||||
$qry_stud = "SELECT vw_student.uid, vorname, nachname, matrikelnr, vw_student.semester, vw_student.verband, vw_student.gruppe FROM campus.vw_student, public.tbl_benutzergruppe, lehre.tbl_lehreinheitgruppe
|
||||
WHERE tbl_lehreinheitgruppe.lehreinheit_id='$lehreinheit_id' AND
|
||||
vw_student.uid = tbl_benutzergruppe.uid AND
|
||||
tbl_benutzergruppe.gruppe_kurzbz = tbl_lehreinheitgruppe.gruppe_kurzbz
|
||||
UNION
|
||||
SELECT vw_student.uid, vorname, nachname, matrikelnr FROM campus.vw_student, lehre.tbl_lehreinheitgruppe WHERE
|
||||
SELECT vw_student.uid, vorname, nachname, matrikelnr, vw_student.semester, vw_student.verband, vw_student.gruppe FROM campus.vw_student, lehre.tbl_lehreinheitgruppe WHERE
|
||||
tbl_lehreinheitgruppe.lehreinheit_id='$lehreinheit_id' AND
|
||||
tbl_lehreinheitgruppe.studiengang_kz=vw_student.studiengang_kz AND
|
||||
tbl_lehreinheitgruppe.semester = vw_student.semester AND
|
||||
@@ -413,6 +421,11 @@ if(isset($_GET['output']) && $_GET['output']=='xls')
|
||||
if(strlen($row_stud->matrikelnr)>$maxlength[$spalte])
|
||||
$maxlength[$spalte]=strlen($row_stud->matrikelnr);
|
||||
|
||||
//Gruppe
|
||||
$worksheet->write($zeile,++$spalte,$row_stud->semester.$row_stud->verband.$row_stud->gruppe);
|
||||
if(strlen($row_stud->semester.$row_stud->verband.$row_stud->gruppe)>$maxlength[$spalte])
|
||||
$maxlength[$spalte]=strlen($row_stud->semester.$row_stud->verband.$row_stud->gruppe);
|
||||
|
||||
foreach($beispiel_obj->beispiele as $row_bsp)
|
||||
{
|
||||
$studentbeispiel_obj = new beispiel($conn);
|
||||
|
||||
@@ -215,6 +215,7 @@ function hideWMTT() {
|
||||
</td>
|
||||
<td valign="top">
|
||||
22.06. BST, DST<br />
|
||||
23.06. DVT<br />
|
||||
28.06. MSE
|
||||
</td>
|
||||
<td valign="top">
|
||||
@@ -385,6 +386,7 @@ function hideWMTT() {
|
||||
<tr><td> </td><td>21.06. Reihungstest BIT</td></tr>
|
||||
<tr><td> </td><td>22.06. Diplomprüfung DVT</td></tr>
|
||||
<tr><td> </td><td>22.06. Sponsion BST, DST</td></tr>
|
||||
<tr><td> </td><td>23.06. Sponsion DVT</td></tr>
|
||||
<tr><td>KW 26</td><td>25.06. Reihungstest BEL</td></tr>
|
||||
<tr><td> </td><td>26.06. Reihungstest BEL</td></tr>
|
||||
<tr><td> </td><td>26.06. Bachelorprüfung BIF</td></tr>
|
||||
|
||||
@@ -0,0 +1,231 @@
|
||||
<?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 <christian.paminger@technikum-wien.at>,
|
||||
* Andreas Oesterreicher <andreas.oesterreicher@technikum-wien.at> and
|
||||
* Rudolf Hangl <rudolf.hangl@technikum-wien.at>.
|
||||
*/
|
||||
|
||||
class log
|
||||
{
|
||||
var $conn; // resource DB-Handle
|
||||
var $errormsg; // string
|
||||
var $new; // boolean
|
||||
var $logs = array(); // lehreinheit Objekt
|
||||
|
||||
//Tabellenspalten
|
||||
var $log_id; // Serial
|
||||
var $executetime; // timestamp
|
||||
var $sql; // text
|
||||
var $sqlundo; // text
|
||||
var $beschreibung; // varchar(64)
|
||||
var $mitarbeiter_uid; // varchar(16)
|
||||
|
||||
|
||||
// *************************************************************************
|
||||
// * Konstruktor - Uebergibt die Connection und laedt optional einen DS
|
||||
// * @param $conn Datenbank-Connection
|
||||
// * $log_id
|
||||
// * $unicode Gibt an ob die Daten mit UNICODE Codierung
|
||||
// * oder LATIN9 Codierung verarbeitet werden sollen
|
||||
// *************************************************************************
|
||||
function log($conn, $log_id=null, $unicode=false)
|
||||
{
|
||||
$this->conn = $conn;
|
||||
|
||||
if($unicode!=null)
|
||||
{
|
||||
if($unicode)
|
||||
$qry = "SET CLIENT_ENCODING TO 'UNICODE';";
|
||||
else
|
||||
$qry = "SET CLIENT_ENCODING TO 'LATIN9';";
|
||||
|
||||
if(!pg_query($conn,$qry))
|
||||
{
|
||||
$this->errormsg = 'Encoding konnte nicht gesetzt werden';
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
if($log_id!=null)
|
||||
$this->load($log_id);
|
||||
}
|
||||
|
||||
// *********************************************************
|
||||
// * Laedt einen Log Eintrag
|
||||
// * @param log_id
|
||||
// *********************************************************
|
||||
function load($log_id)
|
||||
{
|
||||
if(!is_numeric($log_id))
|
||||
{
|
||||
$this->errormsg='Log_id muss eine gueltige Zahl sein';
|
||||
return false;
|
||||
}
|
||||
$qry = "SELECT * FROM public.tbl_log WHERE log_id='$log_id'";
|
||||
|
||||
if($result=pg_query($this->conn, $qry))
|
||||
{
|
||||
if($row = pg_fetch_object($result))
|
||||
{
|
||||
$this->log_id = $row->log_id;
|
||||
$this->executetime = $row->executetime;
|
||||
$this->mitarbeiter_uid = $row->mitarbeiter_uid;
|
||||
$this->beschreibung = $row->beschreibung;
|
||||
$this->sql = $row->sql;
|
||||
$this->sqlundo = $row->sqlundo;
|
||||
return true;
|
||||
}
|
||||
else
|
||||
{
|
||||
$this->errormsg = "Es ist kein Log Eintrag mit der ID $log_id vorhanden";
|
||||
return false;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
$this->errormsg = 'Fehler beim laden des Log Eintrages';
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
// ********************************************
|
||||
// * Laedt die letzten 10 Undo Eintraege
|
||||
// * @param $uid UID des Mitarbeiters dessen
|
||||
// * UNDO befehle geladen werden sollen
|
||||
// * @return true wenn ok , false im Fehlerfall
|
||||
// ********************************************
|
||||
function load_undo($uid)
|
||||
{
|
||||
$qry = "SELECT * FROM public.tbl_log WHERE mitarbeiter_uid='".addslashes($uid)."' AND sqlundo is not null LIMIT 10";
|
||||
|
||||
if($result=pg_query($this->conn, $qry))
|
||||
{
|
||||
while($row = pg_fetch_object($result))
|
||||
{
|
||||
$log_obj = new log($this->conn, null, null);
|
||||
|
||||
$log_obj->log_id = $row->log_id;
|
||||
$log_obj->executetime = $row->executetime;
|
||||
$log_obj->mitarbeiter_uid = $row->mitarbeiter_uid;
|
||||
$log_obj->beschreibung = $row->beschreibung;
|
||||
$log_obj->sql = $row->sql;
|
||||
$log_obj->sqlundo = $row->sqlundo;
|
||||
|
||||
$this->logs[] = $log_obj;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
else
|
||||
{
|
||||
$this->errormsg = 'Fehler beim laden der Log-Eintraege';
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
// *******************************************
|
||||
// * Prueft die Variablen vor dem Speichern
|
||||
// * auf Gueltigkeit.
|
||||
// * @return true wenn ok, false im Fehlerfall
|
||||
// *******************************************
|
||||
function validate()
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
// ************************************************
|
||||
// * wenn $var '' ist wird NULL zurueckgegeben
|
||||
// * wenn $var !='' ist werden Datenbankkritische
|
||||
// * Zeichen mit Backslash versehen und das Ergbnis
|
||||
// * unter Hochkomma gesetzt.
|
||||
// ************************************************
|
||||
function addslashes($var)
|
||||
{
|
||||
return ($var!=''?"'".addslashes($var)."'":'null');
|
||||
}
|
||||
|
||||
// ************************************************************
|
||||
// * Speichert einen Log Eintrag in die Datenbank
|
||||
// * Wenn $new auf true gesetzt ist wird ein neuer Datensatz
|
||||
// * angelegt, ansonsten der Datensatz aktualisiert
|
||||
// * @return true wenn erfolgreich, false im Fehlerfall
|
||||
// ************************************************************
|
||||
function save($new=null)
|
||||
{
|
||||
if(is_null($new))
|
||||
$new = $this->new;
|
||||
|
||||
//Variablen auf Gueltigkeit pruefen
|
||||
if(!$this->validate())
|
||||
return false;
|
||||
|
||||
if($new)
|
||||
{
|
||||
$qry = 'INSERT INTO public.tbl_log(executetime, mitarbeiter_uid, beschreibung, sql, sqlundo) VALUES(now(),'.
|
||||
$this->addslashes($this->mitarbeiter_uid).','.
|
||||
$this->addslashes($this->beschreibung).','.
|
||||
$this->addslashes($this->sql).','.
|
||||
$this->addslashes($this->sqlundo).');';
|
||||
}
|
||||
else
|
||||
{
|
||||
$qry = 'UPDATE public.tbl_log SET'.
|
||||
' executetime='.$this->addslashes($this->executetime).','.
|
||||
' mitarbeiter_uid='.$this->addslashes($this->mitarbeiter_uid).','.
|
||||
' beschreibung='.$this->addslashes($this->beschreibung).','.
|
||||
' sql='.$this->addslashes($this->sql).','.
|
||||
' sqlundo='.$this->addslashes($this->sqlundo).
|
||||
" WHERE log_id=".$this->addslashes($this->log_id).";";
|
||||
}
|
||||
|
||||
if(pg_query($this->conn,$qry))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
else
|
||||
{
|
||||
$this->errormsg = 'Fehler beim Speichern des Beispiels';
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// **********************************
|
||||
// * Loescht einen Log Eintrag
|
||||
// * @param $log_id ID des DS
|
||||
// * @return true wenn ok sonst false
|
||||
// **********************************
|
||||
function delete($log_id)
|
||||
{
|
||||
if(!is_numeric($log_id))
|
||||
{
|
||||
$this->errormsg = 'Log_id ist ungueltig';
|
||||
return false;
|
||||
}
|
||||
|
||||
$qry = "DELETE FROM public.tbl_log WHERE log_id='$log_id'";
|
||||
|
||||
if(pg_query($this->conn, $qry))
|
||||
return true;
|
||||
else
|
||||
{
|
||||
$this->errormsg = 'Fehler beim loeschen des LOG Eintrages';
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
?>
|
||||
@@ -0,0 +1,67 @@
|
||||
<?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 <christian.paminger@technikum-wien.at>,
|
||||
* Andreas Oesterreicher <andreas.oesterreicher@technikum-wien.at> and
|
||||
* Rudolf Hangl <rudolf.hangl@technikum-wien.at>.
|
||||
*/
|
||||
// header für no cache
|
||||
header("Cache-Control: no-cache");
|
||||
header("Cache-Control: post-check=0, pre-check=0",false);
|
||||
header("Expires Mon, 26 Jul 1997 05:00:00 GMT");
|
||||
header("Pragma: no-cache");
|
||||
// content type setzen
|
||||
header("Content-type: application/vnd.mozilla.xul+xml");
|
||||
// xml
|
||||
echo '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>';
|
||||
// DAO
|
||||
require_once('../vilesci/config.inc.php');
|
||||
require_once('../include/log.class.php');
|
||||
require_once('../include/functions.inc.php');
|
||||
|
||||
// Datenbank Verbindung
|
||||
if (!$conn = @pg_pconnect(CONN_STRING))
|
||||
$error_msg='Es konnte keine Verbindung zum Server aufgebaut werden!';
|
||||
|
||||
$log = new log($conn, null, true);
|
||||
$log->load_undo(get_uid());
|
||||
|
||||
$rdf_url='http://www.technikum-wien.at/undo';
|
||||
?>
|
||||
|
||||
<RDF:RDF
|
||||
xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
||||
xmlns:UNDO="<?php echo $rdf_url; ?>/rdf#"
|
||||
>
|
||||
|
||||
<RDF:Seq about="<?php echo $rdf_url ?>/liste">
|
||||
|
||||
<?php
|
||||
foreach ($log->logs as $row)
|
||||
{
|
||||
?>
|
||||
<RDF:li>
|
||||
<RDF:Description id="<?php echo $row->log_id; ?>" about="<?php echo $rdf_url.'/'.$row->log_id; ?>" >
|
||||
<UNDO:log_id><?php echo $row->log_id ?></UNDO:log_id>
|
||||
<UNDO:beschreibung><![CDATA[<?php echo $row->beschreibung ?>]]></UNDO:beschreibung>
|
||||
</RDF:Description>
|
||||
</RDF:li>
|
||||
<?php
|
||||
}
|
||||
?>
|
||||
</RDF:Seq>
|
||||
</RDF:RDF>
|
||||
Reference in New Issue
Block a user