tbl_student changed to tbl_prestudent

This commit is contained in:
Andreas Moik
2016-05-18 09:11:17 +02:00
parent 1aa2756ea8
commit 249076bfcc
49 changed files with 3451 additions and 3884 deletions
+7 -6
View File
@@ -15,10 +15,11 @@
* 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 >
* 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> and
* Andreas Moik <moik@technikum-wien.at>.
*/
// ------------------------------------------------------------------------------------------
@@ -904,7 +905,7 @@ function meine_uid_informationen_detail($db,$uid,$count=0)
$foto=$db->db_result($erg,0,"foto");
}
if(!($erg_stud=$db->db_query("SELECT studiengang_kz, semester, verband, gruppe, matrikelnr, typ::varchar(1) || kurzbz AS stgkz, tbl_studiengang.bezeichnung AS stgbz FROM public.tbl_student JOIN public.tbl_studiengang USING(studiengang_kz) WHERE student_uid=".$db->db_add_param($uid, FHC_STRING))))
if(!($erg_stud=$db->db_query("SELECT studiengang_kz, semester, verband, gruppe, perskz, typ::varchar(1) || kurzbz AS stgkz, tbl_studiengang.bezeichnung AS stgbz FROM public.tbl_prestudent JOIN public.tbl_studiengang USING(studiengang_kz) WHERE uid=".$db->db_add_param($uid, FHC_STRING))))
die($db->db_last_error());
$stud_num_rows=$db->db_num_rows($erg_stud);
if ($stud_num_rows==1)
@@ -915,7 +916,7 @@ function meine_uid_informationen_detail($db,$uid,$count=0)
$semester=$db->db_result($erg_stud,0,"semester");
$verband=$db->db_result($erg_stud,0,"verband");
$gruppe=$db->db_result($erg_stud,0,"gruppe");
$matrikelnr=$db->db_result($erg_stud,0,"matrikelnr");
$matrikelnr=$db->db_result($erg_stud,0,"perskz");
}
$ort='';
+18 -16
View File
@@ -15,10 +15,11 @@
* 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 >
* 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 > and
* Andreas Moik <moik@technikum-wien.at>.
*/
/*******************************************************************************************************
* abgabe_lektor
@@ -50,17 +51,18 @@ $showall=isset($_GET['showall']);
$sql_query = "SELECT
*
FROM
(SELECT tbl_person.vorname, tbl_person.nachname, tbl_studiengang.typ, tbl_studiengang.kurzbz,
tbl_projektarbeit.projekttyp_kurzbz, tbl_projekttyp.bezeichnung, tbl_projektarbeit.titel, tbl_projektarbeit.projektarbeit_id,
tbl_projektbetreuer.betreuerart_kurzbz, tbl_benutzer.uid, tbl_student.matrikelnr, tbl_lehreinheit.studiensemester_kurzbz
FROM lehre.tbl_projektarbeit LEFT JOIN lehre.tbl_projektbetreuer using(projektarbeit_id)
LEFT JOIN public.tbl_benutzer on(uid=student_uid)
LEFT JOIN public.tbl_student on(public.tbl_benutzer.uid=public.tbl_student.student_uid)
LEFT JOIN public.tbl_person on(tbl_benutzer.person_id=tbl_person.person_id)
LEFT JOIN lehre.tbl_lehreinheit using(lehreinheit_id)
LEFT JOIN lehre.tbl_lehrveranstaltung using(lehrveranstaltung_id)
LEFT JOIN public.tbl_studiengang on(lehre.tbl_lehrveranstaltung.studiengang_kz=public.tbl_studiengang.studiengang_kz)
LEFT JOIN lehre.tbl_projekttyp USING (projekttyp_kurzbz)
(SELECT tbl_person.vorname, tbl_person.nachname, tbl_studiengang.typ, tbl_studiengang.kurzbz,
tbl_projektarbeit.projekttyp_kurzbz, tbl_projekttyp.bezeichnung, tbl_projektarbeit.titel, tbl_projektarbeit.projektarbeit_id,
tbl_projektbetreuer.betreuerart_kurzbz, tbl_benutzer.uid, tbl_prestudent.perskz, tbl_lehreinheit.studiensemester_kurzbz
FROM lehre.tbl_projektarbeit
LEFT JOIN lehre.tbl_projektbetreuer using(projektarbeit_id)
LEFT JOIN public.tbl_prestudent on(tbl_projektarbeit.prestudent_id=tbl_prestudent.prestudent_id)
LEFT JOIN public.tbl_benutzer on(tbl_prestudent.uid=tbl_benutzer.uid)
LEFT JOIN public.tbl_person on(tbl_benutzer.person_id=tbl_person.person_id)
LEFT JOIN lehre.tbl_lehreinheit using(lehreinheit_id)
LEFT JOIN lehre.tbl_lehrveranstaltung using(lehrveranstaltung_id)
LEFT JOIN public.tbl_studiengang on(lehre.tbl_lehrveranstaltung.studiengang_kz=public.tbl_studiengang.studiengang_kz)
LEFT JOIN lehre.tbl_projekttyp USING (projekttyp_kurzbz)
WHERE (projekttyp_kurzbz='Bachelor' OR projekttyp_kurzbz='Diplom')
AND tbl_projektbetreuer.person_id IN (SELECT person_id FROM public.tbl_benutzer
WHERE public.tbl_benutzer.person_id=lehre.tbl_projektbetreuer.person_id
@@ -95,7 +97,7 @@ else
{
$htmlstr .= " <tr>\n"; //class='liste".($i%2)."'
$htmlstr .= " <td><input type='checkbox' name='mc_".$row->projektarbeit_id."' ></td>";
$htmlstr .= " <td><a href='abgabe_lektor_details.php?uid=".$row->uid."&projektarbeit_id=".$row->projektarbeit_id."&betreuerart=".$row->betreuerart_kurzbz."' target='al_detail' title='Details anzeigen'>".$row->uid."</a> / ".$row->matrikelnr."</td>\n";
$htmlstr .= " <td><a href='abgabe_lektor_details.php?uid=".$row->uid."&projektarbeit_id=".$row->projektarbeit_id."&betreuerart=".$row->betreuerart_kurzbz."' target='al_detail' title='Details anzeigen'>".$row->uid."</a> / ".$row->perskz."</td>\n";
$htmlstr .= " <td align= center><a href='mailto:$row->uid@".DOMAIN."?subject=Betreuung%20".$row->bezeichnung."'><img src='../../../skin/images/email.png' alt='email' title='Email an Studenten'></a></td>";
$htmlstr .= " <td>".$db->convert_html_chars($row->vorname)."</td>\n";
$htmlstr .= " <td>".$db->convert_html_chars($row->nachname)."</td>\n";
+5 -4
View File
@@ -15,9 +15,10 @@
* 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 >
* Authors: Christian Paminger <christian.paminger@technikum-wien.at>,
* Andreas Oesterreicher <andreas.oesterreicher@technikum-wien.at>,
* Rudolf Hangl <rudolf.hangl@technikum-wien.at> and
* Andreas Moik <moik@technikum-wien.at>.
*/
require_once('../../../config/cis.config.inc.php');
require_once('../../../include/studiensemester.class.php');
@@ -71,7 +72,7 @@ $stg->getAll();
count(*)
FROM
campus.vw_student_lehrveranstaltung
JOIN public.tbl_student ON(uid=student_uid)
JOIN public.tbl_prestudent USING(prestudent_id)
JOIN public.tbl_prestudentstatus USING(prestudent_id)
WHERE
lehrveranstaltung_id=tbl_lehrveranstaltung.lehrveranstaltung_id AND
+7 -7
View File
@@ -200,17 +200,17 @@ else
$stsemdatumbis = $stsem_obj->ende;
$qry = "SELECT
distinct on(nachname, vorname, person_id) vorname, nachname, matrikelnr, person_id, tbl_student.student_uid as uid,
distinct on(nachname, vorname, person_id) vorname, nachname, perskz, person_id, tbl_prestudent.uid,
tbl_studentlehrverband.semester, tbl_studentlehrverband.verband, tbl_studentlehrverband.gruppe,
(SELECT status_kurzbz FROM public.tbl_prestudentstatus WHERE prestudent_id=tbl_student.prestudent_id ORDER BY datum DESC, insertamum DESC, ext_id DESC LIMIT 1) as status,
(SELECT status_kurzbz FROM public.tbl_prestudentstatus WHERE prestudent_id=tbl_prestudent.prestudent_id ORDER BY datum DESC, insertamum DESC, ext_id DESC LIMIT 1) as status,
tbl_bisio.bisio_id, tbl_bisio.bis, tbl_bisio.von,
tbl_zeugnisnote.note
FROM
campus.vw_student_lehrveranstaltung JOIN public.tbl_benutzer USING(uid)
JOIN public.tbl_person USING(person_id) JOIN public.tbl_student ON(uid=student_uid)
LEFT JOIN public.tbl_studentlehrverband ON(public.tbl_student.prestudent_id=tbl_studentlehrverband.prestudent_id AND tbl_zeugnisnote.studiensemester_kurzbz=tbl_studentlehrverband.studiensemester_kurzbz)
LEFT JOIN lehre.tbl_zeugnisnote on(vw_student_lehrveranstaltung.lehrveranstaltung_id=tbl_zeugnisnote.lehrveranstaltung_id AND tbl_zeugnisnote.student_uid=tbl_student.student_uid AND tbl_zeugnisnote.studiensemester_kurzbz=tbl_studentlehrverband.studiensemester_kurzbz)
LEFT JOIN bis.tbl_bisio ON(public.tbl_student.prestudent_id=tbl_bisio.prestudent_id)
JOIN public.tbl_person USING(person_id) JOIN public.tbl_prestudent ON(tbl_benutzer.uid=tbl_prestudent.uid)
LEFT JOIN public.tbl_studentlehrverband ON(public.tbl_prestudent.prestudent_id=tbl_studentlehrverband.prestudent_id AND tbl_zeugnisnote.studiensemester_kurzbz=tbl_studentlehrverband.studiensemester_kurzbz)
LEFT JOIN lehre.tbl_zeugnisnote on(vw_student_lehrveranstaltung.lehrveranstaltung_id=tbl_zeugnisnote.lehrveranstaltung_id AND tbl_zeugnisnote.prestudent_id=tbl_prestudent.prestudent_id AND tbl_zeugnisnote.studiensemester_kurzbz=tbl_studentlehrverband.studiensemester_kurzbz)
LEFT JOIN bis.tbl_bisio ON(public.tbl_prestudent.prestudent_id=tbl_bisio.prestudent_id)
WHERE
vw_student_lehrveranstaltung.lehrveranstaltung_id=".$db->db_add_param($lvid, FHC_INTEGER)." AND
vw_student_lehrveranstaltung.studiensemester_kurzbz=".$db->db_add_param($stsem);
@@ -248,7 +248,7 @@ else
$worksheet->write($lines,1,$elem->nachname.$inc);
$worksheet->write($lines,2,$elem->vorname);
$worksheet->write($lines,3,'="'.$elem->semester.$elem->verband.$elem->gruppe.'"');
$worksheet->write($lines,4,'="'.trim($elem->matrikelnr).'"',$format_highlight);
$worksheet->write($lines,4,'="'.trim($elem->perskz).'"',$format_highlight);
$worksheet->write($lines,5,$note,$format_highlight);
$i++;
$lines++;
+10 -10
View File
@@ -16,15 +16,16 @@
* 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 >
* Andreas Oesterreicher <andreas.oesterreicher@technikum-wien.at>,
* Rudolf Hangl < rudolf.hangl@technikum-wien.at >,
* Gerald Simane-Sequens < gerald.simane-sequens@technikum-wien.at > and
* Andreas Moik <moik@technikum-wien.at>.
*/
require_once('../../../config/cis.config.inc.php');
require_once('../../../include/basis_db.class.php');
require_once('../../../include/functions.inc.php');
require_once('../../../include/benutzerberechtigung.class.php');
require_once ('../../../include/phrasen.class.php');
require_once('../../../include/basis_db.class.php');
require_once('../../../include/functions.inc.php');
require_once('../../../include/benutzerberechtigung.class.php');
require_once ('../../../include/phrasen.class.php');
$sprache = getSprache();
@@ -97,7 +98,7 @@
}
else
{
$sql_query = "SELECT student_uid FROM public.tbl_student WHERE student_uid=".$db->db_add_param($user);
$sql_query = "SELECT uid FROM public.tbl_prestudent WHERE uid=".$db->db_add_param($user);
if($result_student = $db->db_query($sql_query))
{
$num_rows_student = $db->db_num_rows($result_student);
@@ -539,8 +540,7 @@
}
else
{
//$sql_query = "SELECT DISTINCT ON(bz2, lehrevz) tbl_student.studiengang_kz AS id, kurzbzlang, lehrevz AS kuerzel, (tbl_lehrfach.bezeichnung || '; XX') AS bezeichnung, SUBSTRING(tbl_lehrfach.bezeichnung || '; XX', 1, CHAR_LENGTH(tbl_lehrfach.bezeichnung || '; XX') - 4) AS bz2 FROM tbl_lehrfach, public.tbl_studiengang, public.tbl_student WHERE tbl_student.studiengang_kz='$course_id' AND tbl_student.semester='$term_id' AND lehrevz='$short' AND tbl_student.uid='$user' AND tbl_studiengang.studiengang_kz=tbl_student.studiengang_kz LIMIT 1";
$sql_query = "SELECT DISTINCT tbl_lehrveranstaltung.bezeichnung, lehreverzeichnis, UPPER(tbl_studiengang.typ::varchar(1) || tbl_studiengang.kurzbz) as kurzbz FROM public.tbl_student, lehre.tbl_lehrveranstaltung, public.tbl_studiengang WHERE lehreverzeichnis=".$db->db_add_param($short)." AND tbl_student.studiengang_kz=".$db->db_add_param($course_id)." AND tbl_student.semester=".$db->db_add_param($term_id)." AND tbl_student.student_uid=".$db->db_add_param($user)." AND tbl_studiengang.studiengang_kz=tbl_student.studiengang_kz AND tbl_lehrveranstaltung.studiengang_kz=tbl_student.studiengang_kz AND tbl_lehrveranstaltung.semester=tbl_student.semester AND tbl_lehrveranstaltung.lehre=true LIMIT 1";
$sql_query = "SELECT DISTINCT tbl_lehrveranstaltung.bezeichnung, lehreverzeichnis, UPPER(tbl_studiengang.typ::varchar(1) || tbl_studiengang.kurzbz) as kurzbz FROM public.tbl_prestudent, lehre.tbl_lehrveranstaltung, public.tbl_studiengang WHERE lehreverzeichnis=".$db->db_add_param($short)." AND tbl_prestudent.studiengang_kz=".$db->db_add_param($course_id)." AND tbl_student.semester=".$db->db_add_param($term_id)." AND tbl_prestudent.uid=".$db->db_add_param($user)." AND tbl_studiengang.studiengang_kz=tbl_prestudent.studiengang_kz AND tbl_lehrveranstaltung.studiengang_kz=tbl_prestudent.studiengang_kz AND tbl_lehrveranstaltung.semester=tbl_student.semester AND tbl_lehrveranstaltung.lehre=true LIMIT 1";
if(!$result_path_elements = $db->db_query($sql_query))
die('<p align="center"><strong>'.$p->t('upload/benutzerKonnteNichtZugeordnetWerden',array($user)).'</strong>!</p>');
+6 -5
View File
@@ -16,8 +16,9 @@
* 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>.
* Andreas Oesterreicher <andreas.oesterreicher@technikum-wien.at>,
* Rudolf Hangl <rudolf.hangl@technikum-wien.at> and
* Andreas Moik <moik@technikum-wien.at>.
*/
require_once('../../config/cis.config.inc.php');
require_once('../../include/functions.inc.php');
@@ -232,7 +233,7 @@ if(!$is_lector)
//StudentenListe Rausschreiben
if($row->studiengang_kz!=0) //0 ist für ganzes TW
{
$qry_stud = "SELECT count(*) as anzahl FROM public.tbl_student WHERE studiengang_kz='$row->studiengang_kz' AND student_uid NOT LIKE '_Dummy%'";
$qry_stud = "SELECT count(*) as anzahl FROM public.tbl_prestudent WHERE studiengang_kz='$row->studiengang_kz' AND uid NOT LIKE '_Dummy%'";
if(!$row_stud=$db->db_fetch_object($db->db_query($qry_stud)))
echo $p->t('mailverteiler/fehlerBeimLadenDerStudenten');
@@ -250,7 +251,7 @@ if(!$is_lector)
{
if((!is_null($row1->semester)) && !empty($row1->semester) && ($row1->semester != "") && ($row1->semester<=$row->max_semester) && ($row1->semester>'0')) //($row1->semester<'10'))
{
$qry_cnt = "SELECT count(*) as anzahl FROM public.tbl_student WHERE studiengang_kz='$row1->studiengang_kz' AND semester='$row1->semester' AND student_uid NOT LIKE '_Dummy%'";
$qry_cnt = "SELECT count(*) as anzahl FROM public.tbl_prestudent WHERE studiengang_kz='$row1->studiengang_kz' AND semester='$row1->semester' AND uid NOT LIKE '_Dummy%'";
if(trim($row1->verband)!='')
{
$qry_cnt .= " AND verband='$row1->verband'";
@@ -422,4 +423,4 @@ echo '</tr>
</tr>
</tbody>
</table></body></html>';
?>
?>
+3 -3
View File
@@ -81,7 +81,7 @@ if ($num_rows==1)
$email_alias=$db->db_result($erg,0,"alias");
$hp=$db->db_result($erg,0,"homepage");
}
if(!($erg_stud=$db->db_query("SELECT studiengang_kz, semester, verband, gruppe, matrikelnr, typ::varchar(1) || kurzbz AS stgkz, tbl_studiengang.bezeichnung AS stgbz FROM public.tbl_student JOIN public.tbl_studiengang USING(studiengang_kz) WHERE student_uid='".addslashes($uid)."'")))
if(!($erg_stud=$db->db_query("SELECT studiengang_kz, semester, verband, gruppe, perskz, typ::varchar(1) || kurzbz AS stgkz, tbl_studiengang.bezeichnung AS stgbz FROM public.tbl_prestudent JOIN public.tbl_studiengang USING(studiengang_kz) WHERE student_uid='".addslashes($uid)."'")))
die($db->db_last_error());
$stud_num_rows=$db->db_num_rows($erg_stud);
@@ -93,7 +93,7 @@ if ($stud_num_rows==1)
$semester=$db->db_result($erg_stud,0,"semester");
$verband=$db->db_result($erg_stud,0,"verband");
$gruppe=$db->db_result($erg_stud,0,"gruppe");
$matrikelnr=$db->db_result($erg_stud,0,"matrikelnr");
$matrikelnr=$db->db_result($erg_stud,0,"perskz");
}
if(!($erg_lekt=$db->db_query("SELECT * FROM public.tbl_mitarbeiter WHERE mitarbeiter_uid='".addslashes($uid)."'")))
die($db->db_last_error());
@@ -196,4 +196,4 @@ echo "<br>";
echo '</body>
</html>
';
?>
?>
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
+4 -3
View File
@@ -16,8 +16,9 @@
* 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>.
* Andreas Oesterreicher <andreas.oesterreicher@technikum-wien.at>,
* Rudolf Hangl <rudolf.hangl@technikum-wien.at> and
* Andreas Moik <moik@technikum-wien.at>.
*/
/* Erstellt einen Lehrauftrag im PDF Format
*
@@ -64,7 +65,7 @@ else
else
$uids = $_GET['uid'];
$qry = "SELECT student_uid, studiengang_kz FROM public.tbl_student WHERE student_uid=".$db->db_add_param($uids[1]);
$qry = "SELECT uid, studiengang_kz FROM public.tbl_prestudent WHERE uid=".$db->db_add_param($uids[1]);
if($result_std = $db->db_query($qry))
if($db->db_num_rows($result_std)==1)
{
+1 -1
View File
@@ -231,7 +231,7 @@ if($xsl=='AccountInfo')
}
}
$qry = "SELECT student_uid, studiengang_kz FROM public.tbl_student WHERE student_uid='".addslashes($uid)."'";
$qry = "SELECT uid, studiengang_kz FROM public.tbl_prestudent WHERE uid='".addslashes($uid)."'";
if($result_std = $db->db_query($qry))
{
if($db->db_num_rows($result_std)==1)
+4 -5
View File
@@ -15,7 +15,8 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
*
* Authors: Andreas Oesterreicher <andreas.oesterreicher@technikum-wien.at>
* Authors: Andreas Oesterreicher <andreas.oesterreicher@technikum-wien.at> and
* Andreas Moik <moik@technikum-wien.at>.
*/
require_once('../../config/vilesci.config.inc.php');
require_once('../../include/studiengang.class.php');
@@ -140,8 +141,7 @@ if($result_zgv = $db->db_query($qry))
FROM
public.tbl_prestudent a
JOIN public.tbl_person USING(person_id)
JOIN public.tbl_student USING(prestudent_id)
WHERE
WHERE
bismelden=true
AND EXISTS (
SELECT
@@ -150,7 +150,6 @@ if($result_zgv = $db->db_query($qry))
public.tbl_prestudentstatus
WHERE
status_kurzbz='Student'
AND prestudent_id=a.prestudent_id
AND studiensemester_kurzbz=".$db->db_add_param($studiensemester_kurzbz)."
)
AND a.studiengang_kz=".$db->db_add_param($studiengang_kz,FHC_INTEGER)."
@@ -188,4 +187,4 @@ echo '</tbody>
</table>';
echo '</body>
</html>';
?>
?>
+3 -2
View File
@@ -88,7 +88,7 @@ if(isset($_GET['prestudent_id']))
$idstring.=',';
$idstring.="'$id'";
}
$qry = "SELECT distinct on(person_id) foto, vorname, nachname, person_id, prestudent_id, tbl_prestudent.studiengang_kz, semester, verband, gruppe FROM public.tbl_person JOIN public.tbl_prestudent USING(person_id) LEFT JOIN public.tbl_student USING(prestudent_id) WHERE prestudent_id in($idstring)";
$qry = "SELECT distinct on(person_id) foto, vorname, nachname, person_id, prestudent_id, tbl_prestudent.studiengang_kz, semester, verband, gruppe FROM public.tbl_person JOIN public.tbl_prestudent USING(person_id) WHERE prestudent_id in($idstring)";
}
else
{
@@ -96,7 +96,8 @@ else
distinct on(person_id) foto, vorname, nachname, person_id, tbl_studentlehrverband.studiengang_kz, tbl_studentlehrverband.semester, tbl_studentlehrverband.verband, tbl_studentlehrverband.gruppe
FROM
campus.vw_student_lehrveranstaltung JOIN public.tbl_benutzer USING(uid)
JOIN public.tbl_person USING(person_id) JOIN public.tbl_student ON(uid=student_uid)
JOIN public.tbl_person USING(person_id)
JOIN public.tbl_prestudent ON(tbl_prestudent.uid=tbl_benutzer.uid)
LEFT JOIN public.tbl_studentlehrverband USING(prestudent_id)
WHERE
lehrveranstaltung_id='".addslashes($lvid)."' AND
+1 -1
View File
@@ -195,7 +195,7 @@ loadVariables($user);
if($prestudent_ids!='')
{
// Student holen
$qry = "SELECT *, (SELECT UPPER(typ || kurzbz) FROM public.tbl_studiengang WHERE studiengang_kz=tbl_prestudent.studiengang_kz) as stgbez FROM public.tbl_prestudent JOIN public.tbl_person USING(person_id) LEFT JOIN public.tbl_student USING(prestudent_id) WHERE prestudent_id in($prestudent_ids) ORDER BY nachname, vorname";
$qry = "SELECT *, (SELECT UPPER(typ || kurzbz) FROM public.tbl_studiengang WHERE studiengang_kz=tbl_prestudent.studiengang_kz) as stgbez FROM public.tbl_prestudent JOIN public.tbl_person USING(person_id) WHERE prestudent_id in($prestudent_ids) ORDER BY nachname, vorname";
if($result = $db->db_query($qry))
{
+9 -5
View File
@@ -135,13 +135,13 @@ function generateMatrikelnummer($studiengang_kz, $studiensemester_kurzbz)
$jahr = $jahr-1;
$matrikelnummer = sprintf("%02d",$jahr).$art.sprintf("%04d",$studiengang_kz);
$qry = "SELECT matrikelnr FROM public.tbl_student WHERE matrikelnr LIKE '$matrikelnummer%' ORDER BY matrikelnr DESC LIMIT 1";
$qry = "SELECT perskz FROM public.tbl_prestudent WHERE perskz LIKE '$matrikelnummer%' ORDER BY perskz DESC LIMIT 1";
if($result = $db->db_query($qry))
{
if($row = $db->db_fetch_object($result))
{
$max = substr($row->matrikelnr, (strlen(trim($row->matrikelnr))-3));
$max = substr($row->perskz, (strlen(trim($row->perskz))-3));
}
else
$max = 0;
@@ -1112,7 +1112,7 @@ if(!$error)
if($_POST['status_kurzbz']=='Student')
{
//Die Rolle Student darf nur eingefuegt werden, wenn schon eine Studentenrolle vorhanden ist
$qry = "SELECT count(*) as anzahl FROM public.tbl_student WHERE prestudent_id=".$db->db_add_param($_POST['prestudent_id'], FHC_INTEGER);
$qry = "SELECT count(*) as anzahl FROM public.tbl_prestudent WHERE prestudent_id=".$db->db_add_param($_POST['prestudent_id'], FHC_INTEGER);
if($result = $db->db_query($qry))
{
if($row = $db->db_fetch_object($result))
@@ -1248,7 +1248,7 @@ if(!$error)
if($_POST['status_kurzbz']=='Student')
{
//Die Rolle Student darf nur eingefuegt werden, wenn schon eine Studentenrolle vorhanden ist
$qry = "SELECT count(*) as anzahl FROM public.tbl_student WHERE prestudent_id=".$db->db_add_param($_POST['prestudent_id'], FHC_INTEGER);
$qry = "SELECT count(*) as anzahl FROM public.tbl_prestudent WHERE prestudent_id=".$db->db_add_param($_POST['prestudent_id'], FHC_INTEGER);
if($result = $db->db_query($qry))
{
if($row = $db->db_fetch_object($result))
@@ -3871,8 +3871,12 @@ if(!$error)
else
{
$return = false;
$errormsg = 'Unkown type: "'.$db->convert_html_chars($_POST['type']).'"';
$data = '';
if(isset($_POST['type']))
$errormsg = 'Unkown type: "'.$db->convert_html_chars($_POST['type']).'"';
else
$errormsg = 'no type provided';
}
}
echo '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+3 -3
View File
@@ -125,9 +125,9 @@ class akadgrad extends basis_db
{
//laden des Datensatzes
$qry = "SELECT * FROM lehre.tbl_akadgrad WHERE
studiengang_kz = ( SELECT studiengang_kz FROM public.tbl_student WHERE student_uid=".$this->db_add_param($student_uid).") AND
( geschlecht = ( SELECT geschlecht FROM public.tbl_student
JOIN public.tbl_benutzer ON (student_uid=uid)
studiengang_kz = ( SELECT studiengang_kz FROM public.tbl_prestudent WHERE uid=".$this->db_add_param($student_uid).") AND
( geschlecht = ( SELECT geschlecht FROM public.tbl_prestudent
JOIN public.tbl_benutzer ON (tbl_prestudent.uid=tbl_benutzer.uid)
JOIN public.tbl_person USING (person_id)
WHERE student_uid=".$this->db_add_param($student_uid).")
OR geschlecht IS NULL)
+4 -3
View File
@@ -16,6 +16,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
*
* Authors: Andreas Oesterreicher <andreas.oesterreicher@technikum-wien.at> and
* Andreas Moik <moik@technikum-wien.at>.
*/
/**
* Klasse Ampel
@@ -465,7 +466,7 @@ class ampel extends basis_db
// Alle Mitarbeiter/Studenten dazu holen
$qry = "SELECT
distinct on (tbl_ampel_benutzer_bestaetigt.ampel_benutzer_bestaetigt_id, a.uid) *,
tbl_ampel_benutzer_bestaetigt.insertamum,tbl_ampel_benutzer_bestaetigt.insertvon
tbl_ampel_benutzer_bestaetigt.insertamum,tbl_ampel_benutzer_bestaetigt.insertvon
FROM
(".$row->benutzer_select.") a
JOIN campus.vw_benutzer USING(uid)
@@ -479,8 +480,8 @@ class ampel extends basis_db
OR
(funktion_kurzbz is null
AND (SELECT oe_kurzbz FROM
public.tbl_studiengang JOIN public.tbl_student USING(studiengang_kz)
WHERE vw_benutzer.uid=tbl_student.student_uid)
public.tbl_studiengang JOIN public.tbl_prestudent USING(studiengang_kz)
WHERE vw_benutzer.uid=tbl_prestudent.uid)
in(".$this->implode4SQL($oe_arr).")
)
)
+4 -4
View File
@@ -302,12 +302,12 @@ class benutzer extends person
distinct on (uid) vorname, nachname, uid, mitarbeiter_uid, titelpre, titelpost, lektor, fixangestellt, alias, tbl_benutzer.aktiv,
(SELECT UPPER
(tbl_studiengang.typ || tbl_studiengang.kurzbz)
FROM public.tbl_student
FROM public.tbl_prestudent
JOIN public.tbl_studiengang USING(studiengang_kz)
WHERE student_uid=tbl_benutzer.uid) as studiengang,
WHERE uid=tbl_benutzer.uid) as studiengang,
(SELECT studiengang_kz FROM public.tbl_student
WHERE student_uid=tbl_benutzer.uid) as studiengang_kz,
(SELECT studiengang_kz FROM public.tbl_prestudent
WHERE uid=tbl_benutzer.uid) as studiengang_kz,
(SELECT tbl_kontakt.kontakt || ' - ' ||telefonklappe
FROM public.tbl_mitarbeiter
+4 -3
View File
@@ -17,8 +17,9 @@
*
* Authors: Christian Paminger <christian.paminger@technikum-wien.at>,
* Andreas Oesterreicher <andreas.oesterreicher@technikum-wien.at>,
* Rudolf Hangl <rudolf.hangl@technikum-wien.at> and
* Gerald Simane-Sequens <gerald.simane-sequens@technikum-wien.at>
* Rudolf Hangl <rudolf.hangl@technikum-wien.at>,
* Gerald Simane-Sequens <gerald.simane-sequens@technikum-wien.at> and
* Andreas Moik <moik@technikum-wien.at>.
*/
require_once(dirname(__FILE__).'/basis_db.class.php');
require_once(dirname(__FILE__).'/organisationseinheit.class.php');
@@ -424,7 +425,7 @@ class benutzerberechtigung extends basis_db
system.tbl_benutzerrolle
WHERE
tbl_benutzerrolle.funktion_kurzbz='Student' AND
EXISTS (SELECT student_uid FROM public.tbl_student WHERE student_uid=".$this->db_add_param($uid).")
EXISTS (SELECT uid FROM public.tbl_prestudent WHERE uid=".$this->db_add_param($uid).")
ORDER BY negativ DESC";
+169 -168
View File
@@ -1,168 +1,169 @@
<?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>.
*/
require_once(dirname(__FILE__).'/basis_db.class.php');
class benutzerlvstudiensemester extends basis_db
{
public $new; // boolean
public $benutzerlvstudiensemester = array(); // benutzerlvstudiensemester Objekt
//Tabellenspalten
public $uid; // varchar(16)
public $studiensemester_kurzbz; // varchar(16)
public $lehrveranstaltung_id; // integer
/**
* Konstruktor - Laedt optional eine Zuteilung
* @param $uid
* @param $studiensemester_kurzbz
* @param $lehrveranstaltung_id
*/
public function __construct($uid=null, $studiensemester_kurzbz=null, $lehrveranstaltung_id=null)
{
parent::__construct();
$this->new = true;
if(!is_null($uid) && !is_null($studiensemester_kurzbz) && !is_null($lehrveranstaltung_id))
$this->load($uid, $studiensemester_kurzbz, $lehrveranstaltung_id);
}
/**
* Laedt eine Zuteilung
* @param $uid, $studiensemester_kurzbz, $lehrveranstaltung_nr
*/
public function load($uid, $studiensemester_kurzbz, $lehrveranstaltung_id)
{
$this->errormsg = 'Not implemented';
return false;
}
/**
* Laedt alle uids in zu einer lv/szudiensemester - kombination
* gibt auch vor- und Nachname zurueck
* @param studiensemester_kurzbz
* @param lehrveranstaltung_id public.get_rolle_prestudent(12345,NULL) AS status
* @return boolean
*/
public function get_all_uids($studiensemester_kurzbz, $lehrveranstaltung_id)
{
$qry = "SELECT tbl_benutzerlvstudiensemester.uid, vw_benutzer.nachname, vw_benutzer.vorname, COALESCE (public.get_rolle_prestudent(prestudent_id,NULL),'-') AS status
FROM campus.tbl_benutzerlvstudiensemester
LEFT JOIN campus.vw_benutzer USING(uid)
LEFT JOIN public.tbl_student ON (uid=student_uid)
WHERE studiensemester_kurzbz=".$this->db_add_param($studiensemester_kurzbz)."
AND lehrveranstaltung_id = ".$this->db_add_param($lehrveranstaltung_id)."
ORDER BY nachname";
if(!$this->db_query($qry))
{
$this->errormsg = 'Datensatz konnte nicht geladen werden';
return false;
}
if ($this->db_num_rows() == 0)
return false;
else
{
while($row = $this->db_fetch_object())
{
$lv_obj = new benutzerlvstudiensemester();
$lv_obj->uid = $row->uid;
$lv_obj->nachname = $row->nachname;
$lv_obj->vorname = $row->vorname;
$lv_obj->status = $row->status;
$this->uids[] = $lv_obj;
}
return true;
}
}
/**
* Prueft die Variablen vor dem Speichern
* auf Gueltigkeit.
* @return true wenn ok, false im Fehlerfall
*/
protected function validate()
{
if(mb_strlen($this->uid)>16)
{
$this->errormsg = 'UID darf nicht laenger als 16 Zeichen sein';
return false;
}
if(mb_strlen($this->studiensemester_kurzbz)>16)
{
$this->errormsg = 'Studiensemester_kurzbz darf nicht laenger als 16 Zeichen sein';
return false;
}
if(!is_numeric($this->lehrveranstaltung_id))
{
$this->errormsg = 'Lehrveranstaltungsnummer muss eine gueltige Zahl sein';
return false;
}
return true;
}
/**
* Speichert Zuteilung in die Datenbank
* Wenn $new auf true gesetzt ist wird ein neuer Datensatz
* angelegt, ansonsten der Datensatz upgedated
* @return true wenn erfolgreich, false im Fehlerfall
*/
public function save($new=null)
{
if(!is_null($new))
$this->new = $new;
//Variablen auf Gueltigkeit pruefen
if(!$this->validate())
return false;
if($this->new)
{
$qry = 'INSERT INTO campus.tbl_benutzerlvstudiensemester (uid, studiensemester_kurzbz, lehrveranstaltung_id)
VALUES('.$this->db_add_param($this->uid).','.
$this->db_add_param($this->studiensemester_kurzbz).','.
$this->db_add_param($this->lehrveranstaltung_id).');';
}
else
{
// ToDo
//$qry = 'Select 1;';
$this->errormsg = 'Update ist noch nicht implementiert';
return false;
}
if($this->db_query($qry))
{
//Log schreiben
$this->new = false;
return true;
}
else
{
$this->errormsg = 'Fehler beim Speichern der BenutzerLVStudiensemester';
return false;
}
}
}
?>
<?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>,
* Rudolf Hangl <rudolf.hangl@technikum-wien.at> and
* Andreas Moik <moik@technikum-wien.at>
*/
require_once(dirname(__FILE__).'/basis_db.class.php');
class benutzerlvstudiensemester extends basis_db
{
public $new; // boolean
public $benutzerlvstudiensemester = array(); // benutzerlvstudiensemester Objekt
//Tabellenspalten
public $uid; // varchar(16)
public $studiensemester_kurzbz; // varchar(16)
public $lehrveranstaltung_id; // integer
/**
* Konstruktor - Laedt optional eine Zuteilung
* @param $uid
* @param $studiensemester_kurzbz
* @param $lehrveranstaltung_id
*/
public function __construct($uid=null, $studiensemester_kurzbz=null, $lehrveranstaltung_id=null)
{
parent::__construct();
$this->new = true;
if(!is_null($uid) && !is_null($studiensemester_kurzbz) && !is_null($lehrveranstaltung_id))
$this->load($uid, $studiensemester_kurzbz, $lehrveranstaltung_id);
}
/**
* Laedt eine Zuteilung
* @param $uid, $studiensemester_kurzbz, $lehrveranstaltung_nr
*/
public function load($uid, $studiensemester_kurzbz, $lehrveranstaltung_id)
{
$this->errormsg = 'Not implemented';
return false;
}
/**
* Laedt alle uids in zu einer lv/szudiensemester - kombination
* gibt auch vor- und Nachname zurueck
* @param studiensemester_kurzbz
* @param lehrveranstaltung_id public.get_rolle_prestudent(12345,NULL) AS status
* @return boolean
*/
public function get_all_uids($studiensemester_kurzbz, $lehrveranstaltung_id)
{
$qry = "SELECT tbl_benutzerlvstudiensemester.uid, vw_benutzer.nachname, vw_benutzer.vorname, COALESCE (public.get_rolle_prestudent(prestudent_id,NULL),'-') AS status
FROM campus.tbl_benutzerlvstudiensemester
LEFT JOIN campus.vw_benutzer USING(uid)
LEFT JOIN public.tbl_prestudent ON (tbl_prestudent.uid=campus.vw_benutzer.uid)
WHERE studiensemester_kurzbz=".$this->db_add_param($studiensemester_kurzbz)."
AND lehrveranstaltung_id = ".$this->db_add_param($lehrveranstaltung_id)."
ORDER BY nachname";
if(!$this->db_query($qry))
{
$this->errormsg = 'Datensatz konnte nicht geladen werden';
return false;
}
if ($this->db_num_rows() == 0)
return false;
else
{
while($row = $this->db_fetch_object())
{
$lv_obj = new benutzerlvstudiensemester();
$lv_obj->uid = $row->uid;
$lv_obj->nachname = $row->nachname;
$lv_obj->vorname = $row->vorname;
$lv_obj->status = $row->status;
$this->uids[] = $lv_obj;
}
return true;
}
}
/**
* Prueft die Variablen vor dem Speichern
* auf Gueltigkeit.
* @return true wenn ok, false im Fehlerfall
*/
protected function validate()
{
if(mb_strlen($this->uid)>16)
{
$this->errormsg = 'UID darf nicht laenger als 16 Zeichen sein';
return false;
}
if(mb_strlen($this->studiensemester_kurzbz)>16)
{
$this->errormsg = 'Studiensemester_kurzbz darf nicht laenger als 16 Zeichen sein';
return false;
}
if(!is_numeric($this->lehrveranstaltung_id))
{
$this->errormsg = 'Lehrveranstaltungsnummer muss eine gueltige Zahl sein';
return false;
}
return true;
}
/**
* Speichert Zuteilung in die Datenbank
* Wenn $new auf true gesetzt ist wird ein neuer Datensatz
* angelegt, ansonsten der Datensatz upgedated
* @return true wenn erfolgreich, false im Fehlerfall
*/
public function save($new=null)
{
if(!is_null($new))
$this->new = $new;
//Variablen auf Gueltigkeit pruefen
if(!$this->validate())
return false;
if($this->new)
{
$qry = 'INSERT INTO campus.tbl_benutzerlvstudiensemester (uid, studiensemester_kurzbz, lehrveranstaltung_id)
VALUES('.$this->db_add_param($this->uid).','.
$this->db_add_param($this->studiensemester_kurzbz).','.
$this->db_add_param($this->lehrveranstaltung_id).');';
}
else
{
// ToDo
//$qry = 'Select 1;';
$this->errormsg = 'Update ist noch nicht implementiert';
return false;
}
if($this->db_query($qry))
{
//Log schreiben
$this->new = false;
return true;
}
else
{
$this->errormsg = 'Fehler beim Speichern der BenutzerLVStudiensemester';
return false;
}
}
}
?>
+5 -4
View File
@@ -16,8 +16,9 @@
* 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>.
* Andreas Oesterreicher <andreas.oesterreicher@technikum-wien.at>,
* Rudolf Hangl <rudolf.hangl@technikum-wien.at> and
* Andreas Moik <moik@technikum-wien.at>.
*/
require_once(dirname(__FILE__).'/basis_db.class.php');
require_once(dirname(__FILE__).'/authentication.class.php');
@@ -154,7 +155,7 @@ function check_student($uid)
$db = new basis_db();
// uid von Tabelle 'Student' holen
$sql_query="SELECT student_uid FROM public.tbl_student WHERE student_uid=".$db->db_add_param($uid);
$sql_query="SELECT uid FROM public.tbl_prestudent WHERE uid=".$db->db_add_param($uid);
//echo $sql_query;
if($db->db_query($sql_query))
{
@@ -163,7 +164,7 @@ function check_student($uid)
if ($num_rows>0)
{
$row = $db->db_fetch_object();
return $row->student_uid;
return $row->uid;
}
else
return 0;
+11 -10
View File
@@ -16,8 +16,9 @@
* 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>.
* Andreas Oesterreicher <andreas.oesterreicher@technikum-wien.at>,
* Rudolf Hangl <rudolf.hangl@technikum-wien.at> and
* Andreas Moik <moik@technikum-wien.at>.
*/
/**
* Klasse Konto
@@ -485,13 +486,13 @@ class konto extends basis_db
*/
public function checkStudienbeitrag($uid, $stsem)
{
$subqry = "SELECT tbl_konto.buchungsnr, tbl_konto.buchungsdatum FROM public.tbl_konto, public.tbl_benutzer, public.tbl_student
$subqry = "SELECT tbl_konto.buchungsnr, tbl_konto.buchungsdatum FROM public.tbl_konto, public.tbl_benutzer, public.tbl_prestudent
WHERE
tbl_konto.studiensemester_kurzbz = ".$this->db_add_param($stsem)."
AND tbl_benutzer.uid = ".$this->db_add_param($uid)."
AND tbl_benutzer.uid = tbl_student.student_uid
AND tbl_benutzer.uid = tbl_prestudent.uid
AND tbl_benutzer.person_id = tbl_konto.person_id
AND tbl_konto.studiengang_kz=tbl_student.studiengang_kz
AND tbl_konto.studiengang_kz=tbl_prestudent.studiengang_kz
AND tbl_konto.buchungstyp_kurzbz = 'Studiengebuehr' ORDER BY buchungsnr";
if($this->db_query($subqry))
@@ -580,12 +581,12 @@ class konto extends basis_db
*/
public function getLastStudienbeitrag($uid)
{
$subqry = "SELECT tbl_konto.buchungsnr, tbl_konto.buchungsdatum, tbl_konto.buchungsnr_verweis, tbl_konto.studiensemester_kurzbz FROM public.tbl_konto, public.tbl_benutzer, public.tbl_student
$subqry = "SELECT tbl_konto.buchungsnr, tbl_konto.buchungsdatum, tbl_konto.buchungsnr_verweis, tbl_konto.studiensemester_kurzbz FROM public.tbl_konto, public.tbl_benutzer, public.tbl_prestudent
WHERE
tbl_benutzer.uid = ".$this->db_add_param($uid)."
AND tbl_benutzer.uid = tbl_student.student_uid
AND tbl_benutzer.uid = tbl_prestudent.uid
AND tbl_benutzer.person_id = tbl_konto.person_id
AND tbl_konto.studiengang_kz=tbl_student.studiengang_kz
AND tbl_konto.studiengang_kz=tbl_prestudent.studiengang_kz
AND tbl_konto.buchungstyp_kurzbz = 'Studiengebuehr' ORDER BY buchungsnr DESC";
if($result = $this->db_query($subqry))
@@ -639,11 +640,11 @@ class konto extends basis_db
FROM
public.tbl_konto
JOIN public.tbl_benutzer USING(person_id)
JOIN public.tbl_student ON(uid=student_uid)
JOIN public.tbl_prestudent ON(tbl_prestudent.uid=tbl_benutzer.uid)
JOIN public.tbl_studiensemester USING(studiensemester_kurzbz)
WHERE
tbl_benutzer.uid = ".$this->db_add_param($uid)."
AND tbl_konto.studiengang_kz=tbl_student.studiengang_kz
AND tbl_konto.studiengang_kz=tbl_prestudent.studiengang_kz
AND tbl_konto.buchungstyp_kurzbz in(".$this->db_implode4SQL($buchungstyp_kurzbz_array).")";
if(!is_null($studiensemester_kurzbz))
$subqry.=" AND studiensemester_kurzbz=".$this->db_add_param($studiensemester_kurzbz);
+46 -16
View File
@@ -22,7 +22,6 @@
*/
require_once(dirname(__FILE__).'/person.class.php');
require_once(dirname(__FILE__).'/log.class.php');
require_once(dirname(__FILE__).'/studiensemester.class.php');
class prestudent extends person
{
@@ -78,6 +77,10 @@ class prestudent extends person
public $bestaetigtvon;
public $bewerbung_abgeschicktamum;
public $semester;
public $verband;
public $gruppe;
public $studiensemester_old = '';
public $ausbildungssemester_old = '';
@@ -1803,25 +1806,52 @@ class prestudent extends person
return false;
}
}
/**
* Liefert den studentlehrverband des Prestudenten im aktuellen oder nächsten Semester
* @return Objekt mit gruppe, verband und semester
* Laedt die StudentLehrverband Zuteilung
* @param prestudent_id
* @param studiensemester_kurzbz
* @return true wenn vorhanden, false wenn nicht
*/
public function getStudentLehrverband()
public function load_studentlehrverband($studiensemester_kurzbz)
{
$studiensemester = new studiensemester();
$studiensemester_kurzbz = $studiensemester->getaktorNext();
$qry_sem = "SELECT gruppe, verband, semester from tbl_studentlehrverband WHERE studiensemester_kurzbz=".$this->db_add_param($studiensemester_kurzbz)." AND prestudent_id=".$this->db_add_param($this->prestudent_id, FHC_INTEGER);
if(!$res_sem = $this->db_query($qry_sem))
$this->errormsg = 'Fehler beim Laden der Daten';
if($this->db_num_rows($res_sem) == 1)
if(!is_numeric($this->prestudent_id))
{
$row_sem = $this->db_fetch_object($res_sem);
return $row_sem;
$this->errormsg = 'PrestudentID ist ungueltig';
return false;
}
if($studiensemester_kurzbz == "")
{
$this->errormsg = 'studiensemester_kurzbz muss angegeben werden';
return false;
}
$qry = "SELECT * FROM public.tbl_studentlehrverband
WHERE prestudent_id=".$this->db_add_param($this->prestudent_id)."
AND studiensemester_kurzbz=".$this->db_add_param($studiensemester_kurzbz);
if($this->db_query($qry))
{
if($row = $this->db_fetch_object())
{
$this->studiensemester_kurzbz = $row->studiensemester_kurzbz;
$this->studiengang_kz = $row->studiengang_kz;
$this->semester = $row->semester;
$this->verband = $row->verband;
$this->gruppe = $row->gruppe;
return true;
}
else
{
$this->errormsg = 'Fehler beim Ermitteln des Lehrverbandes';
return false;
}
}
else
{
$this->errormsg ='Fehler beim Ermitteln des Lehrverbandes';
return false;
}
return false;
}
}
+12 -2
View File
@@ -424,6 +424,18 @@ class student extends benutzer
*/
public function load_studentlehrverband($prestudent_id, $studiensemester_kurzbz)
{
if(!is_numeric($prestudent_id))
{
$this->errormsg = 'PrestudentID ist ungueltig';
return false;
}
if($studiensemester_kurzbz == "")
{
$this->errormsg = 'studiensemester_kurzbz muss angegeben werden';
return false;
}
$qry = "SELECT * FROM public.tbl_studentlehrverband
WHERE prestudent_id=".$this->db_add_param($prestudent_id)."
AND studiensemester_kurzbz=".$this->db_add_param($studiensemester_kurzbz);
@@ -432,8 +444,6 @@ class student extends benutzer
{
if($row = $this->db_fetch_object())
{
$this->uid = $this->getUid($row->prestudent_id);
$this->prestudent_id = $row->prestudent_id;
$this->studiensemester_kurzbz = $row->studiensemester_kurzbz;
$this->studiengang_kz = $row->studiengang_kz;
+2 -2
View File
@@ -274,7 +274,7 @@ class zeugnisnote extends basis_db
)
)
LEFT JOIN lehre.tbl_note USING(note)
LEFT JOIN public.tbl_student ON( public.tbl_student.student_uid=vw_student_lehrveranstaltung.uid)
LEFT JOIN public.tbl_prestudent ON( public.tbl_prestudent.uid=vw_student_lehrveranstaltung.uid)
WHERE true $where
UNION
SELECT lehre.tbl_lehrveranstaltung.lehrveranstaltung_id,prestudent_id, lehre.tbl_zeugnisnote.prestudent_id AS uid,studiensemester_kurzbz, note, punkte,
@@ -286,7 +286,7 @@ class zeugnisnote extends basis_db
lehre.tbl_zeugnisnote
JOIN lehre.tbl_lehrveranstaltung USING (lehrveranstaltung_id)
JOIN lehre.tbl_note USING(note)
LEFT JOIN public.tbl_student ON( public.tbl_student.student_uid=lehre.tbl_zeugnisnote.prestudent_id )
LEFT JOIN public.tbl_prestudent ON( public.tbl_prestudent.prestudent_id=lehre.tbl_zeugnisnote.prestudent_id )
WHERE true $where2
ORDER BY sort";
if($this->db_query($qry))
+12 -11
View File
@@ -15,7 +15,8 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
*
* Authors: Nikolaus Krondraf <nikolaus.krondraf@technikum-wien.at>
* Authors: Nikolaus Krondraf <nikolaus.krondraf@technikum-wien.at> and
* Andreas Moik <moik@technikum-wien.at>.
*/
/**
* Erstellt das XML fuer die Anwesenheitsliste
@@ -54,7 +55,7 @@ $qry = "SELECT le.lehreinheit_id, le.lehrveranstaltung_id, lv.lvnr, lv.bezeichnu
. "JOIN lehre.tbl_stundenplan sp ON (sp.lehreinheit_id=le.lehreinheit_id) "
. "JOIN lehre.tbl_stunde stu ON stu.stunde = sp.stunde "
. "WHERE 1=1";
//echo "<sql>".var_dump($qry)."</sql>";
//echo "<sql>".$qry."</sql>";
if($studiengang!='')
$qry.=" AND stg.studiengang_kz = " . $db->db_add_param($studiengang) . " ";
@@ -83,9 +84,9 @@ else
}
$qry .= " ORDER BY datum, beginn";
if($db->db_query($qry))
if($res = $db->db_query($qry))
{
while($row = $db->db_fetch_object())
while($row = $db->db_fetch_object($res))
{
if(empty($row))
die("Lehreinheit $lehreinheit am $von nicht gefunden");
@@ -115,18 +116,18 @@ foreach($data as $key => $value)
// Daten der Studenten ermitteln
$qry = "SELECT pe.person_id, vorname, nachname, titelpre, titelpost, note, "
. "get_rolle_prestudent(tbl_student.prestudent_id, " . $db->db_add_param($studiensemester) . ") AS laststatus "
. "get_rolle_prestudent(tbl_prestudent.prestudent_id, " . $db->db_add_param($studiensemester) . ") AS laststatus "
. "FROM campus.vw_student_lehrveranstaltung stlv "
. "JOIN public.tbl_benutzer be ON be.uid = stlv.uid "
. "JOIN public.tbl_person pe ON pe.person_id = be.person_id "
. "JOIN public.tbl_student ON be.uid = tbl_student.student_uid "
. "LEFT JOIN lehre.tbl_zeugnisnote zn ON (zn.lehrveranstaltung_id = stlv.lehrveranstaltung_id AND zn.student_uid = stlv.uid AND zn.studiensemester_kurzbz = " . $db->db_add_param($studiensemester) . ") "
. "JOIN public.tbl_prestudent ON be.uid = tbl_prestudent.uid "
. "LEFT JOIN lehre.tbl_zeugnisnote zn ON (zn.lehrveranstaltung_id = stlv.lehrveranstaltung_id AND zn.prestudent_id = stlv.prestudent_id AND zn.studiensemester_kurzbz = " . $db->db_add_param($studiensemester) . ") "
. "WHERE stlv.lehreinheit_id = " . $db->db_add_param($key) . " "
. "AND get_rolle_prestudent(tbl_student.prestudent_id, " . $db->db_add_param($studiensemester) . ") NOT IN ('Abbrecher', 'Unterbrecher') "
. "AND tbl_student.student_uid NOT IN ("
. "SELECT stud.student_uid "
. "AND get_rolle_prestudent(tbl_prestudent.prestudent_id, " . $db->db_add_param($studiensemester) . ") NOT IN ('Abbrecher', 'Unterbrecher') "
. "AND tbl_prestudent.uid NOT IN ("
. "SELECT pre.uid "
. "FROM bis.tbl_bisio bis "
. "JOIN public.tbl_student stud ON bis.prestudent_id = stud.prestudent_id "
. "JOIN public.tbl_prestudent pre ON bis.prestudent_id = pre.prestudent_id "
. "WHERE bis.von <= " . $db->db_add_param($currentDay) . "::DATE AND bis.bis >= " . $db->db_add_param($currentDay) . "::DATE) "
. "ORDER BY nachname ASC";
+9 -5
View File
@@ -204,7 +204,7 @@ elseif ($xmlformat=='xml')
{
global $datum, $btyp;
$rueckerstattung=false;
echo "
<buchung>
<buchungsnr><![CDATA[".$row->buchungsnr."]]></buchungsnr>
@@ -226,7 +226,7 @@ elseif ($xmlformat=='xml')
$rueckerstattung=true;
}
if($rueckerstattung)
if($rueckerstattung)
echo "<rueckerstattung><![CDATA[true]]></rueckerstattung>";
echo "
<buchungsdatum><![CDATA[".$datum->convertISODate($row->buchungsdatum)."]]></buchungsdatum>
@@ -293,11 +293,15 @@ elseif ($xmlformat=='xml')
$btyp = array();
foreach ($buchungstyp->result as $row)
$btyp[$row->buchungstyp_kurzbz]=$row->beschreibung;
$btyp[$row->buchungstyp_kurzbz]=$row->beschreibung;
if($person_id!='')
foreach ($konto->result as $buchung)
{
if($xmlformat == "xml")
die("Die Kombination aus xml und person_id ist nicht zulässig!");
drawrow_xml($buchung);
}
elseif($buchungsnummern!='')
{
$buchungsnr = explode(';',$buchungsnummern);
@@ -311,7 +315,7 @@ elseif ($xmlformat=='xml')
{
drawperson_xml($konto);
$drawperson=false;
}
}
drawrow_xml($konto);
}
}
@@ -324,4 +328,4 @@ elseif ($xmlformat=='xml')
echo "\n</konto>";
}
?>
?>
+12 -12
View File
@@ -193,13 +193,13 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
{
if ($inforow = $db->db_fetch_object())
{
$lehrinhalte_arr = explode("<br>",$inforow->lehrinhalte);
$lehrinhalte_arr = explode("<br>",$inforow->lehrinhalte);
for ($i = 0; $i < sizeof($lehrinhalte_arr); $i++)
{
$lehrinhalte .= $lehrinhalte_arr[$i].'\n';
$lehrinhalte .= $lehrinhalte_arr[$i].'\n';
}
}
}
}
}
$xml = "<?xml version='1.0' encoding='UTF-8' standalone='yes'?>";
$xml .= "<zertifikate>";
@@ -233,10 +233,10 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
if($pruefer_uid!='')
{
$pruefer = new mitarbeiter($pruefer_uid);
$pruefer_name = trim($pruefer->titelpre.' '.$pruefer->vorname.' '.$pruefer->nachname.' '.$pruefer->titelpost);
$pruefer_name = trim($pruefer->titelpre.' '.$pruefer->vorname.' '.$pruefer->nachname.' '.$pruefer->titelpost);
}
$query = "SELECT tbl_student.matrikelnr, tbl_student.studiengang_kz, tbl_studiengang.typ, tbl_studiengang.bezeichnung, tbl_person.vorname, tbl_person.nachname,tbl_person.gebdatum,tbl_person.titelpre, tbl_person.titelpost, tbl_person.geschlecht FROM tbl_person, tbl_student, tbl_studiengang, tbl_benutzer WHERE tbl_student.studiengang_kz = tbl_studiengang.studiengang_kz and tbl_student.student_uid = tbl_benutzer.uid and tbl_benutzer.person_id = tbl_person.person_id and tbl_student.student_uid = '".$uid_arr[$i]."'";
$query = "SELECT tbl_prestudent.perskz, tbl_prestudent.studiengang_kz, tbl_studiengang.typ, tbl_studiengang.bezeichnung, tbl_person.vorname, tbl_person.nachname,tbl_person.gebdatum,tbl_person.titelpre, tbl_person.titelpost, tbl_person.geschlecht FROM tbl_person, tbl_prestudent, tbl_studiengang, tbl_benutzer WHERE tbl_prestudent.studiengang_kz = tbl_studiengang.studiengang_kz and tbl_prestudent.uid = tbl_benutzer.uid and tbl_benutzer.person_id = tbl_person.person_id and tbl_prestudent.uid = '".$uid_arr[$i]."'";
if($db->db_query($query))
{
@@ -276,7 +276,7 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
$gebdatum = date('d.m.Y',strtotime($row->gebdatum));
$xml .= "\n <gebdatum>".$gebdatum."</gebdatum>";
$xml .= "\n <geschlecht>".$row->geschlecht."</geschlecht>";
$xml .= "\n <matrikelnr>".$row->matrikelnr."</matrikelnr>";
$xml .= "\n <matrikelnr>".$row->perskz."</matrikelnr>";
$xml .= "\n <studiengangsleiter>".$stgl."</studiengangsleiter>";
$datum_aktuell = date('d.m.Y');
$xml .= "\n <ort_datum>Wien, am ".$datum_aktuell."</ort_datum>";
@@ -348,11 +348,11 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
$studienplan_lehrveranstaltung_id = "";
foreach($lehrveranstaltung->lehrveranstaltungen as $lv)
{
if(($lv->lehrveranstaltung_id == $lehrveranstaltung_id) || ($lv->lehrveranstaltung_id == $lehrveranstaltung_id_kompatibel))
{
$studienplan_lehrveranstaltung_id = $lv->studienplan_lehrveranstaltung_id;
break;
}
if(($lv->lehrveranstaltung_id == $lehrveranstaltung_id) || ($lv->lehrveranstaltung_id == $lehrveranstaltung_id_kompatibel))
{
$studienplan_lehrveranstaltung_id = $lv->studienplan_lehrveranstaltung_id;
break;
}
}
$studienplan = new studienplan();
+8 -8
View File
@@ -58,16 +58,16 @@ if(isset($_REQUEST['xmlformat']) && $_REQUEST['xmlformat']=="xml")
echo "<sammelzeugnis>";
$qry = "SELECT tbl_student.matrikelnr, tbl_student.studiengang_kz, tbl_studiengang.typ, tbl_studiengang.projektarbeit_note_anzeige,
$qry = "SELECT tbl_prestudent.perskz, tbl_prestudent.studiengang_kz, tbl_studiengang.typ, tbl_studiengang.projektarbeit_note_anzeige,
tbl_studiengang.bezeichnung, tbl_studiengang.english, tbl_studentlehrverband.semester,
tbl_person.vorname, tbl_person.vornamen, tbl_person.nachname,tbl_person.gebdatum,tbl_person.titelpre,
tbl_person.titelpost, tbl_person.anrede, tbl_studiensemester.bezeichnung as sembezeichnung,
tbl_studiensemester.studiensemester_kurzbz as stsem, tbl_student.prestudent_id
FROM tbl_person, tbl_student, tbl_studiengang, tbl_benutzer, tbl_studentlehrverband, tbl_studiensemester
WHERE tbl_student.studiengang_kz = tbl_studiengang.studiengang_kz
AND tbl_student.student_uid = tbl_benutzer.uid AND tbl_benutzer.person_id = tbl_person.person_id
AND tbl_student.student_uid = ".$db->db_add_param($uid)."
AND tbl_studentlehrverband.prestudent_id=tbl_student.prestudent_id
tbl_studiensemester.studiensemester_kurzbz as stsem, tbl_prestudent.prestudent_id
FROM tbl_person, tbl_prestudent, tbl_studiengang, tbl_benutzer, tbl_studentlehrverband, tbl_studiensemester
WHERE tbl_prestudent.studiengang_kz = tbl_studiengang.studiengang_kz
AND tbl_prestudent.uid = tbl_benutzer.uid AND tbl_benutzer.person_id = tbl_person.person_id
AND tbl_prestudent.uid = ".$db->db_add_param($uid)."
AND tbl_studentlehrverband.prestudent_id=tbl_prestudent.prestudent_id
AND tbl_studiensemester.studiensemester_kurzbz = tbl_studentlehrverband.studiensemester_kurzbz
order by semester;";
@@ -91,7 +91,7 @@ if(isset($_REQUEST['xmlformat']) && $_REQUEST['xmlformat']=="xml")
echo ' <nachname>'.$row_person->nachname.'</nachname>';
echo ' <name>'.trim($row_person->titelpre.' '.trim($row_person->vorname.' '.$row_person->vornamen).' '.mb_strtoupper($row_person->nachname).($row_person->titelpost!=''?', '.$row_person->titelpost:'')).'</name>';
echo ' <gebdatum>'.$gebdatum.'</gebdatum>';
echo ' <matrikelnr>'.$row_person->matrikelnr.'</matrikelnr>';
echo ' <matrikelnr>'.$row_person->perskz.'</matrikelnr>';
echo ' <studiengang>'.$row_person->bezeichnung.'</studiengang>';
echo ' <studiengang_englisch>'.$row_person->english.'</studiengang_englisch>';
echo " <studiengang_kz>".sprintf('%04s', $row_person->studiengang_kz)."</studiengang_kz>";
+74 -78
View File
@@ -122,7 +122,7 @@ function checkfilter($row, $filter2, $buchungstyp = null)
elseif($filter2=='zgvohnedatum')
{
//Alle Personen die den ZGV Typ eingetragen haben aber noch kein Datum
$qry = "SELECT zgv_code, zgvdatum, zgvmas_code, zgvmadatum FROM public.tbl_prestudent WHERE prestudent_id='$row->prestudent_id'";
$qry = "SELECT zgv_code, zgvdatum, zgvmas_code, zgvmadatum FROM public.tbl_prestudent WHERE prestudent_id=".$db->db_add_param($row->prestudent_id, FHC_INTEGER);
if($db->db_query($qry))
{
if($row_filter = $db->db_fetch_object())
@@ -168,7 +168,7 @@ function draw_content_liste($row)
<STUDENT:semester><![CDATA['.(isset($row->semester)?$row->semester:'').']]></STUDENT:semester>
<STUDENT:verband><![CDATA['.(isset($row->verband)?$row->verband:'').']]></STUDENT:verband>
<STUDENT:gruppe><![CDATA['.(isset($row->gruppe)?$row->gruppe:'').']]></STUDENT:gruppe>
<STUDENT:matrikelnummer><![CDATA['.(isset($row->matrikelnr)?$row->matrikelnr:'').']]></STUDENT:matrikelnummer>
<STUDENT:matrikelnummer><![CDATA['.(isset($row->perskz)?$row->perskz:'').']]></STUDENT:matrikelnummer>
<STUDENT:mail_privat><![CDATA['.$row->email_privat.']]></STUDENT:mail_privat>
<STUDENT:mail_intern><![CDATA['.(isset($row->uid)?$row->uid.'@'.DOMAIN:'').']]></STUDENT:mail_intern>
<STUDENT:status><![CDATA['.$status.']]></STUDENT:status>
@@ -287,7 +287,7 @@ function draw_content($row)
<STUDENT:aktiv><![CDATA['.$aktiv.']]></STUDENT:aktiv>
<STUDENT:uid><![CDATA['.(isset($row->uid)?$row->uid:'').']]></STUDENT:uid>
<STUDENT:matrikelnummer><![CDATA['.(isset($row->matrikelnr)?$row->matrikelnr:'').']]></STUDENT:matrikelnummer>
<STUDENT:matrikelnummer><![CDATA['.(isset($row->perskz)?$row->perskz:'').']]></STUDENT:matrikelnummer>
<STUDENT:alias><![CDATA['.(isset($row->alias)?$row->alias:'').']]></STUDENT:alias>
<STUDENT:semester><![CDATA['.(isset($row->semester)?$row->semester:$semester_prestudent).']]></STUDENT:semester>
<STUDENT:verband><![CDATA['.(isset($row->verband)?$row->verband:'').']]></STUDENT:verband>
@@ -446,25 +446,25 @@ if($xmlformat=='rdf')
//$where.=" AND tbl_studentlehrverband.studiensemester_kurzbz='$studiensemester_kurzbz'";
$sql_query="SELECT p.person_id, tbl_prestudent.prestudent_id, tbl_prestudent.uid, titelpre, titelpost, vorname, vornamen, geschlecht,
nachname, gebdatum, tbl_prestudent.anmerkung,ersatzkennzeichen,svnr, tbl_student.matrikelnr, p.anmerkung as anmerkungen,
nachname, gebdatum, tbl_prestudent.anmerkung,ersatzkennzeichen,svnr, tbl_prestudent.perskz, p.anmerkung as anmerkungen,
tbl_studentlehrverband.semester, tbl_studentlehrverband.verband, tbl_studentlehrverband.gruppe,
tbl_student.studiengang_kz, aufmerksamdurch_kurzbz, mentor, public.tbl_benutzer.aktiv AS bnaktiv,
tbl_prestudent.studiengang_kz, aufmerksamdurch_kurzbz, mentor, public.tbl_benutzer.aktiv AS bnaktiv,
( SELECT kontakt
FROM public.tbl_kontakt
WHERE kontakttyp='email' AND person_id=p.person_id AND zustellung
LIMIT 1
)
AS email_privat,
(SELECT rt_gesamtpunkte as punkte FROM public.tbl_prestudent WHERE prestudent_id=tbl_student.prestudent_id) as punkte,
(SELECT rt_punkte1 as punkte FROM public.tbl_prestudent WHERE prestudent_id=tbl_student.prestudent_id) as rt_punkte1,
(SELECT rt_punkte2 as punkte FROM public.tbl_prestudent WHERE prestudent_id=tbl_student.prestudent_id) as rt_punkte2,
(SELECT rt_punkte3 as punkte FROM public.tbl_prestudent WHERE prestudent_id=tbl_student.prestudent_id) as rt_punkte3,
(SELECT rt_gesamtpunkte as punkte FROM public.tbl_prestudent WHERE prestudent_id=tbl_prestudent.prestudent_id) as punkte,
(SELECT rt_punkte1 as punkte FROM public.tbl_prestudent psrt1 WHERE psrt1.prestudent_id=ps.prestudent_id) as rt_punkte1,
(SELECT rt_punkte2 as punkte FROM public.tbl_prestudent psrt2 WHERE psrt2.prestudent_id=ps.prestudent_id) as rt_punkte2,
(SELECT rt_punkte3 as punkte FROM public.tbl_prestudent psrt3 WHERE psrt3.prestudent_id=ps.prestudent_id) as rt_punkte3,
tbl_prestudent.dual as dual, p.matr_nr
FROM public.tbl_student
JOIN public.tbl_benutzer ON (student_uid=uid) JOIN public.tbl_person p USING (person_id) JOIN public.tbl_prestudent USING(prestudent_id) ";
FROM public.tbl_prestudent ps
JOIN public.tbl_benutzer ON (student_uid=uid) JOIN public.tbl_person p USING (person_id)";
if($gruppe_kurzbz!=null)
$sql_query.= "JOIN public.tbl_benutzergruppe USING (uid) ";
$sql_query.="LEFT JOIN public.tbl_studentlehrverband ON (tbl_studentlehrverband.prestudent_id=tbl_student.prestudent_id AND tbl_studentlehrverband.studiensemester_kurzbz='$studiensemester_kurzbz')";
$sql_query.="LEFT JOIN public.tbl_studentlehrverband ON (tbl_studentlehrverband.prestudent_id=ps.prestudent_id AND tbl_studentlehrverband.studiensemester_kurzbz='$studiensemester_kurzbz')";
$sql_query.="WHERE ".$where.' ORDER BY nachname, vorname';
@@ -577,77 +577,77 @@ if($xmlformat=='rdf')
{
if($filter!='')
{
if(substr_compare($filter, "#ref", 0, 4,true)==0)
{
$zahlungsreferenz = explode(" ", $filter);
unset($zahlungsreferenz[0]);
foreach($zahlungsreferenz as $ref)
if(substr_compare($filter, "#ref", 0, 4,true)==0)
{
$konto = new konto();
$konto->loadFromZahlungsreferenz($ref);
$prestudent=new prestudent();
$prestudent->getPrestudenten($konto->person_id);
if(!empty($prestudent->result))
{
$prestudent_temp = new prestudent($prestudent->result[0]->prestudent_id);
$student = new student();
$uid = $student->getUid($prestudent_temp->prestudent_id);
$zahlungsreferenz = explode(" ", $filter);
unset($zahlungsreferenz[0]);
if($uid!='' && $uid != false)
foreach($zahlungsreferenz as $ref)
{
if(!$student->load($uid, $studiensemester_kurzbz))
$student->load($uid);
draw_content($student);
draw_prestudent($prestudent_temp);
$konto = new konto();
$konto->loadFromZahlungsreferenz($ref);
$prestudent=new prestudent();
$prestudent->getPrestudenten($konto->person_id);
if(!empty($prestudent->result))
{
$prestudent_temp = new prestudent($prestudent->result[0]->prestudent_id);
$student = new student();
$uid = $student->getUid($prestudent_temp->prestudent_id);
if($uid!='' && $uid != false)
{
if(!$student->load($uid, $studiensemester_kurzbz))
$student->load($uid);
draw_content($student);
draw_prestudent($prestudent_temp);
}
else
{
draw_content($prestudent_temp);
draw_prestudent($prestudent_temp);
}
}
}
else
{
draw_content($prestudent_temp);
draw_prestudent($prestudent_temp);
}
}
}
}
else
{
//$filter = utf8_decode($filter);
$qry = "SELECT prestudent_id
FROM
public.tbl_person JOIN tbl_prestudent USING (person_id) LEFT JOIN tbl_student using(prestudent_id)
WHERE
COALESCE(nachname,'')||' '||COALESCE(vorname,'') ~* '".addslashes($filter)."' OR
COALESCE(vorname,'')||' '||COALESCE(nachname,'') ~* '".addslashes($filter)."' OR
student_uid ~* '".addslashes($filter)."' OR
matrikelnr = '".addslashes($filter)."' OR
svnr = '".addslashes($filter)."';";
if($db->db_query($qry))
else
{
while($row = $db->db_fetch_object())
{
$student=new student();
if($uid = $student->getUid($row->prestudent_id))
//$filter = utf8_decode($filter);
$qry = "SELECT prestudent_id
FROM
public.tbl_person JOIN tbl_prestudent USING (person_id)
WHERE
COALESCE(nachname,'')||' '||COALESCE(vorname,'') ~* '".addslashes($filter)."' OR
COALESCE(vorname,'')||' '||COALESCE(nachname,'') ~* '".addslashes($filter)."' OR
uid ~* '".addslashes($filter)."' OR
perskz = '".addslashes($filter)."' OR
svnr = '".addslashes($filter)."';";
if($db->db_query($qry))
{
//Wenn kein Eintrag fuers aktuelle Studiensemester da ist, dann
//nochmal laden aber ohne studiensemester
if(!$student->load($uid, $studiensemester_kurzbz))
$student->load($uid);
while($row = $db->db_fetch_object())
{
$student=new student();
if($uid = $student->getUid($row->prestudent_id))
{
//Wenn kein Eintrag fuers aktuelle Studiensemester da ist, dann
//nochmal laden aber ohne studiensemester
if(!$student->load($uid, $studiensemester_kurzbz))
$student->load($uid);
}
$prestd = new prestudent();
$prestd->load($row->prestudent_id);
if($uid!='')
{
draw_content($student);
draw_prestudent($prestd);
}
else
{
draw_content($prestd);
draw_prestudent($prestd);
}
}
}
$prestd = new prestudent();
$prestd->load($row->prestudent_id);
if($uid!='')
{
draw_content($student);
draw_prestudent($prestd);
}
else
{
draw_content($prestd);
draw_prestudent($prestd);
}
}
}
}
}
elseif(isset($prestudent_id))
{
@@ -672,11 +672,7 @@ if($xmlformat=='rdf')
draw_prestudent($prestd);
}
}
}
echo "</RDF:Seq>\n</RDF:RDF>";
}
else
+16 -16
View File
@@ -42,21 +42,21 @@ function draw_studienerfolg($uid, $studiensemester_kurzbz)
$db = new basis_db();
$query = "SELECT
tbl_student.matrikelnr, tbl_student.studiengang_kz, tbl_studiengang.bezeichnung,
tbl_prestudent.perskz, tbl_prestudent.studiengang_kz, tbl_studiengang.bezeichnung,
tbl_studentlehrverband.semester, tbl_person.titelpre, tbl_person.titelpost,
tbl_person.vorname, tbl_person.nachname,tbl_person.gebdatum,
tbl_studiensemester.bezeichnung as sembezeichnung,
tbl_studiengang.english as bezeichnung_englisch,
tbl_studiengang.orgform_kurzbz
FROM
public.tbl_person, public.tbl_student, public.tbl_studiengang, public.tbl_benutzer,
public.tbl_person, public.tbl_prestudent, public.tbl_studiengang, public.tbl_benutzer,
public.tbl_studentlehrverband, public.tbl_studiensemester
WHERE
tbl_student.studiengang_kz = tbl_studiengang.studiengang_kz
and tbl_student.student_uid = tbl_benutzer.uid
tbl_prestudent.studiengang_kz = tbl_studiengang.studiengang_kz
and tbl_prestudent.uid = tbl_benutzer.uid
and tbl_benutzer.person_id = tbl_person.person_id
and tbl_student.student_uid = ".$db->db_add_param($uid)."
and tbl_studentlehrverband.prestudent_id=tbl_student.prestudent_id
and tbl_prestudent.uid = ".$db->db_add_param($uid)."
and tbl_studentlehrverband.prestudent_id=tbl_prestudent.prestudent_id
and tbl_studiensemester.studiensemester_kurzbz = tbl_studentlehrverband.studiensemester_kurzbz
and tbl_studentlehrverband.studiensemester_kurzbz = ".$db->db_add_param($studiensemester_kurzbz);
@@ -81,11 +81,11 @@ function draw_studienerfolg($uid, $studiensemester_kurzbz)
$studiensemester->load($studiensemester_aktuell);
$semester_aktuell='';
$qry_semester = "SELECT tbl_prestudentstatus.ausbildungssemester as semester FROM public.tbl_student, public.tbl_prestudentstatus
WHERE tbl_student.prestudent_id=tbl_prestudentstatus.prestudent_id
$qry_semester = "SELECT tbl_prestudentstatus.ausbildungssemester as semester FROM public.tbl_prestudent, public.tbl_prestudentstatus
WHERE tbl_prestudent.prestudent_id=tbl_prestudentstatus.prestudent_id
AND tbl_prestudentstatus.status_kurzbz in('Student','Incoming','Outgoing','Praktikant','Diplomand')
AND studiensemester_kurzbz=".$db->db_add_param($studiensemester_aktuell)."
AND tbl_student.student_uid = ".$db->db_add_param($uid);
AND tbl_prestudent.uid = ".$db->db_add_param($uid);
if($db->db_query($qry_semester))
if($row_semester = $db->db_fetch_object())
@@ -94,11 +94,11 @@ function draw_studienerfolg($uid, $studiensemester_kurzbz)
if($semester_aktuell=='')
$studiensemester_aktuell='';
$qry_semester = "SELECT tbl_prestudentstatus.ausbildungssemester as semester, tbl_prestudentstatus.orgform_kurzbz FROM public.tbl_student, public.tbl_prestudentstatus
WHERE tbl_student.prestudent_id=tbl_prestudentstatus.prestudent_id
$qry_semester = "SELECT tbl_prestudentstatus.ausbildungssemester as semester, tbl_prestudentstatus.orgform_kurzbz FROM public.tbl_prestudent, public.tbl_prestudentstatus
WHERE tbl_prestudent.prestudent_id=tbl_prestudentstatus.prestudent_id
AND tbl_prestudentstatus.status_kurzbz in('Student','Incoming','Outgoing','Praktikant','Diplomand')
AND studiensemester_kurzbz=".$db->db_add_param($studiensemester_kurzbz)."
AND tbl_student.student_uid = ".$db->db_add_param($uid);
AND tbl_prestudent.uid = ".$db->db_add_param($uid);
$orgform='';
if($db->db_query($qry_semester))
@@ -153,7 +153,7 @@ function draw_studienerfolg($uid, $studiensemester_kurzbz)
$xml .= " <nachname>".$row->nachname."</nachname>";
$gebdatum = date('d.m.Y',strtotime($row->gebdatum));
$xml .= " <gebdatum>".$gebdatum."</gebdatum>";
$xml .= " <matrikelnr>".$row->matrikelnr."</matrikelnr>";
$xml .= " <matrikelnr>".$row->perskz."</matrikelnr>";
$xml .= " <studiensemester_kurzbz>".(($stdsem->beschreibung != NULL) ? $stdsem->beschreibung : $studiensemester_kurzbz)."</studiensemester_kurzbz>";
$datum_aktuell = date('d.m.Y');
$xml .= " <datum>".$datum_aktuell."</datum>";
@@ -167,7 +167,7 @@ function draw_studienerfolg($uid, $studiensemester_kurzbz)
$obj = new zeugnisnote();
if(!$obj->getZeugnisnoten($lehrveranstaltung_id=null, $student->prestudent_id,, $studiensemester_kurzbz))
if(!$obj->getZeugnisnoten($lehrveranstaltung_id=null, $student->prestudent_id, $studiensemester_kurzbz))
die('Fehler beim Laden der Noten:'.$obj->errormsg);
@@ -281,8 +281,8 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
$qry = "SELECT * FROM public.tbl_studiensemester
WHERE studiensemester_kurzbz in(
SELECT studiensemester_kurzbz
FROM public.tbl_prestudentstatus JOIN public.tbl_student USING(prestudent_id)
WHERE student_uid='".addslashes($uid_arr[$i])."')
FROM public.tbl_prestudentstatus JOIN public.tbl_prestudent USING(prestudent_id)
WHERE uid='".addslashes($uid_arr[$i])."')
ORDER BY start";
if($db->db_query($qry))
while($row = $db->db_fetch_object())
+2 -2
View File
@@ -185,7 +185,7 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
$studiengang_typ='';
$xml_fussnote='';
$query = "SELECT tbl_student.matrikelnr, tbl_student.studiengang_kz, tbl_studiengang.typ, tbl_studiengang.bezeichnung, tbl_person.vorname, tbl_person.nachname,tbl_person.gebdatum,tbl_person.titelpre, tbl_person.titelpost, tbl_person.geschlecht FROM tbl_person, tbl_student, tbl_studiengang, tbl_benutzer WHERE tbl_student.studiengang_kz = tbl_studiengang.studiengang_kz and tbl_student.student_uid = tbl_benutzer.uid and tbl_benutzer.person_id = tbl_person.person_id and tbl_student.student_uid = '".$uid_arr[$i]."'";
$query = "SELECT tbl_prestudent.perskz, tbl_prestudent.studiengang_kz, tbl_studiengang.typ, tbl_studiengang.bezeichnung, tbl_person.vorname, tbl_person.nachname,tbl_person.gebdatum,tbl_person.titelpre, tbl_person.titelpost, tbl_person.geschlecht FROM tbl_person, tbl_prestudent, tbl_studiengang, tbl_benutzer WHERE tbl_prestudent.studiengang_kz = tbl_studiengang.studiengang_kz and tbl_prestudent.uid = tbl_benutzer.uid and tbl_benutzer.person_id = tbl_person.person_id and tbl_prestudent.uid = '".$uid_arr[$i]."'";
if($db->db_query($query))
{
@@ -213,7 +213,7 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
$gebdatum = date('d.m.Y',strtotime($row->gebdatum));
$xml .= "\n <gebdatum>".$gebdatum."</gebdatum>";
$xml .= "\n <geschlecht>".$row->geschlecht."</geschlecht>";
$xml .= "\n <matrikelnr>".$row->matrikelnr."</matrikelnr>";
$xml .= "\n <matrikelnr>".$row->perskz."</matrikelnr>";
$xml .= "\n <studiengangsleiter>".$stgl."</studiengangsleiter>";
$datum_aktuell = date('d.m.Y');
$xml .= "\n <ort_datum>Wien, am ".$datum_aktuell."</ort_datum>";
+22 -24
View File
@@ -120,12 +120,12 @@ class stip extends basis_db
function searchPersonKz($PersonKz)
{
$qry = "SELECT
prestudent_id, vorname, nachname, svnr, matrikelnr
prestudent_id, vorname, nachname, svnr, perskz
FROM
public.tbl_student student
JOIN public.tbl_benutzer benutzer on(benutzer.uid=student.student_uid)
JOIN public.tbl_person person using(person_id)
WHERE student.matrikelnr = ".$this->db_add_param($PersonKz).";";
public.tbl_prestudent prestudent
JOIN public.tbl_benutzer benutzer on(benutzer.uid=prestudent.uid)
JOIN public.tbl_person person on(person.person_id = prestudent.person_id)
WHERE prestudent.perskz = ".$this->db_add_param($PersonKz).";";
if($this->db_query($qry))
{
@@ -134,7 +134,7 @@ class stip extends basis_db
$this->Vorname_Antwort = $row->vorname;
$this->Familienname_Antwort = $row->nachname;
$this->SVNR_Antwort = $row->svnr;
$this->PersKz_Antwort = trim($row->matrikelnr);
$this->PersKz_Antwort = trim($row->perskz);
$this->AntwortStatusCode = 1;
return $row->prestudent_id;
}
@@ -158,10 +158,10 @@ class stip extends basis_db
function searchSvnr($Svnr)
{
$qry = "SELECT
prestudent_id, vorname, nachname, svnr, matrikelnr
prestudent_id, vorname, nachname, svnr, perskz
FROM
public.tbl_student student
JOIN public.tbl_benutzer benutzer on(benutzer.uid=student.student_uid)
public.tbl_prestudent prestudent
JOIN public.tbl_benutzer benutzer on(benutzer.uid=prestudent.uid)
JOIN public.tbl_person person using(person_id)
WHERE person.svnr = ".$this->db_add_param($Svnr).";";
@@ -175,7 +175,7 @@ class stip extends basis_db
$this->Vorname_Antwort = $row->vorname;
$this->Familienname_Antwort = $row->nachname;
$this->SVNR_Antwort = $row->svnr;
$this->PersKz_Antwort = trim($row->matrikelnr);
$this->PersKz_Antwort = trim($row->perskz);
$this->AntwortStatusCode = 1;
return $row->prestudent_id;
}
@@ -207,7 +207,7 @@ class stip extends basis_db
function searchVorNachname($Vorname, $Nachname)
{
$qry = "SELECT
prestudent_id, vorname, nachname, svnr, matrikelnr
prestudent_id, vorname, nachname, svnr, perskz
FROM
public.tbl_student student
JOIN public.tbl_benutzer benutzer on(benutzer.uid=student.student_uid)
@@ -226,7 +226,7 @@ class stip extends basis_db
$this->Vorname_Antwort = $row->vorname;
$this->Familienname_Antwort = $row->nachname;
$this->SVNR_Antwort = $row->svnr;
$this->PersKz_Antwort = trim($row->matrikelnr);
$this->PersKz_Antwort = trim($row->perskz);
$this->AntwortStatusCode = 1;
return $row->prestudent_id;
}
@@ -253,24 +253,23 @@ class stip extends basis_db
/**
*
* Gibt den orgform_code zurück für übergebene StudentUID und Semester
* Gibt den orgform_code zurück für übergebene prestudent_id und Semester
* z.B. 1 für Vollzeit
* z.B. 2 für Berufsbegleitend
* @param $studentUID
* @param $prestudent_id
* @param $studSemester
*/
function getOrgFormTeilCode($studentUID, $studSemester, $prestudentID)
function getOrgFormTeilCode($prestudent_id, $studSemester)
{
// hole mischform von studenten
$qry_mischform = "
SELECT
studiengang.mischform
FROM
public.tbl_studiengang studiengang
JOIN public.tbl_student student using(studiengang_kz)
JOIN public.tbl_prestudent prestudent using(prestudent_id)
WHERE student_uid=".$this->db_add_param($studentUID);
JOIN public.tbl_prestudent prestudent using(studiengang_kz)
WHERE prestudent_id=".$this->db_add_param($prestudent_id);
if($this->db_query($qry_mischform))
{
@@ -287,15 +286,14 @@ class stip extends basis_db
$qry = "
SELECT
orgform.code, studiengang.orgform_kurzbz as studorgkz, student.student_uid, student.studiengang_kz studiengang
orgform.code, studiengang.orgform_kurzbz as studorgkz, prestudent.uid, student.studiengang_kz studiengang
FROM
public.tbl_studiengang studiengang
JOIN public.tbl_student student using(studiengang_kz)
JOIN public.tbl_prestudent prestudent using(prestudent_id)
JOIN public.tbl_prestudent prestudent using(studiengang_kz)
JOIN public.tbl_prestudentstatus status using(prestudent_id)
JOIN bis.tbl_orgform orgform on(orgform.orgform_kurzbz = studiengang.orgform_kurzbz)
WHERE
student_uid=".$this->db_add_param($studentUID)."
prestudent_id=".$this->db_add_param($prestudent_id)."
AND status.studiensemester_kurzbz =".$this->db_add_param($studSemester);
// Wenn kein Status gefunden wurde -> null
@@ -317,7 +315,7 @@ class stip extends basis_db
$prestudentStatus = new prestudent();
// wenn status vorhanden übernehme OrgForm
if($prestudentStatus->getLastStatus($prestudentID,$studSemester))
if($prestudentStatus->getLastStatus($prestudent_id,$studSemester))
{
$statusOrgForm = $prestudentStatus->orgform_kurzbz;
$this->OrgFormTeilCode = $this->getOrgFormCodeFromKurzbz($statusOrgForm);
+11 -10
View File
@@ -15,7 +15,8 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
*
* Authors: Karl Burkhart <burkhart@technikum-wien.at>.
* Authors: Karl Burkhart <burkhart@technikum-wien.at> and
* Andreas Moik <moik@technikum-wien.at>.
*/
require_once('../config/vilesci.config.inc.php');
@@ -45,13 +46,13 @@ $SOAPServer->handle();
* @param $parameters -> XML SOAP File
*/
function GetStipendienbezieherStip($parameters)
{
{
$anfrageDaten = $parameters->anfrageDaten;
$Stipendiumsbezieher = $anfrageDaten->Stipendiumsbezieher;
$ErhalterKz = $anfrageDaten->ErhKz;
$AnfrageDatenID = $anfrageDaten->AnfragedatenID;
$ErhalterKz = $anfrageDaten->ErhKz;
$AnfrageDatenID = $anfrageDaten->AnfragedatenID;
// Eintrag in der LogTabelle anlegen
$log = new webservicelog();
$log->request_data = file_get_contents('php://input');
@@ -100,7 +101,7 @@ function GetStipendienbezieherStip($parameters)
$StipBezieher->Familienname = $BezieherStip->Familienname;
$StipBezieher->Vorname = $BezieherStip->Vorname;
$StipBezieher->Typ = $BezieherStip->Typ;
// Studiensemester_kurzbz auslesen
if($BezieherStip->Semester == "WS" || $BezieherStip->Semester == "ws")
{
@@ -112,7 +113,7 @@ function GetStipendienbezieherStip($parameters)
$year = mb_substr($BezieherStip->Studienjahr, 0,2).mb_substr($BezieherStip->Studienjahr, 5,7);
$studSemester = "SS".$year;
}
if(!$prestudentID = $StipBezieher->searchPersonKz($BezieherStip->PersKz))
if(!$prestudentID = $StipBezieher->searchSvnr($BezieherStip->SVNR))
$prestudentID = $StipBezieher->searchVorNachname($BezieherStip->Vorname, $BezieherStip->Familienname);
@@ -153,10 +154,10 @@ function GetStipendienbezieherStip($parameters)
else
$StipBezieher->Inskribiert = 'j';
}
if($BezieherStip->Typ == "as" || $BezieherStip->Typ == "AS")
{
$StipBezieher->getOrgFormTeilCode($studentUID, $studSemester, $prestudentID);
$StipBezieher->getOrgFormTeilCode($prestudentID, $studSemester);
$StipBezieher->Studienbeitrag = $studGebuehr;
// Wenn letzter Status von Semester Interessent ist -> Semester = null
+4 -4
View File
@@ -102,7 +102,7 @@ if($result = $db->db_query($qry))
// Letzte Warnung vor Accountloeschung verschicken
// Abbrecher
$qry = "SELECT uid FROM public.tbl_benutzer JOIN public.tbl_student ON(uid=student_uid) WHERE
$qry = "SELECT uid FROM public.tbl_benutzer JOIN public.tbl_prestudent USING(uid) WHERE
aktiv=false AND updateaktivam=CURRENT_DATE- interval '".DEL_ABBRECHER_WEEKS." week'
AND get_rolle_prestudent (prestudent_id, NULL)='Abbrecher' ";
if($result = $db->db_query($qry))
@@ -136,7 +136,7 @@ if($result = $db->db_query($qry))
// Abbrecher an Bibliothek melden wenn diese inaktiv gesetzt wurden
$qry = "SELECT uid, vorname, nachname, titelpre, titelpost FROM public.tbl_benutzer JOIN public.tbl_student ON(uid=student_uid) JOIN public.tbl_person USING(person_id) WHERE
$qry = "SELECT uid, vorname, nachname, titelpre, titelpost FROM public.tbl_benutzer JOIN public.tbl_prestudent USING(uid) JOIN public.tbl_person ON(tbl_person.person_id = tbl_benutzer.person_id) WHERE
tbl_benutzer.aktiv=false AND tbl_benutzer.updateaktivam=(CURRENT_DATE - '1 day'::interval)::date
AND get_rolle_prestudent (prestudent_id, NULL)='Abbrecher' ";
if($result = $db->db_query($qry))
@@ -164,7 +164,7 @@ if($result = $db->db_query($qry))
}
// Studenten
$qry = "SELECT uid FROM public.tbl_benutzer JOIN public.tbl_student ON(uid=student_uid) WHERE
$qry = "SELECT uid FROM public.tbl_benutzer JOIN public.tbl_prestudent USING(uid) WHERE
aktiv=false AND updateaktivam=CURRENT_DATE- interval '".DEL_STUDENT_WEEKS." week'
AND get_rolle_prestudent (prestudent_id, NULL)<>'Abbrecher'";
if($result = $db->db_query($qry))
@@ -238,4 +238,4 @@ if($text!='')
}
echo '</body></html>';
?>
?>
+10 -11
View File
@@ -139,24 +139,23 @@ $tabelle = '<table>
</tr>';
$anzahl_gemeldet=0;
//Hauptselect
$qry="SELECT DISTINCT ON(student_uid, nachname, vorname) *, public.tbl_person.person_id AS pers_id, to_char(gebdatum, 'ddmmyy') AS vdat
FROM public.tbl_student
JOIN public.tbl_benutzer ON(student_uid=uid)
JOIN public.tbl_person USING (person_id)
JOIN public.tbl_prestudent USING (prestudent_id)
$qry="SELECT DISTINCT ON(uid, nachname, vorname) *, public.tbl_person.person_id AS pers_id, to_char(gebdatum, 'ddmmyy') AS vdat
FROM public.tbl_prestudent
JOIN public.tbl_benutzer USING (uid)
JOIN public.tbl_person ON (tbl_person.person_id = tbl_prestudent.person_id)
JOIN public.tbl_prestudentstatus ON(tbl_prestudent.prestudent_id=tbl_prestudentstatus.prestudent_id)
WHERE bismelden IS TRUE
AND tbl_student.studiengang_kz=".$db->db_add_param($stg_kz)."
AND tbl_prestudent.studiengang_kz=".$db->db_add_param($stg_kz)."
AND (((tbl_prestudentstatus.studiensemester_kurzbz=".$db->db_add_param($ssem).") AND (tbl_prestudentstatus.datum<=".$db->db_add_param($bisdatum).")
AND (status_kurzbz='Student' OR status_kurzbz='Outgoing'
OR status_kurzbz='Praktikant' OR status_kurzbz='Diplomand' OR status_kurzbz='Absolvent'
OR status_kurzbz='Abbrecher' OR status_kurzbz='Unterbrecher'))
OR ((tbl_prestudentstatus.studiensemester_kurzbz=".$db->db_add_param($psem).") AND (status_kurzbz='Absolvent'
OR status_kurzbz='Abbrecher') AND tbl_prestudentstatus.datum>".$db->db_add_param($bisprevious).")
OR (status_kurzbz='Incoming' AND tbl_student.prestudent_id IN (SELECT prestudent_id FROM bis.tbl_bisio WHERE (tbl_bisio.bis>=".$db->db_add_param($bisprevious).")
OR (status_kurzbz='Incoming' AND tbl_prestudent.prestudent_id IN (SELECT prestudent_id FROM bis.tbl_bisio WHERE (tbl_bisio.bis>=".$db->db_add_param($bisprevious).")
OR (tbl_bisio.von<".$db->db_add_param($bisdatum)." AND (tbl_bisio.bis>=".$db->db_add_param($bisdatum)." OR tbl_bisio.bis IS NULL))
)))
ORDER BY student_uid, nachname, vorname
ORDER BY uid, nachname, vorname
";
if($result = $db->db_query($qry))
@@ -437,7 +436,7 @@ if($result = $db->db_query($qry))
if($error_log!='' OR $error_log1!='')
{
//Ausgabe der fehlenden Daten
$v.="<u>Bei Student (UID, Vorname, Nachname) '".$row->student_uid."', '".$row->nachname."', '".$row->vorname."' ($row->status_kurzbz): </u>\n";
$v.="<u>Bei Student (UID, Vorname, Nachname) '".$row->uid."', '".$row->nachname."', '".$row->vorname."' ($row->status_kurzbz): </u>\n";
if($error_log!='')
{
$v.="&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Fehler: ".$error_log."\n";
@@ -455,12 +454,12 @@ if($result = $db->db_query($qry))
else
{
$anzahl_gemeldet++;
$tabelle.='<tr><td>'.$row->student_uid.'</td><td>'.$row->nachname.'</td><td>'.$row->vorname.'</td><td>'.$row->matrikelnr.'</td></tr>';
$tabelle.='<tr><td>'.$row->uid.'</td><td>'.$row->nachname.'</td><td>'.$row->vorname.'</td><td>'.$row->perskz.'</td></tr>';
//Erstellung der XML-Datei
$datei.="
<StudentIn>
<PersKz>".trim($row->matrikelnr)."</PersKz>
<PersKz>".trim($row->perskz)."</PersKz>
<GeburtsDatum>".date("dmY", $datumobj->mktime_fromdate($row->gebdatum))."</GeburtsDatum>
<Geschlecht>".strtoupper($row->geschlecht)."</Geschlecht>";
if(($row->svnr!='')&&($row->ersatzkennzeichen!=''))
-19
View File
@@ -1,19 +0,0 @@
<HTML>
<HEAD>
<TITLE>Mailinglisten</TITLE>
<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
<LINK rel="stylesheet" href="../../../skin/vilesci.css" type="text/css">
</HEAD>
<BODY class="background_main">
<H2>MailingListen </H2>
<H3>Gruppen</H3>
<UL>
<!--<LI><A href="mlists_index.php" class="linkblue">Verwaltung</A></LI>-->
<LI><A href="../../../admin/mlists_generate.php" class="linkblue">Generate Lists</A></LI>
</UL>
<UL>
<LI>Check UIDs </LI>
</UL>
</BODY>
</HTML>
-153
View File
@@ -1,153 +0,0 @@
<?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 >
* Rudolf Hangl < rudolf.hangl@technikum-wien.at >
* Gerald Simane-Sequens < gerald.simane-sequens@technikum-wien.at >
*/
/**
* Changes: 23.10.2004: Anpassung an neues DB-Schema (WM)
*/
require_once('../../config/vilesci.config.inc.php');
require_once('../../include/basis_db.class.php');
if (!$db = new basis_db())
die('Es konnte keine Verbindung zum Server aufgebaut werden.');
require_once('../../include/functions.inc.php');
?>
<html>
<head>
<title>Kontakte - eMail-Verteiler</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<link rel="stylesheet" href="../../skin/vilesci.css" type="text/css">
</head>
<body class="background_main">
<h4>Kontakte - eMail-Verteiler</h4>
<br>
<h3>Module</h3>
<table class="liste">
<tr class="liste" >
<?php
if(!($erg=$db->db_query("SELECT studiengang_kz, bezeichnung, UPPER(typ::varchar(1) || kurzbz) as kurzbz FROM public.tbl_studiengang ORDER BY kurzbz ASC")))
die($db->db_last_error());
$num_rows=$db->db_num_rows($erg);
for ($i=0;$i<$num_rows;$i++)
{
$row=$db->db_fetch_object($erg, $i);
echo "<th>$row->kurzbz<BR><SMALL>$row->bezeichnung</SMALL></th>";
}
?>
</tr>
<tr bgcolor="#DDDDDD" valign="top">
<?php
for ($i=0; $i<$num_rows; $i++)
{
echo "<td nowrap>";
$row=$db->db_fetch_object($erg, $i);
$stg_id=$row->studiengang_kz;
$stg_kzbz=$row->kurzbz;
$sql_query="SELECT * FROM public.tbl_gruppe WHERE studiengang_kz=$stg_id ORDER BY gruppe_kurzbz";
//echo $sql_query;
if(!($result=$db->db_query($sql_query)))
die($db->db_last_error());
$nr_sem=$db->db_num_rows($result);
for ($j=0; $j<$nr_sem; $j++)
{
$row_sem=$db->db_fetch_object($result, $j);
if($row_sem->mailgrp=='t')
echo "<a class=\"h1\" href=\"mailto:$row_sem->gruppe_kurzbz@technikum-wien.at\">$row_sem->gruppe_kurzbz</a><br>";
else
echo "$row_sem->gruppe_kurzbz<br>";
echo "<a target=\"_blank\" class=\"linkgreen\" href=\"studenten_liste_export.php?einheitid=$row_sem->gruppe_kurzbz\">&nbsp;&nbsp;&nbsp;&nbsp;(Liste)</a><br>";
}
echo"</td>";
}
?>
</tr>
</table>
<h3>Studenten</h3>
<table class="liste">
<tr class="liste">
<?php
if(!($erg=$db->db_query("SELECT studiengang_kz, bezeichnung, UPPER(typ::varchar(1) || kurzbz) as kurzbz FROM public.tbl_studiengang ORDER BY kurzbz ASC")))
die($db->db_last_error());
$num_rows=$db->db_num_rows($erg);
for ($i=0;$i<$num_rows;$i++)
{
$row=$db->db_fetch_object($erg, $i);
echo "<th>$row->kurzbz<BR><SMALL>$row->bezeichnung</SMALL></th>";
}
?>
</tr>
<tr bgcolor="#DDDDDD">
<?php
for ($i=0; $i<$num_rows; $i++)
{
echo "<td nowrap valign= \"top\">";
$row=$db->db_fetch_object($erg, $i);
$stg_id=$row->studiengang_kz;
$stg_kzbz=$row->kurzbz;
$sql_query="SELECT DISTINCT semester FROM public.tbl_student WHERE studiengang_kz=$stg_id ORDER BY semester";
//echo $sql_query;
if(!($result_sem=$db->db_query($sql_query)))
die($db->db_last_error());
$nr_sem=$db->db_num_rows($result_sem);
for ($j=0; $j<$nr_sem; $j++)
{
$row_sem=$db->db_fetch_object($result_sem, $j);
$stg_kzbz_lo=strtolower($stg_kzbz);
echo "<a class=\"h1\" href=\"mailto:$stg_kzbz_lo$row_sem->semester@technikum-wien.at\">$stg_kzbz-$row_sem->semester</a><br>";
$sql_query="SELECT DISTINCT verband FROM public.tbl_student WHERE studiengang_kz=$stg_id AND semester=$row_sem->semester ORDER BY verband";
//echo $sql_query;
if(!($result_ver=$db->db_query($sql_query)))
die($db->db_last_error());
$nr_ver=$db->db_num_rows($result_ver);
for ($k=0; $k<$nr_ver; $k++)
{
$row_ver=$db->db_fetch_object($result_ver, $k);
$ver_lo=strtolower($row_ver->verband);
echo "&nbsp;- <a class=\"linkblue\" href=\"mailto:$stg_kzbz_lo$row_sem->semester$ver_lo@technikum-wien.at\">$stg_kzbz-$row_sem->semester$row_ver->verband</a><br>";
$sql_query="SELECT DISTINCT gruppe FROM public.tbl_student WHERE studiengang_kz=$stg_id AND semester=$row_sem->semester AND verband='$row_ver->verband' ORDER BY gruppe";
//echo $sql_query;
if(!($result_grp=$db->db_query($sql_query)))
die($db->db_last_error());
$nr_grp=$db->db_num_rows($result_grp);
for ($l=0; $l<$nr_grp; $l++)
{
$row_grp=$db->db_fetch_object($result_grp, $l);
echo "&nbsp;&nbsp;- <a class=\"linkgreen\" href=\"mailto:$stg_kzbz_lo$row_sem->semester$ver_lo$row_grp->gruppe@technikum-wien.at\">$stg_kzbz-$row_sem->semester$row_ver->verband$row_grp->gruppe</a><br>";
echo "<a target=\"_blank\" class=\"linkgreen\" href=\"studenten_liste_export.php?stgid=$stg_id&stg_kzbz=$stg_kzbz_lo&sem=$row_sem->semester&ver=$ver_lo&grp=$row_grp->gruppe\">&nbsp;&nbsp;&nbsp;&nbsp;(Liste)</a><br>";
}
}
}
echo"</td>";
}
?>
</tr>
</table>
</body>
</html>
@@ -1,58 +0,0 @@
<?php
/**
* Changes: 23.10.2004: Anpassung an neues DB-Schema (WM)
*/
require_once('../../config/vilesci.config.inc.php');
require_once('../../include/basis_db.class.php');
if (!$db = new basis_db())
die('Es konnte keine Verbindung zum Server aufgebaut werden.');
if (isset($_REQUEST['einheitid']))
$einheitid=$_REQUEST['einheitid'];
if (isset($_REQUEST['stgid']))
$stgid=$_REQUEST['stgid'];
$sem=(isset($_REQUEST['sem'])?$_REQUEST['sem']:0);
$grp=(isset($_REQUEST['grp'])?$_REQUEST['grp']:'');
if (!isset($einheitid))
$name=$stg_kzbz.$sem.$ver.$grp.'.txt';
else
$name='modul_id'.$einheitid.'.txt';
header("Content-disposition: filename=$name");
header("Content-type: application/octetstream");
header("Pragma: no-cache");
header("Expires: 0");
// doing some DOS-CRLF magic...
$crlf="\n";
$client=getenv("HTTP_USER_AGENT");
if (ereg('[^(]*\((.*)\)[^)]*',$client,$regs))
{
$os = $regs[1];
// this looks better under WinX
if (eregi("Win",$os)) $crlf="\r\n";
}
if(isset($stgid))
$sql_query='SELECT uid, nachname, vorname FROM campus.vw_student '.
'WHERE studiengang_kz='.$stgid.' AND semester='.$sem.
' AND verband=\''.strtoupper($ver).'\' AND gruppe='.$grp.
' ORDER BY nachname';
if (isset($einheitid))
$sql_query='SELECT uid, nachname, vorname FROM campus.vw_benutzer JOIN tbl_benutzergruppe USING(uid) WHERE gruppe_kurzbz=\''.$einheitid.'\' ORDER BY nachname';
//echo $sql_query;
if(!($result=$db->db_query($sql_query)))
die($db->db_db_last_error());
$anz=$db->db_num_rows($result);
for ($j=0; $j<$anz; $j++)
{
$row=$db->db_fetch_object($result, $j);
echo '#'.$row->nachname.' '.$row->vorname.$crlf.$row->uid.$crlf;
}
?>
-14
View File
@@ -1,14 +0,0 @@
<HTML>
<HEAD>
<TITLE>Untitled Document</TITLE>
<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
<LINK rel="stylesheet" href="../../../include/styles.css" type="text/css">
</HEAD>
<BODY bgcolor="#FFFFFF" text="#000000">
<P><A href="raum.php">R&auml;ume</A> </P>
<P><A href="lektoren.php">Lektoren</A> - <A href="zeitwunsch.php">Zeitw&uuml;nsche</A></P>
<P><A href="studenten.php">Studenten</A> </P>
<P>&nbsp;</P>
</BODY>
</HTML>
-56
View File
@@ -1,56 +0,0 @@
<?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 >
* Rudolf Hangl < rudolf.hangl@technikum-wien.at >
* Gerald Simane-Sequens < gerald.simane-sequens@technikum-wien.at >
*/
require_once('../../../config/vilesci.config.inc.php');
require_once('../../../include/basis_db.class.php');
if (!$db = new basis_db())
die('Es konnte keine Verbindung zum Server aufgebaut werden.');
include('../../../include/functions.inc.php');
$studiensemester_kurzbz=(isset($_REQUEST['studiensemester_kurzbz']) ? $_REQUEST['studiensemester_kurzbz'] :'SS2009' );
header("Content-disposition: filename=lektoren.txt");
header("Content-type: application/octetstream");
header("Pragma: no-cache");
header("Expires: 0");
// doing some DOS-CRLF magic...
$crlf="\n";
$client=getenv("HTTP_USER_AGENT");
if (ereg('[^(]*\((.*)\)[^)]*',$client,$regs))
{
$os = $regs[1];
// this looks better under WinX
if (eregi("Win",$os)) $crlf="\r\n";
}
$sql_query="SELECT distinct tbl_lehreinheitmitarbeiter.mitarbeiter_uid,public.tbl_person.* FROM lehre.tbl_lehreinheitmitarbeiter ,lehre.tbl_lehreinheit,public.tbl_mitarbeiter,public.tbl_person where public.tbl_person.aktiv and public.tbl_person.person_id=public.tbl_mitarbeiter.personalnummer and public.tbl_mitarbeiter.mitarbeiter_uid=tbl_lehreinheitmitarbeiter.mitarbeiter_uid and tbl_lehreinheitmitarbeiter.lehreinheit_id=tbl_lehreinheit.lehreinheit_id and tbl_lehreinheit.studiensemester_kurzbz='$studiensemester_kurzbz' and lehrfunktion_kurzbz='Lektor' ORDER BY tbl_lehreinheitmitarbeiter.mitarbeiter_uid";
//echo $sql_query;
if(!($result=$db->db_query($sql_query)))
die($db->db_last_error());
$anz=$db->db_num_rows($result);
for ($j=0; $j<$anz; $j++)
{
$row=$db->db_fetch_object($result, $j);
echo '"'.$row->mitarbeiter_uid.'","'.$row->nachname.'",,,,,,,,,,,,,,,,,,,,,,,,,,,"'.$row->vornamen.'","'.$row->anrede.'","'.$row->titelpost.'",,'.$crlf;
}
?>
-57
View File
@@ -1,57 +0,0 @@
<?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 >
* Rudolf Hangl < rudolf.hangl@technikum-wien.at >
* Gerald Simane-Sequens < gerald.simane-sequens@technikum-wien.at >
*/
require_once('../../../config/vilesci.config.inc.php');
require_once('../../../include/basis_db.class.php');
if (!$db = new basis_db())
die('Es konnte keine Verbindung zum Server aufgebaut werden.');
include('../../../include/functions.inc.php');
header("Content-disposition: filename=raum.txt");
header("Content-type: application/octetstream");
header("Pragma: no-cache");
header("Expires: 0");
// doing some DOS-CRLF magic...
$crlf="\n";
$client=getenv("HTTP_USER_AGENT");
if (ereg('[^(]*\((.*)\)[^)]*',$client,$regs))
{
$os = $regs[1];
// this looks better under WinX
if (eregi("Win",$os)) $crlf="\r\n";
}
$sql_query="SELECT * FROM public.tbl_ort ORDER BY ort_kurzbz";
//echo $sql_query;
if(!($result=$db->db_query($sql_query)))
die($db->db_last_error());
$anz=$db->db_num_rows($result);
for ($j=0; $j<$anz; $j++)
{
$row=$db->db_fetch_object($result, $j);
echo '"'.$row->ort_kurzbz.'","'.$row->bezeichnung.'",,,,,,'.$row->max_person.',,,,,,,,,,'.$crlf;
}
?>
-58
View File
@@ -1,58 +0,0 @@
<?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 >
* Rudolf Hangl < rudolf.hangl@technikum-wien.at >
* Gerald Simane-Sequens < gerald.simane-sequens@technikum-wien.at >
*/
require_once('../../../config/vilesci.config.inc.php');
require_once('../../../include/basis_db.class.php');
if (!$db = new basis_db())
die('Es konnte keine Verbindung zum Server aufgebaut werden.');
include('../../../include/functions.inc.php');
header("Content-disposition: filename=studenten.txt");
header("Content-type: application/octetstream");
header("Pragma: no-cache");
header("Expires: 0");
// doing some DOS-CRLF magic...
$crlf="\n";
$client=getenv("HTTP_USER_AGENT");
if (ereg('[^(]*\((.*)\)[^)]*',$client,$regs))
{
$os = $regs[1];
// this looks better under WinX
if (eregi("Win",$os)) $crlf="\r\n";
}
$sql_query="SELECT student_uid,nachname,vornamen, matrikelnr, semester, verband, gruppe, tbl_student.studiengang_kz FROM public.tbl_student, public.tbl_studiengang,public.tbl_mitarbeiter, public.tbl_prestudent ,public.tbl_person WHERE public.tbl_person.aktiv and public.tbl_person.person_id=tbl_prestudent.person_id and tbl_prestudent.prestudent_id=tbl_student.prestudent_id and tbl_student.studiengang_kz=tbl_studiengang.studiengang_kz ORDER BY student_uid";
//echo $sql_query;
if(!($result=$db->db_query($sql_query)))
die($db->db_last_error());
$anz=$db->db_num_rows($result);
for ($j=0; $j<$anz; $j++)
{
$row=$db->db_fetch_object($result, $j);
echo '"'.$row->student_uid.'","'.$row->nachname.'",,,,,,"'.$row->vornamen.'","'.$row->matrikelnr.'","'.$row->kurzbz.'-'.$row->semester.$row->verband.$row->gruppe.'","2",'.$crlf;
}
?>
-60
View File
@@ -1,60 +0,0 @@
<?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 >
* Rudolf Hangl < rudolf.hangl@technikum-wien.at >
* Gerald Simane-Sequens < gerald.simane-sequens@technikum-wien.at >
*/
require_once('../../../config/vilesci.config.inc.php');
require_once('../../../include/basis_db.class.php');
if (!$db = new basis_db())
die('Es konnte keine Verbindung zum Server aufgebaut werden.');
include('../../../include/functions.inc.php');
$studiensemester_kurzbz=(isset($_REQUEST['studiensemester_kurzbz']) ? $_REQUEST['studiensemester_kurzbz'] :'SS2009' );
header("Content-disposition: filename=zeitwuensche_lektoren.txt");
header("Content-type: application/octetstream");
header("Pragma: no-cache");
header("Expires: 0");
// doing some DOS-CRLF magic...
$crlf="\n";
$client=getenv("HTTP_USER_AGENT");
if (ereg('[^(]*\((.*)\)[^)]*',$client,$regs))
{
$os = $regs[1];
// this looks better under WinX
if (eregi("Win",$os)) $crlf="\r\n";
}
# $sql_query="SELECT lektor.kurzbz, zeitwunsch.lektor_id, zeitwunsch.tag, zeitwunsch.stunde_id, zeitwunsch.gewicht FROM zeitwunsch, lektor WHERE zeitwunsch.lektor_id=lektor.id ORDER BY lektor.kurzbz";
$sql_query="SELECT distinct tbl_lehreinheitmitarbeiter.mitarbeiter_uid,public.tbl_person.* , tbl_zeitwunsch.tag, tbl_zeitwunsch.stunde, tbl_zeitwunsch.gewicht,tbl_stunde.beginn ,tbl_stunde.ende FROM lehre.tbl_stunde, campus.tbl_zeitwunsch , lehre.tbl_lehreinheitmitarbeiter ,lehre.tbl_lehreinheit,public.tbl_mitarbeiter,public.tbl_person where lehre.tbl_stunde.stunde=tbl_zeitwunsch.stunde and public.tbl_person.aktiv and public.tbl_person.person_id=public.tbl_mitarbeiter.personalnummer and campus.tbl_zeitwunsch.mitarbeiter_uid=tbl_lehreinheitmitarbeiter.mitarbeiter_uid and public.tbl_mitarbeiter.mitarbeiter_uid=tbl_lehreinheitmitarbeiter.mitarbeiter_uid and tbl_lehreinheitmitarbeiter.lehreinheit_id=tbl_lehreinheit.lehreinheit_id and tbl_lehreinheit.studiensemester_kurzbz='$studiensemester_kurzbz' and lehrfunktion_kurzbz='Lektor' ORDER BY tbl_lehreinheitmitarbeiter.mitarbeiter_uid";
//echo $sql_query;
if(!($result=$db->db_query($sql_query)))
die($db->db_last_error());
$anz=$db->db_num_rows($result);
for ($j=0; $j<$anz; $j++)
{
$row=$db->db_fetch_object($result, $j);
echo '"L","'.$row->mitarbeiter_uid.'",'.$row->tag.','.$row->stunde.','.$row->gewicht.','.$row->beginn.','.$row->ende.$crlf;
}
?>
+16 -15
View File
@@ -15,10 +15,11 @@
* 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 >
* 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 > and
* Andreas Moik < moik@technikum-wien.at >.
*/
/*
* Fuehrt eine Kollisionspruefung im Stundenplan auf Studentenebene durch
@@ -126,22 +127,22 @@ if($dontloadcontent)
if($stg_kz=='')
{
$qry = "SELECT datum, stunde, student_uid, count(student_uid) AS anzahl
$qry = "SELECT datum, stunde, uid, count(uid) AS anzahl
FROM lehre.vw_".$db_stpl_table."_student_unr
WHERE datum>=".$db->db_add_param($beginn)." AND datum<=".$db->db_add_param($ende)."
GROUP BY datum, stunde, student_uid
HAVING count(student_uid)>1
ORDER BY datum, stunde, student_uid LIMIT 30;
GROUP BY datum, stunde, uid
HAVING count(uid)>1
ORDER BY datum, stunde, uid LIMIT 30;
";
}
else
{
$qry = "SELECT datum, stunde, student_uid, count(student_uid) AS anzahl
FROM lehre.vw_".$db_stpl_table."_student_unr JOIN public.tbl_student USING(student_uid)
$qry = "SELECT datum, stunde, uid, count(uid) AS anzahl
FROM lehre.vw_".$db_stpl_table."_student_unr JOIN public.tbl_prestudent USING(uid)
WHERE datum>=".$db->db_add_param($beginn)." AND datum<=".$db->db_add_param($ende)." AND studiengang_kz=".$db->db_add_param($stg_kz)."
GROUP BY datum, stunde, student_uid
HAVING count(student_uid)>1
ORDER BY datum, stunde, student_uid LIMIT 30;
GROUP BY datum, stunde, uid
HAVING count(uid)>1
ORDER BY datum, stunde, uid LIMIT 30;
";
}
//echo $qry;
@@ -165,10 +166,10 @@ if($result = $db->db_query($qry))
echo "<tr>";
echo "<td class='table-sortable:default' align='center'>$row->datum</td>";
echo "<td class='table-sortable:default' align='center'>$row->stunde</td>";
echo "<td class='table-sortable:default' align='center'>$row->student_uid</td>";
echo "<td class='table-sortable:default' align='center'>$row->uid</td>";
echo "<td class='table-sortable:default' align='center'>$row->anzahl</td>";
echo "<td class='table-sortable:default' align='center'><a href='stpl_benutzer_kollision_details.php?datum=$row->datum&stunde=$row->stunde' target='kollision_detail'>Stundenplan</a></td>";
echo "<td class='table-sortable:default' align='center'><a href='stpl_benutzer_kollision_details.php?datum=$row->datum&stunde=$row->stunde&uid=$row->student_uid' target='kollision_detail'>UNR</a></td>";
echo "<td class='table-sortable:default' align='center'><a href='stpl_benutzer_kollision_details.php?datum=$row->datum&stunde=$row->stunde&uid=$row->uid' target='kollision_detail'>UNR</a></td>";
echo "</tr>";
}
}
+185 -185
View File
@@ -1,185 +1,185 @@
<?php
/* Copyright (C) 2014 fhcomplete.org
*
* 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: Martin Tatzber <tatzberm@technikum-wien.at
*/
require_once('../../config/vilesci.config.inc.php');
require_once('../../include/functions.inc.php');
require_once('../../include/benutzerberechtigung.class.php');
require_once('../../include/studiengang.class.php');
require_once('../../include/studienplan.class.php');
require_once('../../include/prestudent.class.php');
$user = get_uid();
$rechte = new benutzerberechtigung();
$rechte->getBerechtigungen($user);
if(!$rechte->isBerechtigt('assistenz', null, 'suid'))
die('keine Berechtigung für diese Seite!');
if (!$db = new basis_db())
die('Es konnte keine Verbindung zum Server aufgebaut werden.');
if(isset($_REQUEST['stg_kz']))
$stg_kz=$_REQUEST['stg_kz'];
else
$stg_kz='';
if(isset($_POST["schick"]))
{
$studienplan_id=$_POST["stpl"];
$prestudent_id=$_POST["prestudent_id"];
$prestudent_rollen=new prestudent();
$prestudent_rollen->getPrestudentRolle($prestudent_id);
if($studienplan_id!='')
{
foreach($prestudent_rollen->result as $rolle)
{
$prestudent=new prestudent();
$prestudent->load_rolle($rolle->prestudent_id, $rolle->status_kurzbz, $rolle->studiensemester_kurzbz, $rolle->ausbildungssemester);
$prestudent->studienplan_id=$studienplan_id;
if(!$prestudent->save_rolle())
echo 'Fehler: '.$prestudent->errormsg;
}
}
}
$output='<h1>Zuteilung von Studenten zum zugehörigen Studienplan</h1>
<form action="'.$_SERVER['PHP_SELF'].'" method="GET">
Studiengang: <select name="stg_kz" onchange="this.form.submit()"><option value="">-- Alle --</option>';
$studiengang=new studiengang();
$studiengang->getAll('typ,kurzbz');
foreach ($studiengang->result as $stg)
{
if($stg->studiengang_kz==$stg_kz)
$selected=' selected';
else
$selected='';
$output .= '<option value="'.$stg->studiengang_kz.'"'.$selected.'>'.$stg->kurzbzlang.' - '.$stg->bezeichnung.'</option>';
}
$output .= '</select>
</form>';
$limit=20;
$qry_from_where=" FROM public.tbl_prestudent
JOIN public.tbl_person USING(person_id)
JOIN public.tbl_student USING(prestudent_id)
JOIN public.tbl_benutzer ON(student_uid=uid)
WHERE NOT EXISTS(
SELECT 1 FROM public.tbl_prestudentstatus
WHERE tbl_prestudent.prestudent_id=tbl_prestudentstatus.prestudent_id
AND tbl_prestudentstatus.studienplan_id is not null)
AND tbl_benutzer.aktiv = TRUE
AND get_rolle_prestudent(prestudent_id,null) in('Student','Diplomand','Unterbrecher')";
if($stg_kz!='')
{
$qry_from_where .= " AND tbl_prestudent.studiengang_kz=".$db->db_add_param($stg_kz, FHC_INTEGER);
$qry_order_by = " ORDER BY nachname";
}
else
$qry_order_by = " ORDER BY tbl_prestudent.studiengang_kz, nachname";
$qry_limit=" LIMIT ".$limit;
$count_qry="SELECT count(*) as count".$qry_from_where;
$select_qry="SELECT tbl_person.vorname, tbl_person.nachname, tbl_prestudent.prestudent_id, tbl_prestudent.studiengang_kz,
get_rolle_prestudent(prestudent_id,null) as laststatus".$qry_from_where.$qry_order_by.$qry_limit;
$count='';
if($result=$db->db_query($count_qry))
{
if($row=$db->db_fetch_object($result))
{
$count=$row->count;
}
}
$output .= 'Zeige '.($count<$limit?$count:$limit).' von '.$count;
//if($stg_kz!='')
//{
$output .= '
<table class="tablesorter" id="t1">
<thead>
<th>Vorname</th>
<th>Nachname</th>
<th>Studiengang</th>
<th>Status</th>
<th>Studienplan</th>
</thead>
<tbody>';
$studiengang=new studiengang();
if($result=$db->db_query($select_qry))
{
while($row=$db->db_fetch_object($result))
{
$studiengang->load($row->studiengang_kz);
$output .= '
<form action="'.$_SERVER['PHP_SELF'].'" method="POST">
<input type="hidden" name="stg_kz" value="'.$stg_kz.'" />
<tr>
<td>'.$row->vorname.'</td>
<td>'.$row->nachname.'</td>
<td>'.$studiengang->kurzbzlang.' - '.$studiengang->bezeichnung.'</td>';
$prestudent=new prestudent();
$prestudent->getLastStatus($row->prestudent_id);
$output .= '<td>'.$prestudent->status_kurzbz.'</td>
<td>
<input type="hidden" name="prestudent_id" value="'.$row->prestudent_id.'" />
<select name="stpl">
<option value="">-- keine Auswahl--</option>';
$studienplan=new studienplan();
$studienplan->getStudienplaene($row->studiengang_kz);
foreach($studienplan->result as $stpl)
{
$output .= '<option value="'.$stpl->studienplan_id.'">'.$db->convert_html_chars($stpl->bezeichnung.' ('.$stpl->studienplan_id.')').'</option>';
}
$output .= '
</select><input type="submit" name="schick" value="Speichern"/>
</td>
</tr></form>';
}
}
$output .= '</tbody></table>';
//}
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<link href="../../skin/vilesci.css" rel="stylesheet" type="text/css">
<link rel="stylesheet" href="../../skin/tablesort.css" type="text/css">
<script type="text/javascript">
$(document).ready(function()
{
$("#t1").tablesorter();
});
</script>
<title>Studienplan Zuteilung</title>
</head>
<body>
<?php echo $output; ?>
</body>
</html>
<?php
/* Copyright (C) 2014 fhcomplete.org
*
* 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: Martin Tatzber <tatzberm@technikum-wien.at> and
* Andreas Moik <moik@technikum-wien.at>.
*/
require_once('../../config/vilesci.config.inc.php');
require_once('../../include/functions.inc.php');
require_once('../../include/benutzerberechtigung.class.php');
require_once('../../include/studiengang.class.php');
require_once('../../include/studienplan.class.php');
require_once('../../include/prestudent.class.php');
$user = get_uid();
$rechte = new benutzerberechtigung();
$rechte->getBerechtigungen($user);
if(!$rechte->isBerechtigt('assistenz', null, 'suid'))
die('keine Berechtigung für diese Seite!');
if (!$db = new basis_db())
die('Es konnte keine Verbindung zum Server aufgebaut werden.');
if(isset($_REQUEST['stg_kz']))
$stg_kz=$_REQUEST['stg_kz'];
else
$stg_kz='';
if(isset($_POST["schick"]))
{
$studienplan_id=$_POST["stpl"];
$prestudent_id=$_POST["prestudent_id"];
$prestudent_rollen=new prestudent();
$prestudent_rollen->getPrestudentRolle($prestudent_id);
if($studienplan_id!='')
{
foreach($prestudent_rollen->result as $rolle)
{
$prestudent=new prestudent();
$prestudent->load_rolle($rolle->prestudent_id, $rolle->status_kurzbz, $rolle->studiensemester_kurzbz, $rolle->ausbildungssemester);
$prestudent->studienplan_id=$studienplan_id;
if(!$prestudent->save_rolle())
echo 'Fehler: '.$prestudent->errormsg;
}
}
}
$output='<h1>Zuteilung von Studenten zum zugehörigen Studienplan</h1>
<form action="'.$_SERVER['PHP_SELF'].'" method="GET">
Studiengang: <select name="stg_kz" onchange="this.form.submit()"><option value="">-- Alle --</option>';
$studiengang=new studiengang();
$studiengang->getAll('typ,kurzbz');
foreach ($studiengang->result as $stg)
{
if($stg->studiengang_kz==$stg_kz)
$selected=' selected';
else
$selected='';
$output .= '<option value="'.$stg->studiengang_kz.'"'.$selected.'>'.$stg->kurzbzlang.' - '.$stg->bezeichnung.'</option>';
}
$output .= '</select>
</form>';
$limit=20;
$qry_from_where=" FROM public.tbl_prestudent
JOIN public.tbl_person USING(person_id)
JOIN public.tbl_benutzer USING(uid)
WHERE NOT EXISTS(
SELECT 1 FROM public.tbl_prestudentstatus
WHERE tbl_prestudent.prestudent_id=tbl_prestudentstatus.prestudent_id
AND tbl_prestudentstatus.studienplan_id is not null)
AND tbl_benutzer.aktiv = TRUE
AND get_rolle_prestudent(prestudent_id,null) in('Student','Diplomand','Unterbrecher')";
if($stg_kz!='')
{
$qry_from_where .= " AND tbl_prestudent.studiengang_kz=".$db->db_add_param($stg_kz, FHC_INTEGER);
$qry_order_by = " ORDER BY nachname";
}
else
$qry_order_by = " ORDER BY tbl_prestudent.studiengang_kz, nachname";
$qry_limit=" LIMIT ".$limit;
$count_qry="SELECT count(*) as count".$qry_from_where;
$select_qry="SELECT tbl_person.vorname, tbl_person.nachname, tbl_prestudent.prestudent_id, tbl_prestudent.studiengang_kz,
get_rolle_prestudent(prestudent_id,null) as laststatus".$qry_from_where.$qry_order_by.$qry_limit;
$count='';
if($result=$db->db_query($count_qry))
{
if($row=$db->db_fetch_object($result))
{
$count=$row->count;
}
}
$output .= 'Zeige '.($count<$limit?$count:$limit).' von '.$count;
//if($stg_kz!='')
//{
$output .= '
<table class="tablesorter" id="t1">
<thead>
<th>Vorname</th>
<th>Nachname</th>
<th>Studiengang</th>
<th>Status</th>
<th>Studienplan</th>
</thead>
<tbody>';
$studiengang=new studiengang();
if($result=$db->db_query($select_qry))
{
while($row=$db->db_fetch_object($result))
{
$studiengang->load($row->studiengang_kz);
$output .= '
<form action="'.$_SERVER['PHP_SELF'].'" method="POST">
<input type="hidden" name="stg_kz" value="'.$stg_kz.'" />
<tr>
<td>'.$row->vorname.'</td>
<td>'.$row->nachname.'</td>
<td>'.$studiengang->kurzbzlang.' - '.$studiengang->bezeichnung.'</td>';
$prestudent=new prestudent();
$prestudent->getLastStatus($row->prestudent_id);
$output .= '<td>'.$prestudent->status_kurzbz.'</td>
<td>
<input type="hidden" name="prestudent_id" value="'.$row->prestudent_id.'" />
<select name="stpl">
<option value="">-- keine Auswahl--</option>';
$studienplan=new studienplan();
$studienplan->getStudienplaene($row->studiengang_kz);
foreach($studienplan->result as $stpl)
{
$output .= '<option value="'.$stpl->studienplan_id.'">'.$db->convert_html_chars($stpl->bezeichnung.' ('.$stpl->studienplan_id.')').'</option>';
}
$output .= '
</select><input type="submit" name="schick" value="Speichern"/>
</td>
</tr></form>';
}
}
$output .= '</tbody></table>';
//}
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<link href="../../skin/vilesci.css" rel="stylesheet" type="text/css">
<link rel="stylesheet" href="../../skin/tablesort.css" type="text/css">
<script type="text/javascript">
$(document).ready(function()
{
$("#t1").tablesorter();
});
</script>
<title>Studienplan Zuteilung</title>
</head>
<body>
<?php echo $output; ?>
</body>
</html>
@@ -206,7 +206,7 @@ if($method=="lehrveranstaltungen")
FROM
campus.vw_student_lehrveranstaltung
JOIN public.tbl_benutzer using(uid)
JOIN public.tbl_student ON(uid=student_uid)
JOIN public.tbl_student ON(uid=student_uid)
JOIN public.tbl_prestudentstatus USING(prestudent_id)
WHERE
lehrveranstaltung_id=tbl_lehrveranstaltung.lehrveranstaltung_id
+8 -12
View File
@@ -272,14 +272,13 @@ if(count($prestudent->result)>0)
</thead><tbody>';
foreach ($prestudent->result as $row)
{
$uid='';
$gruppe='';
$pst = new prestudent();
$pst->getLastStatus($prestudent->prestudent_id);
$studiensemester = new studiensemester();
$studiensemester_kurzbz = $studiensemester->getaktorNext();
$pst->load_studentlehrverband($studiensemester_kurzbz);
$pst = new prestudent($row->prestudent_id);
$uid = $pst->uid;
if($vrb = $pst->getStudentLehrverband())
$gruppe = $vrb->semester.$vrb->verband.$vrb->gruppe;
$pst->getLastStatus($row->prestudent_id);
echo '<tr>';
echo "<td>$row->prestudent_id</td>";
@@ -287,12 +286,9 @@ if(count($prestudent->result)>0)
echo "<td>".($row->reihungstestangetreten?'Ja':'Nein')."</td>";
echo "<td>$pst->uid</td>";
echo "<td>$uid</td>";
echo "<td>$gruppe</td>";
$prestudent1 = new prestudent();
$prestudent1->getLastStatus($row->prestudent_id);
echo "<td>$prestudent1->status_kurzbz ".($prestudent1->ausbildungssemester!=''?"($prestudent1->ausbildungssemester. Semester)":'')."</td>";
echo "<td>$pst->status_kurzbz ".($pst->ausbildungssemester!=''?"($pst->ausbildungssemester. Semester)":'')."</td>";
echo '</tr>';
}
echo '</tbody></table>';
+7 -16
View File
@@ -28,7 +28,6 @@ require_once('../../include/functions.inc.php');
require_once('../../include/studiengang.class.php');
require_once('../../include/person.class.php');
require_once('../../include/benutzer.class.php');
require_once('../../include/student.class.php');
require_once('../../include/prestudent.class.php');
require_once('../../include/datum.class.php');
require_once('../../include/authentication.class.php');
@@ -200,19 +199,11 @@ if($searchstr!='')
while($row_student = $db->db_fetch_object($result_student))
{
$stsem = new studiensemester();
$stsem_kurzbz = $stsem->getaktorNext();
$qry_sem = "SELECT gruppe, verband, semester from tbl_studentlehrverband WHERE studiensemester_kurzbz=".$db->db_add_param($stsem_kurzbz);
if(!$res_sem = $db->db_query($qry_sem))
die("Fehler beim holen des Lehrverbandes");
$gruppe='';
$student = new prestudent();var_dump($row_student->prestudent_id);
$student->getLastStatus($row_student->prestudent_id);
if($vrb = $student->getStudentLehrverband())
$gruppe = $vrb->semester.$vrb->verband.$vrb->gruppe;
$prestudent = new prestudent();
$prestudent->getLastStatus($row_student->prestudent_id);
$studiensemester = new studiensemester();
$studiensemester_kurzbz = $studiensemester->getaktorNext();
$prestudent->load_studentlehrverband($studiensemester_kurzbz);
$content.= '<tr>';
$content.= '<td></td>';
@@ -220,7 +211,7 @@ if($searchstr!='')
$content.= '<td></td>';
$content.= '<td></td>';
$content.= '<td></td>';
$content.= "<td>$student->status_kurzbz</td>";
$content.= "<td>$prestudent->status_kurzbz</td>";
$content.= "<td><a href='personen_details.php?uid=$row_student->uid'>$row_student->uid</a></td>";
$content.= "<td>".($row_student->aktiv=='t'?'Ja':'Nein')."</td>";
@@ -238,7 +229,7 @@ if($searchstr!='')
$content.= "<td></td>";
$content.= "<td></td>";
$content.= "<td>".$stg_arr[$row_student->studiengang_kz]."</td>";
$content.= "<td>$gruppe</td>";
$content.= "<td>$prestudent->semester$prestudent->verband$prestudent->gruppe</td>";
$content.= "<td>".($row_student->supdateamum!=''?date('d.m.Y H:i:s', $datum_obj->mktime_fromtimestamp($row_student->supdateamum)):'')."</td>";
$content.= "<td>$row_student->supdatevon</td>";
$content.= '</tr>';