Merge branch 'master' into udf

system/dbupdate_3.3.php

@@ -268,6 +268,7 @@ if($result = $db->db_query("SELECT view_definition FROM information_schema.views
 	}
 }
 
+<<<<<<< HEAD
 // Creates table system.tbl_udf if it doesn't exist and grants privileges
 if(!$result = @$db->db_query("SELECT 1 FROM system.tbl_udf LIMIT 1"))
 {
@@ -332,6 +333,30 @@ if(!$result = @$db->db_query("SELECT udf_values FROM public.tbl_prestudent LIMIT
 		echo '<strong>public.tbl_prestudent: '.$db->db_last_error().'</strong><br>';
 	else
 		echo '<br>Added column udf_values to table public.tbl_prestudent';
+=======
+// Spalten mailversand,teilnehmer_anonym,termine_anonym in campus.tbl_coodle
+if(!$result = @$db->db_query("SELECT mailversand FROM campus.tbl_coodle LIMIT 1;"))
+{
+	$qry = "ALTER TABLE campus.tbl_coodle ADD COLUMN mailversand boolean;
+			ALTER TABLE campus.tbl_coodle ADD COLUMN teilnehmer_anonym boolean;
+			ALTER TABLE campus.tbl_coodle ADD COLUMN termine_anonym boolean;";
+
+	if(!$db->db_query($qry))
+		echo '<strong>campus.tbl_coodle: '.$db->db_last_error().'</strong><br>';
+		else
+			echo '<br>campus.tbl_coodle: Spalten mailversand, teilnehmer_anonym und termine_anonym hinzugefuegt!<br>';
+}
+
+// Spalte onlinebewerbung_studienplan in lehre.tbl_studienplan
+if(!$result = @$db->db_query("SELECT onlinebewerbung_studienplan FROM lehre.tbl_studienplan LIMIT 1;"))
+{
+	$qry = "ALTER TABLE lehre.tbl_studienplan ADD COLUMN onlinebewerbung_studienplan boolean NOT NULL DEFAULT true;";
+
+	if(!$db->db_query($qry))
+		echo '<strong>lehre.tbl_studienplan: '.$db->db_last_error().'</strong><br>';
+		else
+			echo '<br>lehre.tbl_studienplan: Spalte onlinebewerbung_studienplan hinzugefuegt!<br>';
+>>>>>>> master
 }
 
 // *** Pruefung und hinzufuegen der neuen Attribute und Tabellen
@@ -380,7 +405,7 @@ $tabellen=array(
 	"campus.tbl_contentgruppe"  => array("content_id","gruppe_kurzbz","insertamum","insertvon"),
 	"campus.tbl_contentlog"  => array("contentlog_id","contentsprache_id","uid","start","ende"),
 	"campus.tbl_contentsprache"  => array("contentsprache_id","content_id","sprache","version","sichtbar","content","reviewvon","reviewamum","updateamum","updatevon","insertamum","insertvon","titel","gesperrt_uid"),
-	"campus.tbl_coodle"  => array("coodle_id","titel","beschreibung","coodle_status_kurzbz","dauer","endedatum","insertamum","insertvon","updateamum","updatevon","ersteller_uid"),
+	"campus.tbl_coodle"  => array("coodle_id","titel","beschreibung","coodle_status_kurzbz","dauer","endedatum","insertamum","insertvon","updateamum","updatevon","ersteller_uid","mailversand","teilnehmer_anonym","termine_anonym"),
 	"campus.tbl_coodle_ressource"  => array("coodle_ressource_id","coodle_id","uid","ort_kurzbz","email","name","zugangscode","insertamum","insertvon","updateamum","updatevon"),
 	"campus.tbl_coodle_termin"  => array("coodle_termin_id","coodle_id","datum","uhrzeit","auswahl"),
 	"campus.tbl_coodle_ressource_termin"  => array("coodle_ressource_id","coodle_termin_id","insertamum","insertvon"),
@@ -409,7 +434,7 @@ $tabellen=array(
 	"campus.tbl_pruefungsfenster" => array("pruefungsfenster_id","studiensemester_kurzbz","oe_kurzbz","start","ende"),
 	"campus.tbl_pruefung" => array("pruefung_id","mitarbeiter_uid","studiensemester_kurzbz","pruefungsfenster_id","pruefungstyp_kurzbz","titel","beschreibung","methode","einzeln","storniert","insertvon","insertamum","updatevon","updateamum","pruefungsintervall"),
 	"campus.tbl_pruefungstermin" => array("pruefungstermin_id","pruefung_id","von","bis","teilnehmer_max","teilnehmer_min","anmeldung_von","anmeldung_bis","ort_kurzbz","sammelklausur"),
-	"campus.tbl_pruefungsanmeldung" => array("pruefungsanmeldung_id","uid","pruefungstermin_id","lehrveranstaltung_id","status_kurzbz","wuensche","reihung","kommentar","statusupdatevon","statusupdateamum","anrechnung_id","pruefungstyp_kurzbz"),
+	"campus.tbl_pruefungsanmeldung" => array("pruefungsanmeldung_id","uid","pruefungstermin_id","lehrveranstaltung_id","status_kurzbz","wuensche","reihung","kommentar","statusupdatevon","statusupdateamum","anrechnung_id","pruefungstyp_kurzbz","insertamum"),
 	"campus.tbl_pruefungsstatus" => array("status_kurzbz","bezeichnung"),
 	"campus.tbl_reservierung"  => array("reservierung_id","ort_kurzbz","studiengang_kz","uid","stunde","datum","titel","beschreibung","semester","verband","gruppe","gruppe_kurzbz","veranstaltung_id","insertamum","insertvon"),
 	"campus.tbl_resturlaub"  => array("mitarbeiter_uid","resturlaubstage","mehrarbeitsstunden","updateamum","updatevon","insertamum","insertvon","urlaubstageprojahr"),
@@ -467,7 +492,7 @@ $tabellen=array(
 	"lehre.tbl_studienordnung"  => array("studienordnung_id","studiengang_kz","version","gueltigvon","gueltigbis","bezeichnung","ects","studiengangbezeichnung","studiengangbezeichnung_englisch","studiengangkurzbzlang","akadgrad_id","insertamum","insertvon","updateamum","updatevon","ext_id", "status_kurzbz", "standort_id"),
 	"lehre.tbl_studienordnungstatus" => array("status_kurzbz","bezeichnung","reihenfolge"),
 	"lehre.tbl_studienordnung_semester"  => array("studienordnung_semester_id","studienordnung_id","studiensemester_kurzbz","semester"),
-	"lehre.tbl_studienplan" => array("studienplan_id","studienordnung_id","orgform_kurzbz","version","regelstudiendauer","sprache","aktiv","bezeichnung","insertamum","insertvon","updateamum","updatevon","semesterwochen","testtool_sprachwahl","ext_id", "ects_stpl", "pflicht_sws", "pflicht_lvs"),
+	"lehre.tbl_studienplan" => array("studienplan_id","studienordnung_id","orgform_kurzbz","version","regelstudiendauer","sprache","aktiv","bezeichnung","insertamum","insertvon","updateamum","updatevon","semesterwochen","testtool_sprachwahl","ext_id", "ects_stpl", "pflicht_sws", "pflicht_lvs","onlinebewerbung_studienplan"),
 	"lehre.tbl_studienplan_lehrveranstaltung" => array("studienplan_lehrveranstaltung_id","studienplan_id","lehrveranstaltung_id","semester","studienplan_lehrveranstaltung_id_parent","pflicht","koordinator","insertamum","insertvon","updateamum","updatevon","sort","ext_id", "curriculum","export","genehmigung"),
 	"lehre.tbl_studienplan_semester" => array("studienplan_semester_id", "studienplan_id", "studiensemester_kurzbz", "semester"),
 	"lehre.tbl_studienplatz" => array("studienplatz_id","studiengang_kz","studiensemester_kurzbz","orgform_kurzbz","ausbildungssemester","gpz","npz","insertamum","insertvon","updateamum","updatevon","ext_id", "apz", "studienplan_id"),

system/generatestudienordnung.php

@@ -39,13 +39,13 @@ $db = new basis_db();
 foreach($studiengang->result as $rowstg)
 {
 /*
-	$qry = "SELECT 
-				studiensemester_kurzbz 
-			FROM 
-				lehre.tbl_lehrveranstaltung 
-				JOIN lehre.tbl_lehreinheit USING(lehrveranstaltung_id) 
-				JOIN public.tbl_studiensemester USING(studiensemester_kurzbz) 
-			WHERE 
+	$qry = "SELECT
+				studiensemester_kurzbz
+			FROM
+				lehre.tbl_lehrveranstaltung
+				JOIN lehre.tbl_lehreinheit USING(lehrveranstaltung_id)
+				JOIN public.tbl_studiensemester USING(studiensemester_kurzbz)
+			WHERE
 				tbl_lehrveranstaltung.studiengang_kz=".$db->db_add_param($rowstg->studiengang_kz, FHC_INTEGER)."
 			ORDER BY tbl_studiensemester.start LIMIT 1";
 */
@@ -79,11 +79,11 @@ foreach($studiengang->result as $rowstg)
 	}
 	else
 		$studienordnung_id = $studienordnung->studienordnung_id;
-	
+
 	// Studienplan anlegen
 	if($rowstg->mischform)
 	{
-		$qry = "SELECT 
+		$qry = "SELECT
 					distinct orgform_kurzbz
 				FROM
 					lehre.tbl_lehrveranstaltung
@@ -158,19 +158,19 @@ function createStudienplan($orgform, $studienordnung_id, $rowstg, $studienordnun
 			$wochen = $row->wochen;
 		}
 	}
-	
+
 	$studienplan->semesterwochen = $wochen;
 	$studienplan->testtool_sprachwahl = true;//$db->db_parse_bool($rowstg->testtool_sprachwahl);
 	$studienplan->insertvon = 'generate';
 	if(!$studienplan->save())
 	{
 		echo 'Studienplan failed for '.$rowstg->studiengang_kz.$studienplan->errormsg;
-		continue;
+		return false;
 	}
 	else
 		$studienplan_id = $studienplan->studienplan_id;
 
-	$qry = "SELECT 
+	$qry = "SELECT
 				distinct lehrveranstaltung_id, semester, koordinator
 			FROM
 				lehre.tbl_lehrveranstaltung

system/mlists/mlists_generate.php

@@ -50,7 +50,7 @@ $error_msg='';
 	if (!$db = new basis_db())
  		die('Fehler beim Oeffnen der Datenbankverbindung');
 
-   	// aktuelles Studiensemester ermitteln
+	// aktuelles Studiensemester ermitteln
 	$sql_query="SELECT studiensemester_kurzbz FROM public.vw_studiensemester ORDER BY delta LIMIT 1";
 	if(!($result = $db->db_query($sql_query)))
 		$error_msg.=$db->db_last_error();
@@ -76,7 +76,7 @@ $error_msg='';
 		$db->db_query($qry);
 	}
 
-   	// **************************************************************
+	// **************************************************************
 	// MitarbeiterInnenVerteiler abgleichen
 	$mlist_name='tw_ma';
 	setGeneriert($mlist_name);
@@ -90,7 +90,7 @@ $error_msg='';
 
 	while($row = $db->db_fetch_object($result))
 	{
-     	$sql_query="DELETE FROM public.tbl_benutzergruppe WHERE UPPER(gruppe_kurzbz)=UPPER('$mlist_name') AND uid='$row->uid'";
+		$sql_query="DELETE FROM public.tbl_benutzergruppe WHERE UPPER(gruppe_kurzbz)=UPPER('$mlist_name') AND uid='$row->uid'";
 		if(!$db->db_query($sql_query))
 			$error_msg.=$db->db_last_error().$sql_query;
 		echo '-';
@@ -103,7 +103,7 @@ $error_msg='';
 		$error_msg.= $db->db_last_error();
 	while($row = $db->db_fetch_object($result))
 	{
-     	$sql_query="INSERT INTO public.tbl_benutzergruppe(uid, gruppe_kurzbz, insertamum, insertvon) VALUES ('$row->uid','".strtoupper($mlist_name)."', now(), 'mlists_generate')";
+		$sql_query="INSERT INTO public.tbl_benutzergruppe(uid, gruppe_kurzbz, insertamum, insertvon) VALUES ('$row->uid','".strtoupper($mlist_name)."', now(), 'mlists_generate')";
 		if(!$db->db_query($sql_query))
 			$error_msg.=$db->db_last_error().$sql_query;
 		echo '-';
@@ -124,7 +124,7 @@ $error_msg='';
 
 	while($row = $db->db_fetch_object($result))
 	{
-     	$sql_query="DELETE FROM public.tbl_benutzergruppe WHERE UPPER(gruppe_kurzbz)=UPPER(".$db->db_add_param($mlist_name).") AND uid=".$db->db_add_param($row->uid);
+		$sql_query="DELETE FROM public.tbl_benutzergruppe WHERE UPPER(gruppe_kurzbz)=UPPER(".$db->db_add_param($mlist_name).") AND uid=".$db->db_add_param($row->uid);
 		if(!$db->db_query($sql_query))
 			$error_msg.=$db->db_last_error().$sql_query;
 		echo '-';
@@ -137,7 +137,7 @@ $error_msg='';
 		$error_msg.= $db->db_last_error();
 	while($row = $db->db_fetch_object($result))
 	{
-     	$sql_query="INSERT INTO public.tbl_benutzergruppe(uid, gruppe_kurzbz, insertamum, insertvon) VALUES (".$db->db_add_param($row->uid).",".$db->db_add_param(strtoupper($mlist_name)).", now(), 'mlists_generate')";
+		$sql_query="INSERT INTO public.tbl_benutzergruppe(uid, gruppe_kurzbz, insertamum, insertvon) VALUES (".$db->db_add_param($row->uid).",".$db->db_add_param(strtoupper($mlist_name)).", now(), 'mlists_generate')";
 		if(!$db->db_query($sql_query))
 			$error_msg.=$db->db_last_error().$sql_query;
 		echo '-';
@@ -158,7 +158,7 @@ $error_msg='';
 
 	while($row = $db->db_fetch_object($result))
 	{
-     	$sql_query="DELETE FROM public.tbl_benutzergruppe WHERE UPPER(gruppe_kurzbz)=UPPER('$mlist_name') AND uid='$row->uid'";
+		$sql_query="DELETE FROM public.tbl_benutzergruppe WHERE UPPER(gruppe_kurzbz)=UPPER('$mlist_name') AND uid='$row->uid'";
 		if(!$db->db_query($sql_query))
 			$error_msg.=$db->db_last_error().$sql_query;
 		echo '-';
@@ -171,7 +171,7 @@ $error_msg='';
 		$error_msg.= $db->db_last_error();
 	while($row = $db->db_fetch_object($result))
 	{
-     	$sql_query="INSERT INTO public.tbl_benutzergruppe(uid, gruppe_kurzbz, insertamum, insertvon) VALUES ('$row->uid','".strtoupper($mlist_name)."', now(), 'mlists_generate')";
+		$sql_query="INSERT INTO public.tbl_benutzergruppe(uid, gruppe_kurzbz, insertamum, insertvon) VALUES ('$row->uid','".strtoupper($mlist_name)."', now(), 'mlists_generate')";
 		if(!$db->db_query($sql_query))
 			$error_msg.=$db->db_last_error().$sql_query;
 		echo '-';
@@ -199,7 +199,7 @@ $error_msg='';
 		$error_msg.=$db->db_last_error();
 	while($row = $db->db_fetch_object($result))
 	{
-     	$sql_query="DELETE FROM public.tbl_benutzergruppe WHERE UPPER(gruppe_kurzbz)=UPPER('$mlist_name') AND uid='$row->uid'";
+		$sql_query="DELETE FROM public.tbl_benutzergruppe WHERE UPPER(gruppe_kurzbz)=UPPER('$mlist_name') AND uid='$row->uid'";
 		if(!$db->db_query($sql_query))
 			$error_msg.=$db->db_last_error().$sql_query;
 		echo '-';
@@ -224,7 +224,7 @@ $error_msg='';
 		$error_msg.=$db->db_last_error();
 	while($row=$db->db_fetch_object($result))
 	{
-     	$sql_query="INSERT INTO public.tbl_benutzergruppe(uid, gruppe_kurzbz, studiensemester_kurzbz, updateamum, updatevon, insertamum, insertvon) VALUES ('$row->uid','".strtoupper($mlist_name)."',null, null, null, now(), 'mlists_generate')";
+		$sql_query="INSERT INTO public.tbl_benutzergruppe(uid, gruppe_kurzbz, studiensemester_kurzbz, updateamum, updatevon, insertamum, insertvon) VALUES ('$row->uid','".strtoupper($mlist_name)."',null, null, null, now(), 'mlists_generate')";
 		if(!$db->db_query($sql_query))
 			$error_msg.=$db->db_last_error().$sql_query;
 		echo '-';
@@ -256,7 +256,7 @@ $error_msg='';
 		$error_msg.=$db->db_last_error();
 	while($row=$db->db_fetch_object($result))
 	{
-     	$sql_query="DELETE FROM public.tbl_benutzergruppe WHERE UPPER(gruppe_kurzbz)=UPPER('$mlist_name') AND uid='$row->uid'";
+		$sql_query="DELETE FROM public.tbl_benutzergruppe WHERE UPPER(gruppe_kurzbz)=UPPER('$mlist_name') AND uid='$row->uid'";
 		if(!$db->db_query($sql_query))
 			$error_msg.=$db->db_last_error().$sql_query;
 		echo '-';
@@ -281,7 +281,75 @@ $error_msg='';
 		$error_msg.=$db->db_last_error();
 	while($row=$db->db_fetch_object($result))
 	{
-     	$sql_query="INSERT INTO public.tbl_benutzergruppe(uid, gruppe_kurzbz, studiensemester_kurzbz, updateamum, updatevon, insertamum, insertvon) VALUES ('$row->uid','".strtoupper($mlist_name)."',null, null, null, now(), 'mlists_generate')";
+		$sql_query="INSERT INTO public.tbl_benutzergruppe(uid, gruppe_kurzbz, studiensemester_kurzbz, updateamum, updatevon, insertamum, insertvon) VALUES ('$row->uid','".strtoupper($mlist_name)."',null, null, null, now(), 'mlists_generate')";
+		if(!$db->db_query($sql_query))
+			$error_msg.=$db->db_last_error().$sql_query;
+		echo '-';
+		flush();
+	}
+
+	// **************************************************************
+	// Studiengangsleiter-Verteiler abgleichen
+	// Es werden auch StellvertreterInnen hinzugefügt
+	$mlist_name='tw_stgl_bama';
+	setGeneriert($mlist_name);
+	// Personen holen die nicht mehr in den Verteiler gehoeren
+	echo $mlist_name.' wird abgeglichen!<BR>';
+	flush();
+	$sql_query="SELECT uid FROM public.tbl_benutzergruppe
+				WHERE
+					UPPER(gruppe_kurzbz)=UPPER('$mlist_name') AND
+					uid NOT IN (SELECT mitarbeiter_uid
+								FROM
+									public.tbl_mitarbeiter
+									JOIN public.tbl_benutzer ON (mitarbeiter_uid=uid)
+									JOIN public.tbl_benutzerfunktion USING(uid)
+									JOIN public.tbl_studiengang USING(oe_kurzbz)
+								WHERE tbl_benutzer.aktiv AND (funktion_kurzbz='Leitung' OR funktion_kurzbz='gLtg' OR funktion_kurzbz='stvLtg') AND
+								(tbl_benutzerfunktion.datum_von is null OR tbl_benutzerfunktion.datum_von<=now()) AND
+								(tbl_benutzerfunktion.datum_bis is null OR tbl_benutzerfunktion.datum_bis>=now())
+								AND tbl_studiengang.aktiv=true
+								AND tbl_studiengang.typ in('b','m')
+								AND tbl_studiengang.studiengang_kz>0
+								AND tbl_studiengang.studiengang_kz<10000
+								)";
+	if(!($result = $db->db_query($sql_query)))
+		$error_msg.=$db->db_last_error();
+	while($row=$db->db_fetch_object($result))
+	{
+		$sql_query="DELETE FROM public.tbl_benutzergruppe WHERE UPPER(gruppe_kurzbz)=UPPER('$mlist_name') AND uid=".$db->db_add_param($row->uid);
+		if(!$db->db_query($sql_query))
+			$error_msg.=$db->db_last_error().$sql_query;
+		echo '-';
+		flush();
+	}
+	// Personen holen die nicht im Verteiler sind
+	echo '<BR>';
+	$sql_query="SELECT DISTINCT mitarbeiter_uid AS uid
+				FROM
+					public.tbl_mitarbeiter
+					JOIN public.tbl_benutzer ON (mitarbeiter_uid=uid)
+					JOIN public.tbl_benutzerfunktion USING(uid)
+					JOIN public.tbl_studiengang USING(oe_kurzbz)
+				WHERE
+					tbl_benutzer.aktiv AND
+					(tbl_benutzerfunktion.funktion_kurzbz='Leitung' OR funktion_kurzbz='gLtg' OR funktion_kurzbz='stvLtg') AND
+					(tbl_benutzerfunktion.datum_von is null OR tbl_benutzerfunktion.datum_von<=now()) AND
+					(tbl_benutzerfunktion.datum_bis is null OR tbl_benutzerfunktion.datum_bis>=now()) AND
+					mitarbeiter_uid NOT LIKE '\\\\_%' AND mitarbeiter_uid NOT IN (SELECT uid FROM public.tbl_benutzergruppe WHERE UPPER(gruppe_kurzbz)=UPPER('$mlist_name'))
+					AND tbl_studiengang.aktiv=true
+					AND tbl_studiengang.typ in('b','m')
+					AND tbl_studiengang.studiengang_kz>0
+					AND tbl_studiengang.studiengang_kz<10000";
+	if(!($result = $db->db_query($sql_query)))
+		$error_msg.=$db->db_last_error();
+	while($row=$db->db_fetch_object($result))
+	{
+		$sql_query="INSERT INTO public.tbl_benutzergruppe(uid, gruppe_kurzbz, studiensemester_kurzbz,
+					updateamum, updatevon, insertamum, insertvon) VALUES (".
+					$db->db_add_param($row->uid).",".
+					$db->db_add_param(strtoupper($mlist_name)).
+					",null, null, null, now(), 'mlists_generate')";
 		if(!$db->db_query($sql_query))
 			$error_msg.=$db->db_last_error().$sql_query;
 		echo '-';
@@ -300,7 +368,7 @@ $error_msg='';
 		$error_msg.=$db->db_last_error();
 	while($row=$db->db_fetch_object($result))
 	{
-     	$sql_query="DELETE FROM public.tbl_benutzergruppe WHERE UPPER(gruppe_kurzbz)=UPPER('$mlist_name') AND uid='$row->uid'";
+		$sql_query="DELETE FROM public.tbl_benutzergruppe WHERE UPPER(gruppe_kurzbz)=UPPER('$mlist_name') AND uid='$row->uid'";
 		if(!$db->db_query($sql_query))
 			$error_msg.=$db->db_last_error().$sql_query;
 		echo '-';
@@ -313,7 +381,7 @@ $error_msg='';
 		$error_msg.=$db->db_last_error();
 	while($row=$db->db_fetch_object($result))
 	{
-     	$sql_query="INSERT INTO public.tbl_benutzergruppe(uid, gruppe_kurzbz, insertamum, insertvon) VALUES ('$row->uid','".strtoupper($mlist_name)."', now(), 'mlists_generate')";
+		$sql_query="INSERT INTO public.tbl_benutzergruppe(uid, gruppe_kurzbz, insertamum, insertvon) VALUES ('$row->uid','".strtoupper($mlist_name)."', now(), 'mlists_generate')";
 		if(!$db->db_query($sql_query))
 			$error_msg.=$db->db_last_error().$sql_query;
 		echo '-';
@@ -332,7 +400,7 @@ $error_msg='';
 		$error_msg.=$db->db_last_error();
 	while($row=$db->db_fetch_object($result))
 	{
-     	$sql_query="DELETE FROM public.tbl_benutzergruppe WHERE UPPER(gruppe_kurzbz)=UPPER('$mlist_name') AND uid='$row->uid'";
+		$sql_query="DELETE FROM public.tbl_benutzergruppe WHERE UPPER(gruppe_kurzbz)=UPPER('$mlist_name') AND uid='$row->uid'";
 		if(!$db->db_query($sql_query))
 			$error_msg.=$db->db_last_error().$sql_query;
 		echo '-';
@@ -345,7 +413,7 @@ $error_msg='';
 		$error_msg.=$db->db_last_error();
 	while($row = $db->db_fetch_object($result))
 	{
-     	$sql_query="INSERT INTO public.tbl_benutzergruppe(uid, gruppe_kurzbz, insertamum, insertvon) VALUES ('$row->uid','".strtoupper($mlist_name)."', now(), 'mlists_generate')";
+		$sql_query="INSERT INTO public.tbl_benutzergruppe(uid, gruppe_kurzbz, insertamum, insertvon) VALUES ('$row->uid','".strtoupper($mlist_name)."', now(), 'mlists_generate')";
 		if(!$db->db_query($sql_query))
 			$error_msg.=$db->db_last_error().$sql_query;
 		echo '-';
@@ -364,7 +432,7 @@ $error_msg='';
 		$error_msg.=$db->db_last_error();
 	while($row=$db->db_fetch_object($result))
 	{
-     	$sql_query="DELETE FROM public.tbl_benutzergruppe WHERE UPPER(gruppe_kurzbz)=UPPER('$mlist_name') AND uid='$row->uid'";
+		$sql_query="DELETE FROM public.tbl_benutzergruppe WHERE UPPER(gruppe_kurzbz)=UPPER('$mlist_name') AND uid='$row->uid'";
 		if(!$db->db_query($sql_query))
 			$error_msg.=$db->db_last_error().$sql_query;
 		echo '-';
@@ -377,14 +445,13 @@ $error_msg='';
 		$error_msg.=$db->db_last_error();
 	while($row = $db->db_fetch_object($result))
 	{
-     	$sql_query="INSERT INTO public.tbl_benutzergruppe(uid, gruppe_kurzbz, insertamum, insertvon) VALUES ('$row->uid','".strtoupper($mlist_name)."', now(), 'mlists_generate')";
+		$sql_query="INSERT INTO public.tbl_benutzergruppe(uid, gruppe_kurzbz, insertamum, insertvon) VALUES ('$row->uid','".strtoupper($mlist_name)."', now(), 'mlists_generate')";
 		if(!$db->db_query($sql_query))
 			$error_msg.=$db->db_last_error().$sql_query;
 		echo '-';
 		flush();
 	}
 
-
 	// **************************************************************
 	// Lektoren-Verteiler innerhalb der Studiengaenge abgleichen
 	// Lektoren holen die nicht mehr in den Verteiler gehoeren
@@ -401,12 +468,12 @@ $error_msg='';
 			tbl_studiengang.studiengang_kz=tbl_lehrveranstaltung.studiengang_kz AND
 			(studiensemester_kurzbz='$studiensemester' OR
 			 studiensemester_kurzbz='$stsem2') AND mitarbeiter_uid NOT LIKE '\\\\_%')";
-	//echo $sql_query;
+
 	if(!($result=$db->db_query($sql_query)))
 		$error_msg.=$db->db_last_error().$sql_query;
 	while($row=$db->db_fetch_object($result))
 	{
-     	$sql_query="DELETE FROM public.tbl_benutzergruppe WHERE UPPER(gruppe_kurzbz)=UPPER('$row->gruppe_kurzbz') AND uid='$row->uid'";
+		$sql_query="DELETE FROM public.tbl_benutzergruppe WHERE UPPER(gruppe_kurzbz)=UPPER('$row->gruppe_kurzbz') AND uid='$row->uid'";
 		if(!$db->db_query($sql_query))
 			$error_msg.=$db->db_last_error().$sql_query;
 		echo '-';
@@ -450,7 +517,7 @@ $error_msg='';
 			echo "<br>Fehler:$sql_query";
 
 		setGeneriert($row->mlist_name);
-     	$sql_query="INSERT INTO public.tbl_benutzergruppe(uid, gruppe_kurzbz, insertamum, insertvon) VALUES ('$row->mitarbeiter_uid','".strtoupper($row->mlist_name)."', now(), 'mlists_generate')";
+		$sql_query="INSERT INTO public.tbl_benutzergruppe(uid, gruppe_kurzbz, insertamum, insertvon) VALUES ('$row->mitarbeiter_uid','".strtoupper($row->mlist_name)."', now(), 'mlists_generate')";
 		if(!$db->db_query($sql_query))
 			$error_msg.=$db->db_last_error().$sql_query;
 		echo '-';
@@ -494,7 +561,7 @@ $error_msg='';
 		$error_msg.=$db->db_last_error();
 	while($row = $db->db_fetch_object($result))
 	{
-     	$sql_query="DELETE FROM public.tbl_benutzergruppe WHERE UPPER(gruppe_kurzbz)=UPPER('$row->gruppe_kurzbz') AND uid='$row->uid'";
+		$sql_query="DELETE FROM public.tbl_benutzergruppe WHERE UPPER(gruppe_kurzbz)=UPPER('$row->gruppe_kurzbz') AND uid='$row->uid'";
 		if(!$db->db_query($sql_query))
 			$error_msg.=$db->db_last_error().$sql_query;
 		echo '-';
@@ -523,7 +590,7 @@ $error_msg='';
 		if($row->uid!='')
 		{
 			setGeneriert('TW_HSV');
-	     	$sql_query="INSERT INTO public.tbl_benutzergruppe (uid, gruppe_kurzbz, insertamum, insertvon) VALUES (".$db->db_add_param($row->uid).",'TW_HSV', now(), 'mlists_generate')";
+			$sql_query="INSERT INTO public.tbl_benutzergruppe (uid, gruppe_kurzbz, insertamum, insertvon) VALUES (".$db->db_add_param($row->uid).",'TW_HSV', now(), 'mlists_generate')";
 			if(!$db->db_query($sql_query))
 				$error_msg.=$db->db_last_error().$sql_query;
 			echo '-';
@@ -579,7 +646,7 @@ $error_msg='';
 		$error_msg.=$db->db_last_error();
 	while($row = $db->db_fetch_object($result))
 	{
-     	$sql_query="DELETE FROM public.tbl_benutzergruppe WHERE UPPER(gruppe_kurzbz)=UPPER('$row->gruppe_kurzbz') AND uid='$row->uid'";
+		$sql_query="DELETE FROM public.tbl_benutzergruppe WHERE UPPER(gruppe_kurzbz)=UPPER('$row->gruppe_kurzbz') AND uid='$row->uid'";
 		if(!$db->db_query($sql_query))
 			$error_msg.=$db->db_last_error().$sql_query;
 		echo '-';
@@ -610,7 +677,7 @@ $error_msg='';
 		if($row->gruppe_kurzbz!='')
 		{
 			setGeneriert($row->gruppe_kurzbz);
-	     	$sql_query="INSERT INTO public.tbl_benutzergruppe (uid, gruppe_kurzbz, insertamum, insertvon) VALUES ('$row->uid','".mb_strtoupper($row->gruppe_kurzbz)."', now(), 'mlists_generate')";
+			$sql_query="INSERT INTO public.tbl_benutzergruppe (uid, gruppe_kurzbz, insertamum, insertvon) VALUES ('$row->uid','".mb_strtoupper($row->gruppe_kurzbz)."', now(), 'mlists_generate')";
 			if(!$db->db_query($sql_query))
 				$error_msg.=$db->db_last_error().$sql_query;
 			echo '-';
@@ -637,9 +704,9 @@ $error_msg='';
 	else
 		echo "<br>Fehler:$sql_query";
 
-    flush();
+	flush();
 	ob_flush();
-    setGeneriert('TW_STDV');
+	setGeneriert('TW_STDV');
 	$sql_query="SELECT gruppe_kurzbz, uid FROM public.tbl_benutzergruppe
 				WHERE gruppe_kurzbz='TW_STDV'
 				AND uid not in (SELECT uid FROM public.tbl_benutzerfunktion JOIN public.tbl_benutzer USING(uid)
@@ -651,7 +718,7 @@ $error_msg='';
 		$error_msg.=$db->db_last_error();
 	while($row = $db->db_fetch_object($result))
 	{
-     	$sql_query="DELETE FROM public.tbl_benutzergruppe WHERE UPPER(gruppe_kurzbz)=UPPER('tw_stdv') AND uid='$row->uid'";
+		$sql_query="DELETE FROM public.tbl_benutzergruppe WHERE UPPER(gruppe_kurzbz)=UPPER('tw_stdv') AND uid='$row->uid'";
 		if(!$db->db_query($sql_query))
 			$error_msg.=$db->db_last_error().$sql_query;
 		echo '-';
@@ -670,7 +737,7 @@ $error_msg='';
 		$error_msg.=$db->db_last_error();
 	while($row = $db->db_fetch_object($result))
 	{
-	   	$sql_query="INSERT INTO public.tbl_benutzergruppe (uid, gruppe_kurzbz, insertamum, insertvon) VALUES ('$row->uid','TW_STDV', now(), 'mlists_generate')";
+		$sql_query="INSERT INTO public.tbl_benutzergruppe (uid, gruppe_kurzbz, insertamum, insertvon) VALUES ('$row->uid','TW_STDV', now(), 'mlists_generate')";
 		if(!$db->db_query($sql_query))
 			$error_msg.=$db->db_last_error().$sql_query;
 		echo '-';
@@ -725,7 +792,7 @@ $error_msg='';
 		$error_msg.=$db->db_last_error();
 	while($row = $db->db_fetch_object($result))
 	{
-     	$sql_query="DELETE FROM public.tbl_benutzergruppe WHERE UPPER(gruppe_kurzbz)=UPPER('$row->gruppe_kurzbz') AND uid='$row->uid'";
+		$sql_query="DELETE FROM public.tbl_benutzergruppe WHERE UPPER(gruppe_kurzbz)=UPPER('$row->gruppe_kurzbz') AND uid='$row->uid'";
 		if(!$db->db_query($sql_query))
 			$error_msg.=$db->db_last_error().$sql_query;
 		echo '-';
@@ -756,7 +823,7 @@ $error_msg='';
 		if($row->gruppe_kurzbz!='')
 		{
 			setGeneriert($row->gruppe_kurzbz);
-	     	$sql_query="INSERT INTO public.tbl_benutzergruppe (uid, gruppe_kurzbz, insertamum, insertvon) VALUES ('$row->uid','".mb_strtoupper($row->gruppe_kurzbz)."', now(), 'mlists_generate')";
+			$sql_query="INSERT INTO public.tbl_benutzergruppe (uid, gruppe_kurzbz, insertamum, insertvon) VALUES ('$row->uid','".mb_strtoupper($row->gruppe_kurzbz)."', now(), 'mlists_generate')";
 			if(!$db->db_query($sql_query))
 				$error_msg.=$db->db_last_error().$sql_query;
 			echo '-';
@@ -783,9 +850,9 @@ $error_msg='';
 	else
 		echo "<br>Fehler:$sql_query";
 	// Studierende holen, die nicht mehr in den Verteiler gehoeren
-    flush();
+	flush();
 	ob_flush();
-    setGeneriert('TW_JGV');
+	setGeneriert('TW_JGV');
 	$sql_query="SELECT gruppe_kurzbz, uid FROM public.tbl_benutzergruppe
 				WHERE gruppe_kurzbz='TW_JGV'
 				AND uid not in (SELECT uid FROM public.tbl_benutzerfunktion JOIN public.tbl_benutzer USING(uid)
@@ -797,7 +864,7 @@ $error_msg='';
 		$error_msg.=$db->db_last_error();
 	while($row = $db->db_fetch_object($result))
 	{
-     	$sql_query="DELETE FROM public.tbl_benutzergruppe WHERE UPPER(gruppe_kurzbz)=UPPER('tw_jgv') AND uid='$row->uid'";
+		$sql_query="DELETE FROM public.tbl_benutzergruppe WHERE UPPER(gruppe_kurzbz)=UPPER('tw_jgv') AND uid='$row->uid'";
 		if(!$db->db_query($sql_query))
 			$error_msg.=$db->db_last_error().$sql_query;
 		echo '-';
@@ -825,13 +892,13 @@ $error_msg='';
 
 	// ***************************
 	// TW_STD abgleichen
-    flush();
-    setGeneriert('TW_STD');
-    echo 'TW_STD wird abgeglichen!<br>';
+	flush();
+	setGeneriert('TW_STD');
+	echo 'TW_STD wird abgeglichen!<br>';
 
-    //Abbrecher bleiben noch 3 Wochen im Verteiler
-    //andere inaktive noch fuer 20 Wochen
-    //damit im CIS die Menuepunkte fuer Studierende richtig angezeigt werden
+	//Abbrecher bleiben noch 3 Wochen im Verteiler
+	//andere inaktive noch fuer 20 Wochen
+	//damit im CIS die Menuepunkte fuer Studierende richtig angezeigt werden
 	$sql_query="DELETE FROM public.tbl_benutzergruppe
 				WHERE UPPER(gruppe_kurzbz)='TW_STD'
 				AND uid not in
@@ -871,14 +938,14 @@ $error_msg='';
 
 	// ***************************
 	// TW_STD_M abgleichen. Alle maennlichen Studenten
-    flush();
+	flush();
 	ob_flush();
-    setGeneriert('TW_STD_M');
-    echo 'TW_STD_M wird abgeglichen!<br>';
+	setGeneriert('TW_STD_M');
+	echo 'TW_STD_M wird abgeglichen!<br>';
 
-    //Abbrecher bleiben noch 3 Wochen im Verteiler
-    //andere inaktive noch fuer 20 Wochen
-    //damit im CIS die Menuepunkte fuer Studierende richtig angezeigt werden
+	//Abbrecher bleiben noch 3 Wochen im Verteiler
+	//andere inaktive noch fuer 20 Wochen
+	//damit im CIS die Menuepunkte fuer Studierende richtig angezeigt werden
 	$sql_query="DELETE FROM public.tbl_benutzergruppe
 				WHERE UPPER(gruppe_kurzbz)='TW_STD_M'
 				AND uid not in
@@ -918,14 +985,14 @@ $error_msg='';
 
 	// ***************************
 	// TW_STD_W abgleichen. Alle weiblichen Studentinnen
-    flush();
+	flush();
 	ob_flush();
-    setGeneriert('TW_STD_W');
-    echo 'TW_STD_W wird abgeglichen!<br>';
+	setGeneriert('TW_STD_W');
+	echo 'TW_STD_W wird abgeglichen!<br>';
 
-    //Abbrecher bleiben noch 3 Wochen im Verteiler
-    //andere inaktive noch fuer 20 Wochen
-    //damit im CIS die Menuepunkte fuer Studierende richtig angezeigt werden
+	//Abbrecher bleiben noch 3 Wochen im Verteiler
+	//andere inaktive noch fuer 20 Wochen
+	//damit im CIS die Menuepunkte fuer Studierende richtig angezeigt werden
 	$sql_query="DELETE FROM public.tbl_benutzergruppe
 				WHERE UPPER(gruppe_kurzbz)='TW_STD_W'
 				AND uid not in
@@ -963,7 +1030,70 @@ $error_msg='';
 		$error_msg.=$db->db_last_error();
 
 
-   	// **************************************************************
+	// ***************************
+	// TW_BAMA abgleichen
+	// Alle ordentlichen Bachelor- und Master-Studierenden
+	flush();
+	ob_flush();
+	setGeneriert('TW_BAMA');
+	echo 'TW_BAMA wird abgeglichen!<br>';
+
+	//Abbrecher bleiben noch 3 Wochen im Verteiler
+	//andere inaktive noch fuer 20 Wochen
+	$sql_query="DELETE FROM public.tbl_benutzergruppe
+			WHERE UPPER(gruppe_kurzbz)='TW_BAMA'
+			AND uid NOT IN
+			(
+				SELECT
+					uid
+				FROM
+					campus.vw_student
+				WHERE aktiv
+				AND studiengang_kz IN
+						(SELECT studiengang_kz FROM public.tbl_studiengang WHERE typ IN ('b','m'))
+
+				UNION
+
+				SELECT
+					uid
+				FROM
+					campus.vw_student
+				WHERE aktiv=false
+				AND studiengang_kz IN
+						(SELECT studiengang_kz FROM public.tbl_studiengang WHERE typ IN ('b','m'))
+				AND get_rolle_prestudent(vw_student.prestudent_id, null)='Absolvent'
+				AND updateaktivam>now()-'20 weeks'::interval
+			)";
+	if($result = $db->db_query($sql_query))
+	{
+		echo $db->db_affected_rows($result).' Eintraege entfernt<br>';
+	}
+	else
+	{
+		$error_msg.=$db->db_last_error();
+	}
+
+	// Studenten holen die nicht im Verteiler sind
+	$sql_query="INSERT INTO public.tbl_benutzergruppe (uid, gruppe_kurzbz, insertamum, insertvon)
+			SELECT uid,'TW_BAMA',now(),'mlists_generate'
+			FROM campus.vw_student
+			WHERE (aktiv
+					OR
+					(aktiv=false AND get_rolle_prestudent(vw_student.prestudent_id, null)='Absolvent' AND updateaktivam>now()-'20 weeks'::interval))
+			AND studiengang_kz IN
+					(SELECT studiengang_kz FROM public.tbl_studiengang WHERE typ IN ('b','m'))
+			AND uid NOT in(SELECT uid FROM public.tbl_benutzergruppe
+				WHERE UPPER(gruppe_kurzbz)='TW_BAMA')";
+
+	if($result = $db->db_query($sql_query))
+	{
+		echo $db->db_affected_rows($result).' Eintraege hinzugefuegt<br>';
+	}
+	else
+		$error_msg.=$db->db_last_error();
+
+
+	// **************************************************************
 	// Moodle - LektorenVerteiler abgleichen
 	$mlist_name='moodle_lkt';
 	setGeneriert($mlist_name);
@@ -997,7 +1127,7 @@ $error_msg='';
 	echo '<BR>';
 	while($row = $db->db_fetch_object($result))
 	{
-     	$sql_query="INSERT INTO public.tbl_benutzergruppe(uid, gruppe_kurzbz, insertamum, insertvon) VALUES ('$row->uid','".strtoupper($mlist_name)."', now(), 'mlists_generate')";
+		$sql_query="INSERT INTO public.tbl_benutzergruppe(uid, gruppe_kurzbz, insertamum, insertvon) VALUES ('$row->uid','".strtoupper($mlist_name)."', now(), 'mlists_generate')";
 		if(!$db->db_query($sql_query))
 		{
 			$error_msg.=$db->db_last_error().$sql_query;
@@ -1079,7 +1209,7 @@ $error_msg='';
 			echo '<BR>';
 			while($row_oe = $db->db_fetch_object($result_oe))
 			{
-		     	$sql_query="INSERT INTO public.tbl_benutzergruppe(uid, gruppe_kurzbz, insertamum, insertvon) VALUES ('$row_oe->uid','".$mlist_name."', now(), 'mlists_generate')";
+				$sql_query="INSERT INTO public.tbl_benutzergruppe(uid, gruppe_kurzbz, insertamum, insertvon) VALUES ('$row_oe->uid','".$mlist_name."', now(), 'mlists_generate')";
 				if(!$db->db_query($sql_query))
 				{
 					$error_msg.=$db->db_last_error().$sql_query;
@@ -1166,7 +1296,7 @@ $error_msg='';
 
 			while($row_oe = $db->db_fetch_object($result_oe))
 			{
-		     	$sql_query="INSERT INTO public.tbl_benutzergruppe(uid, gruppe_kurzbz, insertamum, insertvon) VALUES ('$row_oe->uid','".$mlist_name."', now(), 'mlists_generate')";
+				$sql_query="INSERT INTO public.tbl_benutzergruppe(uid, gruppe_kurzbz, insertamum, insertvon) VALUES ('$row_oe->uid','".$mlist_name."', now(), 'mlists_generate')";
 				if(!$db->db_query($sql_query))
 				{
 					$error_msg.=$db->db_last_error().$sql_query;
@@ -1246,7 +1376,7 @@ $error_msg='';
 			// Lektoren holen die nicht im Verteiler sind
 			while($row_oe = $db->db_fetch_object($result_oe))
 			{
-		     	$sql_query="INSERT INTO public.tbl_benutzergruppe(uid, gruppe_kurzbz, insertamum, insertvon) VALUES ('$row_oe->uid','".$mlist_name."', now(), 'mlists_generate')";
+				$sql_query="INSERT INTO public.tbl_benutzergruppe(uid, gruppe_kurzbz, insertamum, insertvon) VALUES ('$row_oe->uid','".$mlist_name."', now(), 'mlists_generate')";
 				if(!$db->db_query($sql_query))
 				{
 					$error_msg.=$db->db_last_error().$sql_query;
@@ -1285,10 +1415,10 @@ $error_msg='';
 
 		while($row = $db->db_fetch_object($result))
 		{
-	     	$mlist_name=strtoupper($row->typ.$row->kurzbz.'_'.$row->orgform_kurzbz);
-	     	echo $mlist_name.'<br>';
+			$mlist_name=strtoupper($row->typ.$row->kurzbz.'_'.$row->orgform_kurzbz);
+			echo $mlist_name.'<br>';
 
-	     	//Gruppe anlegen falls noch nicht vorhanden
+			//Gruppe anlegen falls noch nicht vorhanden
 			$grp = new gruppe();
 			if(!$grp->exists($mlist_name))
 			{
@@ -1345,7 +1475,7 @@ $error_msg='';
 
 			while($row_oe = $db->db_fetch_object($result_oe))
 			{
-		     	$sql_query="INSERT INTO public.tbl_benutzergruppe(uid, gruppe_kurzbz, insertamum, insertvon) VALUES ('$row_oe->student_uid','".$mlist_name."', now(), 'mlists_generate')";
+				$sql_query="INSERT INTO public.tbl_benutzergruppe(uid, gruppe_kurzbz, insertamum, insertvon) VALUES ('$row_oe->student_uid','".$mlist_name."', now(), 'mlists_generate')";
 				if(!$db->db_query($sql_query))
 				{
 					$error_msg.=$db->db_last_error().$sql_query;
@@ -1406,7 +1536,7 @@ $error_msg='';
 		$error_msg.=$db->db_last_error();
 	while($row=$db->db_fetch_object($result))
 	{
-     	$sql_query="DELETE FROM public.tbl_benutzergruppe WHERE UPPER(gruppe_kurzbz)=UPPER('$mlist_name') AND uid='$row->uid'";
+		$sql_query="DELETE FROM public.tbl_benutzergruppe WHERE UPPER(gruppe_kurzbz)=UPPER('$mlist_name') AND uid='$row->uid'";
 		if(!$db->db_query($sql_query))
 			$error_msg.=$db->db_last_error().$sql_query;
 		echo '-';
@@ -1429,7 +1559,7 @@ $error_msg='';
 		$error_msg.=$db->db_last_error();
 	while($row=$db->db_fetch_object($result))
 	{
-     	$sql_query="INSERT INTO public.tbl_benutzergruppe(uid, gruppe_kurzbz, studiensemester_kurzbz, updateamum, updatevon, insertamum, insertvon) VALUES ('$row->mitarbeiter_uid','".strtoupper($mlist_name)."',null, null, null, now(), 'mlists_generate')";
+		$sql_query="INSERT INTO public.tbl_benutzergruppe(uid, gruppe_kurzbz, studiensemester_kurzbz, updateamum, updatevon, insertamum, insertvon) VALUES ('$row->mitarbeiter_uid','".strtoupper($mlist_name)."',null, null, null, now(), 'mlists_generate')";
 		if(!$db->db_query($sql_query))
 			$error_msg.=$db->db_last_error().$sql_query;
 		echo '-';
@@ -1553,7 +1683,7 @@ $error_msg='';
 	// Lektoren holen die nicht im Verteiler sind
 	while($row_oe = $db->db_fetch_object($result_oe))
 	{
-	   	$sql_query="INSERT INTO public.tbl_benutzergruppe(uid, gruppe_kurzbz, insertamum, insertvon) VALUES ('$row_oe->uid','".$mlist_name."', now(), 'mlists_generate')";
+		$sql_query="INSERT INTO public.tbl_benutzergruppe(uid, gruppe_kurzbz, insertamum, insertvon) VALUES ('$row_oe->uid','".$mlist_name."', now(), 'mlists_generate')";
 		if(!$db->db_query($sql_query))
 		{
 			$error_msg.=$db->db_last_error().$sql_query;
@@ -1711,7 +1841,7 @@ $error_msg='';
 	// Personen holen die nicht im Verteiler sind
 	while($row_oe = $db->db_fetch_object($result_oe))
 	{
-	   	$sql_query="INSERT INTO public.tbl_benutzergruppe(uid, gruppe_kurzbz, insertamum, insertvon) VALUES ('$row_oe->uid','".$mlist_name."', now(), 'mlists_generate')";
+		$sql_query="INSERT INTO public.tbl_benutzergruppe(uid, gruppe_kurzbz, insertamum, insertvon) VALUES ('$row_oe->uid','".$mlist_name."', now(), 'mlists_generate')";
 		if(!$db->db_query($sql_query))
 		{
 			$error_msg.=$db->db_last_error().$sql_query;

system/templates/news_xslt_xhtml.xslt

@@ -138,7 +138,11 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 	</xsl:template>
 	<xsl:template match="ass">
 			<xsl:variable name="uid" select="uid"></xsl:variable>
-			<p><a href="../cis/private/profile/index.php?uid={$uid}"><xsl:value-of select="name" /></a><br />			
+			<p>
+			<xsl:if test="bezeichnung != 'Assistenz'" >
+				<b><xsl:value-of select="bezeichnung" /></b><br />
+			</xsl:if>
+			<a href="../cis/private/profile/index.php?uid={$uid}"><xsl:value-of select="name" /></a><br />			
 			T: <xsl:value-of select="telefon" /><br />
 			R: <xsl:value-of select="ort" /><br />
 			E: <xsl:variable name="mail" select="email"></xsl:variable>

system/xsl/Studienblatt_Leer.xsl

@@ -0,0 +1,291 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
+xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
+>
+
+<xsl:output method="xml" version="1.0" indent="yes"/>
+<xsl:template match="studienblaetter">
+
+<office:document-content xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:rpt="http://openoffice.org/2005/report" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:grddl="http://www.w3.org/2003/g/data-view#" xmlns:officeooo="http://openoffice.org/2009/office" xmlns:tableooo="http://openoffice.org/2009/table" xmlns:drawooo="http://openoffice.org/2010/draw" xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:css3t="http://www.w3.org/TR/css3-text/" office:version="1.2">
+    <office:scripts/>
+    <office:font-face-decls>
+        <style:font-face style:name="Mangal1" svg:font-family="Mangal"/>
+        <style:font-face style:name="Arial" svg:font-family="Arial" style:font-family-generic="roman" style:font-pitch="variable"/>
+        <style:font-face style:name="Tahoma" svg:font-family="Tahoma" style:font-family-generic="roman" style:font-pitch="variable"/>
+        <style:font-face style:name="Times New Roman" svg:font-family="&apos;Times New Roman&apos;" style:font-family-generic="roman" style:font-pitch="variable"/>
+        <style:font-face style:name="Liberation Sans" svg:font-family="&apos;Liberation Sans&apos;" style:font-family-generic="swiss" style:font-pitch="variable"/>
+        <style:font-face style:name="Arial1" svg:font-family="Arial" style:font-family-generic="system" style:font-pitch="variable"/>
+        <style:font-face style:name="Mangal" svg:font-family="Mangal" style:font-family-generic="system" style:font-pitch="variable"/>
+        <style:font-face style:name="Microsoft YaHei" svg:font-family="&apos;Microsoft YaHei&apos;" style:font-family-generic="system" style:font-pitch="variable"/>
+        <style:font-face style:name="Tahoma1" svg:font-family="Tahoma" style:font-family-generic="system" style:font-pitch="variable"/>
+        <style:font-face style:name="Times New Roman1" svg:font-family="&apos;Times New Roman&apos;" style:font-family-generic="system" style:font-pitch="variable"/>
+    </office:font-face-decls>
+    <office:automatic-styles>
+        <style:style style:name="Tabelle1" style:family="table">
+            <style:table-properties style:width="16.443cm" fo:margin-left="-0.199cm" fo:margin-top="0cm" fo:margin-bottom="0cm" table:align="left" style:writing-mode="lr-tb"/>
+        </style:style>
+        <style:style style:name="Tabelle1.A" style:family="table-column">
+            <style:table-column-properties style:column-width="4.69cm"/>
+        </style:style>
+        <style:style style:name="Tabelle1.B" style:family="table-column">
+            <style:table-column-properties style:column-width="7.5cm"/>
+        </style:style>
+        <style:style style:name="Tabelle1.C" style:family="table-column">
+            <style:table-column-properties style:column-width="4.253cm"/>
+        </style:style>
+        <style:style style:name="Tabelle1.1" style:family="table-row">
+            <style:table-row-properties style:min-row-height="1cm" fo:keep-together="auto"/>
+        </style:style>
+        <style:style style:name="Tabelle1.A1" style:family="table-cell">
+            <style:table-cell-properties fo:background-color="#ffffff" fo:padding-left="0.199cm" fo:padding-right="0.191cm" fo:padding-top="0cm" fo:padding-bottom="0cm" fo:border="0.5pt solid #00000a">
+                <style:background-image/>
+            </style:table-cell-properties>
+        </style:style>
+        <style:style style:name="Tabelle1.2" style:family="table-row">
+            <style:table-row-properties style:min-row-height="0.501cm" fo:keep-together="auto"/>
+        </style:style>
+        <style:style style:name="Tabelle2" style:family="table">
+            <style:table-properties style:width="16.379cm" fo:margin-left="-0.199cm" fo:margin-top="0cm" fo:margin-bottom="0cm" table:align="left" style:writing-mode="lr-tb"/>
+        </style:style>
+        <style:style style:name="Tabelle2.A" style:family="table-column">
+            <style:table-column-properties style:column-width="5.84cm"/>
+        </style:style>
+        <style:style style:name="Tabelle2.B" style:family="table-column">
+            <style:table-column-properties style:column-width="6.003cm"/>
+        </style:style>
+        <style:style style:name="Tabelle2.C" style:family="table-column">
+            <style:table-column-properties style:column-width="4.537cm"/>
+        </style:style>
+        <style:style style:name="Tabelle2.1" style:family="table-row">
+            <style:table-row-properties fo:keep-together="auto"/>
+        </style:style>
+        <style:style style:name="Tabelle2.A1" style:family="table-cell">
+            <style:table-cell-properties fo:background-color="#ffffff" fo:padding-left="0.199cm" fo:padding-right="0.191cm" fo:padding-top="0cm" fo:padding-bottom="0cm" fo:border="0.5pt solid #00000a">
+                <style:background-image/>
+            </style:table-cell-properties>
+        </style:style>
+        <style:style style:name="Tabelle3" style:family="table">
+            <style:table-properties style:width="16.443cm" fo:margin-left="-0.199cm" fo:margin-top="0cm" fo:margin-bottom="0cm" table:align="left" style:writing-mode="lr-tb"/>
+        </style:style>
+        <style:style style:name="Tabelle3.A" style:family="table-column">
+            <style:table-column-properties style:column-width="7.689cm"/>
+        </style:style>
+        <style:style style:name="Tabelle3.B" style:family="table-column">
+            <style:table-column-properties style:column-width="8.754cm"/>
+        </style:style>
+        <style:style style:name="Tabelle3.1" style:family="table-row">
+            <style:table-row-properties style:min-row-height="0.801cm" fo:keep-together="auto"/>
+        </style:style>
+        <style:style style:name="Tabelle3.A1" style:family="table-cell">
+            <style:table-cell-properties style:vertical-align="middle" fo:background-color="#ffffff" fo:padding-left="0.199cm" fo:padding-right="0.191cm" fo:padding-top="0cm" fo:padding-bottom="0cm" fo:border="0.5pt solid #00000a">
+                <style:background-image/>
+            </style:table-cell-properties>
+        </style:style>
+        <style:style style:name="Tabelle4" style:family="table">
+            <style:table-properties style:width="16.443cm" fo:margin-left="-0.199cm" fo:margin-top="0cm" fo:margin-bottom="0cm" table:align="left" style:writing-mode="lr-tb"/>
+        </style:style>
+        <style:style style:name="Tabelle4.A" style:family="table-column">
+            <style:table-column-properties style:column-width="3.69cm"/>
+        </style:style>
+        <style:style style:name="Tabelle4.B" style:family="table-column">
+            <style:table-column-properties style:column-width="12.753cm"/>
+        </style:style>
+        <style:style style:name="Tabelle4.1" style:family="table-row">
+            <style:table-row-properties fo:keep-together="auto"/>
+        </style:style>
+        <style:style style:name="Tabelle4.A1" style:family="table-cell">
+            <style:table-cell-properties fo:padding-left="0.199cm" fo:padding-right="0.191cm" fo:padding-top="0cm" fo:padding-bottom="0cm" fo:border="0.5pt solid #00000a"/>
+        </style:style>
+        <style:style style:name="P1" style:family="paragraph" style:parent-style-name="Footer">
+            <style:paragraph-properties>
+                <style:tab-stops>
+                    <style:tab-stop style:position="8.001cm" style:type="center"/>
+                    <style:tab-stop style:position="15.998cm" style:type="right"/>
+                </style:tab-stops>
+            </style:paragraph-properties>
+            <style:text-properties fo:font-size="8pt" style:font-size-asian="8pt" style:font-size-complex="8pt"/>
+        </style:style>
+        <style:style style:name="P2" style:family="paragraph" style:parent-style-name="Standard">
+            <style:paragraph-properties>
+                <style:tab-stops>
+                    <style:tab-stop style:position="6.752cm"/>
+                    <style:tab-stop style:position="13.002cm" style:type="right"/>
+                </style:tab-stops>
+            </style:paragraph-properties>
+            <style:text-properties fo:font-size="11pt" style:font-size-asian="11pt" style:font-size-complex="11pt"/>
+        </style:style>
+        <style:style style:name="P3" style:family="paragraph" style:parent-style-name="Standard">
+            <style:paragraph-properties>
+                <style:tab-stops>
+                    <style:tab-stop style:position="6.752cm"/>
+                    <style:tab-stop style:position="13.002cm" style:type="right"/>
+                </style:tab-stops>
+            </style:paragraph-properties>
+        </style:style>
+        <style:style style:name="P4" style:family="paragraph" style:parent-style-name="Standard">
+            <style:paragraph-properties>
+                <style:tab-stops>
+                    <style:tab-stop style:position="6.752cm"/>
+                    <style:tab-stop style:position="13.002cm" style:type="right"/>
+                </style:tab-stops>
+            </style:paragraph-properties>
+            <style:text-properties fo:font-size="9pt" style:font-size-asian="9pt" style:font-size-complex="9pt"/>
+        </style:style>
+        <style:style style:name="P5" style:family="paragraph" style:parent-style-name="Standard">
+            <style:paragraph-properties fo:text-align="end" style:justify-single-word="false">
+                <style:tab-stops>
+                    <style:tab-stop style:position="6.752cm"/>
+                    <style:tab-stop style:position="13.002cm" style:type="right"/>
+                </style:tab-stops>
+            </style:paragraph-properties>
+        </style:style>
+        <style:style style:name="P6" style:family="paragraph" style:parent-style-name="Standard">
+            <style:paragraph-properties fo:margin-top="0.106cm" fo:margin-bottom="0cm" style:contextual-spacing="false">
+                <style:tab-stops>
+                    <style:tab-stop style:position="6.752cm"/>
+                    <style:tab-stop style:position="13.002cm" style:type="right"/>
+                </style:tab-stops>
+            </style:paragraph-properties>
+        </style:style>
+        <style:style style:name="P7" style:family="paragraph" style:parent-style-name="Standard">
+            <style:paragraph-properties fo:margin-top="0.106cm" fo:margin-bottom="0cm" style:contextual-spacing="false">
+                <style:tab-stops>
+                    <style:tab-stop style:position="6.752cm"/>
+                    <style:tab-stop style:position="13.002cm" style:type="right"/>
+                </style:tab-stops>
+            </style:paragraph-properties>
+            <style:text-properties fo:font-size="11pt" style:font-size-asian="11pt" style:font-size-complex="11pt"/>
+        </style:style>
+        <style:style style:name="P8" style:family="paragraph" style:parent-style-name="Standard">
+            <style:paragraph-properties fo:margin-top="0.106cm" fo:margin-bottom="0cm" style:contextual-spacing="false">
+                <style:tab-stops>
+                    <style:tab-stop style:position="6.752cm"/>
+                    <style:tab-stop style:position="13.002cm" style:type="right"/>
+                </style:tab-stops>
+            </style:paragraph-properties>
+            <style:text-properties fo:font-size="11pt" officeooo:rsid="00026b08" officeooo:paragraph-rsid="00026b08" style:font-size-asian="11pt" style:font-size-complex="11pt"/>
+        </style:style>
+        <style:style style:name="P9" style:family="paragraph" style:parent-style-name="Header">
+            <style:paragraph-properties fo:margin-top="0.494cm" fo:margin-bottom="0.423cm" style:contextual-spacing="false">
+                <style:tab-stops>
+                    <style:tab-stop style:position="7.502cm"/>
+                    <style:tab-stop style:position="9.502cm"/>
+                    <style:tab-stop style:position="14.753cm"/>
+                    <style:tab-stop style:position="15.503cm"/>
+                    <style:tab-stop style:position="16.002cm" style:type="right"/>
+                </style:tab-stops>
+            </style:paragraph-properties>
+            <style:text-properties fo:font-size="11pt" style:font-size-asian="11pt" style:font-size-complex="11pt"/>
+        </style:style>
+        <style:style style:name="P10" style:family="paragraph" style:parent-style-name="Standard">
+            <style:paragraph-properties fo:margin-top="0.106cm" fo:margin-bottom="0cm" style:contextual-spacing="false">
+                <style:tab-stops>
+                    <style:tab-stop style:position="6.752cm"/>
+                    <style:tab-stop style:position="13.002cm" style:type="right"/>
+                </style:tab-stops>
+            </style:paragraph-properties>
+            <style:text-properties fo:font-size="9pt" style:font-size-asian="9pt" style:font-size-complex="9pt"/>
+        </style:style>
+        <style:style style:name="P11" style:family="paragraph" style:parent-style-name="Standard">
+            <style:paragraph-properties fo:margin-top="0.106cm" fo:margin-bottom="0cm" style:contextual-spacing="false">
+                <style:tab-stops>
+                    <style:tab-stop style:position="6.752cm"/>
+                    <style:tab-stop style:position="13.002cm" style:type="right"/>
+                </style:tab-stops>
+            </style:paragraph-properties>
+            <style:text-properties fo:font-size="9pt" officeooo:paragraph-rsid="00026b08" style:font-size-asian="9pt" style:font-size-complex="9pt"/>
+        </style:style>
+        <style:style style:name="P12" style:family="paragraph" style:parent-style-name="Standard">
+            <style:paragraph-properties fo:margin-top="0.106cm" fo:margin-bottom="0cm" style:contextual-spacing="false">
+                <style:tab-stops>
+                    <style:tab-stop style:position="6.752cm"/>
+                    <style:tab-stop style:position="13.002cm" style:type="right"/>
+                </style:tab-stops>
+            </style:paragraph-properties>
+            <style:text-properties fo:font-size="11pt" officeooo:rsid="00026b08" officeooo:paragraph-rsid="00026b08" style:font-size-asian="11pt" style:font-size-complex="11pt"/>
+        </style:style>
+        <style:style style:name="P13" style:family="paragraph" style:parent-style-name="Standard">
+            <style:paragraph-properties>
+                <style:tab-stops>
+                    <style:tab-stop style:position="6.752cm"/>
+                    <style:tab-stop style:position="13.002cm" style:type="right"/>
+                </style:tab-stops>
+            </style:paragraph-properties>
+            <style:text-properties fo:font-size="9pt" style:font-size-asian="9pt" style:font-size-complex="9pt"/>
+        </style:style>
+        <style:style style:name="P14" style:family="paragraph" style:parent-style-name="Standard">
+            <style:paragraph-properties>
+                <style:tab-stops>
+                    <style:tab-stop style:position="6.752cm"/>
+                    <style:tab-stop style:position="13.002cm" style:type="right"/>
+                </style:tab-stops>
+            </style:paragraph-properties>
+            <style:text-properties fo:font-size="11pt" style:font-size-asian="11pt" style:font-size-complex="11pt"/>
+        </style:style>
+        <style:style style:name="P15" style:family="paragraph" style:parent-style-name="Standard">
+            <style:paragraph-properties>
+                <style:tab-stops>
+                    <style:tab-stop style:position="6.752cm"/>
+                    <style:tab-stop style:position="13.002cm" style:type="right"/>
+                </style:tab-stops>
+            </style:paragraph-properties>
+            <style:text-properties fo:font-size="11pt" officeooo:rsid="00026b08" style:font-size-asian="11pt" style:font-size-complex="11pt"/>
+        </style:style>
+        <style:style style:name="P16" style:family="paragraph" style:parent-style-name="Header">
+            <style:text-properties fo:font-size="8pt" style:font-size-asian="8pt" style:font-size-complex="8pt"/>
+        </style:style>
+        <style:style style:name="P17" style:family="paragraph" style:parent-style-name="Header" style:master-page-name="Standard">
+            <style:paragraph-properties fo:margin-top="0.423cm" fo:margin-bottom="0.423cm" style:contextual-spacing="false" style:page-number="auto">
+                <style:tab-stops>
+                    <style:tab-stop style:position="7.502cm"/>
+                    <style:tab-stop style:position="9.502cm"/>
+                    <style:tab-stop style:position="14.753cm"/>
+                    <style:tab-stop style:position="15.503cm"/>
+                    <style:tab-stop style:position="16.002cm" style:type="right"/>
+                </style:tab-stops>
+            </style:paragraph-properties>
+            <style:text-properties fo:font-size="14pt" style:font-size-asian="14pt" style:font-size-complex="14pt"/>
+        </style:style>
+        <style:style style:name="P18" style:family="paragraph" style:parent-style-name="Header">
+            <style:paragraph-properties fo:margin-top="0.423cm" fo:margin-bottom="0.423cm" style:contextual-spacing="false">
+                <style:tab-stops>
+                    <style:tab-stop style:position="7.502cm"/>
+                    <style:tab-stop style:position="9.502cm"/>
+                    <style:tab-stop style:position="14.753cm"/>
+                    <style:tab-stop style:position="15.503cm"/>
+                    <style:tab-stop style:position="16.002cm" style:type="right"/>
+                </style:tab-stops>
+            </style:paragraph-properties>
+            <style:text-properties fo:font-size="14pt" style:font-size-asian="14pt" style:font-size-complex="14pt"/>
+        </style:style>
+        <style:style style:name="P19" style:family="paragraph" style:parent-style-name="Standard">
+            <style:paragraph-properties fo:text-align="end" style:justify-single-word="false" fo:margin-top="0.106cm" fo:margin-bottom="0cm" style:contextual-spacing="false"/>
+            <style:text-properties fo:font-size="9pt" style:font-size-asian="9pt" style:font-size-complex="9pt"/>
+        </style:style>
+        <style:style style:name="T1" style:family="text">
+            <style:text-properties fo:font-size="9pt" style:font-size-asian="9pt" style:font-size-complex="9pt"/>
+        </style:style>
+        <style:style style:name="T2" style:family="text">
+            <style:text-properties fo:font-size="9pt" officeooo:rsid="00026b08" style:font-size-asian="9pt" style:font-size-complex="9pt"/>
+        </style:style>
+        <style:style style:name="T3" style:family="text">
+            <style:text-properties fo:font-size="11pt" style:font-size-asian="11pt" style:font-size-complex="11pt"/>
+        </style:style>
+        <style:style style:name="T4" style:family="text">
+            <style:text-properties officeooo:rsid="00026b08"/>
+        </style:style>
+        <style:style style:name="fr1" style:family="graphic" style:parent-style-name="Graphics">
+            <style:graphic-properties fo:margin-left="0.318cm" fo:margin-right="0.318cm" fo:margin-top="0cm" fo:margin-bottom="0cm" style:run-through="background" style:wrap="run-through" style:number-wrapped-paragraphs="no-limit" style:vertical-pos="from-top" style:vertical-rel="paragraph" style:horizontal-pos="from-left" style:horizontal-rel="paragraph" fo:background-color="transparent" style:background-transparency="100%" fo:padding="0cm" fo:border="none" style:mirror="none" fo:clip="rect(0cm, 0cm, 0cm, 0cm)" draw:luminance="0%" draw:contrast="0%" draw:red="0%" draw:green="0%" draw:blue="0%" draw:gamma="100%" draw:color-inversion="false" draw:image-opacity="100%" draw:color-mode="standard">
+                <style:background-image/>
+            </style:graphic-properties>
+        </style:style>
+    </office:automatic-styles>
+  <office:body>
+	  <office:text text:use-soft-page-breaks="true" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0">
+	  <text:p text:style-name="P17">Ein Studienblatt ist für diesen Studiengang/Lehrgang nicht vorgesehen</text:p>
+        </office:text>
+  </office:body>
+</office:document-content>
+</xsl:template>
+
+</xsl:stylesheet>

system/xsl/ZeugnisEng_0.xsl

@@ -474,7 +474,7 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
             </table:table>
             <text:p text:style-name="P26"/>
             <text:p text:style-name="P22">¹ 1 Semester period per week = 45 minutes</text:p>
-            <text:p text:style-name="P22">² Grades:<text:tab/>excellent (1), very good (2), good (3), satisfactory (4), fail (5), not graded (nb), Credit based on previous experience/work (ar),</text:p>
+            <text:p text:style-name="P22">² Grades:<text:tab/>excellent (1), good (2), satisfactory (3), sufficient (4), insufficient (5), not graded (nb), Credit based on previous experience/work (ar),</text:p>
             <text:p text:style-name="P22">
                 <text:tab/>Participated with success (met), passed (b), successfully completed (ea), not successfully completed (nea), did not participate (nt), participated(tg)</text:p>
             <text:p text:style-name="P7"/>

system/xsl/ZeugnisEng_Lehrgaenge.xsl

@@ -462,7 +462,7 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
             </table:table>
             <text:p text:style-name="P26"/>
             <text:p text:style-name="P22">¹ 1 Semester period per week = 45 minutes</text:p>
-            <text:p text:style-name="P22">² Grades:<text:tab/>excellent (1), very good (2), good (3), satisfactory (4), fail (5), not graded (nb), Credit based on previous experience/work (ar),</text:p>
+            <text:p text:style-name="P22">² Grades:<text:tab/>excellent (1), good (2), satisfactory (3), sufficient (4), insufficient (5), not graded (nb), Credit based on previous experience/work (ar),</text:p>
             <text:p text:style-name="P22">
                 <text:tab/>Participated with success (met), passed (b), successfully completed (ea), not successfully completed (nea), did not participate (nt), participated(tg)</text:p>
             <text:p text:style-name="P7"/>