mlists: tbl_student replaced

cis/private/lehre/benotungstool/studentenansicht.php

@@ -267,12 +267,12 @@ $qry = "SELECT distinct lehreinheit_id, lehrfach.kurzbz FROM lehre.tbl_lehreinhe
 		SELECT 
 			lehreinheit_id 
 		FROM 
-			public.tbl_student, lehre.tbl_lehreinheitgruppe, public.tbl_studentlehrverband
+			public.tbl_prestudent, lehre.tbl_lehreinheitgruppe, public.tbl_studentlehrverband
 		WHERE 
-			tbl_student.student_uid=".$db->db_add_param($user)." AND
-			tbl_studentlehrverband.prestudent_id=tbl_student.prestudent_id AND
+			tbl_prestudent.uid=".$db->db_add_param($user)." AND
+			tbl_studentlehrverband.prestudent_id=tbl_prestudent.prestudent_id AND
 			tbl_studentlehrverband.studiensemester_kurzbz=".$db->db_add_param($stsem)." AND
-			tbl_student.studiengang_kz=tbl_lehreinheitgruppe.studiengang_kz AND
+			tbl_prestudent.studiengang_kz=tbl_lehreinheitgruppe.studiengang_kz AND
 			tbl_lehreinheitgruppe.gruppe_kurzbz is null AND
 			tbl_studentlehrverband.semester=tbl_lehreinheitgruppe.semester AND
 			(

cis/private/lvplan/index.php

@@ -21,6 +21,7 @@
  *          Gerald Simane-Sequens 	< gerald.simane-sequens@technikum-wien.at >
  *          Manfred Kindl <manfred.kindl@technikum-wien.at>
  *          Alexander Nimmervoll <alexander.nimmervoll@technikum-wien.at>
+ *          Andreas Moik 	< moik@technikum-wien.at >
  */
  
 require_once('../../../config/cis.config.inc.php');
@@ -98,7 +99,7 @@ if(!$result_ort)
   	die("ort not found!");  	
 $num_rows_ort=$db->db_num_rows($result_ort);
 
-/*$sql_query="SELECT student_uid FROM public.tbl_student ORDER BY student_uid";
+/*$sql_query="SELECT uid FROM public.tbl_prestudent ORDER BY uid";
 $result_lektor=$db->db_query($sql_query);
 if(!$result_lektor)
 	die("lektor not found!");

content/statistik/studentenexportextended.xls.php

@@ -186,7 +186,7 @@ loadVariables($user);
 	{
 		// Student holen
 		$qry = "SELECT *, tbl_prestudent.studiengang_kz as prestgkz, (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) 
+				FROM public.tbl_prestudent JOIN public.tbl_person USING(person_id)
 				WHERE prestudent_id in($prestudent_ids) ORDER BY nachname, vorname";
 	
 		if($db->db_query($qry))
@@ -305,7 +305,7 @@ loadVariables($user);
 		$worksheet->write($zeile,$i, $row->stgbez);
 		$i++;
 		
-		$qry = "SELECT tbl_studentlehrverband.semester AS semester_studiensemester, tbl_student.semester AS semester_aktuell,* FROM public.tbl_studentlehrverband JOIN public.tbl_student USING(prestudent_id)
+		$qry = "SELECT tbl_studentlehrverband.semester AS semester_studiensemester, tbl_student.semester AS semester_aktuell,* FROM public.tbl_studentlehrverband
 				WHERE prestudent_id=".$db->db_add_param($row->prestudent_id)."
 				AND studiensemester_kurzbz=".$db->db_add_param($studiensemester_kurzbz);
 		if($db->db_query($qry))

content/statistik/studentenstatistik_lehrgaenge.php

@@ -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 eine Liste der Studenten eines Studiensemesters
@@ -110,7 +111,7 @@ if($stsem!='')
 				(SELECT count(*) FROM (SELECT distinct prestudent_id FROM public.tbl_prestudent JOIN public.tbl_prestudentstatus USING (prestudent_id)
 	   			 	WHERE studiengang_kz=stg.studiengang_kz AND status_kurzbz='Incoming' AND studiensemester_kurzbz='".addslashes($stsem)."'
 					) a) AS inc,
-				(SELECT count(*) FROM (SELECT distinct student_uid FROM public.tbl_student JOIN bis.tbl_bisio USING (student_uid)
+				(SELECT count(*) FROM (SELECT distinct uid FROM public.tbl_prestudent JOIN bis.tbl_bisio USING (prestudent_id)
 	   			 	WHERE studiengang_kz=stg.studiengang_kz AND (bis>='".addslashes($stsem_obj->start)."' OR bis is null) AND von<='".addslashes($stsem_obj->ende)."'
 					) a) AS out,
 				(SELECT count(*) FROM (SELECT distinct prestudent_id FROM public.tbl_prestudent JOIN public.tbl_prestudentstatus USING (prestudent_id)
@@ -264,7 +265,7 @@ if($stsem!='')
 				(SELECT count(*) FROM (SELECT distinct prestudent_id FROM public.tbl_prestudent JOIN public.tbl_prestudentstatus USING (prestudent_id)
 	   			 	WHERE studiengang_kz=stg.studiengang_kz AND status_kurzbz='Incoming' AND studiensemester_kurzbz='".addslashes($stsem)."'
 					) a) AS inc,
-				(SELECT count(*) FROM (SELECT distinct student_uid FROM public.tbl_student JOIN bis.tbl_bisio USING (student_uid)
+				(SELECT count(*) FROM (SELECT distinct uid FROM public.tbl_prestudent JOIN bis.tbl_bisio USING (prestudent_id)
 	   			 	WHERE studiengang_kz=stg.studiengang_kz AND (bis>='".addslashes($stsem_obj->start)."' OR bis is null) AND von<='".addslashes($stsem_obj->ende)."'
 					) a) AS out,
 				(SELECT count(*) FROM (SELECT distinct prestudent_id FROM public.tbl_prestudent JOIN public.tbl_prestudentstatus USING (prestudent_id)
@@ -407,4 +408,4 @@ if($stsem!='')
 }
 ?>
 </body>
-</html>
+</html>

content/statistik/vertragsuebersicht.xls.php

@@ -45,7 +45,7 @@ $datum_obj = new datum();
 if($studiensemester_kurzbz=='')
 {
 	$stsem = new studiensemester();
-	$studiensemester_kurzbz = $stsem->getAktOrNext();
+	$studiensemester_kurzbz = $stsem->getaktorNext();
 }
 
 if($studiensemester_kurzbz!='')
@@ -64,8 +64,8 @@ if($studiensemester_kurzbz!='')
 	$format_bold =& $workbook->addFormat();
 	$format_bold->setBold();
 	
-	$format_number =& $workbook->addFormat();
-	$format_number->setNumFormat('0,0.00');
+	$format_number =& $workbook->addFormat();
+	$format_number->setNumFormat('0,0.00');
 
 		
 	$spalte=0;
@@ -175,30 +175,30 @@ else
 	';
 }
 
-function BerechneGesamtTage($startdatum, $endedatum)
-{
-	$gesamttage=0;
-
-	$datum = new DateTime($startdatum);
-	$ende = new DateTime($endedatum);
-
-	$i=0;
-	while($datum<$ende)
-	{
-		$i++;
-		if($i>100)
-			die('Rekursion? Abbruch');
-
-		$tag = $datum->format('d');
-		if($tag==31)
-			$gesamttage+=1;
-		else
-			$gesamttage+=31-$tag;
-
-		$datum = new DateTime(date('Y-m-t',$datum->getTimestamp())); // Letzten Tag im Monat
-		$datum->add(new DateInterval('P1D')); // 1 Tag dazuzaehlen
-	}
-
-	return $gesamttage;
+function BerechneGesamtTage($startdatum, $endedatum)
+{
+	$gesamttage=0;
+
+	$datum = new DateTime($startdatum);
+	$ende = new DateTime($endedatum);
+
+	$i=0;
+	while($datum<$ende)
+	{
+		$i++;
+		if($i>100)
+			die('Rekursion? Abbruch');
+
+		$tag = $datum->format('d');
+		if($tag==31)
+			$gesamttage+=1;
+		else
+			$gesamttage+=31-$tag;
+
+		$datum = new DateTime(date('Y-m-t',$datum->getTimestamp())); // Letzten Tag im Monat
+		$datum->add(new DateInterval('P1D')); // 1 Tag dazuzaehlen
+	}
+
+	return $gesamttage;
 }
 ?>

system/mlists/mlists_copy.php

@@ -7,24 +7,24 @@
 <BODY class="background_main">
 <H3>Copy mLists</H3>
 <?php
-	function mysystem($command) 
+function mysystem($command)
+{
+	if (!($p=popen("($command)2>&1","r")))
 	{
-    	if (!($p=popen("($command)2>&1","r"))) 
-		{ 
-        	return 126;
-        }
+		return 126;
+	}
 
-        while (!feof($p)) 
-		{
-        	$line=fgets($p,1000);
-            $out .= $line;
-        }
-        pclose($p);
-        return $out; 
-    }
-	$var="../../../mlists/copymlists.sh";
-    echo mysystem($var);
+	while (!feof($p))
+	{
+		$line=fgets($p,1000);
+		$out .= $line;
+	}
+	pclose($p);
+	return $out;
+}
+$var="../../../mlists/copymlists.sh";
+echo mysystem($var);
 ?>
 Verarbeitung erledigt!
 </BODY>
-</HTML>
+</HTML>

system/mlists/mlists_create.php

@@ -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>.
  */
 /**
  * Gerneriert die Textfiles fuer die Mailverteiler
@@ -101,7 +102,7 @@
 	}
 
 	//$qry = "SELECT vornamen, nachname, uid, alias FROM tbl_person where alias<>'' ORDER BY nachname, vornamen";
-	$qry = "SELECT vorname, nachname, uid, alias FROM (public.tbl_person JOIN public.tbl_benutzer USING(person_id)) LEFT JOIN public.tbl_student on(uid=student_uid)
+	$qry = "SELECT vorname, nachname, uid, alias FROM (public.tbl_person JOIN public.tbl_benutzer USING(person_id)) LEFT JOIN public.tbl_prestudent USING(uid)
 	        WHERE 
 	        	alias<>''";
 	if($noalias_kz!='')

system/mlists/mlists_generate.php

@@ -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>.
  */
 /****************************************************************************
  * Script: 			mlists_generate.php
@@ -1264,8 +1265,8 @@ $error_msg='';
 			tbl_studiengang.typ, 
 			tbl_studiengang.kurzbz 
 		FROM 
-			public.tbl_student
-			JOIN public.tbl_benutzer ON(student_uid=uid)
+			public.tbl_prestudent
+			JOIN public.tbl_benutzer USING(uid)
 			JOIN public.tbl_prestudentstatus USING(prestudent_id)
 			JOIN public.tbl_studiengang USING(studiengang_kz)
 		WHERE
@@ -1314,18 +1315,18 @@ $error_msg='';
 				SELECT 
 					distinct student_uid
 				FROM 
-					public.tbl_student 
-					JOIN public.tbl_benutzer ON(uid=student_uid)
+					public.tbl_prestudent
+					JOIN public.tbl_benutzer USING(uid)
 				WHERE
 					tbl_benutzer.aktiv AND
 					'".addslashes($row->orgform_kurzbz)."'=
 						(SELECT orgform_kurzbz 
 						 FROM public.tbl_prestudentstatus 
 						 WHERE 
-						 	prestudent_id=tbl_student.prestudent_id 
+						 	prestudent_id=tbl_prestudent.prestudent_id
 						 	AND tbl_prestudentstatus.studiensemester_kurzbz='".addslashes($stsem)."' 
-						 ORDER BY datum desc, insertamum desc, ext_id desc LIMIT 1)					
-					AND tbl_student.studiengang_kz='".addslashes($row->studiengang_kz)."'";
+						 ORDER BY datum desc, insertamum desc, ext_id desc LIMIT 1)
+					AND tbl_prestudent.studiengang_kz='".addslashes($row->studiengang_kz)."'";
 			
 			//Personen entfernen die nicht mehr in den Verteiler gehoeren
 			$qry = "DELETE FROM public.tbl_benutzergruppe WHERE gruppe_kurzbz='".$mlist_name."' AND uid NOT IN(".$sql_query.");";

system/mlists/student_lists_copy.php

@@ -7,25 +7,25 @@
 <BODY class="background_main">
 <H3>Copy mLists</H3>
 <?php
-	function mysystem($command) 
+function mysystem($command)
+{
+	if (!($p=popen("($command)2>&1","r")))
 	{
-    	if (!($p=popen("($command)2>&1","r"))) 
-		{ 
-        	return 126;
-        }
+		return 126;
+	}
 
-        while (!feof($p)) 
-		{
-        	$line=fgets($p,1000);
-            $out .= $line;
-        }
-        pclose($p);
-        return $out; 
-    }
-	$var="../../../mlists/student/copymlists.sh";
-    echo mysystem($var);
+	while (!feof($p))
+	{
+		$line=fgets($p,1000);
+		$out .= $line;
+	}
+	pclose($p);
+	return $out;
+}
+$var="../../../mlists/student/copymlists.sh";
+echo mysystem($var);
 ?>
 Verarbeitung erledigt!<BR>
 <A href="index.html" class="linkblue">&lt;&lt;Zur&uuml;ck</A> 
 </BODY>
-</HTML>
+</HTML>

system/mlists/student_lists_create.php

@@ -16,14 +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> 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>.
  */
 /**
  * Generiert die Listen fuer die Mailverteiler der Studenten
  */
 	require_once('../../config/vilesci.config.inc.php');
 	require_once('../../include/functions.inc.php');
+	require_once('../../include/studiensemester.class.php');
 	
 	$db = new basis_db();
 	if(!($erg=$db->db_query("SELECT studiengang_kz, bezeichnung, lower(typ::varchar(1) || kurzbz) as kurzbz FROM public.tbl_studiengang ORDER BY kurzbz ASC")))
@@ -42,12 +44,16 @@
 
 
 <?php
+
+ $stsem = new studiensemester();
+ $studiensemester_kurzbz = $stsem->getaktorNext();
+
 	for ($i=0; $i<$num_rows; $i++)
 	{
 		$row=$db->db_fetch_object($erg, $i);
-     	$stg_kz=$row->studiengang_kz;
+		$stg_kz=$row->studiengang_kz;
 		$stg_kzbz=$row->kurzbz;
-		$sql_query="SELECT DISTINCT semester FROM public.tbl_student WHERE studiengang_kz=$stg_kz AND student_uid NOT LIKE '\\\\_%' AND semester<10 AND semester>0 ORDER BY semester";
+		$sql_query="SELECT DISTINCT semester FROM public.tbl_studentlehrverband WHERE studiensemester_kurzbz=".$db->db_add_param($studiensemester_kurzbz)." AND studiengang_kz=".$db->db_add_param($stg_kz, FHC_INTEGER)." AND semester<10 AND semester>0 ORDER BY semester";
 
 		if(!($result_sem = $db->db_query($sql_query)))
 			die($db->db_last_error());
@@ -57,7 +63,7 @@
 			$row_sem=$db->db_fetch_object($result_sem, $j);
 			echo $stg_kzbz.'-'.$row_sem->semester.'<br>';
 
-			$sql_query="SELECT DISTINCT verband FROM public.tbl_student WHERE studiengang_kz=$stg_kz AND semester=$row_sem->semester AND student_uid NOT LIKE '\\\\_%' ORDER BY verband";
+			$sql_query="SELECT DISTINCT verband FROM public.tbl_studentlehrverband WHERE studiensemester_kurzbz=".$db->db_add_param($studiensemester_kurzbz)." AND studiengang_kz=".$db->db_add_param($stg_kz, FHC_INTEGER)." AND semester=".$db->db_add_param($row_sem->semester)." ORDER BY verband";
 			
 			if(!($result_ver = $db->db_query($sql_query)))
 				die($db->db_last_error());
@@ -69,7 +75,7 @@
 				if ( ($row_ver->verband==' ' || $row_ver->verband=='') )
 					$row_ver->verband='A';
 
-				$sql_query="SELECT DISTINCT gruppe FROM public.tbl_student WHERE studiengang_kz=$stg_kz AND semester=$row_sem->semester AND (verband='$row_ver->verband' OR verband='' OR verband=' ') AND student_uid NOT LIKE '\\\\_%' ORDER BY gruppe";
+				$sql_query="SELECT DISTINCT gruppe FROM public.tbl_studentlehrverband WHERE studiensemester_kurzbz=".$db->db_add_param($studiensemester_kurzbz)." AND studiengang_kz=".$db->db_add_param($stg_kz, FHC_INTEGER)." AND semester=$row_sem->semester AND (verband='$row_ver->verband' OR verband='' OR verband=' ') ORDER BY gruppe";
 
 				if(!($result_grp = $db->db_query($sql_query)))
 					die($db->db_last_error());
@@ -135,4 +141,4 @@
 Finished!!! <BR>
 <A href="index.html" class="linkblue">&lt;&lt;Zur&uuml;ck</A>
 </BODY>
-</HTML>
+</HTML>

system/sync/sync_moodle_kurse.php

@@ -46,7 +46,7 @@ if(php_sapi_name() != 'cli')
 $db = new basis_db();
 
 $stsem_obj = new studiensemester();
-$stsem = $stsem_obj->getAktOrNext();
+$stsem = $stsem_obj->getaktorNext();
 
 $qry = "SELECT
                         distinct lehrveranstaltung_id, tbl_lehrveranstaltung.bezeichnung, tbl_lehrveranstaltung.kurzbz,

vilesci/bis/studentenmeldung.php

@@ -185,16 +185,15 @@ else
 //Ausgabe aktiver Studenten, die nicht gemeldet werden
 $qry_akt="
 	SELECT
-		DISTINCT ON(student_uid, nachname, vorname) *, public.tbl_person.person_id AS pers_id
+		DISTINCT ON(uid, nachname, vorname) *, public.tbl_person.person_id AS pers_id
 	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)
+		public.tbl_prestudent
+		JOIN public.tbl_benutzer USING (uid)
+		JOIN public.tbl_person ON (tbl_prestudent.person_id=tbl_person.person_id)
 		JOIN public.tbl_prestudentstatus ON(tbl_prestudent.prestudent_id=tbl_prestudentstatus.prestudent_id)
 	WHERE
 		bismelden=FALSE
-		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 status_kurzbz IN ('Student','Diplomand','Unterbrecher','Praktikant','Outgoing'))
 		AND tbl_prestudent.prestudent_id NOT IN
 			(
@@ -204,13 +203,13 @@ $qry_akt="
 			 	tbl_prestudentstatus.studiensemester_kurzbz=".$db->db_add_param($ssem)."
 			 	AND (status_kurzbz='Abbrecher' OR status_kurzbz='Absolvent')
 			 )
-	ORDER BY student_uid, nachname, vorname
+	ORDER BY uid, nachname, vorname
 	";
 if($result_akt = $db->db_query($qry_akt))
 {
 	while($row_akt = $db->db_fetch_object($result_akt))
 	{
-		$v.="<u><b>Person (UID, Vorname, Nachname) '".$row_akt->student_uid."', '".$row_akt->nachname."', '".$row_akt->vorname."'</u></b> hat Status $row_akt->status_kurzbz, wird aber nicht BIS gemeldet!!! <br>\n";
+		$v.="<u><b>Person (UID, Vorname, Nachname) '".$row_akt->uid."', '".$row_akt->nachname."', '".$row_akt->vorname."'</u></b> hat Status $row_akt->status_kurzbz, wird aber nicht BIS gemeldet!!! <br>\n";
 		$anzahl_fehler++;
 	}
 }
@@ -218,24 +217,23 @@ if($result_akt = $db->db_query($qry_akt))
 //Incoming ohne I/O Datensatz anzeigen
 $qry_in="
 	SELECT
-		DISTINCT ON(student_uid, nachname, vorname) *, public.tbl_person.person_id AS pers_id
+		DISTINCT ON(uid, nachname, vorname) *, public.tbl_person.person_id AS pers_id
 	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)
+		public.tbl_prestudent
+		JOIN public.tbl_benutzer USING (uid)
+		JOIN public.tbl_person ON (tbl_prestudent.person_id=tbl_person.person_id)
 		JOIN public.tbl_prestudentstatus ON(tbl_prestudent.prestudent_id=tbl_prestudentstatus.prestudent_id)
 	WHERE
 		bismelden=TRUE
-		AND tbl_student.studiengang_kz=".$db->db_add_param($stg_kz)."
-		AND (status_kurzbz='Incoming' AND tbl_student.prestudent_id NOT IN (SELECT prestudent_id FROM bis.tbl_bisio))
-	ORDER BY student_uid, nachname, vorname
+		AND tbl_prestudent.studiengang_kz=".$db->db_add_param($stg_kz)."
+		AND (status_kurzbz='Incoming' AND tbl_prestudent.prestudent_id NOT IN (SELECT prestudent_id FROM bis.tbl_bisio))
+	ORDER BY uid, nachname, vorname
 	";
 if($result_in = $db->db_query($qry_in))
 {
 	while($row_in = $db->db_fetch_object($result_in))
 	{
-		$v.="<u>Bei Student (UID, Vorname, Nachname) '".$row_in->student_uid."', '".$row_in->nachname."', '".$row_in->vorname."' ($row_in->status_kurzbz): </u>\n";
+		$v.="<u>Bei Student (UID, Vorname, Nachname) '".$row_in->uid."', '".$row_in->nachname."', '".$row_in->vorname."' ($row_in->status_kurzbz): </u>\n";
 		$v.="&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Es fehlt der I/O-Datensatz\n\n";
 		$anzahl_fehler++;
 	}
@@ -244,26 +242,25 @@ if($result_in = $db->db_query($qry_in))
 //Hauptselect
 $qry="
 	SELECT
-		DISTINCT ON(student_uid, nachname, vorname) *, public.tbl_person.person_id AS pers_id, to_char(gebdatum, 'ddmmyy') AS vdat
+		DISTINCT ON(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)
+		public.tbl_prestudent
+		JOIN public.tbl_benutzer USING (uid)
+		JOIN public.tbl_person ON (tbl_prestudent.person_id=tbl_person.person_id)
 		JOIN public.tbl_prestudentstatus ON(tbl_prestudent.prestudent_id=tbl_prestudentstatus.prestudent_id)
 	WHERE
 		bismelden=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))
@@ -556,7 +553,7 @@ function GenerateXMLStudentBlock($row)
 	$datumobj = new datum();
 
 	//Pruefen ob Ausserordnetlicher Studierender (4.Stelle in Personenkennzeichen = 9)
-	if(mb_substr($row->matrikelnr,3,1)=='9')
+	if(mb_substr($row->perskz,3,1)=='9')
 		$ausserordentlich=true;
 	else
 		$ausserordentlich=false;
@@ -884,7 +881,7 @@ function GenerateXMLStudentBlock($row)
 
 	if($error_log!='' OR $error_log1!='')
 	{
-		$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";
@@ -903,7 +900,7 @@ function GenerateXMLStudentBlock($row)
 	{
 		$datei.="
 		<StudentIn>
-			<PersKz>".trim($row->matrikelnr)."</PersKz>";
+			<PersKz>".trim($row->perskz)."</PersKz>";
 		if(!$ausserordentlich)
 		{
 			$datei.="
@@ -1106,7 +1103,7 @@ function GenerateXMLStudentBlock($row)
 		$verwendete_orgformen[]=$storgform;
 
 	//Studentenliste
-	$stlist.="<tr><td align=center>".trim($row->student_uid)."</td><td align=center>".trim($row->matrikelnr)."</td><td>".trim($row->nachname)."</td><td>".trim($row->vorname)."</td><td>".trim($aktstatus)."</td><td align=center>".trim($sem)."</td><td align=center>".trim($storgform)."</td></tr>";
+	$stlist.="<tr><td align=center>".trim($row->uid)."</td><td align=center>".trim($row->perskz)."</td><td>".trim($row->nachname)."</td><td>".trim($row->vorname)."</td><td>".trim($aktstatus)."</td><td align=center>".trim($sem)."</td><td align=center>".trim($storgform)."</td></tr>";
 	return $datei;
 }
 

vilesci/cronjobs/lvplanwartung.php

@@ -73,7 +73,7 @@ else
 	$semester='';
 
 $stsem_obj = new studiensemester();
-$studiensemester_kurzbz = $stsem_obj->getAktOrNext();
+$studiensemester_kurzbz = $stsem_obj->getaktorNext();
 
 $qry="SELECT
 			*, planstunden-verplant::smallint AS offenestunden

vilesci/personen/anwesenheit.php

@@ -392,7 +392,7 @@ if($work=='')
 	echo '</select>';
 
 	$stsem = new studiensemester();
-	$akt = $stsem->getAktOrNext();
+	$akt = $stsem->getaktorNext();
 	$stsem->getAll();
 	echo 'Studiensemester <select name="stsem" id="stsem" onchange="loadListe()">';
 	foreach($stsem->studiensemester as $row)

vilesci/statistik/oehwaehlerverzeichnis.php

@@ -41,7 +41,7 @@ $db = new basis_db();
 $datum_obj = new datum();
 
 $stsem_obj = new studiensemester();
-$studiensemester_kurzbz = $stsem_obj->getAktOrNext();
+$studiensemester_kurzbz = $stsem_obj->getaktorNext();
 
 $erhalter = new erhalter();
 $erhalter->getAll();