Merge branch 'master' into ciauth

CHANGELOG.md

@@ -48,7 +48,8 @@
 	lehre.tbl_zeugnis, fue.tbl_scrumsprint, fue.tbl_scrumteam, wawi.tbl_aufteilung, wawi.tbl_aufteilung_default,
 	testtool.tbl_kategorie, testtool.tbl_kriterien, public.tbl_prestudent.rt_punkte1, public.tbl_prestudent.rt_punkte2
 	public.tbl_prestudent.rt_punkte3, public.tbl_prestudent.anmeldungreihungstest, public.tbl_prestudent.reihungstest_id
-	public.tbl_prestudent.ausstellungsstaat, public.tbl_prestudent.aufnahmeschluessel, lehre.tbl_lehrveranstaltung.old_lehrfach_id
+	public.tbl_prestudent.ausstellungsstaat, public.tbl_prestudent.aufnahmeschluessel, lehre.tbl_lehrveranstaltung.old_lehrfach_id, lehre.tbl_projektarbeit.gesamtstunden, lehre.tbl_projektarbeit.faktor,
+	lehre.tbl_projektarbeit.stundensatz
 - **[CORE]** LV-Infos werden mit der kommenden Version aus dem Core entfernt - Dies ist jetzt ein Addon
 - **[CORE]** WaWi wird mit der kommenden Version aus dem Core entfernt- Dies ist jetzt ein Addon
 - **[CIS]** Benotungstool/Kreuzerltool wird mit der kommenden Version aus dem Core entfernt

application/controllers/system/infocenter/InfoCenter.php

@@ -1463,7 +1463,7 @@ class InfoCenter extends Auth_Controller
 		$data = array
 		(
 			'interessentbez' => $interessentbez,
-			'studiengangbez' => $prestudent->studiengangbezeichnung,
+			'studiengangbez' => $prestudentstatus->studiengangbezeichnung,
 			'studiengangtypbez' => $prestudent->studiengangtyp_bez,
 			'orgform' => $orgform,
 			'studiensemester' => $prestudentstatus->studiensemester_kurzbz,
@@ -1487,7 +1487,7 @@ class InfoCenter extends Auth_Controller
 		$this->load->library('LogLib');
 		$this->load->helper('hlp_sancho');
 
-		$subject = ($person->geschlecht == 'm' ? 'Interessent ' : 'Interessentin ').$person->vorname.' '.$person->nachname.' für '.$prestudent->studiengangbezeichnung.$orgform.' freigegeben';
+		$subject = ($person->geschlecht == 'm' ? 'Interessent ' : 'Interessentin ').$person->vorname.' '.$person->nachname.' für '.$prestudentstatus->studiengangbezeichnung.$orgform.' freigegeben';
 
 		$receiver = $prestudent->studiengangmail;
 

application/helpers/hlp_sancho_helper.php

@@ -74,7 +74,7 @@ function sendSanchoMail($vorlage_kurzbz, $vorlage_data, $to, $subject, $headerIm
 	$body = _parseMailContent('Sancho_Mail_Template', $layout);
 
 	// Send mail
-	$ci->maillib->send($from, $to, $subject, $body, $alias = '', $cc = null, $bcc = null, $altMessage = '', $bulk = true, $autogenerated = true);
+	$ci->maillib->send($from, $to, $subject, $body, $alias = '', $cc, $bcc, $altMessage = '', $bulk = true, $autogenerated = true);
 }
 
 /**

application/models/crm/Reihungstest_model.php

@@ -473,11 +473,30 @@ class Reihungstest_model extends DB_Model
 		return $this->execQuery($query, array($reihungstest_id));
 	}
 
+	/**
+	 * Loads the date of the next placement test to the given degree program
+	 * @param integer $studiengang_kz Kennzahl of degree program to load the next placement test date
+	 * @return string Returns date of the next placement test
+	 */
+	public function getNextPlacementtestDate($studiengang_kz)
+	{
+		$query = '
+			SELECT *
+			FROM PUBLIC.tbl_reihungstest
+			WHERE studiengang_kz = ?
+			AND datum > now()
+			ORDER BY datum ASC
+			LIMIT 1
+			';
+
+		return $this->execQuery($query, array($studiengang_kz));
+	}
+
 	/**
 	 * Loads all placement tests of the given day and optional degree program
 	 * @param string $date Date of the tests to be loaded (YYYY-MM-DD)
 	 * @param integer $studiengang_kz Optional. Kennzahl of degree program to load
-	 * @return array Returns object array with data of applicants.
+	 * @return array Returns object array with data of placement tests
 	 */
 	public function getTestsOnDate($date, $studiengang_kz = null)
 	{

application/models/education/Lehreinheit_model.php

@@ -14,6 +14,7 @@ class Lehreinheit_model extends DB_Model
 		$this->load->model('education/lehrveranstaltung_model', 'LehrveranstaltungModel');
 		$this->load->model('education/lehreinheitgruppe_model', 'LehreinheitgruppeModel');
 		$this->load->model('education/lehreinheitmitarbeiter_model', 'LehreinheitmitarbeiterModel');
+		$this->load->model('organisation/studiengang_model', 'StudiengangModel');
 	}
 
 	/**
@@ -57,13 +58,22 @@ class Lehreinheit_model extends DB_Model
 					{
 						foreach ($lehreinheitgruppen->retval as $lehreinheitgruppe)
 						{
-							$letoadd->lehreinheitgruppen[] = array(
-								'semester' => $lehreinheitgruppe->semester,
-								'verband' => $lehreinheitgruppe->verband,
-								'gruppe' => $lehreinheitgruppe->gruppe,
-								'gruppe_kurzbz' => $lehreinheitgruppe->gruppe_kurzbz,
-								'direktinskription' => $lehreinheitgruppe->direktinskription
-							);
+							$studiengangresponse = $this->StudiengangModel->load($lehreinheitgruppe->studiengang_kz);
+							if (hasData($studiengangresponse))
+							{
+								$studiengang = $studiengangresponse->retval[0];
+								$stgkuerzel = mb_strtoupper($studiengang->typ . $studiengang->kurzbz);
+
+									$letoadd->lehreinheitgruppen[] = array(
+										'semester' => $lehreinheitgruppe->semester,
+										'verband' => $lehreinheitgruppe->verband,
+										'gruppe' => $lehreinheitgruppe->gruppe,
+										'gruppe_kurzbz' => $lehreinheitgruppe->gruppe_kurzbz,
+										'direktinskription' => $lehreinheitgruppe->direktinskription,
+										'studiengang_kz' => $lehreinheitgruppe->studiengang_kz,
+										'studiengang_kuerzel' => $stgkuerzel
+									);
+							}
 						}
 					}
 

application/models/education/Lehrveranstaltung_model.php

@@ -203,4 +203,65 @@ class Lehrveranstaltung_model extends DB_Model
 
 		return $this->execQuery($qry, $params);
 	}
+
+	/**
+	 * Gets valid Lehrveranstaltungen with incoming places for a Studiensemester.
+	 * Only
+	 * 1. Lvs with incoming places > 0
+	 * 2. Studienplan valid in current semester or with Lehrauftrag (i.e. assigned Lehreinheit)
+	 * @param $studiensemester_kurzbz
+	 * @return object
+	 */
+	public function getLvsWithIncomingPlaces($studiensemester_kurzbz)
+	{
+		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
+
+		$studsemres = $this->StudiensemesterModel->load($studiensemester_kurzbz);
+
+		if (!hasData($studsemres))
+			return success(array());
+
+		$parametersarray = array($studiensemester_kurzbz, $studsemres->retval[0]->studienjahr_kurzbz, $studiensemester_kurzbz, $studiensemester_kurzbz);
+
+		$query = "
+			SELECT * FROM (
+				SELECT DISTINCT ON (lv.lehrveranstaltung_id) lv.lehrveranstaltung_id, lv.bezeichnung AS lv_bezeichnung, lv.kurzbz AS lv_kurzbz, lv.sprache, lv.ects, lv.lehre,
+				lv.lehreverzeichnis, lv.sws, lv.lvs, lv.alvs, lv.lvps, lv.las, lv.incoming, lv.lehrform_kurzbz, lv.orgform_kurzbz AS lv_orgform, lv.semester,
+				? AS studiensemester_kurzbz, ? AS studienjahr_kurzbz, UPPER(stg.typ::VARCHAR(1) || stg.kurzbz) AS studiengang_kuerzel,
+				stg.bezeichnung AS studiengang_bezeichnung, stg.english AS studiengang_bezeichnung_english, stg.typ, stg.orgform_kurzbz AS studiengang_orgform,
+				tbl_sprache.locale, CASE WHEN lv.orgform_kurzbz NOTNULL THEN lv.orgform_kurzbz ELSE stg.orgform_kurzbz END AS orgform_kurzbz
+				FROM lehre.tbl_lehrveranstaltung lv
+				JOIN public.tbl_studiengang stg ON lv.studiengang_kz = stg.studiengang_kz
+				JOIN public.tbl_sprache ON lv.sprache = tbl_sprache.sprache
+				WHERE lv.lehrtyp_kurzbz != 'modul'
+						  AND (
+							EXISTS
+							(
+								WITH gueltige_studienplaene AS (
+									SELECT studienplan_id, semester
+									FROM lehre.tbl_studienplan
+									JOIN lehre.tbl_studienplan_semester USING(studienplan_id)
+									WHERE tbl_studienplan.aktiv
+									AND lehre.tbl_studienplan_semester.studiensemester_kurzbz = ?
+								)
+								SELECT 1
+								FROM lehre.tbl_studienplan_lehrveranstaltung
+								WHERE tbl_studienplan_lehrveranstaltung.studienplan_id IN (SELECT studienplan_id FROM gueltige_studienplaene)
+									  AND tbl_studienplan_lehrveranstaltung.semester IN
+										  (SELECT semester FROM gueltige_studienplaene
+											 WHERE gueltige_studienplaene.studienplan_id = tbl_studienplan_lehrveranstaltung.studienplan_id)
+									  AND tbl_studienplan_lehrveranstaltung.lehrveranstaltung_id = lv.lehrveranstaltung_id
+									  AND tbl_studienplan_lehrveranstaltung.export
+							)
+							OR EXISTS (SELECT 1 FROM lehre.tbl_lehreinheit WHERE lehrveranstaltung_id = lv.lehrveranstaltung_id AND studiensemester_kurzbz = ?)
+						  )
+				AND lv.incoming > 0
+				AND lv.aktiv
+				AND (stg.typ IN ('b', 'm') OR stg.studiengang_kz = 10006)-- ECI Studiengang Campus International
+			) lvs
+			ORDER BY studiengang_kuerzel, orgform_kurzbz, lv_bezeichnung, lehrform_kurzbz, lehrveranstaltung_id;
+		";
+
+		return $this->execQuery($query, $parametersarray);
+	}
 }

cis/private/lehre/benotungstool/lvgesamtnoteverwalten.php

@@ -805,18 +805,32 @@ if (isset($_REQUEST["freigabe"]) && ($_REQUEST["freigabe"] == 1))
 		$neuenoten = 0;
 
 		$studlist = "<table border='1'>
-		<tr>
-			<td><b>" . $p->t('global/personenkz') . "</b></td>
-			<td><b>" . $p->t('global/nachname') . "</b></td>
-			<td><b>" . $p->t('global/vorname') . "</b></td>";
+		<tr>";
 
-		if (defined('CIS_GESAMTNOTE_PUNKTE') && CIS_GESAMTNOTE_PUNKTE)
-		{
-			$studlist .= "<td><b>" . $p->t('benotungstool/punkte') . "</b></td>\n";
+		// entweder personenbezogene Daten einbinden
+		if (defined('CIS_GESAMTNOTE_FREIGABEMAIL_NOTE') && CIS_GESAMTNOTE_FREIGABEMAIL_NOTE)
+        {
+            $studlist .= "
+                <td><b>" . $p->t('global/personenkz') . "</b></td>
+			    <td><b>" . $p->t('global/nachname') . "</b></td>
+			    <td><b>" . $p->t('global/vorname') . "</b></td>
+            ";
+
+            if (defined('CIS_GESAMTNOTE_PUNKTE') && CIS_GESAMTNOTE_PUNKTE)
+            {
+                $studlist .= "<td><b>" . $p->t('benotungstool/punkte') . "</b></td>\n";
+            }
+            $studlist .= "<td><b>" . $p->t('benotungstool/note') . "</b></td>\n";
+
+            $studlist .= "<td><b>" . $p->t('benotungstool/bearbeitetvon') . "</b></td></tr>\n";
+		}
+		// oder anonymisiert nur die UIDs einbinden
+		else
+		{
+			$studlist .= "
+                <td><b>" . $p->t('global/uid') . "</b></td></tr>\n
+            ";
 		}
-		$studlist .= "<td><b>" . $p->t('benotungstool/note') . "</b></td>\n";
-
-		$studlist .= "<td><b>" . $p->t('benotungstool/bearbeitetvon') . "</b></td></tr>\n";
 
 		// studentenquery
 		$qry_stud = "SELECT
@@ -842,23 +856,30 @@ if (isset($_REQUEST["freigabe"]) && ($_REQUEST["freigabe"] == 1))
 						$lvgesamtnote->freigabevon_uid = $user;
 						$lvgesamtnote->save();
 
-						$studlist .= "<tr><td>" . trim($row_stud->matrikelnr) . "</td>";
-						$studlist .= "<td>" . trim($row_stud->nachname) . "</td>";
-						$studlist .= "<td>" . trim($row_stud->vorname) . "</td>";
-
-						if (defined('CIS_GESAMTNOTE_PUNKTE') && CIS_GESAMTNOTE_PUNKTE)
+						if (defined('CIS_GESAMTNOTE_FREIGABEMAIL_NOTE') && CIS_GESAMTNOTE_FREIGABEMAIL_NOTE)
 						{
-							$studlist .= "<td>";
-							if ($lvgesamtnote->punkte != '')
-								$studlist .= trim(number_format($lvgesamtnote->punkte, 2));
-							$studlist .= "</td>\n";
-						}
-						$studlist .= "<td>" . $noten_array[trim($lvgesamtnote->note)]['bezeichnung_mehrsprachig'][$sprache] . "</td>";
+							$studlist .= "<tr><td>" . trim($row_stud->matrikelnr) . "</td>";
+							$studlist .= "<td>" . trim($row_stud->nachname) . "</td>";
+							$studlist .= "<td>" . trim($row_stud->vorname) . "</td>";
 
-						$studlist .= "<td>" . $lvgesamtnote->mitarbeiter_uid;
-						if ($lvgesamtnote->updatevon != '')
-							$studlist .= " (" . $lvgesamtnote->updatevon . ")";
-						$studlist .= "</td></tr>\n";
+                            if (defined('CIS_GESAMTNOTE_PUNKTE') && CIS_GESAMTNOTE_PUNKTE)
+                            {
+                                $studlist .= "<td>";
+                                if ($lvgesamtnote->punkte != '')
+                                    $studlist .= trim(number_format($lvgesamtnote->punkte, 2));
+                                $studlist .= "</td>\n";
+                            }
+                            $studlist .= "<td>" . $noten_array[trim($lvgesamtnote->note)]['bezeichnung_mehrsprachig'][$sprache] . "</td>";
+
+                            $studlist .= "<td>" . $lvgesamtnote->mitarbeiter_uid;
+                            if ($lvgesamtnote->updatevon != '')
+                                $studlist .= " (" . $lvgesamtnote->updatevon . ")";
+                            $studlist .= "</td></tr>\n";
+						}
+						else
+						{
+							$studlist .= "<tr><td>" . trim($row_stud->uid) . "</td></tr>\n";
+						}
 
 						$neuenoten ++;
 					}
@@ -896,8 +917,7 @@ if (isset($_REQUEST["freigabe"]) && ($_REQUEST["freigabe"] == 1))
 					<br>eingetragen.\n<br><br>
 					Die Noten können jetzt ins Zeugnis übernommen werden.\n";
 
-			if (defined('CIS_GESAMTNOTE_FREIGABEMAIL_NOTE') && CIS_GESAMTNOTE_FREIGABEMAIL_NOTE)
-				$htmlcontent.= $studlist;
+            $htmlcontent .= $studlist;
 
 			$htmlcontent.= "
 					<br>Anzahl der Noten:" . $neuenoten . "

cis/private/lehre/fotoliste.pdf.php

@@ -109,7 +109,7 @@ if ($result = $db->db_query($qry)) {
         $stg_typ = $row->stg_typ;
         //collect all gruppenkürzel
         if ($row->gruppe_kurzbz == '')
-            $gruppen_string = trim($row->kuerzel . '-' . $row->semester);
+            $gruppen_string = trim($row->kuerzel . '-' . $row->semester . $row->verband . $row->gruppe);
         else
             $gruppen_string = $row->gruppe_kurzbz;
 

cis/private/lehre/lehrtaetigkeit.pdf.php

@@ -0,0 +1,276 @@
+<?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: Cristina Hainberger		hainberg@technikum-wien.at>.
+ */
+
+require_once('../../../config/cis.config.inc.php');
+require_once('../../../include/dokument_export.class.php');
+require_once('../../../include/functions.inc.php');
+require_once('../../../include/person.class.php');
+require_once('../../../include/lehreinheitmitarbeiter.class.php');
+require_once('../../../include/lehreinheit.class.php');
+require_once('../../../include/projektbetreuer.class.php');
+require_once('../../../include/projektarbeit.class.php');
+require_once('../../../include/bisverwendung.class.php');
+require_once('../../../include/studiensemester.class.php');
+require_once('../../../include/phrasen.class.php');
+require_once('../../../include/benutzerberechtigung.class.php');
+
+$user = get_uid();
+$sprache = getSprache();
+$p = new phrasen($sprache);
+
+$doc = new dokument_export('Lehrtaetigkeit');
+
+
+if (!$db = new basis_db())
+	die('Es konnte keine Verbindung zum Server aufgebaut werden.');
+
+//	Check permission
+$berechtigung = new benutzerberechtigung();
+$berechtigung->getBerechtigungen($user);
+if (!$berechtigung->isBerechtigt('admin') &&
+	!$berechtigung->isBerechtigt('mitarbeiter'))
+	die('Sie muessen das Recht "ADMIN" oder "MITARBEITER" haben, um diese Seite aufrufen zu koennen');
+
+// Get GET params
+$uid = (isset($_GET['uid']) && is_string($_GET['uid'])) ? $_GET['uid'] : die($p->t('global/fehlerBeimErmittelnDerUID'));
+$output = (isset($_GET['output']) && ($_GET['output'] == 'odt' || $_GET['output'] == 'doc')) ? $_GET['output'] : 'pdf';
+
+// Personal data of lector
+$person = new Person();
+$person->getPersonFromBenutzer($uid);
+$person_id = $person->person_id;
+$anrede = $person->anrede;
+$fullname = $person->getFullName();
+$birthday_date = new DateTime($person->gebdatum);
+
+// Get the lectors lehreinheiten-semesterstunden per semester
+$semesterstunden_per_semester = array();
+$le_ma = new Lehreinheitmitarbeiter();
+
+// * get all semester of the lector where he was teaching actively
+$active_semester_arr = $le_ma->getSemesterZuLektor($uid);
+$active_semester_arr = array_keys($active_semester_arr);
+
+// * for each semester:
+foreach($active_semester_arr as $active_semester)
+{
+	// * get all the lectors lehreinheiten
+	$le_id_arr = array();
+	$le_array = $le_ma->getLehreinheiten($uid, $active_semester);
+	foreach($le_array as $le)
+	{
+		$le_id_arr[]= $le->lehreinheit_id;
+	}
+
+	// * get begin- and end date of studiensemester
+	$ss = new Studiensemester($active_semester);
+	$studiensemester_start_date = $ss->start;
+	$studiensemester_end_date = $ss->ende;
+
+	// * get total amount of semesterstunden of the lehreinheiten, where stundensatz > 0
+	$total_semesterstunden = 0;
+	foreach ($le_id_arr as $le_id)
+	{
+		$le_ma = new Lehreinheitmitarbeiter($le_id, $uid);
+		if ($le_ma && (!is_null ($le_ma->stundensatz) && $le_ma->stundensatz > 0))
+		{
+			$total_semesterstunden = $total_semesterstunden + $le_ma->semesterstunden;
+		}
+	}
+
+	// * store data only if semesterstunden > 0
+	if ($total_semesterstunden > 0)
+	{
+		$semesterstunden_per_semester []= (
+			array(
+				'studiensemester_kurzbz'=> $active_semester,
+				'total_semesterstunden' => $total_semesterstunden,
+				'studiensemester_start_date' => $studiensemester_start_date,
+				'studiensemester_end_date' => $studiensemester_end_date
+			)
+		);
+	}
+}
+
+// Get the lectors projektarbeitstunden per semester
+$projektstunden_per_semester = array();
+$pb = new Projektbetreuer();
+$pb->getAllProjects($person_id);
+$project_arr = $pb->result;
+
+// * for each project
+foreach ($project_arr as $project)
+{
+	$pa_id = $project->projektarbeit_id;
+	$projektstunden = $project->stunden;
+
+	// * get studiensemester
+	$pa = new Projektarbeit($pa_id);
+	$le = new Lehreinheit($pa->lehreinheit_id);
+	$studiensemester_kurzbz = $le->studiensemester_kurzbz;
+
+	// * get begin- and end date of studiensemester
+	$ss = new Studiensemester($studiensemester_kurzbz);
+	$studiensemester_start_date = $ss->start;
+	$studiensemester_end_date = $ss->ende;
+
+	// Get total amount of semesterstunden by studiensemester
+	// * check if studiensemester already exists. If so, get array index.
+	$studiensemester_index = array_search($studiensemester_kurzbz, array_map(function($val) {
+		return $val['studiensemester_kurzbz'];
+	}, $projektstunden_per_semester
+	));
+
+	// * if studiensemester exists, sum up hours of projektarbeit, where stundensatz > 0
+	if ($studiensemester_index !== false)
+	{
+		$projektstunden_per_semester [$studiensemester_index]['total_semesterstunden'] = $projektstunden_per_semester [$studiensemester_index]['total_semesterstunden'] + $projektstunden;
+	}
+	// * if not, create new index
+	else
+	{
+		$projektstunden_per_semester []= (
+			array(
+				'studiensemester_kurzbz'=> $studiensemester_kurzbz,
+				'total_semesterstunden' => $projektstunden,
+				'studiensemester_start_date' => $studiensemester_start_date,
+				'studiensemester_end_date' => $studiensemester_end_date
+			)
+		);
+	}
+}
+
+// Merge lehreinheit- and projektarbeitstunden arrays
+foreach ($projektstunden_per_semester as $item)
+{
+	// check if studiensemester already exists in projektstunden-per-term-array. If so, get array index.
+	$studiensemester_index = array_search($item['studiensemester_kurzbz'], array_map(function($val) {
+		return $val['studiensemester_kurzbz'];
+	}, $semesterstunden_per_semester
+	));
+
+	// * if studiensemester exists, merge lehreinheit- and projektarbeit hours
+	if ($studiensemester_index !== false)
+	{
+		$semesterstunden_per_semester [$studiensemester_index]['total_semesterstunden'] = $semesterstunden_per_semester [$studiensemester_index]['total_semesterstunden'] + $item['total_semesterstunden'];
+	}
+	// * if not, create new index
+	else
+	{
+		$semesterstunden_per_semester []= (
+			array(
+				'studiensemester_kurzbz'=> $item['studiensemester_kurzbz'],
+				'total_semesterstunden' => intval($item['total_semesterstunden']),
+				'studiensemester_start_date' => $item['studiensemester_start_date'],
+				'studiensemester_end_date' =>  $item['studiensemester_end_date']
+			)
+		);
+	}
+}
+
+// Sort lehreinheit- and projektarbeitstunden array by date
+usort($semesterstunden_per_semester, function($a, $b)
+{
+	return strtotime($a['studiensemester_start_date']) - strtotime($b['studiensemester_start_date']);
+});
+
+// Split studiensemester array into actual studiensemester array and former studiensemester array
+// * get actual studiensemester
+$ss = new Studiensemester();
+$actual_studiensemester = $ss->getakt();
+$actual_studiensemester_index = array_search($actual_studiensemester, array_map(function($val) {
+	return $val['studiensemester_kurzbz'];
+}, $semesterstunden_per_semester
+));
+
+// * if lector is teaching actually, split former teaching activities from actual teaching activities of actual studiensemester
+$semesterstunden_of_actual_semester = array();
+if ($actual_studiensemester_index !== false)
+{
+	$semesterstunden_of_actual_semester = array_slice($semesterstunden_per_semester, $actual_studiensemester_index);	// array with actual + future semester
+	$semesterstunden_per_semester = array_slice($semesterstunden_per_semester, 0, $actual_studiensemester_index);	// array with all former semester
+}
+
+// Semester begin and ending date of lehreinheit- and projektarbeit studiensemester
+//	* begin date of first lehreinheit- and projektarbeit studiensemester
+$earliest_ss = current($semesterstunden_per_semester)['studiensemester_start_date'];
+$begin_date = !is_null($earliest_ss) ? new DateTime($earliest_ss) : null;
+
+//	* end date of last lehreinheit- and projektarbeit studiensemester
+// * if lector is teaching on actual studiensemester, get end date of actual studiensemester
+$latest_ss = !empty($semesterstunden_of_actual_semester)
+	? current($semesterstunden_of_actual_semester)['studiensemester_end_date']
+// * else get end date of the last of his teaching studiensemester
+	: end($semesterstunden_per_semester)['studiensemester_end_date'];
+$end_date = !is_null($latest_ss) ? new DateTime($latest_ss) : null;
+
+$actual_date = new DateTime();
+
+// if the lector is still employed, reset the end date to null
+if ($end_date > $actual_date)
+{
+	$end_date = null;
+}
+
+$data = array (
+	'anrede' => $anrede,
+	'full_name' => $fullname,
+	'birthday' => $birthday_date->format('d.m.Y'),
+	'begin_date' => !is_null($begin_date) ? $begin_date->format('d.m.Y') : '',
+	'end_date' =>  !is_null($end_date) ? $end_date->format('d.m.Y') : '',	// empty, if lector is still employed
+	'total_ss_actual_semester' => current($semesterstunden_of_actual_semester),	// empty, if lector has no lehreinheit- or projektarbeitsstunden at the actual studiensemester
+	'actual_date' => $actual_date->format('d.m.Y')
+);
+
+// Put semesterstunden per semester array in correct format for xsl template
+if (!empty($semesterstunden_per_semester))
+{
+	foreach ($semesterstunden_per_semester as &$item)
+	{
+		$data[]= array('total_ss_per_semester'=>
+		   array(
+			   'studiensemester_kurzbz'=> $item['studiensemester_kurzbz'],
+			   'total_semesterstunden' => $item['total_semesterstunden']
+		   )
+		);
+	}
+}
+else
+{
+	$data[]= array('total_ss_per_semester'=> '');	// empty if lector has no lehreinheit- or projektarbeitsstunden in the past (before the actual studiensemester)
+}
+
+// Add data to lehrtaetigkeit.xsl
+$doc->addDataArray($data, 'lehrtaetigkeit');
+
+// Set doc name
+$doc->setFilename('Lehrtaetigkeit_'. rtrim($fullname, '.'));
+
+// Create doc in format required
+if (!$doc->create($output))
+	die($doc->errormsg);
+
+// Download doc
+$doc->output();
+
+// unlink doc from tmp-folder
+$doc->close();
+
+

cis/private/tools/ampelverwaltung.php

@@ -124,10 +124,10 @@ if ($is_popup)
 	$user_ampel_arr,
 	$cnt_ueberfaellig_und_verpflichtend) =		//counts mandatory, overdue (not expired), unconfirmed, not before vorlaufzeit
 	getPopupUserAmpelData($user_ampel_arr);
-}	
+}
 
 //filter ampeln of actual term (if radiobutton is set to aktuell)
-if ($show == 'aktuell')
+if (!$is_popup && $show == 'aktuell')
 	$user_ampel_arr = getActualUserAmpelData($user_ampel_arr, $semester_start);
 
 
@@ -361,7 +361,7 @@ function typeWrite(span){
 				<div>
 					<img src="../../../skin/images/sancho/sancho_header_du_hast_verpflichtende_ampeln.jpg" alt="sancho_verpflichtende_ampeln" style="width: 100%;">
 				</div>			
-				<p><br><br></p>';		
+				<p><br><br></p>';
 		}	
 	}
 	?>
@@ -401,7 +401,7 @@ function typeWrite(span){
 				$cnt_active++;
 	}
 	
-	if ($cnt_active == 0)
+	if ($cnt_active == 0 && !$is_popup)
 	{
 		echo '
 			<div class="panel">

cis/private/tools/zeitaufzeichnung.php

@@ -91,12 +91,12 @@ $fieldheadings = array(
 if ($rechte->isBerechtigt('basis/servicezeitaufzeichnung'))
 {
 	$za_simple = 0;
-	$activities = 	array('Design', 'Operativ', 'Betrieb',  'Pause', 'LehreIntern', 'Arztbesuch', 'DienstreiseMT', 'Behoerde', 'Ersatzruhe');
+	$activities = 	array('Design', 'Operativ', 'Betrieb',  'Pause', 'Lehre', 'Arztbesuch', 'DienstreiseMT', 'Behoerde', 'Ersatzruhe');
 }
 else
 {
 	$za_simple = 1;
-	$activities = array('Arbeit', 'Pause', 'LehreIntern', 'Arztbesuch', 'DienstreiseMT', 'Behoerde', 'Ersatzruhe');
+	$activities = array('Arbeit', 'Pause', 'Lehre', 'Arztbesuch', 'DienstreiseMT', 'Behoerde', 'Ersatzruhe');
 }
 
 $activities_str = "'".implode("','", $activities)."'";
@@ -534,6 +534,8 @@ if(isset($_POST['save']) || isset($_POST['edit']) || isset($_POST['import']))
 								echo '<span style="color:red"><b>'.$p->t("global/fehlerBeimSpeichernDerDaten").': Eingabe nicht möglich da vor dem Sperrdatum ('.$data[2].')</b></span><br>';
 							else
 							{
+								if ($data[1] == 'LehreIntern')
+									$data[1] = 'Lehre';
 								$zeit->new = true;
 								$zeit->insertamum = date('Y-m-d H:i:s');
 								$zeit->updateamum = date('Y-m-d H:i:s');
@@ -1041,7 +1043,7 @@ if($projekt->getProjekteMitarbeiter($user, true))
 		$sem_akt = $stsem->getakt();
 		$lehre = new zeitaufzeichnung();
 		$l_arr = $lehre->getLehreForUser($user, $sem_akt);
-		if ($l_arr["LehreAuftraege"]>0 || $l_arr["LehreIntern"] > 0 || $l_arr["LehreExtern"] > 0)
+		if ($l_arr["LehreAuftraege"]>0 || $l_arr["Lehre"] > 0 || $l_arr["LehreExtern"] > 0)
 		{
 			if ($lehre_inkludiert == -1)
 			{
@@ -1056,8 +1058,8 @@ if($projekt->getProjekteMitarbeiter($user, true))
 			echo '<tr><td colspan="3" style="border: 1px solid gray"><h3>Übersicht Lehre '.$sem_akt.'</h3></tr>';
 			echo '<tr><td colspan="3" style="border: 1px solid gray">(in Stunden)</tr>';
 			echo '<tr><td></td><td style="border: 1px solid gray">beauftragt (LE)</td><td style="border: 1px solid gray">gebucht</td></tr>';
-			if ($lehre_inkludiert > 0 || $l_arr["LehreIntern"] > 0)
-				echo '<tr><td style="border: 1px solid gray">LehreIntern:</td><td align="right" style="border: 1px solid gray">'.$lehre_inkludiert_norm.' ('.$lehre_inkludiert.')</td><td align="right" style="border: 1px solid gray">'.$l_arr["LehreIntern"].'</td></tr>';
+			if ($lehre_inkludiert > 0 || $l_arr["Lehre"] > 0)
+				echo '<tr><td style="border: 1px solid gray">Lehre:</td><td align="right" style="border: 1px solid gray">'.$lehre_inkludiert_norm.' ('.$lehre_inkludiert.')</td><td align="right" style="border: 1px solid gray">'.$l_arr["Lehre"].'</td></tr>';
 			if ($l_extern_soll > 0 || $l_arr["LehreExtern"] > 0)
 				echo '<tr><td style="border: 1px solid gray">LehreExtern:</td><td align="right" style="border: 1px solid gray">'.$l_extern_soll_norm.' ('.$l_extern_soll.')</td><td align="right" style="border: 1px solid gray">'.$l_arr["LehreExtern"].'</td></tr>';
 

cis/testtool/menu.php

@@ -193,7 +193,8 @@ if (isset($_SESSION['pruefling_id']))
         )
 
 
-        SELECT DISTINCT
+        SELECT DISTINCT ON 
+            (gebiet_id, semester)
 	        semester,
 	        gebiet_id,
 	        bezeichnung,
@@ -252,6 +253,7 @@ if (isset($_SESSION['pruefling_id']))
 
         ORDER BY
 	        semester,
+	        gebiet_id,
 	        reihung
         ";
 

cms/dms.php

@@ -64,7 +64,7 @@ if($doc->isLocked($id))
 	//und person_id Besitzer des Dokuments ist (person_id aus tbl_akte)
 	//und das Dokument in der Onlinebewerbung hochgeladen werden kann
 	//darf das Dokument heruntergeladen werden
-	if($person_id!='' && $akte_id!='')
+	if($person_id != '' && $akte_id != '')
 	{
 		$akte = new akte();
 		$akte->load($akte_id);
@@ -102,15 +102,15 @@ if($doc->isLocked($id))
 			// dann darf nur mit diesem Recht darauf zugegriffen werden
 			$kategorie = new dms();
 			$kategorie->loadKategorie($doc->kategorie_kurzbz);
-			if($kategorie->berechtigung_kurzbz!='')
+			if($kategorie->berechtigung_kurzbz != '')
 			{
 				if(!$rechte->isBerechtigt($kategorie->berechtigung_kurzbz))
-					die('Sie haben keinen Zugriff auf dieses Dokument');
+					die($rechte->errormsg);
 			}
 
 			//Globales DMS recht pruefen
 			if(!$rechte->isBerechtigt('basis/dms'))
-				die('Sie haben keinen Zugriff auf dieses Dokument');
+				die($rechte->errormsg);
 		}
 	}
 }

config/global.config-default.inc.php

@@ -106,7 +106,7 @@ define('FAS_REIHUNGSTEST_PUNKTE', false);
 
 // Legt fest, welche Reihungstestgebiete bei der Berechnung der Gesamtpunkte NICHT einbezogen werden.
 // array(gebiet_id1, gebiet_id2,...)
-define('FAS_REIHUNGSTEST_EXCLUDE_GEBIETE', array());
+define('FAS_REIHUNGSTEST_EXCLUDE_GEBIETE', serialize(array()));
 
 // Legt fest ob Messages im FAS angezeigt werden true|false
 define('FAS_MESSAGES',false);

content/fas.xul.php

@@ -173,7 +173,6 @@ foreach($addon_obj->result as $addon)
   <command id="menu-bis-studenten-checkstudent:command" oncommand="BISStudentenPlausicheck();"/>
   <command id="menu-help-about:command" oncommand="OpenAboutDialog()"/>
   <command id="menu-help-manual:command" oncommand="OpenManual()"/>
-  <command id="menu-help-todo:command" oncommand="OpenToDoDialog()"/>
 </commandset>
 
 <keyset id="mainkeys">
@@ -899,12 +898,6 @@ foreach($addon_obj->result as $addon)
                label     = "&menu-help-manual.label;"
                command   =  "menu-help-manual:command"
                accesskey = "&menu-help-manual.accesskey;"/>
-            <menuitem
-               id        =  "menu-help-todo"
-               key       =  "menu-help-todo:key"
-               label     = "&menu-help-todo.label;"
-               command   =  "menu-help-todo:command"
-               accesskey = "&menu-help-todo.accesskey;"/>
             <menuitem
                id        =  "menu-help-about"
                key       =  "menu-help-about:key"

content/fasoverlay.js.php

@@ -1526,14 +1526,6 @@ function OpenManual()
 	window.open('http://fhcomplete.technikum-wien.at/dokuwiki/doku.php?','_blank');
 }
 
-// ****
-// * Oeffnet die ToDo Liste
-// ****
-function OpenToDoDialog()
-{
-	window.open('http://fhcomplete.technikum-wien.at/mantis/login.php?username=anonymous&return=%2Fmantis%2Froadmap_page.php%3F','_blank');
-}
-
 // ****
 // * Oeffnet ALVS-Statistik
 // ****

content/statistik/bewerberstatistik.php

@@ -1085,15 +1085,15 @@ if (isset($_GET['excel']))
 				$worksheet2->write($zeile, ++$i, $row->interessenten_w, $$format);
 				if (strlen($row->interessenten_w) > $maxlength[$i])
 					$maxlength[$i] = mb_strlen($row->interessenten_w);
-				$worksheet2->write($zeile, ++$i, "k.A.", $$format);
-				if (strlen("k.A.") > $maxlength[$i])
-					$maxlength[$i] = mb_strlen("k.A.");
-				$worksheet2->write($zeile, ++$i, "k.A.", $$format);
-				if (strlen("k.A.") > $maxlength[$i])
-					$maxlength[$i] = mb_strlen("k.A.");
-				$worksheet2->write($zeile, ++$i, "k.A.", $$format);
-				if (strlen("k.A.") > $maxlength[$i])
-					$maxlength[$i] = mb_strlen("k.A.");
+				$worksheet2->write($zeile, ++$i, "k.A.*", $$format);
+				if (strlen("k.A.*") > $maxlength[$i])
+					$maxlength[$i] = mb_strlen("k.A.*");
+				$worksheet2->write($zeile, ++$i, "k.A.*", $$format);
+				if (strlen("k.A.*") > $maxlength[$i])
+					$maxlength[$i] = mb_strlen("k.A.*");
+				$worksheet2->write($zeile, ++$i, "k.A.*", $$format);
+				if (strlen("k.A.*") > $maxlength[$i])
+					$maxlength[$i] = mb_strlen("k.A.*");
 				$worksheet2->write($zeile, ++$i, $row->interessentenrtanmeldung, $$format);
 				if (strlen($row->interessentenrtanmeldung) > $maxlength[$i])
 					$maxlength[$i] = mb_strlen($row->interessentenrtanmeldung);
@@ -1188,15 +1188,15 @@ if (isset($_GET['excel']))
 			$worksheet2->write($zeile, ++$i, $interessenten_w_sum, $format_bold);
 			if (strlen($interessenten_w_sum) > $maxlength[$i])
 				$maxlength[$i] = mb_strlen($interessenten_w_sum);
-			$worksheet2->write($zeile, ++$i, "k.A.", $format_bold);
-			if (strlen("k.A.") > $maxlength[$i])
-				$maxlength[$i] = mb_strlen("k.A.");
-			$worksheet2->write($zeile, ++$i, "k.A.", $format_bold);
-			if (strlen("k.A.") > $maxlength[$i])
-				$maxlength[$i] = mb_strlen("k.A.");
-			$worksheet2->write($zeile, ++$i, "k.A.", $format_bold);
-			if (strlen("k.A.") > $maxlength[$i])
-				$maxlength[$i] = mb_strlen("k.A.");
+			$worksheet2->write($zeile, ++$i, "k.A.*", $format_bold);
+			if (strlen("k.A.*") > $maxlength[$i])
+				$maxlength[$i] = mb_strlen("k.A.*");
+			$worksheet2->write($zeile, ++$i, "k.A.*", $format_bold);
+			if (strlen("k.A.*") > $maxlength[$i])
+				$maxlength[$i] = mb_strlen("k.A.*");
+			$worksheet2->write($zeile, ++$i, "k.A.*", $format_bold);
+			if (strlen("k.A.*") > $maxlength[$i])
+				$maxlength[$i] = mb_strlen("k.A.*");
 			$worksheet2->write($zeile, ++$i, $interessentenrtanmeldung_sum, $format_bold);
 			if (strlen($interessentenrtanmeldung_sum) > $maxlength[$i])
 				$maxlength[$i] = mb_strlen($interessentenrtanmeldung_sum);
@@ -1253,7 +1253,9 @@ if (isset($_GET['excel']))
 				$maxlength[$i] = mb_strlen($student3sem_w_sum);
 		}
 		//Verteilung
-		$zeile = $zeile + 3;
+		$zeile = $zeile + 2;
+		$worksheet2->write($zeile, 0, '* für ZGV liegen zum Stichtag keine historischen Daten vor');
+		$zeile = $zeile + 2;
 		$i = 0;
 		$worksheet2->write($zeile, 0, 'Verteilung'.$stsem, $format_bold);
 		$worksheet2->mergeCells($zeile, $i, $zeile, $i + 1);
@@ -2060,7 +2062,7 @@ else
 						<tr>
 							<th class='table-sortable:default'>Studiengang</th>
 							<th class='table-sortable:numeric'>InteressentInnen (m/w)</th>
-							<th class='table-sortable:numeric'>InteressentInnen mit ZGV (m/w)</th>
+							<th class='table-sortable:numeric'>InteressentInnen mit ZGV (m/w) *</th>
 							<th class='table-sortable:numeric'>InteressentInnen mit RT Anmeldung (m/w)</th>
 							<th class='table-sortable:numeric'>BewerberIn (m/w)</th>
 							<th class='table-sortable:numeric'>Aufgenommene (m/w)</th>
@@ -2099,7 +2101,7 @@ else
 				$content .= '<tr>';
 				$content .= "<td>".mb_strtoupper($row->typ.$row->kurzbz)." ($row->kurzbzlang)</td>";
 				$content .= "<td align='center'>$row->interessenten ($row->interessenten_m / $row->interessenten_w)</td>";
-				$content .= "<td align='center'>k.A.</td>";
+				$content .= "<td align='center'>k.A.*</td>";
 				$content .= "<td align='center'>$row->interessentenrtanmeldung ($row->interessentenrtanmeldung_m / $row->interessentenrtanmeldung_w)</td>";
 				$content .= "<td align='center'>$row->bewerber ($row->bewerber_m / $row->bewerber_w)</td>";
 				$content .= "<td align='center'>$row->aufgenommener ($row->aufgenommener_m / $row->aufgenommener_w)</td>";
@@ -2136,7 +2138,7 @@ else
 			$content .= '</tbody><tfoot style="font-weight: bold;"><tr>';
 			$content .= "<td>Summe</td>";
 			$content .= "<td align='center'>$interessenten_sum ($interessenten_m_sum / $interessenten_w_sum)</td>";
-			$content .= "<td align='center'>k.A.</td>";
+			$content .= "<td align='center'>k.A.*</td>";
 			$content .= "<td align='center'>$interessentenrt_sum ($interessentenrt_m_sum / $interessentenrt_w_sum)</td>";
 			$content .= "<td align='center'>$bewerber_sum ($bewerber_m_sum / $bewerber_w_sum)</td>";
 			$content .= "<td align='center'>$aufgenommener_sum ($aufgenommener_m_sum / $aufgenommener_w_sum)</td>";
@@ -2146,6 +2148,7 @@ else
 			$content .= "</tr>";
 			$content .= '</tfoot></table>';
 
+			$content .= "<br />* für ZGV liegen zum Stichtag keine historischen Daten vor";
 			//Verteilung
 			$content .= '<br><h2>Verteilung '.$stsem.'</h2><br>';
 			$qry = "SELECT

content/statistik/lehrauftragsliste_mail.xls.php

@@ -173,6 +173,10 @@ if($result_stg = $db->db_query($qry_stg))
 		$gesamt->write($gesamtsheet_row,$i,"Familienname", $format_bold);
 		$worksheet->write(2,++$i,"Fixangestellt", $format_bold);
 		$gesamt->write($gesamtsheet_row,$i,"Fixangestellt", $format_bold);
+		$worksheet->write(2,++$i,"Disz. Zuordnung", $format_bold);
+		$gesamt->write($gesamtsheet_row,$i,"Disz. Zuordnung", $format_bold);
+		$worksheet->write(2,++$i,"Department", $format_bold);
+		$gesamt->write($gesamtsheet_row,$i,"Department", $format_bold);
 		$worksheet->write(2,++$i,"LV-Stunden", $format_bold);
 		$gesamt->write($gesamtsheet_row,$i,"LV-Stunden", $format_bold);
 		$worksheet->write(2,++$i,"LV-Kosten", $format_bold);
@@ -187,27 +191,103 @@ if($result_stg = $db->db_query($qry_stg))
 		$gesamt->write($gesamtsheet_row,$i,"Gesamtkosten", $format_bold);
 		
 		//Daten holen
-		$qry = "SELECT
-					tbl_lehreinheit.*, tbl_person.vorname, tbl_person.nachname, tbl_person.titelpre,
-					tbl_mitarbeiter.personalnummer, tbl_person.person_id, tbl_mitarbeiter.mitarbeiter_uid,
-					tbl_lehreinheitmitarbeiter.faktor as faktor, tbl_lehreinheitmitarbeiter.stundensatz as stundensatz,
-					tbl_lehreinheitmitarbeiter.semesterstunden as semesterstunden,
-					CASE WHEN tbl_mitarbeiter.fixangestellt = true THEN 'Ja' ELSE 'Nein' END as fixangestellt,
-					CASE WHEN COALESCE(tbl_lehreinheitmitarbeiter.updateamum, tbl_lehreinheitmitarbeiter.insertamum)>now()-interval '31 days' THEN 't' ELSE 'f' END as geaendert
-				FROM
-					lehre.tbl_lehreinheit, lehre.tbl_lehreinheitmitarbeiter, public.tbl_mitarbeiter,
-					public.tbl_benutzer, public.tbl_person, lehre.tbl_lehrveranstaltung
-				WHERE
-					tbl_person.person_id = tbl_benutzer.person_id AND
-					tbl_benutzer.uid=tbl_mitarbeiter.mitarbeiter_uid AND
-					tbl_lehreinheitmitarbeiter.mitarbeiter_uid=tbl_mitarbeiter.mitarbeiter_uid AND
-					tbl_lehreinheit.lehreinheit_id=tbl_lehreinheitmitarbeiter.lehreinheit_id AND
-					tbl_lehrveranstaltung.lehrveranstaltung_id=tbl_lehreinheit.lehrveranstaltung_id AND
-					studiengang_kz=".$db->db_add_param($studiengang_kz)." AND studiensemester_kurzbz=".$db->db_add_param($semester_aktuell)." AND
-					tbl_lehreinheitmitarbeiter.semesterstunden<>0 AND tbl_lehreinheitmitarbeiter.semesterstunden is not null
-					AND tbl_lehreinheitmitarbeiter.stundensatz<>0 AND tbl_lehreinheitmitarbeiter.faktor<>0
-					AND EXISTS (SELECT lehreinheit_id FROM lehre.tbl_lehreinheitgruppe WHERE lehreinheit_id=tbl_lehreinheit.lehreinheit_id)
-					ORDER BY nachname, vorname, tbl_mitarbeiter.mitarbeiter_uid";
+		$qry = "SELECT tbl_lehreinheit.*,
+					tbl_person.vorname,
+					tbl_person.nachname,
+					tbl_person.titelpre,
+					tbl_mitarbeiter.personalnummer,
+					tbl_person.person_id,
+					tbl_mitarbeiter.mitarbeiter_uid,
+					tbl_lehreinheitmitarbeiter.faktor AS faktor,
+					tbl_lehreinheitmitarbeiter.stundensatz AS stundensatz,
+					tbl_lehreinheitmitarbeiter.semesterstunden AS semesterstunden,
+					CASE 
+						WHEN tbl_mitarbeiter.fixangestellt = true
+							THEN 'Ja'
+						ELSE 'Nein'
+						END AS fixangestellt,
+					(
+						SELECT tbl_organisationseinheit.organisationseinheittyp_kurzbz || ' ' || tbl_organisationseinheit.bezeichnung
+						FROM PUBLIC.tbl_benutzerfunktion
+						JOIN PUBLIC.tbl_organisationseinheit USING (oe_kurzbz)
+						WHERE funktion_kurzbz = 'oezuordnung'
+							AND (
+								datum_von IS NULL
+								OR datum_von <= now()
+								)
+							AND (
+								datum_bis IS NULL
+								OR datum_bis >= now()
+								)
+							AND tbl_benutzerfunktion.uid = tbl_benutzer.uid LIMIT 1
+						) AS oezuordnung,
+					(
+						WITH RECURSIVE meine_oes(oe_kurzbz, oe_parent_kurzbz, organisationseinheittyp_kurzbz) AS (
+								SELECT oe_kurzbz,
+									oe_parent_kurzbz,
+									organisationseinheittyp_kurzbz
+								FROM PUBLIC.tbl_organisationseinheit
+								WHERE oe_kurzbz IN (
+										SELECT oe_kurzbz
+										FROM PUBLIC.tbl_benutzerfunktion
+										WHERE funktion_kurzbz = 'oezuordnung'
+											AND (
+												datum_von IS NULL
+												OR datum_von <= now()
+												)
+											AND (
+												datum_bis IS NULL
+												OR datum_bis >= now()
+												)
+											AND tbl_benutzerfunktion.uid = tbl_benutzer.uid LIMIT 1
+										)
+									AND aktiv = true
+								
+								UNION ALL
+								
+								SELECT o.oe_kurzbz,
+									o.oe_parent_kurzbz,
+									o.organisationseinheittyp_kurzbz
+								FROM PUBLIC.tbl_organisationseinheit o,
+									meine_oes
+								WHERE o.oe_kurzbz = meine_oes.oe_parent_kurzbz
+									AND aktiv = true
+								)
+						SELECT ARRAY_TO_STRING(ARRAY_AGG(DISTINCT tbl_organisationseinheit.bezeichnung), ', ')
+						FROM meine_oes
+						JOIN PUBLIC.tbl_organisationseinheit USING (oe_kurzbz)
+						WHERE meine_oes.organisationseinheittyp_kurzbz = 'Department'
+						) AS department,
+					CASE 
+						WHEN COALESCE(tbl_lehreinheitmitarbeiter.updateamum, tbl_lehreinheitmitarbeiter.insertamum) > now() - interval '31 days'
+							THEN 't'
+						ELSE 'f'
+						END AS geaendert
+				FROM lehre.tbl_lehreinheit,
+					lehre.tbl_lehreinheitmitarbeiter,
+					PUBLIC.tbl_mitarbeiter,
+					PUBLIC.tbl_benutzer,
+					PUBLIC.tbl_person,
+					lehre.tbl_lehrveranstaltung
+				WHERE tbl_person.person_id = tbl_benutzer.person_id
+					AND tbl_benutzer.uid = tbl_mitarbeiter.mitarbeiter_uid
+					AND tbl_lehreinheitmitarbeiter.mitarbeiter_uid = tbl_mitarbeiter.mitarbeiter_uid
+					AND tbl_lehreinheit.lehreinheit_id = tbl_lehreinheitmitarbeiter.lehreinheit_id
+					AND tbl_lehrveranstaltung.lehrveranstaltung_id = tbl_lehreinheit.lehrveranstaltung_id
+					AND studiengang_kz = ".$db->db_add_param($studiengang_kz)."
+					AND studiensemester_kurzbz = ".$db->db_add_param($semester_aktuell)."
+					AND tbl_lehreinheitmitarbeiter.semesterstunden <> 0
+					AND tbl_lehreinheitmitarbeiter.semesterstunden IS NOT NULL
+					AND tbl_lehreinheitmitarbeiter.stundensatz <> 0
+					AND tbl_lehreinheitmitarbeiter.faktor <> 0
+					AND EXISTS (
+						SELECT lehreinheit_id
+						FROM lehre.tbl_lehreinheitgruppe
+						WHERE lehreinheit_id = tbl_lehreinheit.lehreinheit_id
+						)
+				ORDER BY nachname,
+					vorname,
+					tbl_mitarbeiter.mitarbeiter_uid";
 
 		if($result = $db->db_query($qry))
 		{
@@ -237,6 +317,8 @@ if($result_stg = $db->db_query($qry_stg))
 				$liste[$row->mitarbeiter_uid]['vorname'] = $row->vorname;
 				$liste[$row->mitarbeiter_uid]['nachname'] = $row->nachname;
 				$liste[$row->mitarbeiter_uid]['fixangestellt'] = $row->fixangestellt;
+				$liste[$row->mitarbeiter_uid]['oezuordnung'] = $row->oezuordnung;
+				$liste[$row->mitarbeiter_uid]['department'] = $row->department;
 				$liste[$row->mitarbeiter_uid]['betreuergesamtstunden'] = 0;
 				$liste[$row->mitarbeiter_uid]['betreuergesamtkosten'] = 0;
 				if($row->geaendert=='t')
@@ -245,7 +327,52 @@ if($result_stg = $db->db_query($qry_stg))
 
 			//Alle holen die eine Betreuung aber keinen Lehrauftrag haben
 			$qry = "SELECT 
-						distinct personalnummer, titelpre, vorname, nachname, uid, CASE WHEN fixangestellt = true THEN 'Ja' ELSE 'Nein' END as fixangestellt
+						distinct personalnummer, titelpre, vorname, nachname, uid, CASE WHEN fixangestellt = true THEN 'Ja' ELSE 'Nein' END as fixangestellt,
+						(SELECT tbl_organisationseinheit.organisationseinheittyp_kurzbz||' '||tbl_organisationseinheit.bezeichnung
+						FROM public.tbl_benutzerfunktion 
+						JOIN public.tbl_organisationseinheit USING (oe_kurzbz)
+						WHERE funktion_kurzbz='oezuordnung'
+						AND (datum_von IS NULL OR datum_von <= now())
+						AND (datum_bis IS NULL OR datum_bis >= now())
+						AND tbl_benutzerfunktion.uid = tbl_benutzer.uid
+						LIMIT 1) AS oezuordnung,
+						(
+						WITH RECURSIVE meine_oes(oe_kurzbz, oe_parent_kurzbz, organisationseinheittyp_kurzbz) AS (
+								SELECT oe_kurzbz,
+									oe_parent_kurzbz,
+									organisationseinheittyp_kurzbz
+								FROM PUBLIC.tbl_organisationseinheit
+								WHERE oe_kurzbz IN (
+										SELECT oe_kurzbz
+										FROM PUBLIC.tbl_benutzerfunktion
+										WHERE funktion_kurzbz = 'oezuordnung'
+											AND (
+												datum_von IS NULL
+												OR datum_von <= now()
+												)
+											AND (
+												datum_bis IS NULL
+												OR datum_bis >= now()
+												)
+											AND tbl_benutzerfunktion.uid = tbl_benutzer.uid LIMIT 1
+										)
+									AND aktiv = true
+								
+								UNION ALL
+								
+								SELECT o.oe_kurzbz,
+									o.oe_parent_kurzbz,
+									o.organisationseinheittyp_kurzbz
+								FROM PUBLIC.tbl_organisationseinheit o,
+									meine_oes
+								WHERE o.oe_kurzbz = meine_oes.oe_parent_kurzbz
+									AND aktiv = true
+								)
+						SELECT ARRAY_TO_STRING(ARRAY_AGG(DISTINCT tbl_organisationseinheit.bezeichnung), ', ')
+						FROM meine_oes
+						JOIN PUBLIC.tbl_organisationseinheit USING (oe_kurzbz)
+						WHERE meine_oes.organisationseinheittyp_kurzbz = 'Department'
+						) AS department
 					FROM 
 						lehre.tbl_projektbetreuer, public.tbl_person, public.tbl_benutzer, 
 						public.tbl_mitarbeiter, lehre.tbl_projektarbeit, lehre.tbl_lehreinheit, 
@@ -286,6 +413,8 @@ if($result_stg = $db->db_query($qry_stg))
 						$liste[$row->uid]['vorname'] = $row->vorname;
 						$liste[$row->uid]['nachname'] = $row->nachname;
 						$liste[$row->uid]['fixangestellt'] = $row->fixangestellt;
+						$liste[$row->uid]['oezuordnung'] = $row->oezuordnung;
+						$liste[$row->uid]['department'] = $row->department;
 						$liste[$row->uid]['geaendert']=false;
 						$liste[$row->uid]['gesamtstunden'] = 0;
 						$liste[$row->uid]['gesamtkosten'] = 0;
@@ -370,6 +499,12 @@ if($result_stg = $db->db_query($qry_stg))
 				//Fixangestellt
 				$worksheet->write($zeile,++$i,$row['fixangestellt'], $format);
 				$gesamt->write($gesamtsheet_row,$i,$row['fixangestellt'], $format);
+				//OE-Zuordnung
+				$worksheet->write($zeile,++$i,$row['oezuordnung'], $format);
+				$gesamt->write($gesamtsheet_row,$i,$row['oezuordnung'], $format);
+				//Department der OE-Zuordnung
+				$worksheet->write($zeile,++$i,$row['department'], $format);
+				$gesamt->write($gesamtsheet_row,$i,$row['department'], $format);
 				//LVStunden
 				$lvstunden = str_replace(',', '.', $row['lvstunden']);
 				$worksheet->write($zeile,++$i,$lvstunden, $format);

content/statistik/lvplanung.xls.php

@@ -102,41 +102,66 @@ $stg_obj = new studiengang();
 $stg_obj->getAll('typ, kurzbz', false);
 
 $qry = "
-SELECT
-	lehrfach.bezeichnung as lf_bezeichnung, tbl_lehrveranstaltung.studiengang_kz, lehrfach.oe_kurzbz as lehrfach_oe_kurzbz,
+SELECT tbl_lehrveranstaltung.bezeichnung AS lf_bezeichnung,
+	tbl_lehrveranstaltung.studiengang_kz,
+	tbl_lehrveranstaltung.oe_kurzbz AS lv_oe_kurzbz,
 	tbl_lehreinheitmitarbeiter.mitarbeiter_uid,
-	tbl_lehrveranstaltung.semester as lv_semester, tbl_lehreinheit.lehreinheit_id, tbl_lehreinheitmitarbeiter.faktor,
+	tbl_lehrveranstaltung.semester AS lv_semester,
+	tbl_lehreinheit.lehreinheit_id,
+	tbl_lehreinheitmitarbeiter.faktor,
 	tbl_lehreinheitmitarbeiter.stundensatz,
-	tbl_lehreinheitmitarbeiter.semesterstunden lemss, tbl_lehreinheitmitarbeiter.planstunden,
-	tbl_lehreinheit.stundenblockung, tbl_lehreinheit.wochenrythmus, tbl_lehreinheit.raumtyp, tbl_lehreinheit.raumtypalternativ,
-	tbl_lehreinheitmitarbeiter.anmerkung
-	,tbl_lehreinheit.studiensemester_kurzbz
-	,tbl_lehrveranstaltung.ects
-	,tbl_lehrveranstaltung.semesterstunden
-	,tbl_lehrveranstaltung.semesterstunden  as sws
-	,tbl_lehrveranstaltung.lehrform_kurzbz
-	,tbl_lehrveranstaltung.lehrveranstaltung_id
-	,(SELECT nachname FROM public.tbl_person JOIN public.tbl_benutzer USING(person_id)
-		  WHERE uid=(SELECT mitarbeiter_uid FROM lehre.tbl_lehreinheitmitarbeiter  WHERE lehre.tbl_lehreinheitmitarbeiter.lehreinheit_id=lehre.tbl_lehreinheit.lehreinheit_id and lehre.tbl_lehreinheitmitarbeiter.lehrfunktion_kurzbz='LV-Leitung' LIMIT 1)
-		)as lv_leitung
-	,(SELECT vorname FROM public.tbl_person JOIN public.tbl_benutzer USING(person_id)
-		  WHERE uid=(SELECT mitarbeiter_uid FROM lehre.tbl_lehreinheitmitarbeiter  WHERE lehre.tbl_lehreinheitmitarbeiter.lehreinheit_id=lehre.tbl_lehreinheit.lehreinheit_id and lehre.tbl_lehreinheitmitarbeiter.lehrfunktion_kurzbz='LV-Leitung' LIMIT 1)
-		)as lv_leitung_vorname
-	,(SELECT bezeichnung FROM lehre.tbl_lehrform  WHERE lehre.tbl_lehrform.lehrform_kurzbz=tbl_lehrveranstaltung.lehrform_kurzbz LIMIT 1) as lv_type
-	,tbl_lehrveranstaltung.lehrform_kurzbz
-FROM
-	lehre.tbl_lehrveranstaltung
-	JOIN lehre.tbl_lehreinheit USING(lehrveranstaltung_id)
-	JOIN lehre.tbl_lehreinheitmitarbeiter USING(lehreinheit_id)
-	JOIN lehre.tbl_lehrveranstaltung as lehrfach ON(tbl_lehreinheit.lehrfach_id=lehrfach.lehrveranstaltung_id)
-WHERE
-	tbl_lehreinheit.studiensemester_kurzbz=".$db->db_add_param($studiensemester_kurzbz);
+	tbl_lehreinheitmitarbeiter.semesterstunden lemss,
+	tbl_lehreinheitmitarbeiter.planstunden,
+	tbl_lehreinheit.stundenblockung,
+	tbl_lehreinheit.wochenrythmus,
+	tbl_lehreinheit.raumtyp,
+	tbl_lehreinheit.raumtypalternativ,
+	tbl_lehreinheit.anmerkung,
+	tbl_lehreinheit.studiensemester_kurzbz,
+	tbl_lehrveranstaltung.ects,
+	tbl_lehrveranstaltung.semesterstunden,
+	tbl_lehrveranstaltung.semesterstunden AS sws,
+	tbl_lehrveranstaltung.lehrform_kurzbz,
+	tbl_lehrveranstaltung.lehrveranstaltung_id,
+	(
+		SELECT nachname
+		FROM PUBLIC.tbl_person
+		JOIN PUBLIC.tbl_benutzer USING (person_id)
+		WHERE uid = (
+				SELECT mitarbeiter_uid
+				FROM lehre.tbl_lehreinheitmitarbeiter
+				WHERE lehre.tbl_lehreinheitmitarbeiter.lehreinheit_id = lehre.tbl_lehreinheit.lehreinheit_id
+					AND lehre.tbl_lehreinheitmitarbeiter.lehrfunktion_kurzbz = 'LV-Leitung' LIMIT 1
+				)
+		) AS lv_leitung,
+	(
+		SELECT vorname
+		FROM PUBLIC.tbl_person
+		JOIN PUBLIC.tbl_benutzer USING (person_id)
+		WHERE uid = (
+				SELECT mitarbeiter_uid
+				FROM lehre.tbl_lehreinheitmitarbeiter
+				WHERE lehre.tbl_lehreinheitmitarbeiter.lehreinheit_id = lehre.tbl_lehreinheit.lehreinheit_id
+					AND lehre.tbl_lehreinheitmitarbeiter.lehrfunktion_kurzbz = 'LV-Leitung' LIMIT 1
+				)
+		) AS lv_leitung_vorname,
+	(
+		SELECT bezeichnung
+		FROM lehre.tbl_lehrform
+		WHERE lehre.tbl_lehrform.lehrform_kurzbz = tbl_lehrveranstaltung.lehrform_kurzbz LIMIT 1
+		) AS lv_type,
+	tbl_lehrveranstaltung.lehrform_kurzbz
+FROM lehre.tbl_lehrveranstaltung
+JOIN lehre.tbl_lehreinheit USING (lehrveranstaltung_id)
+JOIN lehre.tbl_lehreinheitmitarbeiter USING (lehreinheit_id)
+--JOIN lehre.tbl_lehrveranstaltung as lehrfach ON(tbl_lehreinheit.lehrfach_id=lehrfach.lehrveranstaltung_id)
+WHERE tbl_lehreinheit.studiensemester_kurzbz = ".$db->db_add_param($studiensemester_kurzbz);
 
 if($studiengang_kz!='')
 	$qry.=" AND tbl_lehrveranstaltung.studiengang_kz=".$db->db_add_param($studiengang_kz, FHC_INTEGER);
 
 if($oe_kurzbz!='')
-	$qry.=" AND lehrfach.oe_kurzbz=".$db->db_add_param($oe_kurzbz);
+	$qry.=" AND tbl_lehrveranstaltung.oe_kurzbz=".$db->db_add_param($oe_kurzbz);
 
 if($semester!='')
 	$qry.=" AND tbl_lehrveranstaltung.semester=".$db->db_add_param($semester, FHC_INTEGER);
@@ -172,21 +197,23 @@ $spalte=0;
 $worksheet->write($zeile,$spalte,"Studiengang", $format_bold);
 $maxlength[$spalte]=11;
 $worksheet->write($zeile,++$spalte,"Organisationseinheit", $format_bold);
-$maxlength[$spalte]=8;
+$maxlength[$spalte]=25;
 $worksheet->write($zeile,++$spalte,"Lektor", $format_bold);
 $maxlength[$spalte]=6;
-$worksheet->write($zeile,++$spalte,"Lehrfach", $format_bold);
-$maxlength[$spalte]=8;
+$worksheet->write($zeile,++$spalte,"Bezeichnung", $format_bold);
+$maxlength[$spalte]=25;
 $worksheet->write($zeile,++$spalte,"Semester", $format_bold);
 $maxlength[$spalte]=8;
 $worksheet->write($zeile,++$spalte,"Gruppen", $format_bold);
-$maxlength[$spalte]=7;
-$worksheet->write($zeile,++$spalte,"Stunden", $format_bold);
-$maxlength[$spalte]=7;
+$maxlength[$spalte]=20;
+$worksheet->write($zeile,++$spalte,"Semesterstunden", $format_bold);
+$maxlength[$spalte]=12;
+$worksheet->write($zeile,++$spalte,"Stundensatz", $format_bold);
+$maxlength[$spalte]=12;
 $worksheet->write($zeile,++$spalte,"Kosten", $format_bold);
-$maxlength[$spalte]=6;
+$maxlength[$spalte]=7;
 $worksheet->write($zeile,++$spalte,"Planstunden", $format_bold);
-$maxlength[$spalte]=11;
+$maxlength[$spalte]=10;
 $worksheet->write($zeile,++$spalte,"Stundenblockung", $format_bold);
 $maxlength[$spalte]=15;
 $worksheet->write($zeile,++$spalte,"Wochenrhythmus", $format_bold);
@@ -232,18 +259,20 @@ if($result = $db->db_query($qry))
 			$maxlength[$spalte]=mb_strlen($stg_obj->kuerzel_arr[$row->studiengang_kz]);
 
 		//Organisationseinheit
-		$worksheet->write($zeile,++$spalte,$oe_arr[$row->lehrfach_oe_kurzbz]);
-		if($maxlength[$spalte]<mb_strlen($oe_arr[$row->lehrfach_oe_kurzbz]))
-			$maxlength[$spalte]=mb_strlen($oe_arr[$row->lehrfach_oe_kurzbz]);
+		$worksheet->write($zeile,++$spalte,$oe_arr[$row->lv_oe_kurzbz]);
+		//if($maxlength[$spalte]<mb_strlen($oe_arr[$row->lv_oe_kurzbz]))
+			//$maxlength[$spalte]=mb_strlen($oe_arr[$row->lv_oe_kurzbz]);
 
 		//Lektor
 		$worksheet->write($zeile,++$spalte,$mitarbeiter->nachname.' '.$mitarbeiter->vorname);
 		if($maxlength[$spalte]<mb_strlen($mitarbeiter->nachname.' '.$mitarbeiter->vorname))
 			$maxlength[$spalte]=mb_strlen($mitarbeiter->nachname.' '.$mitarbeiter->vorname);
+
 		//Lehrfach
 		$worksheet->write($zeile,++$spalte,$row->lf_bezeichnung);
-		if($maxlength[$spalte]<mb_strlen($row->lf_bezeichnung))
-			$maxlength[$spalte]=mb_strlen($row->lf_bezeichnung);
+		//if($maxlength[$spalte]<mb_strlen($row->lf_bezeichnung))
+			//$maxlength[$spalte]=mb_strlen($row->lf_bezeichnung);
+
 		//Semester
 		$worksheet->write($zeile,++$spalte,$row->lv_semester);
 		if($maxlength[$spalte]<mb_strlen($row->lv_semester))
@@ -264,16 +293,21 @@ if($result = $db->db_query($qry))
 
 		//Gruppen
 		$worksheet->write($zeile,++$spalte,$gruppe);
-		if($maxlength[$spalte]<mb_strlen($gruppe))
-			$maxlength[$spalte]=mb_strlen($gruppe);
+		//if($maxlength[$spalte]<mb_strlen($gruppe))
+			//$maxlength[$spalte]=mb_strlen($gruppe);
+
 		//Semesterstunden
 		$worksheet->write($zeile,++$spalte,$row->lemss);
 		if($maxlength[$spalte]<mb_strlen($row->lemss))
 			$maxlength[$spalte]=mb_strlen($row->lemss);
 
-		$kosten = ($row->stundensatz*$row->lemss*$row->faktor);
+		//Stundensatz
+		$worksheet->write($zeile,++$spalte,$row->stundensatz);
+		if($maxlength[$spalte]<mb_strlen($row->stundensatz))
+			$maxlength[$spalte]=mb_strlen($row->stundensatz);
 
 		//Kosten
+		$kosten = ($row->stundensatz*$row->lemss);
 		$worksheet->write($zeile,++$spalte,$kosten);
 		if($maxlength[$spalte]<mb_strlen($kosten))
 			$maxlength[$spalte]=mb_strlen($kosten);
@@ -281,6 +315,7 @@ if($result = $db->db_query($qry))
 		$worksheet->write($zeile,++$spalte,$row->planstunden);
 		if($maxlength[$spalte]<mb_strlen($row->planstunden))
 			$maxlength[$spalte]=mb_strlen($row->planstunden);
+
 		//Stundenblockung
 		$worksheet->write($zeile,++$spalte,$row->stundenblockung);
 		if($maxlength[$spalte]<mb_strlen($row->stundenblockung))
@@ -299,8 +334,8 @@ if($result = $db->db_query($qry))
 			$maxlength[$spalte]=mb_strlen($row->raumtypalternativ);
 		//Anmerkung
 		$worksheet->write($zeile,++$spalte,$row->anmerkung);
-		if($maxlength[$spalte]<mb_strlen($row->anmerkung))
-			$maxlength[$spalte]=mb_strlen($row->anmerkung);
+		//if($maxlength[$spalte]<mb_strlen($row->anmerkung))
+			//$maxlength[$spalte]=mb_strlen($row->anmerkung);
 
 		//LV-Leitung
 		$worksheet->write($zeile,++$spalte,$row->lv_leitung.' '.$row->lv_leitung_vorname);
@@ -314,7 +349,7 @@ if($result = $db->db_query($qry))
 
 		//Semesterstunden
 		$semesterstunden = $row->semesterstunden;
-		if ($row->stundensatz==0 || $row->lemss==0 || $row->faktor==0)
+		if ($row->stundensatz==0 || $row->lemss==0)
 			$semesterstunden = 0;
 
 		$worksheet->write($zeile,++$spalte,$semesterstunden);
@@ -336,22 +371,28 @@ if($result = $db->db_query($qry))
 	}
 
 	//Betreuungen
-	$qry = "SELECT
-				tbl_lehrveranstaltung.studiengang_kz, lehrfach.oe_kurzbz as lehrfach_oe_kurzbz,
-				nachname, vorname, lehrfach.bezeichnung,
-				tbl_lehrveranstaltung.semester, student_uid, stunden, tbl_projektbetreuer.stundensatz,
+	$qry = "SELECT tbl_lehrveranstaltung.studiengang_kz,
+				tbl_lehrveranstaltung.oe_kurzbz AS lv_oe_kurzbz,
+				nachname,
+				vorname,
+				tbl_lehrveranstaltung.bezeichnung,
+				tbl_lehrveranstaltung.semester,
+				student_uid,
+				stunden,
+				tbl_projektbetreuer.stundensatz,
 				tbl_projektbetreuer.faktor
-			FROM
-				lehre.tbl_projektarbeit, lehre.tbl_lehreinheit, lehre.tbl_lehrveranstaltung,
-				lehre.tbl_projektbetreuer, public.tbl_person, lehre.tbl_lehrveranstaltung as lehrfach
-			WHERE
-				tbl_projektarbeit.lehreinheit_id=tbl_lehreinheit.lehreinheit_id AND
-				tbl_lehreinheit.lehrveranstaltung_id=tbl_lehrveranstaltung.lehrveranstaltung_id AND
-				tbl_projektarbeit.projektarbeit_id=tbl_projektbetreuer.projektarbeit_id AND
-				tbl_lehreinheit.lehrfach_id=lehrfach.lehrveranstaltung_id AND
-				tbl_person.person_id=tbl_projektbetreuer.person_id AND
-				tbl_lehreinheit.studiensemester_kurzbz=".$db->db_add_param($studiensemester_kurzbz)." AND
-				(tbl_projektbetreuer.faktor*tbl_projektbetreuer.stundensatz*tbl_projektbetreuer.stunden)>0
+			FROM lehre.tbl_projektarbeit,
+				lehre.tbl_lehreinheit,
+				lehre.tbl_lehrveranstaltung,
+				lehre.tbl_projektbetreuer,
+				PUBLIC.tbl_person
+			WHERE tbl_projektarbeit.lehreinheit_id = tbl_lehreinheit.lehreinheit_id
+				AND tbl_lehreinheit.lehrveranstaltung_id = tbl_lehrveranstaltung.lehrveranstaltung_id
+				AND tbl_projektarbeit.projektarbeit_id = tbl_projektbetreuer.projektarbeit_id
+				--AND tbl_lehreinheit.lehrfach_id = tbl_lehrveranstaltung.lehrveranstaltung_id
+				AND tbl_person.person_id = tbl_projektbetreuer.person_id
+				AND tbl_lehreinheit.studiensemester_kurzbz = ".$db->db_add_param($studiensemester_kurzbz)."
+				AND (tbl_projektbetreuer.stundensatz * tbl_projektbetreuer.stunden) > 0
 				";
 
 	if($uid!=='')
@@ -361,7 +402,7 @@ if($result = $db->db_query($qry))
 	}
 
 	if($oe_kurzbz!='')
-		$qry.=" AND lehrfach.oe_kurzbz=".$db->db_add_param($oe_kurzbz);
+		$qry.=" AND tbl_lehrveranstaltung.oe_kurzbz=".$db->db_add_param($oe_kurzbz);
 
 	if($studiengang_kz!='')
 		$qry.=" AND tbl_lehrveranstaltung.studiengang_kz=".$db->db_add_param($studiengang_kz, FHC_INTEGER);
@@ -384,18 +425,20 @@ if($result = $db->db_query($qry))
 				$maxlength[$spalte]=mb_strlen($stg_obj->kuerzel_arr[$row->studiengang_kz]);
 
 			//Organisationseinheit
-			$worksheet->write($zeile,++$spalte,$oe_arr[$row->lehrfach_oe_kurzbz]);
-			if($maxlength[$spalte]<mb_strlen($oe_arr[$row->lehrfach_oe_kurzbz]))
-				$maxlength[$spalte]=mb_strlen($oe_arr[$row->lehrfach_oe_kurzbz]);
+			$worksheet->write($zeile,++$spalte,$oe_arr[$row->lv_oe_kurzbz]);
+			//if($maxlength[$spalte]<mb_strlen($oe_arr[$row->lv_oe_kurzbz]))
+				//$maxlength[$spalte]=mb_strlen($oe_arr[$row->lv_oe_kurzbz]);
 
 			//Lektor
 			$worksheet->write($zeile,++$spalte,$row->nachname.' '.$row->vorname);
-			if($maxlength[$spalte]<mb_strlen($row->nachname.' '.$row->vorname))
-				$maxlength[$spalte]=mb_strlen($row->nachname.' '.$row->vorname);
+			//if($maxlength[$spalte]<mb_strlen($row->nachname.' '.$row->vorname))
+				//$maxlength[$spalte]=mb_strlen($row->nachname.' '.$row->vorname);
+
 			//Lehrfach
 			$worksheet->write($zeile,++$spalte,$row->bezeichnung);
-			if($maxlength[$spalte]<mb_strlen($row->bezeichnung))
-				$maxlength[$spalte]=mb_strlen($row->bezeichnung);
+			//if($maxlength[$spalte]<mb_strlen($row->bezeichnung))
+				//$maxlength[$spalte]=mb_strlen($row->bezeichnung);
+
 			//Semester
 			$worksheet->write($zeile,++$spalte,$row->semester);
 			if($maxlength[$spalte]<mb_strlen($row->semester))
@@ -403,18 +446,24 @@ if($result = $db->db_query($qry))
 
 			$benutzer = new benutzer();
 			$benutzer->load($row->student_uid);
+
 			//Student
 			$worksheet->write($zeile,++$spalte,$benutzer->nachname.' '.$benutzer->vorname);
-			if($maxlength[$spalte]<mb_strlen($benutzer->nachname.' '.$benutzer->vorname))
-				$maxlength[$spalte]=mb_strlen($benutzer->nachname.' '.$benutzer->vorname);
+			//if($maxlength[$spalte]<mb_strlen($benutzer->nachname.' '.$benutzer->vorname))
+				//$maxlength[$spalte]=mb_strlen($benutzer->nachname.' '.$benutzer->vorname);
+
 			//Stunden
 			$worksheet->write($zeile,++$spalte,$row->stunden);
 			if($maxlength[$spalte]<mb_strlen($row->stunden))
 				$maxlength[$spalte]=mb_strlen($row->stunden);
+			//Stundensatz
+			$worksheet->write($zeile,++$spalte,$row->stundensatz);
+			if($maxlength[$spalte]<mb_strlen($row->stundensatz))
+				$maxlength[$spalte]=mb_strlen($row->stundensatz);
 			//Kosten
-			$worksheet->write($zeile,++$spalte,$row->stunden*$row->stundensatz*$row->faktor);
-			if($maxlength[$spalte]<mb_strlen($row->stunden*$row->stundensatz*$row->faktor))
-				$maxlength[$spalte]=mb_strlen($row->stunden*$row->stundensatz*$row->faktor);
+			$worksheet->write($zeile,++$spalte,$row->stunden*$row->stundensatz);
+			if($maxlength[$spalte]<mb_strlen($row->stunden*$row->stundensatz))
+				$maxlength[$spalte]=mb_strlen($row->stunden*$row->stundensatz);
 
 		}
 	}

content/student/aufnahmetermine.js.php

@@ -262,7 +262,7 @@ function AufnahmeTermineAuswahl()
     document.getElementById('aufnahmetermine-textbox-endpunkte-exkl-gebiete').value = endpunkte_exkl_gebiete;
 
     // Sichtbarkeit der RT-Vergleichsergebnispunkte (ohne Quereinsteiger)
-    var basisgebiet_punkte_anzeigen = <?php echo FAS_REIHUNGSTEST_PUNKTE_BASISGEBIET_ANZEIGEN ? 'true' : 'false' ?>;
+    var basisgebiet_punkte_anzeigen = <?php echo (defined('FAS_REIHUNGSTEST_PUNKTE_BASISGEBIET_ANZEIGEN') && FAS_REIHUNGSTEST_PUNKTE_BASISGEBIET_ANZEIGEN) ? 'true' : 'false' ?>;
 
     //  * Generell Anzeige nur wenn über config-Datei gesetzt ist
     if (basisgebiet_punkte_anzeigen)

include/dokument.class.php

@@ -826,6 +826,7 @@ class dokument extends basis_db
 			{
 				return true;
 			}
+			return false;
 		}
 	}
 	

include/lehreinheitmitarbeiter.class.php

@@ -474,7 +474,7 @@ class lehreinheitmitarbeiter extends basis_db
 	public function getLehreinheiten($mitarbeiter_uid, $studiensemester_kurzbz)
 	{
 		$qry = 'SELECT
-					DISTINCT lehreinheit_id, lv_bezeichnung, lv_kurzbz, unr, lv_lehrform_kurzbz, stg_kurzbzlang,
+					DISTINCT lehreinheit_id, lehrveranstaltung_id, lv_bezeichnung, lv_kurzbz, unr, lv_lehrform_kurzbz, stg_kurzbzlang,
 					lv_semester, lehrform_kurzbz
 				FROM
 					campus.vw_lehreinheit

include/projektbetreuer.class.php

@@ -1,337 +1,395 @@
-<?php
-/* Copyright (C) 2007 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>.
- */
-/**
- * Klasse projektbetreuer
- * @create 08-02-2007
- */
-require_once(dirname(__FILE__).'/basis_db.class.php');
-
-class projektbetreuer extends basis_db
-{
-	public $new;       		// boolean
-	public $result = array(); 	// adresse Objekt
-
-	//Tabellenspalten
-	public $person_id;			// integer
-	public $projektarbeit_id;	// integer
-	public $note;				// integer
-	public $betreuerart_kurzbz;// varchar
-	public $faktor;				// numeric(3,2)
-	public $name;				// string
-	public $punkte;				// numeric(6,2)
-	public $stunden;			// numeric(8,4)
-	public $stundensatz;		// numeric(6,2)
-	public $ext_id;				// integer
-	public $insertamum;			// timestamp
-	public $insertvon;			// bigint
-	public $updateamum;			// timestamp
-	public $updatevon;			// bigint
-	public $vertrag_id;			// bigint
-
-	public $person_id_old;
-
-	/**
-	 * Konstruktor
-	 * @param $person_id, $projektarbeit ID des Projektbetreuers, der geladen werden soll (Default=null)
-	 */
-	public function __construct($person_id=null, $projektarbeit_id=null)
-	{
-		parent::__construct();
-
-		if($projektarbeit_id != null && $person_id!=null)
-			$this->load($person_id, $projektarbeit_id);
-	}
-
-	/**
-	 * Laedt die Funktion mit der ID $person_id, $projektarbeit_id
-	 * @param  $person_id ID der zu ladenden Funktion
-	 * @param  $projektarbeit_id ID der zu ladenden Funktion
-	 * @return true wenn ok, false im Fehlerfall
-	 */
-	public function load($person_id, $projektarbeit_id, $betreuerart_kurzbz)
-	{
-		if(!is_numeric($person_id))
-		{
-			$this->errormsg = 'Person_id muss eine gueltige Zahl sein';
-			return false;
-		}
-
-		if(!is_numeric($projektarbeit_id))
-		{
-			$this->errormsg = 'Projektarbeit_id muss eine gueltige Zahl sein';
-			return false;
-		}
-
-		$qry = "SELECT
-					*
-				FROM
-					lehre.tbl_projektbetreuer
-				WHERE
-					person_id=".$this->db_add_param($person_id, FHC_INTEGER)."
-					AND projektarbeit_id=".$this->db_add_param($projektarbeit_id, FHC_INTEGER)."
-					AND betreuerart_kurzbz=".$this->db_add_param($betreuerart_kurzbz);
-
-		if($this->db_query($qry))
-		{
-			if($row = $this->db_fetch_object())
-			{
-				$this->person_id = $row->person_id;
-				$this->projektarbeit_id = $row->projektarbeit_id;
-				$this->note = $row->note;
-				$this->betreuerart_kurzbz = $row->betreuerart_kurzbz;
-				$this->faktor = $row->faktor;
-				$this->name = $row->name;
-				$this->punkte = $row->punkte;
-				$this->stunden = $row->stunden;
-				$this->stundensatz = $row->stundensatz;
-				$this->updateamum = $row->updateamum;
-				$this->updatevon = $row->updatevon;
-				$this->insertamum = $row->insertamum;
-				$this->insertvon = $row->insertvon;
-				$this->ext_id = $row->ext_id;
-				$this->vertrag_id = $row->vertrag_id;
-				$this->new=false;
-				return true;
-			}
-			else
-			{
-				$this->errormsg = 'Datensatz wurde nicht gefunden';
-				return false;
-			}
-		}
-		else
-		{
-			$this->errormsg = 'Fehler beim Laden der Daten';
-			return false;
-		}
-	}
-
-	/**
-	 * Prueft die Variablen auf Gueltigkeit
-	 * @return true wenn ok, false im Fehlerfall
-	 */
-	protected function validate()
-	{
-		if($this->betreuerart_kurzbz=='')
-		{
-			$this->errormsg = 'Betreuerart muss eingegeben werden';
-			return false;
-		}
-		if(mb_strlen($this->betreuerart_kurzbz)>16)
-		{
-			$this->errormsg = 'betreuerart darf nicht länger als 16 Zeichen sein';
-			return false;
-		}
-		if(mb_strlen($this->name)>32)
-		{
-			$this->errormsg = 'Name darf nicht länger als 32 Zeichen sein';
-			return false;
-		}
-
-		if($this->note!='' && !is_numeric($this->note))
-		{
-			$this->errormsg = 'Note muss ein numerischer Wert sein';
-			return false;
-		}
-		if($this->punkte!='' && !is_numeric($this->punkte))
-		{
-			$this->errormsg = 'Punkte muss ein numerischer Wert sein';
-		}
-		if($this->faktor!='' && !is_numeric($this->faktor))
-		{
-			$this->errormsg = 'Faktor muss ein numerischer Wert sein';
-			return false;
-		}
-		if($this->stundensatz!='' && !is_numeric($this->stundensatz))
-		{
-			$this->errormsg = 'Stundensatz muss ein numerischer Wert sein';
-			return false;
-		}
-
-		//Pruefen ob projektarbeit_id eine gueltige Zahl ist
-		if(!is_numeric($this->projektarbeit_id))
-		{
-			$this->errormsg = 'projektarbeit_id muss eine gueltige Zahl sein';
-			return false;
-		}
-
-		//Pruefen ob person_id eine gueltige Zahl ist
-		if(!is_numeric($this->person_id))
-		{
-			$this->errormsg = 'person_id muss eine gueltige Zahl sein';
-			return false;
-		}
-		$this->errormsg = '';
-		return true;
-	}
-
-	/**
-	 * Speichert den aktuellen Datensatz in die Datenbank
-	 * Wenn $neu auf true gesetzt ist wird ein neuer Datensatz angelegt
-	 * andernfalls wird der Datensatz aktualisiert
-	 * @return true wenn ok, false im Fehlerfall
-	 */
-	public function save($new=null)
-	{
-		if($new==null)
-			$new = $this->new;
-
-		//Variablen pruefen
-		if(!$this->validate())
-			return false;
-
-		if($new)
-		{
-			//Neuen Datensatz einfuegen
-			$qry='INSERT INTO lehre.tbl_projektbetreuer (person_id, projektarbeit_id, note, betreuerart_kurzbz, faktor, name,
-				 punkte, stunden, stundensatz, insertamum, insertvon, updateamum, updatevon, vertrag_id) VALUES('.
-			     $this->db_add_param($this->person_id).', '.
-			     $this->db_add_param($this->projektarbeit_id).', '.
-			     $this->db_add_param($this->note).', '.
-			     $this->db_add_param($this->betreuerart_kurzbz).', '.
-			     $this->db_add_param($this->faktor).', '.
-			     $this->db_add_param($this->name).', '.
-			     $this->db_add_param($this->punkte).', '.
-			     $this->db_add_param($this->stunden).', '.
-			     $this->db_add_param($this->stundensatz).', now(), '.
-			     $this->db_add_param($this->insertvon).', now(), '.
-			     $this->db_add_param($this->updatevon).', '.
-				 $this->db_add_param($this->vertrag_id).');';
-		}
-		else
-		{
-			//Updaten des bestehenden Datensatzes
-			if($this->person_id_old=='')
-				$this->person_id_old = $this->person_id;
-
-			if(!isset($this->betreuerart_kurzbz_old) || $this->betreuerart_kurzbz_old=='')
-				$this->betreuerart_kurzbz_old = $this->betreuerart_kurzbz;
-
-			$qry='UPDATE lehre.tbl_projektbetreuer SET '.
-				'person_id='.$this->db_add_param($this->person_id).', '.
-				'note='.$this->db_add_param($this->note).', '.
-				'betreuerart_kurzbz='.$this->db_add_param($this->betreuerart_kurzbz).', '.
-				'faktor='.$this->db_add_param($this->faktor).', '.
-				'name='.$this->db_add_param($this->name).', '.
-				'punkte='.$this->db_add_param($this->punkte).', '.
-				'stunden='.$this->db_add_param($this->stunden).', '.
-				'stundensatz='.$this->db_add_param($this->stundensatz).', '.
-				'updateamum='.$this->db_add_param($this->updateamum).', '.
-			    'updatevon='.$this->db_add_param($this->updatevon).', '.
-				'vertrag_id='.$this->db_add_param($this->vertrag_id).' '.
-				"WHERE projektarbeit_id=".$this->db_add_param($this->projektarbeit_id, FHC_INTEGER,false).
-				" AND person_id=".$this->db_add_param($this->person_id_old, FHC_INTEGER,false).
-				" AND betreuerart_kurzbz=".$this->db_add_param($this->betreuerart_kurzbz_old).";";
-		}
-
-		if($this->db_query($qry))
-		{
-			return true;
-		}
-		else
-		{
-			$this->errormsg = 'Fehler beim Speichern der Daten';
-			return false;
-		}
-	}
-
-	/**
-	 * Loescht den Datenensatz mit der ID die uebergeben wird
-	 * @param $person_id ID die geloescht werden soll
-	 * @param $projektarbeit_id ID die geloescht werden soll
-	 * @return true wenn ok, false im Fehlerfall
-	 */
-	public function delete($person_id, $projektarbeit_id, $betreuerart_kurzbz)
-	{
-		if(!is_numeric($person_id))
-		{
-			$this->errormsg = 'Person_id muss eine gueltige Zahl sein';
-			return false;
-		}
-
-		if(!is_numeric($projektarbeit_id))
-		{
-			$this->errormsg = 'Projektarbeit_id muss eine gueltige Zahl sein';
-			return false;
-		}
-
-		$qry = "DELETE FROM lehre.tbl_projektbetreuer WHERE person_id=".$this->db_add_param($person_id, FHC_INTEGER)." AND projektarbeit_id=".$this->db_add_param($projektarbeit_id, FHC_INTEGER)." AND betreuerart_kurzbz=".$this->db_add_param($betreuerart_kurzbz).";";
-
-		if($this->db_query($qry))
-		{
-			return true;
-		}
-		else
-		{
-			$this->errormsg = 'Fehler beim Loeschen des Datensatzes';
-			return false;
-		}
-	}
-
-	/**
-	 * Liefert alle Betreuer zu einer Projektarbeit
-	 * @param projektarbeit_id
-	 */
-	public function getProjektbetreuer($projektarbeit_id)
-	{
-		if(!is_numeric($projektarbeit_id))
-		{
-			$this->errormsg = 'Projektarbeit_id muss eine gueltige Zahl sein';
-			return false;
-		}
-
-		$qry = "SELECT * FROM lehre.tbl_projektbetreuer WHERE projektarbeit_id=".$this->db_add_param($projektarbeit_id, FHC_INTEGER)." ORDER BY name";
-
-		if($this->db_query($qry))
-		{
-			while($row = $this->db_fetch_object())
-			{
-				$obj = new projektbetreuer();
-
-				$obj->person_id = $row->person_id;
-				$obj->projektarbeit_id = $row->projektarbeit_id;
-				$obj->note = $row->note;
-				$obj->betreuerart_kurzbz = $row->betreuerart_kurzbz;
-				$obj->faktor = $row->faktor;
-				$obj->name = $row->name;
-				$obj->punkte = $row->punkte;
-				$obj->stunden = $row->stunden;
-				$obj->stundensatz = $row->stundensatz;
-				$obj->updateamum = $row->updateamum;
-				$obj->updatevon = $row->updatevon;
-				$obj->insertamum = $row->insertamum;
-				$obj->insertvon = $row->insertvon;
-				$obj->ext_id = $row->ext_id;
-				$obj->vertrag_id = $row->vertrag_id;
-
-				$this->result[] = $obj;
-			}
-			return true;
-		}
-		else
-		{
-			$this->errormsg = 'Fehler bei einer Abfrage';
-			return false;
-		}
-	}
-}
-?>
+<?php
+/* Copyright (C) 2007 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>.
+ */
+/**
+ * Klasse projektbetreuer
+ * @create 08-02-2007
+ */
+require_once(dirname(__FILE__).'/basis_db.class.php');
+
+class projektbetreuer extends basis_db
+{
+	public $new;       		// boolean
+	public $result = array(); 	// adresse Objekt
+
+	//Tabellenspalten
+	public $person_id;			// integer
+	public $projektarbeit_id;	// integer
+	public $note;				// integer
+	public $betreuerart_kurzbz;// varchar
+	public $faktor;				// numeric(3,2)
+	public $name;				// string
+	public $punkte;				// numeric(6,2)
+	public $stunden;			// numeric(8,4)
+	public $stundensatz;		// numeric(6,2)
+	public $ext_id;				// integer
+	public $insertamum;			// timestamp
+	public $insertvon;			// bigint
+	public $updateamum;			// timestamp
+	public $updatevon;			// bigint
+	public $vertrag_id;			// bigint
+
+	public $person_id_old;
+
+	/**
+	 * Konstruktor
+	 * @param $person_id, $projektarbeit ID des Projektbetreuers, der geladen werden soll (Default=null)
+	 */
+	public function __construct($person_id=null, $projektarbeit_id=null)
+	{
+		parent::__construct();
+
+		if($projektarbeit_id != null && $person_id!=null)
+			$this->load($person_id, $projektarbeit_id);
+	}
+
+	/**
+	 * Laedt die Funktion mit der ID $person_id, $projektarbeit_id
+	 * @param  $person_id ID der zu ladenden Funktion
+	 * @param  $projektarbeit_id ID der zu ladenden Funktion
+	 * @return true wenn ok, false im Fehlerfall
+	 */
+	public function load($person_id, $projektarbeit_id, $betreuerart_kurzbz)
+	{
+		if(!is_numeric($person_id))
+		{
+			$this->errormsg = 'Person_id muss eine gueltige Zahl sein';
+			return false;
+		}
+
+		if(!is_numeric($projektarbeit_id))
+		{
+			$this->errormsg = 'Projektarbeit_id muss eine gueltige Zahl sein';
+			return false;
+		}
+
+		$qry = "SELECT
+					*
+				FROM
+					lehre.tbl_projektbetreuer
+				WHERE
+					person_id=".$this->db_add_param($person_id, FHC_INTEGER)."
+					AND projektarbeit_id=".$this->db_add_param($projektarbeit_id, FHC_INTEGER)."
+					AND betreuerart_kurzbz=".$this->db_add_param($betreuerart_kurzbz);
+
+		if($this->db_query($qry))
+		{
+			if($row = $this->db_fetch_object())
+			{
+				$this->person_id = $row->person_id;
+				$this->projektarbeit_id = $row->projektarbeit_id;
+				$this->note = $row->note;
+				$this->betreuerart_kurzbz = $row->betreuerart_kurzbz;
+				$this->faktor = $row->faktor;
+				$this->name = $row->name;
+				$this->punkte = $row->punkte;
+				$this->stunden = $row->stunden;
+				$this->stundensatz = $row->stundensatz;
+				$this->updateamum = $row->updateamum;
+				$this->updatevon = $row->updatevon;
+				$this->insertamum = $row->insertamum;
+				$this->insertvon = $row->insertvon;
+				$this->ext_id = $row->ext_id;
+				$this->vertrag_id = $row->vertrag_id;
+				$this->new=false;
+				return true;
+			}
+			else
+			{
+				$this->errormsg = 'Datensatz wurde nicht gefunden';
+				return false;
+			}
+		}
+		else
+		{
+			$this->errormsg = 'Fehler beim Laden der Daten';
+			return false;
+		}
+	}
+
+	/**
+	 * Prueft die Variablen auf Gueltigkeit
+	 * @return true wenn ok, false im Fehlerfall
+	 */
+	protected function validate()
+	{
+		if($this->betreuerart_kurzbz=='')
+		{
+			$this->errormsg = 'Betreuerart muss eingegeben werden';
+			return false;
+		}
+		if(mb_strlen($this->betreuerart_kurzbz)>16)
+		{
+			$this->errormsg = 'betreuerart darf nicht länger als 16 Zeichen sein';
+			return false;
+		}
+		if(mb_strlen($this->name)>32)
+		{
+			$this->errormsg = 'Name darf nicht länger als 32 Zeichen sein';
+			return false;
+		}
+
+		if($this->note!='' && !is_numeric($this->note))
+		{
+			$this->errormsg = 'Note muss ein numerischer Wert sein';
+			return false;
+		}
+		if($this->punkte!='' && !is_numeric($this->punkte))
+		{
+			$this->errormsg = 'Punkte muss ein numerischer Wert sein';
+		}
+		if($this->faktor!='' && !is_numeric($this->faktor))
+		{
+			$this->errormsg = 'Faktor muss ein numerischer Wert sein';
+			return false;
+		}
+		if($this->stundensatz!='' && !is_numeric($this->stundensatz))
+		{
+			$this->errormsg = 'Stundensatz muss ein numerischer Wert sein';
+			return false;
+		}
+
+		//Pruefen ob projektarbeit_id eine gueltige Zahl ist
+		if(!is_numeric($this->projektarbeit_id))
+		{
+			$this->errormsg = 'projektarbeit_id muss eine gueltige Zahl sein';
+			return false;
+		}
+
+		//Pruefen ob person_id eine gueltige Zahl ist
+		if(!is_numeric($this->person_id))
+		{
+			$this->errormsg = 'person_id muss eine gueltige Zahl sein';
+			return false;
+		}
+		$this->errormsg = '';
+		return true;
+	}
+
+	/**
+	 * Speichert den aktuellen Datensatz in die Datenbank
+	 * Wenn $neu auf true gesetzt ist wird ein neuer Datensatz angelegt
+	 * andernfalls wird der Datensatz aktualisiert
+	 * @return true wenn ok, false im Fehlerfall
+	 */
+	public function save($new=null)
+	{
+		if($new==null)
+			$new = $this->new;
+
+		//Variablen pruefen
+		if(!$this->validate())
+			return false;
+
+		if($new)
+		{
+			//Neuen Datensatz einfuegen
+			$qry='INSERT INTO lehre.tbl_projektbetreuer (person_id, projektarbeit_id, note, betreuerart_kurzbz, faktor, name,
+				 punkte, stunden, stundensatz, insertamum, insertvon, updateamum, updatevon, vertrag_id) VALUES('.
+			     $this->db_add_param($this->person_id).', '.
+			     $this->db_add_param($this->projektarbeit_id).', '.
+			     $this->db_add_param($this->note).', '.
+			     $this->db_add_param($this->betreuerart_kurzbz).', '.
+			     $this->db_add_param($this->faktor).', '.
+			     $this->db_add_param($this->name).', '.
+			     $this->db_add_param($this->punkte).', '.
+			     $this->db_add_param($this->stunden).', '.
+			     $this->db_add_param($this->stundensatz).', now(), '.
+			     $this->db_add_param($this->insertvon).', now(), '.
+			     $this->db_add_param($this->updatevon).', '.
+				 $this->db_add_param($this->vertrag_id).');';
+		}
+		else
+		{
+			//Updaten des bestehenden Datensatzes
+			if($this->person_id_old=='')
+				$this->person_id_old = $this->person_id;
+
+			if(!isset($this->betreuerart_kurzbz_old) || $this->betreuerart_kurzbz_old=='')
+				$this->betreuerart_kurzbz_old = $this->betreuerart_kurzbz;
+
+			$qry='UPDATE lehre.tbl_projektbetreuer SET '.
+				'person_id='.$this->db_add_param($this->person_id).', '.
+				'note='.$this->db_add_param($this->note).', '.
+				'betreuerart_kurzbz='.$this->db_add_param($this->betreuerart_kurzbz).', '.
+				'faktor='.$this->db_add_param($this->faktor).', '.
+				'name='.$this->db_add_param($this->name).', '.
+				'punkte='.$this->db_add_param($this->punkte).', '.
+				'stunden='.$this->db_add_param($this->stunden).', '.
+				'stundensatz='.$this->db_add_param($this->stundensatz).', '.
+				'updateamum='.$this->db_add_param($this->updateamum).', '.
+			    'updatevon='.$this->db_add_param($this->updatevon).', '.
+				'vertrag_id='.$this->db_add_param($this->vertrag_id).' '.
+				"WHERE projektarbeit_id=".$this->db_add_param($this->projektarbeit_id, FHC_INTEGER,false).
+				" AND person_id=".$this->db_add_param($this->person_id_old, FHC_INTEGER,false).
+				" AND betreuerart_kurzbz=".$this->db_add_param($this->betreuerart_kurzbz_old).";";
+		}
+
+		if($this->db_query($qry))
+		{
+			return true;
+		}
+		else
+		{
+			$this->errormsg = 'Fehler beim Speichern der Daten';
+			return false;
+		}
+	}
+
+	/**
+	 * Loescht den Datenensatz mit der ID die uebergeben wird
+	 * @param $person_id ID die geloescht werden soll
+	 * @param $projektarbeit_id ID die geloescht werden soll
+	 * @return true wenn ok, false im Fehlerfall
+	 */
+	public function delete($person_id, $projektarbeit_id, $betreuerart_kurzbz)
+	{
+		if(!is_numeric($person_id))
+		{
+			$this->errormsg = 'Person_id muss eine gueltige Zahl sein';
+			return false;
+		}
+
+		if(!is_numeric($projektarbeit_id))
+		{
+			$this->errormsg = 'Projektarbeit_id muss eine gueltige Zahl sein';
+			return false;
+		}
+
+		$qry = "DELETE FROM lehre.tbl_projektbetreuer WHERE person_id=".$this->db_add_param($person_id, FHC_INTEGER)." AND projektarbeit_id=".$this->db_add_param($projektarbeit_id, FHC_INTEGER)." AND betreuerart_kurzbz=".$this->db_add_param($betreuerart_kurzbz).";";
+
+		if($this->db_query($qry))
+		{
+			return true;
+		}
+		else
+		{
+			$this->errormsg = 'Fehler beim Loeschen des Datensatzes';
+			return false;
+		}
+	}
+
+	/**
+	 * Liefert alle Betreuer zu einer Projektarbeit
+	 * @param projektarbeit_id
+	 */
+	public function getProjektbetreuer($projektarbeit_id)
+	{
+		if(!is_numeric($projektarbeit_id))
+		{
+			$this->errormsg = 'Projektarbeit_id muss eine gueltige Zahl sein';
+			return false;
+		}
+
+		$qry = "SELECT * FROM lehre.tbl_projektbetreuer WHERE projektarbeit_id=".$this->db_add_param($projektarbeit_id, FHC_INTEGER)." ORDER BY name";
+
+		if($this->db_query($qry))
+		{
+			while($row = $this->db_fetch_object())
+			{
+				$obj = new projektbetreuer();
+
+				$obj->person_id = $row->person_id;
+				$obj->projektarbeit_id = $row->projektarbeit_id;
+				$obj->note = $row->note;
+				$obj->betreuerart_kurzbz = $row->betreuerart_kurzbz;
+				$obj->faktor = $row->faktor;
+				$obj->name = $row->name;
+				$obj->punkte = $row->punkte;
+				$obj->stunden = $row->stunden;
+				$obj->stundensatz = $row->stundensatz;
+				$obj->updateamum = $row->updateamum;
+				$obj->updatevon = $row->updatevon;
+				$obj->insertamum = $row->insertamum;
+				$obj->insertvon = $row->insertvon;
+				$obj->ext_id = $row->ext_id;
+				$obj->vertrag_id = $row->vertrag_id;
+
+				$this->result[] = $obj;
+			}
+			return true;
+		}
+		else
+		{
+			$this->errormsg = 'Fehler bei einer Abfrage';
+			return false;
+		}
+	}
+
+	/**
+	 * Retrieves all projektarbeiten by person (only with stundensatz > 0)
+	 * @param $person_id
+	 * @return boolean If succeeded true and result-array with objects of each projektarbeit of the person.
+	 */
+	public function getAllProjects($person_id)
+	{
+		if (isset($person_id) && is_numeric($person_id))
+		{
+			$qry = '
+				SELECT
+					*
+				FROM
+					lehre.tbl_projektbetreuer
+				WHERE
+					(stundensatz IS NOT NULL) AND (stundensatz > 0)
+				AND 
+					person_id =' . $this->db_add_param($person_id, FHC_INTEGER);
+
+			if ($this->db_query($qry))
+			{
+				while ($row = $this->db_fetch_object())
+				{
+					$obj = new projektbetreuer();
+
+					$obj->person_id = $row->person_id;
+					$obj->projektarbeit_id = $row->projektarbeit_id;
+					$obj->note = $row->note;
+					$obj->betreuerart_kurzbz = $row->betreuerart_kurzbz;
+					$obj->faktor = $row->faktor;
+					$obj->name = $row->name;
+					$obj->punkte = $row->punkte;
+					$obj->stunden = $row->stunden;
+					$obj->stundensatz = $row->stundensatz;
+					$obj->updateamum = $row->updateamum;
+					$obj->updatevon = $row->updatevon;
+					$obj->insertamum = $row->insertamum;
+					$obj->insertvon = $row->insertvon;
+					$obj->ext_id = $row->ext_id;
+					$obj->vertrag_id = $row->vertrag_id;
+
+					$this->result[] = $obj;
+				}
+				return true;
+			}
+			else
+			{
+				$this->errormsg = 'Fehler bei einer Abfrage';
+				return false;
+			}
+		}
+		else
+		{
+			$this->errormsg = 'Person_id fehlt oder nicht numerisch.';
+			return false;
+		}
+	}
+}
+?>

include/pruefling.class.php

@@ -331,7 +331,7 @@ class pruefling extends basis_db
 				FROM 
 					testtool.vw_auswertung_ablauf
 				JOIN 
-					public.tbl_studiengang ON vw_auswertung_ablauf.stg_kurzbz = tbl_studiengang.kurzbzlang
+					public.tbl_studiengang USING (studiengang_kz)
 				WHERE 
 					reihungstest_id = ".$this->db_add_param($reihungstest_id, FHC_INTEGER);
 
@@ -363,7 +363,8 @@ class pruefling extends basis_db
 			{
 				if (defined('FAS_REIHUNGSTEST_EXCLUDE_GEBIETE') && !empty(FAS_REIHUNGSTEST_EXCLUDE_GEBIETE))
 				{
-					$exclude_gebiet_id_arr = FAS_REIHUNGSTEST_EXCLUDE_GEBIETE;
+					$excluded_gebiete = unserialize(FAS_REIHUNGSTEST_EXCLUDE_GEBIETE);
+					$exclude_gebiet_id_arr = $excluded_gebiete;
 					$exclude_gebiet_id_toString = implode(', ', $exclude_gebiet_id_arr);
 					$qry .= " 
 						AND 
@@ -399,13 +400,10 @@ class pruefling extends basis_db
 						tbl_rt_person.rt_id = ".$this->db_add_param($reihungstest_id, FHC_INTEGER)."
 					AND 
 						tbl_prestudentstatus.status_kurzbz='Interessent'
-					AND
-						(tbl_reihungstest.stufe = 1 OR tbl_reihungstest.stufe IS NULL)
 					ORDER BY
 						tbl_reihungstest.datum desc LIMIT 1
 				)
 			";
-
 			if($result = $this->db_query($qry))
 			{
 				// Wenn keine Eintraege vorhanden dann false

include/reihungstest.class.php

@@ -29,28 +29,28 @@ require_once(dirname(__FILE__).'/basis_db.class.php');
 
 class reihungstest extends basis_db
 {
-	public $new=true;			//  boolean
-	public $done = false;	//  boolean
+	public $new = true;            //  boolean
+	public $done = false;    //  boolean
 	public $result = array();
 
 	//Tabellenspalten
 	public $reihungstest_id;//  integer
-	public $studiengang_kz;	//  integer
-	public $ort_kurzbz;		//  string
-	public $anmerkung;		//  string
-	public $datum;			//  date
-	public $uhrzeit;		//  time without time zone
-	public $ext_id;			//  integer
-	public $insertamum;		//  timestamp
-	public $insertvon;		//  bigint
-	public $updateamum;		//  timestamp
-	public $updatevon;		//  bigint
-	public $freigeschaltet = false;	//  boolean
-	public $oeffentlich = false;	//  boolean
-	public $max_teilnehmer;	//  integer
+	public $studiengang_kz;    //  integer
+	public $ort_kurzbz;        //  string
+	public $anmerkung;        //  string
+	public $datum;            //  date
+	public $uhrzeit;        //  time without time zone
+	public $ext_id;            //  integer
+	public $insertamum;        //  timestamp
+	public $insertvon;        //  bigint
+	public $updateamum;        //  timestamp
+	public $updatevon;        //  bigint
+	public $freigeschaltet = false;    //  boolean
+	public $oeffentlich = false;    //  boolean
+	public $max_teilnehmer;    //  integer
 	public $studiensemester_kurzbz; //string
-	public $stufe; 			//smallint
-	public $anmeldefrist; 	//date
+	public $stufe;            //smallint
+	public $anmeldefrist;    //date
 	public $aufnahmegruppe_kurzbz; // varchar(32)
 
 	/**
@@ -62,7 +62,9 @@ class reihungstest extends basis_db
 		parent::__construct();
 
 		if (!is_null($reihungstest_id))
+		{
 			$this->load($reihungstest_id);
+		}
 	}
 
 	/**
@@ -130,7 +132,9 @@ class reihungstest extends basis_db
 	{
 		$qry = "SELECT * FROM public.tbl_reihungstest ";
 		if ($datum != null)
+		{
 			$qry .= " WHERE datum>=".$this->db_add_param($datum);
+		}
 		$qry .= " ORDER BY datum DESC, uhrzeit";
 
 		if ($this->db_query($qry))
@@ -206,7 +210,9 @@ class reihungstest extends basis_db
 	public function save()
 	{
 		if (!$this->__validate())
+		{
 			return false;
+		}
 
 		if ($this->new)
 		{
@@ -299,12 +305,18 @@ class reihungstest extends basis_db
 		$qry = "SELECT * FROM public.tbl_reihungstest WHERE 1=1 ";
 
 		if (is_numeric($studiengang_kz) && $studiengang_kz != '')
+		{
 			$qry .= " AND studiengang_kz=".$this->db_add_param($studiengang_kz, FHC_INTEGER, false);
+		}
 		if ($studiensemester_kurzbz != null)
+		{
 			$qry .= " AND studiensemester_kurzbz=".$this->db_add_param($studiensemester_kurzbz, FHC_STRING, false);
+		}
 
 		if ($order != null)
+		{
 			$qry .= " ORDER BY ".$order;
+		}
 
 		$qry .= ";";
 
@@ -436,10 +448,10 @@ class reihungstest extends basis_db
 	public function getStgZukuenftige($stg)
 	{
 		$qry = "SELECT * ".
-				"FROM public.tbl_reihungstest ".
-				"WHERE studiengang_kz = ".$this->db_add_param($stg, FHC_INTEGER)." ".
-				"AND datum>=now()-'1 days'::interval ".
-				"AND oeffentlich;";
+			"FROM public.tbl_reihungstest ".
+			"WHERE studiengang_kz = ".$this->db_add_param($stg, FHC_INTEGER)." ".
+			"AND datum>=now()-'1 days'::interval ".
+			"AND oeffentlich;";
 
 		if ($result = $this->db_query($qry))
 		{
@@ -471,7 +483,9 @@ class reihungstest extends basis_db
 			return true;
 		}
 		else
+		{
 			return false;
+		}
 	}
 
 	/**
@@ -506,13 +520,13 @@ class reihungstest extends basis_db
 			return false;
 		}
 	}
-	
+
 	/**
 	 * Laedt die Anzahl an verfügbaren Plätzen bei einem Reihungstest.
 	 * Wenn max_teilnehmer gesetzt ist, wird dieser Wert zurückgegeben.
-	 * Ansonsten wird die Anzahl der verfügbaren Arbeitspläte aus den zugeteilten Räumen ermittelt. 
-	 * Hier kann optional ein Prozentanteil für den Schwund übergeben werden, der von den verfügbaren Plätzen abgezogen wird. 
-	 * 
+	 * Ansonsten wird die Anzahl der verfügbaren Arbeitspläte aus den zugeteilten Räumen ermittelt.
+	 * Hier kann optional ein Prozentanteil für den Schwund übergeben werden, der von den verfügbaren Plätzen abgezogen wird.
+	 *
 	 * @param integer $reihungstest_id ID des Reihungstests.
 	 * @param integer $anteilSchwund Prozentanteil für den Schwund, der herausgerechnet werden soll
 	 * @return integer Anzahl der Teilnehmer oder false im Fehlerfall
@@ -534,23 +548,23 @@ class reihungstest extends basis_db
 						ELSE (";
 		if ($anteilSchwund != '' && is_numeric($anteilSchwund))
 		{
-			$qry .= "			SELECT sum(arbeitsplaetze) - (round((sum(arbeitsplaetze)::FLOAT / 100)::FLOAT * " . $anteilSchwund . ")) AS arbeitsplaetze
+			$qry .= "			SELECT sum(arbeitsplaetze) - (round((sum(arbeitsplaetze)::FLOAT / 100)::FLOAT * ".$anteilSchwund.")) AS arbeitsplaetze
 								FROM PUBLIC.tbl_rt_ort
 								JOIN PUBLIC.tbl_ort USING (ort_kurzbz)
 								WHERE rt_id = rt.reihungstest_id";
 		}
 		else
 		{
-					$qry .= "	SELECT sum(arbeitsplaetze) AS arbeitsplaetze
+			$qry .= "	SELECT sum(arbeitsplaetze) AS arbeitsplaetze
 								FROM PUBLIC.tbl_rt_ort
 								JOIN PUBLIC.tbl_ort USING (ort_kurzbz)
 								WHERE rt_id = rt.reihungstest_id";
 		}
-				$qry .= "	)
+		$qry .= "	)
 						END
 					) AS anzahl_plaetze
 			FROM PUBLIC.tbl_reihungstest rt WHERE reihungstest_id=".$this->db_add_param($reihungstest_id, FHC_INTEGER);
-		
+
 		if ($result = $this->db_query($qry))
 		{
 			if ($row = $this->db_fetch_object($result))
@@ -621,10 +635,10 @@ class reihungstest extends basis_db
 				$this->teilgenommen = $this->db_parse_bool($row->teilgenommen);
 				$this->ort_kurzbz = $row->ort_kurzbz;
 				$this->punkte = $row->punkte;
-                $this->insertamum = $row->insertamum;
-                $this->insertvon = $row->insertvon;
-                $this->updateamum =$row->updateamum;
-                $this->updatevon = $row->updatevon;
+				$this->insertamum = $row->insertamum;
+				$this->insertvon = $row->insertvon;
+				$this->updateamum = $row->updateamum;
+				$this->updatevon = $row->updatevon;
 				$this->new = false;
 				return true;
 			}
@@ -669,13 +683,13 @@ class reihungstest extends basis_db
 					public.tbl_reihungstest ON (rt_id=reihungstest_id)
 				WHERE
 					tbl_rt_person.person_id=".$this->db_add_param($person_id);
-		
+
 		if ($studiensemester_kurzbz != '')
 		{
 			$qry .= " AND tbl_reihungstest.studiensemester_kurzbz =  ".$this->db_add_param($studiensemester_kurzbz);
 		}
 		$qry .= " ORDER BY datum, uhrzeit ASC";
-		
+
 		if ($result = $this->db_query($qry))
 		{
 			while ($row = $this->db_fetch_object($result))
@@ -692,7 +706,7 @@ class reihungstest extends basis_db
 				$obj->punkte = $row->punkte;
 				$obj->insertamum = $row->insertamum;
 				$obj->insertvon = $row->insertvon;
-				$obj->updateamum =$row->updateamum;
+				$obj->updateamum = $row->updateamum;
 				$obj->updatevon = $row->updatevon;
 				$obj->studiengang_kz = $row->studiengang_kz;
 				$obj->anmerkung = $row->anmerkung;
@@ -721,9 +735,10 @@ class reihungstest extends basis_db
 	 * Liefert die Zuordnung einer Person zu einem Reihungstest
 	 * @param int $person_id ID der Person.
 	 * @param int $reihungstest_id ID des Reihungstests.
+	 * @param int $studienplan_id Optional. Studienplan ID
 	 * @return boolean true wenn erfolgreich, false im Fehlerfall
 	 */
-	public function getPersonReihungstest($person_id, $reihungstest_id)
+	public function getPersonReihungstest($person_id, $reihungstest_id, $studienplan_id = null)
 	{
 		$qry = "SELECT
 					*
@@ -732,6 +747,11 @@ class reihungstest extends basis_db
 				WHERE
 					tbl_rt_person.person_id=".$this->db_add_param($person_id)."
 					AND rt_id=".$this->db_add_param($reihungstest_id);
+
+		if ($studienplan_id != '')
+		{
+			$qry .= " AND studienplan_id = ".$this->db_add_param($studienplan_id);
+		}
 		if ($result = $this->db_query($qry))
 		{
 			if ($row = $this->db_fetch_object($result))
@@ -744,11 +764,11 @@ class reihungstest extends basis_db
 				$this->teilgenommen = $this->db_parse_bool($row->teilgenommen);
 				$this->ort_kurzbz = $row->ort_kurzbz;
 				$this->punkte = $row->punkte;
-                $this->insertamum = $row->insertamum;
-                $this->insertvon = $row->insertvon;
-                $this->updateamum =$row->updateamum;
-                $this->updatevon = $row->updatevon;
-                
+				$this->insertamum = $row->insertamum;
+				$this->insertvon = $row->insertvon;
+				$this->updateamum = $row->updateamum;
+				$this->updatevon = $row->updatevon;
+
 				return true;
 			}
 			else
@@ -793,10 +813,10 @@ class reihungstest extends basis_db
 				$obj->teilgenommen = $this->db_parse_bool($row->teilgenommen);
 				$obj->ort_kurzbz = $row->ort_kurzbz;
 				$obj->punkte = $row->punkte;
-                $obj->insertamum = $row->insertamum;
-                $obj->insertvon = $row->insertvon;
-                $obj->updateamum =$row->updateamum;
-                $obj->updatevon = $row->updatevon;
+				$obj->insertamum = $row->insertamum;
+				$obj->insertvon = $row->insertvon;
+				$obj->updateamum = $row->updateamum;
+				$obj->updatevon = $row->updatevon;
 
 				$this->result[] = $obj;
 			}
@@ -826,21 +846,21 @@ class reihungstest extends basis_db
 				$this->db_add_param($this->teilgenommen, FHC_BOOLEAN).','.
 				$this->db_add_param($this->ort_kurzbz).','.
 				$this->db_add_param($this->punkte).','.
-                $this->db_add_param($this->insertamum).','.
-                $this->db_add_param($this->insertvon).');';
+				$this->db_add_param($this->insertamum).','.
+				$this->db_add_param($this->insertvon).');';
 		}
 		else
 		{
 			$qry = "UPDATE public.tbl_rt_person SET ".
-			' rt_id = '.$this->db_add_param($this->reihungstest_id).','.
-			' studienplan_id = '.$this->db_add_param($this->studienplan_id).','.
-			' anmeldedatum='.$this->db_add_param($this->anmeldedatum).','.
-			' teilgenommen='.$this->db_add_param($this->teilgenommen, FHC_BOOLEAN).','.
-			' ort_kurzbz='.$this->db_add_param($this->ort_kurzbz).','.
-			' punkte='.$this->db_add_param($this->punkte).','.
-            ' updateamum='.$this->db_add_param($this->updateamum).','.
-            ' updatevon='.$this->db_add_param($this->updatevon).' '.
-			' WHERE rt_person_id='.$this->db_add_param($this->rt_person_id, FHC_INTEGER).';';
+				' rt_id = '.$this->db_add_param($this->reihungstest_id).','.
+				' studienplan_id = '.$this->db_add_param($this->studienplan_id).','.
+				' anmeldedatum='.$this->db_add_param($this->anmeldedatum).','.
+				' teilgenommen='.$this->db_add_param($this->teilgenommen, FHC_BOOLEAN).','.
+				' ort_kurzbz='.$this->db_add_param($this->ort_kurzbz).','.
+				' punkte='.$this->db_add_param($this->punkte).','.
+				' updateamum='.$this->db_add_param($this->updateamum).','.
+				' updatevon='.$this->db_add_param($this->updatevon).' '.
+				' WHERE rt_person_id='.$this->db_add_param($this->rt_person_id, FHC_INTEGER).';';
 		}
 
 		if ($this->db_query($qry))
@@ -948,9 +968,9 @@ class reihungstest extends basis_db
 		if ($this->new)
 		{
 			$qry = "INSERT INTO public.tbl_rt_ort(rt_id, ort_kurzbz, uid) VALUES(".
-					$this->db_add_param($this->reihungstest_id, FHC_INTEGER).','.
-					$this->db_add_param($this->ort_kurzbz).','.
-					$this->db_add_param($this->uid).');';
+				$this->db_add_param($this->reihungstest_id, FHC_INTEGER).','.
+				$this->db_add_param($this->ort_kurzbz).','.
+				$this->db_add_param($this->uid).');';
 		}
 		else
 		{
@@ -1006,15 +1026,15 @@ class reihungstest extends basis_db
 		if ($this->new)
 		{
 			$qry = "INSERT INTO public.tbl_rt_studienplan(reihungstest_id, studienplan_id) VALUES(".
-					$this->db_add_param($this->reihungstest_id, FHC_INTEGER).','.
-					$this->db_add_param($this->studienplan_id).');';
+				$this->db_add_param($this->reihungstest_id, FHC_INTEGER).','.
+				$this->db_add_param($this->studienplan_id).');';
 		}
 		else
 		{
 			$qry = "UPDATE public.tbl_rt_studienplan SET ".
-					' studienplan_id='.$this->db_add_param($this->studienplan_id).' '.
-					' WHERE reihungstest_id='.$this->db_add_param($this->reihungstest_id, FHC_INTEGER).' AND '.
-					' studienplan_id='.$this->db_add_param($this->studienplan_id);
+				' studienplan_id='.$this->db_add_param($this->studienplan_id).' '.
+				' WHERE reihungstest_id='.$this->db_add_param($this->reihungstest_id, FHC_INTEGER).' AND '.
+				' studienplan_id='.$this->db_add_param($this->studienplan_id);
 		}
 
 		if ($this->db_query($qry))
@@ -1092,7 +1112,7 @@ class reihungstest extends basis_db
 	 * @param array $include_ids Array mit ReihungstestIDs die zusaetzlich geladen werden sollen.
 	 * @return boolean true wenn erfolgreich, false im Fehlerfall.
 	 */
-	public function getReihungstestStudienplan($studienplan_arr, $include_ids=null)
+	public function getReihungstestStudienplan($studienplan_arr, $include_ids = null)
 	{
 		$qry = "SELECT
 					distinct a.*,
@@ -1105,11 +1125,11 @@ class reihungstest extends basis_db
 					JOIN public.tbl_rt_studienplan USING(reihungstest_id)
 				WHERE studienplan_id IN(".$this->db_implode4Sql($studienplan_arr).")";
 
-		if(!is_null($include_ids) && is_array($include_ids) && count($include_ids)>0)
+		if (!is_null($include_ids) && is_array($include_ids) && count($include_ids) > 0)
 		{
-			$qry .=" OR reihungstest_id in(".$this->db_implode4SQL($include_ids).")";
+			$qry .= " OR reihungstest_id in(".$this->db_implode4SQL($include_ids).")";
 		}
-		$qry.="	ORDER BY a.datum DESC";
+		$qry .= "	ORDER BY a.datum DESC";
 
 		if ($this->db_query($qry))
 		{
@@ -1165,9 +1185,13 @@ class reihungstest extends basis_db
 					datum=".$this->db_add_param($datum);
 
 		if (!is_null($studiensemester_kurzbz))
+		{
 			$qry .= " AND studiensemester_kurzbz=".$this->db_add_param($studiensemester_kurzbz);
+		}
 		if (!is_null($stufe))
+		{
 			$qry .= " AND stufe=".$this->db_add_param($stufe);
+		}
 		$qry .= " ORDER BY reihungstest_id";
 
 		if ($result = $this->db_query($qry))
@@ -1223,9 +1247,9 @@ class reihungstest extends basis_db
 				WHERE
 					tbl_prestudent.prestudent_id = ".$this->db_add_param($prestudent_id)."
 					AND tbl_reihungstest.datum=".$this->db_add_param($datum);
-		if($result = $this->db_query($qry))
+		if ($result = $this->db_query($qry))
 		{
-			while($row = $this->db_fetch_object($result))
+			while ($row = $this->db_fetch_object($result))
 			{
 				$obj = new stdClass();
 
@@ -1237,10 +1261,10 @@ class reihungstest extends basis_db
 				$obj->teilgenommen = $this->db_parse_bool($row->teilgenommen);
 				$obj->ort_kurzbz = $row->ort_kurzbz;
 				$obj->punkte = $row->punkte;
-                $obj->insertamum = $row->insertamum;
-                $obj->insertvon = $row->insertvon;
-                $obj->updateamum =$row->updateamum;
-                $obj->updatevon = $row->updatevon;
+				$obj->insertamum = $row->insertamum;
+				$obj->insertvon = $row->insertvon;
+				$obj->updateamum = $row->updateamum;
+				$obj->updatevon = $row->updatevon;
 
 				$this->result[] = $obj;
 
@@ -1270,9 +1294,9 @@ class reihungstest extends basis_db
 			WHERE
 				tbl_rt_ort.rt_id = ".$this->db_add_param($reihungstest_id, FHC_INTEGER);
 
-		if($result = $this->db_query($qry))
+		if ($result = $this->db_query($qry))
 		{
-			if($row = $this->db_fetch_object($result))
+			if ($row = $this->db_fetch_object($result))
 			{
 				return $row->anzahl;
 			}
@@ -1288,7 +1312,7 @@ class reihungstest extends basis_db
 			return false;
 		}
 	}
-	
+
 	/**
 	 * Liefert die Raeume mit den Aufsichtspersonen (uid aus tbl_rt_ort), die den Kriterien $uid entsprechen
 	 * @param string|array $uid Optional. Default NULL. UID oder array von UIDs deren Aufsichtszuteilungen geladen werden sollen
@@ -1298,10 +1322,14 @@ class reihungstest extends basis_db
 	public function getOrteByUid($uid = null, $studiengang_kz = null)
 	{
 		if ($uid != null && is_array($uid))
+		{
 			$uid = $this->db_implode4SQL($include_ids);
+		}
 		elseif ($uid != null)
+		{
 			$uid = $this->db_add_param($uid);
-		
+		}
+
 		$qry = "
 			SELECT
 				tbl_rt_ort.ort_kurzbz AS ort, *
@@ -1312,18 +1340,22 @@ class reihungstest extends basis_db
 			WHERE
 				datum>=now()";
 		if ($uid != null)
+		{
 			$qry .= " AND uid IN (".$uid.")";
-			
-		
+		}
+
+
 		if ($studiengang_kz != null)
+		{
 			$qry .= " AND studiengang_kz = ".$this->db_add_param($studiengang_kz);
-	
+		}
+
 		if ($result = $this->db_query($qry))
 		{
 			while ($row = $this->db_fetch_object($result))
 			{
 				$obj = new stdClass();
-		
+
 				$obj->reihungstest_id = $row->rt_id;
 				$obj->ort_kurzbz = $row->ort;
 				$obj->uid = $row->uid;
@@ -1344,7 +1376,7 @@ class reihungstest extends basis_db
 				$obj->stufe = $row->stufe;
 				$obj->anmeldefrist = $row->anmeldefrist;
 				$obj->aufnahmegruppe_kurzbz = $row->aufnahmegruppe_kurzbz;
-		
+
 				$this->result[] = $obj;
 			}
 			return true;
@@ -1355,7 +1387,7 @@ class reihungstest extends basis_db
 			return false;
 		}
 	}
-	
+
 	/**
 	 * Prueft ob eine Person-Reihungstest-Studienplan zuteilung existiert (Muss in der DB unique sein)
 	 * @param int $person_id ID der Person.
@@ -1373,12 +1405,16 @@ class reihungstest extends basis_db
 					tbl_rt_person.person_id=".$this->db_add_param($person_id)."
 					AND tbl_rt_person.rt_id=".$this->db_add_param($rt_id)."
 					AND tbl_rt_person.studienplan_id=".$this->db_add_param($studienplan_id);
-		if($result = $this->db_query($qry))
+		if ($result = $this->db_query($qry))
 		{
-			if($this->db_num_rows($result) > 0)
+			if ($this->db_num_rows($result) > 0)
+			{
 				return true;
+			}
 			else
+			{
 				return false;
+			}
 		}
 		else
 		{
@@ -1386,7 +1422,7 @@ class reihungstest extends basis_db
 			return false;
 		}
 	}
-	
+
 	/**
 	 * Laedt alle person_ids, die einem Reihungstest zugeteilt sind
 	 * @param integer $reihungstest_id ID des Reihungstests.
@@ -1407,9 +1443,9 @@ class reihungstest extends basis_db
 			while ($row = $this->db_fetch_object($result))
 			{
 				$obj = new stdClass();
-				
+
 				$obj->person_id = $row->person_id;
-				
+
 				$this->result[] = $obj;
 			}
 			return true;

include/wochenplan.class.php

@@ -1231,11 +1231,18 @@ class wochenplan extends basis_db
 						//Wenn eine Zeitsperre eingetragen ist, dann diese im Tooltiptext anzeigen
 						$zeitsperre = new zeitsperre();
 						$zeitsperre->getSperreByDate($this->pers_uid, date('Y-m-d',$datum), $j);
+						$datum_obj = new datum();
 						foreach($zeitsperre->result as $sperren)
 						{
 							if ($tooltip!='')
 								$tooltip.=', ';
-							$tooltip.=$sperren->zeitsperretyp_kurzbz.' - '.$sperren->bezeichnung;
+							$aenderungsdatum = $sperren->insertamum;
+							if($sperren->updateamum>$sperren->insertamum)
+								$aenderungsdatum = $sperren->updateamum;
+							$updateinfo = '';
+							if ($aenderungsdatum != '')
+								$updateinfo = ' (letzte Änderung: '.$datum_obj->formatDatum($aenderungsdatum,'d.m.Y H:i').')';
+							$tooltip.=$sperren->zeitsperretyp_kurzbz.' - '.$sperren->bezeichnung.$updateinfo;
 						}
 					}
 				}

include/zeitaufzeichnung.class.php

@@ -674,10 +674,10 @@ or not exists
 	{
 		$where = "uid=".$this->db_add_param($user);
 		$where_sem = "studiensemester_kurzbz=".$this->db_add_param($sem);
-		$lehre_arr = array("LehreIntern"=>0, "LehreExtern"=>0, "LehreAuftraege"=>0);
+		$lehre_arr = array("Lehre"=>0, "LehreExtern"=>0, "LehreAuftraege"=>0);
 
 		$qry = "
-		select sum(extract(epoch from ende-start))/3600 as lehre, aktivitaet_kurzbz from campus.tbl_zeitaufzeichnung where $where and aktivitaet_kurzbz in ('LehreIntern', 'LehreExtern') and start > (select start from public.tbl_studiensemester where $where_sem) group by aktivitaet_kurzbz
+		select sum(extract(epoch from ende-start))/3600 as lehre, aktivitaet_kurzbz from campus.tbl_zeitaufzeichnung where $where and aktivitaet_kurzbz in ('Lehre', 'LehreExtern') and start > (select start from public.tbl_studiensemester where $where_sem) group by aktivitaet_kurzbz
 		";
 
 	    if($result = $this->db_query($qry))

include/zeugnisnote.class.php

@@ -281,6 +281,7 @@ class zeugnisnote extends basis_db
 					   vw_student_lehrveranstaltung.bezeichnung as lehrveranstaltung_bezeichnung,
 					   vw_student_lehrveranstaltung.bezeichnung_english as lehrveranstaltung_bezeichnung_english,
 					   tbl_note.bezeichnung as note_bezeichnung,
+					   tbl_note.positiv as note_positiv,
 					   tbl_zeugnisnote.bemerkung as bemerkung,
 					   vw_student_lehrveranstaltung.sort,
 					   vw_student_lehrveranstaltung.zeugnis,
@@ -301,7 +302,7 @@ class zeugnisnote extends basis_db
 				SELECT lehre.tbl_lehrveranstaltung.lehrveranstaltung_id,student_uid AS uid,studiensemester_kurzbz, note, punkte,
 					uebernahmedatum, benotungsdatum,lehre.tbl_lehrveranstaltung.ects,lehre.tbl_lehrveranstaltung.semesterstunden, tbl_zeugnisnote.updateamum, tbl_zeugnisnote.updatevon, tbl_zeugnisnote.insertamum,
 					tbl_zeugnisnote.insertvon, tbl_zeugnisnote.ext_id, lehre.tbl_lehrveranstaltung.bezeichnung as lehrveranstaltung_bezeichnung, lehre.tbl_lehrveranstaltung.bezeichnung_english as lehrveranstaltung_bezeichnung_english,
-					tbl_note.bezeichnung as note_bezeichnung, tbl_zeugnisnote.bemerkung as bemerkung, tbl_lehrveranstaltung.sort, tbl_lehrveranstaltung.zeugnis, tbl_lehrveranstaltung.studiengang_kz,
+					tbl_note.bezeichnung as note_bezeichnung, tbl_note.positiv as note_positiv, tbl_zeugnisnote.bemerkung as bemerkung, tbl_lehrveranstaltung.sort, tbl_lehrveranstaltung.zeugnis, tbl_lehrveranstaltung.studiengang_kz,
 					tbl_lehrveranstaltung.lehrform_kurzbz as lv_lehrform_kurzbz, tbl_lehrveranstaltung.sws
 				FROM
 					lehre.tbl_zeugnisnote
@@ -329,6 +330,7 @@ class zeugnisnote extends basis_db
 				$obj->insertvon = $row->insertvon;
 				$obj->ext_id = $row->ext_id;
 				$obj->note_bezeichnung = $row->note_bezeichnung;
+				$obj->note_positiv = $this->db_parse_bool($row->note_positiv);
 				$obj->lehrveranstaltung_bezeichnung = $row->lehrveranstaltung_bezeichnung;
 				$obj->lehrveranstaltung_bezeichnung_english = $row->lehrveranstaltung_bezeichnung_english;
 				$obj->bemerkung = $row->bemerkung;

locale/de-AT/fas.dtd

@@ -426,13 +426,9 @@
 <!ENTITY menu-help-about.accesskey    	"U">
 
 <!ENTITY menu-help-manual.key          	"H">
-<!ENTITY menu-help-manual.label        	"DokuWiki FHComplete">
+<!ENTITY menu-help-manual.label        	"Wiki FHComplete">
 <!ENTITY menu-help-manual.accesskey    	"H">
 
-<!ENTITY menu-help-todo.key          	"T">
-<!ENTITY menu-help-todo.label        	"Mantis Bugtracker">
-<!ENTITY menu-help-todo.accesskey    	"T">
-
 <!ENTITY tab-prestudent-aufnahme.label  "Reihungstest">
 <!ENTITY tab-prestudent-aufnahme.anmeldung  "Anmeldung zum Reihungstest am">
 <!ENTITY tab-prestudent-aufnahme.absolviert  "Zum Reihungstest angetreten">

rdf/diplomasupplement.xml.php

@@ -240,13 +240,13 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
 		switch($row->orgform_kurzbz)
 		{
 			case 'BB':	echo '		<studienart>Berufsbegleitendes Studium / Part-time degree programm</studienart>';
-						break;
+				break;
 			case 'VZ':	echo '		<studienart>Vollzeitstudium / Full-time degree programm</studienart>';
-						break;
+				break;
 			case 'DL':	echo '		<studienart>Fernstudium / Distance Learning</studienart>';
-						break;
+				break;
 			default:	echo '		<studienart></studienart>';
-						break;
+				break;
 		}
 
 		if($row->typ=='d')
@@ -606,7 +606,7 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
 
 			$sqlStudent = new student();
 
-			echo "   <semesterKurzbz>Semester $start | $semester_kurzbz</semesterKurzbz>";
+			echo "   <semesterKurzbz>Semester $start</semesterKurzbz>";
 
 			// alle lvs im semester holen
 			// Ohne LVs an denen ein Auslandssemester haengt. Diese werden spaeter separat geholt
@@ -617,7 +617,7 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
 				tbl_lehrveranstaltung.bezeichnung, COALESCE(tbl_lehrveranstaltung.bezeichnung_english,
 				tbl_lehrveranstaltung.bezeichnung) as bezeichnung_english, tbl_lehrveranstaltung.semester,
 				tbl_lehrveranstaltung.semesterstunden, tbl_lehrveranstaltung.ects, zeugnis.studiensemester_kurzbz,
-				zeugnis.note, note.bezeichnung note_bezeichnung, note.anmerkung, note.offiziell, sort, tbl_lehrveranstaltung.sws
+				zeugnis.note, note.bezeichnung note_bezeichnung, note.anmerkung, note.offiziell, note.positiv, sort, tbl_lehrveranstaltung.sws
 			FROM
 				lehre.tbl_zeugnisnote zeugnis
 				JOIN lehre.tbl_note note USING(note)
@@ -654,6 +654,7 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
 						$arrayLvAusbildungssemester[$row_stud->lehrveranstaltung_id]['sws_lv'] = $row_stud->sws;
 						$arrayLvAusbildungssemester[$row_stud->lehrveranstaltung_id]['studiensemester_kurzbz'] = $row_stud->studiensemester_kurzbz;
 						$arrayLvAusbildungssemester[$row_stud->lehrveranstaltung_id]['note'] = $db->db_parse_bool($row_stud->offiziell) ?  $row_stud->anmerkung : "";
+						$arrayLvAusbildungssemester[$row_stud->lehrveranstaltung_id]['note_positiv'] = $db->db_parse_bool($row_stud->positiv);
 						$arrayLvAusbildungssemester[$row_stud->lehrveranstaltung_id]['sort'] = $row_stud->sort;
 						$ects_total += $row_stud->ects;
 						$semester_ects +=$row_stud->ects;
@@ -677,6 +678,7 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
 							$arrayLvAusbildungssemester[$row_stud->lehrveranstaltung_id]['sws_lv'] = $row_stud->sws;
 							$arrayLvAusbildungssemester[$row_stud->lehrveranstaltung_id]['studiensemester_kurzbz'] = $row_stud->studiensemester_kurzbz;
 							$arrayLvAusbildungssemester[$row_stud->lehrveranstaltung_id]['note'] = $db->db_parse_bool($row_stud->offiziell) ?  $row_stud->anmerkung : "";
+							$arrayLvAusbildungssemester[$row_stud->lehrveranstaltung_id]['note_positiv'] = $db->db_parse_bool($row_stud->positiv);
 							$arrayLvAusbildungssemester[$row_stud->lehrveranstaltung_id]['sort'] = $row_stud->sort;
 						}
 					}
@@ -716,9 +718,9 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
 					{
 						while($row_lehrform = $db->db_fetch_object($result_lehrform))
 						{	if($y != 0)
-								$lehrform_kurzbz = $lehrform_kurzbz.', '.$row_lehrform->lehrform_kurzbz;
-							else
-								$lehrform_kurzbz = $row_lehrform->lehrform_kurzbz;
+							$lehrform_kurzbz = $lehrform_kurzbz.', '.$row_lehrform->lehrform_kurzbz;
+						else
+							$lehrform_kurzbz = $row_lehrform->lehrform_kurzbz;
 							$y++;
 						}
 					}
@@ -807,38 +809,39 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
 					$note_eintragen->load($row_stud->note);
 
 					$test = false;
-					}
 				}
+			}
 
-				foreach($arrayLvAusbildungssemester as $lv_test)
-				{
-					$sws = number_format(sprintf('%.1F',$lv_test['sws']),2);
-					$sws_lv = number_format(sprintf('%.1F',$lv_test['sws_lv']),2);
+			foreach($arrayLvAusbildungssemester as $lv_test)
+			{
+				$sws = number_format(sprintf('%.1F',$lv_test['sws']),2);
+				$sws_lv = number_format(sprintf('%.1F',$lv_test['sws_lv']),2);
 
-					if($sws == '0.0')
-						$sws = '';
-					if($sws_lv == '0.0')
-						$sws_lv = '';
+				if($sws == '0.0')
+					$sws = '';
+				if($sws_lv == '0.0')
+					$sws_lv = '';
 
-					echo '<lv>
-							<lehrform_kurzbz>'.$lv_test['lehrform_kurzbz'].'</lehrform_kurzbz>
-							<benotungsdatum>'.$lv_test['benotungsdatum'].'</benotungsdatum>
-							<sws>'.$sws.'</sws>
-							<sws_lv>'.$sws_lv.'</sws_lv>
-							<semester>'.$lv_test['semester'].'</semester>
-							<kurzbz>'.$lv_test['kurzbz'].'</kurzbz>
-							<stsem>'.$lv_test['studiensemester_kurzbz'].'</stsem>
-							<bezeichnung><![CDATA['.$lv_test['bezeichnung'].']]></bezeichnung>
-							<bezeichnung_englisch><![CDATA['.$lv_test['bezeichnung_englisch'].']]></bezeichnung_englisch>
-							<ects>'.$lv_test['ects'].'</ects>
-							<semesterstunden>'.$lv_test['semesterstunden'].'</semesterstunden>
-							<note>'.$lv_test['note'].'</note>
-							<lv_id>'.$lv_test['lehrveranstaltung_id'].'</lv_id>
-						</lv>';
-				}
+				echo '<lv>
+						<lehrform_kurzbz>'.$lv_test['lehrform_kurzbz'].'</lehrform_kurzbz>
+						<benotungsdatum>'.$lv_test['benotungsdatum'].'</benotungsdatum>
+						<sws>'.$sws.'</sws>
+						<sws_lv>'.$sws_lv.'</sws_lv>
+						<semester>'.$lv_test['semester'].'</semester>
+						<kurzbz>'.$lv_test['kurzbz'].'</kurzbz>
+						<stsem>'.$lv_test['studiensemester_kurzbz'].'</stsem>
+						<bezeichnung><![CDATA['.$lv_test['bezeichnung'].']]></bezeichnung>
+						<bezeichnung_englisch><![CDATA['.$lv_test['bezeichnung_englisch'].']]></bezeichnung_englisch>
+						<ects>'.$lv_test['ects'].'</ects>
+						<semesterstunden>'.$lv_test['semesterstunden'].'</semesterstunden>
+						<note>'.$lv_test['note'].'</note>
+						<note_positiv>'.$lv_test['note_positiv'].'</note_positiv>
+						<lv_id>'.$lv_test['lehrveranstaltung_id'].'</lv_id>
+					</lv>';
+			}
 
-				// Ist er Outgoing in diesem semester
-				$qry_outgoing = "
+			// Ist er Outgoing in diesem semester
+			$qry_outgoing = "
 					SELECT
 						studiensemester_kurzbz, ort, ects, semesterstunden, von, bis,
 						universitaet, lehrveranstaltung_id, tbl_lehrveranstaltung.sws,
@@ -852,20 +855,20 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
 					WHERE
 						student_uid = ".$db->db_add_param($uid_arr[$i]);
 
-				if($result_outgoing = $db->db_query($qry_outgoing))
+			if($result_outgoing = $db->db_query($qry_outgoing))
+			{
+				if($row_outgoing = $db->db_fetch_object($result_outgoing))
 				{
-					if($row_outgoing = $db->db_fetch_object($result_outgoing))
+					// Outgoing eintrag ist vorhanden
+					if(in_array($row_outgoing->studiensemester_kurzbz, $aktuellesSemester))
 					{
-						// Outgoing eintrag ist vorhanden
-						if(in_array($row_outgoing->studiensemester_kurzbz, $aktuellesSemester))
-						{
-							$note_outgoing = 'ar';
-							$benotungsdatum_outgoing = '';
-							$lehrform_kurzbz_outgoing = '';
+						$note_outgoing = 'ar';
+						$benotungsdatum_outgoing = '';
+						$lehrform_kurzbz_outgoing = '';
 
-							$qry_outgoing_note = "
+						$qry_outgoing_note = "
 								SELECT
-									anmerkung, offiziell, benotungsdatum, lehrform_kurzbz
+									anmerkung, offiziell, positiv, benotungsdatum, lehrform_kurzbz
 								FROM
 									lehre.tbl_zeugnisnote
 									JOIN tbl_lehrveranstaltung using(lehrveranstaltung_id)
@@ -874,53 +877,54 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
 									lehrveranstaltung_id = ".$db->db_add_param($row_outgoing->lehrveranstaltung_id)."
 									AND student_uid = ".$db->db_add_param($uid_arr[$i]);
 
-							if($result_outgoing_note = $db->db_query($qry_outgoing_note))
+						if($result_outgoing_note = $db->db_query($qry_outgoing_note))
+						{
+							if($row_outgoing_note = $db->db_fetch_object($result_outgoing_note))
 							{
-								if($row_outgoing_note = $db->db_fetch_object($result_outgoing_note))
-								{
-									$note_outgoing = $db->db_parse_bool($row_outgoing_note->offiziell) ? $row_outgoing_note->anmerkung : "";
-									$benotungsdatum_outgoing = $datum->formatDatum($row_outgoing_note->benotungsdatum,'d/m/Y');
-									$lehrform_kurzbz_outgoing = $row_outgoing_note->lehrform_kurzbz;
-								}
+								$note_outgoing = $db->db_parse_bool($row_outgoing_note->offiziell) ? $row_outgoing_note->anmerkung : "";
+								$note_positiv_outgoing = $db->db_parse_bool($row_outgoing_note->positiv);
+								$benotungsdatum_outgoing = $datum->formatDatum($row_outgoing_note->benotungsdatum,'d/m/Y');
+								$lehrform_kurzbz_outgoing = $row_outgoing_note->lehrform_kurzbz;
 							}
+						}
 
-							$datum = new datum();
-							$datum_von = $datum->formatDatum($row_outgoing->von, 'Y.m.d');
-							$datum_bis = $datum->formatDatum($row_outgoing->bis, 'Y.m.d');
-							$auslandssemester_start = 'th'; //Zur englischen Nummerierung der Semester (1st, 2nd, 3rd, 4th, ...)
+						$datum = new datum();
+						$datum_von = $datum->formatDatum($row_outgoing->von, 'Y.m.d');
+						$datum_bis = $datum->formatDatum($row_outgoing->bis, 'Y.m.d');
+						$auslandssemester_start = 'th'; //Zur englischen Nummerierung der Semester (1st, 2nd, 3rd, 4th, ...)
 
-							$sws = number_format(sprintf('%.1F',($row_outgoing->semesterstunden/$wochen)),2);
-							if($sws == '0.0')
-								$sws = '';
+						$sws = number_format(sprintf('%.1F',($row_outgoing->semesterstunden/$wochen)),2);
+						if($sws == '0.0')
+							$sws = '';
 
-							$sws_lv = number_format(sprintf('%.1F',($row_outgoing->sws)),2);
-							if($sws_lv == '0.0')
-								$sws_lv = '';
+						$sws_lv = number_format(sprintf('%.1F',($row_outgoing->sws)),2);
+						if($sws_lv == '0.0')
+							$sws_lv = '';
 
-							switch ($start)
-							{
-								case '1':
-									$auslandssemester_start = 'st';
-									break;
-								case '2':
-									$auslandssemester_start = 'nd';
-									break;
-								case '3':
-									$auslandssemester_start = 'rd';
-									break;
-								default:
-									$auslandssemester_start = 'th';
-									break;
-							}
+						switch ($start)
+						{
+							case '1':
+								$auslandssemester_start = 'st';
+								break;
+							case '2':
+								$auslandssemester_start = 'nd';
+								break;
+							case '3':
+								$auslandssemester_start = 'rd';
+								break;
+							default:
+								$auslandssemester_start = 'th';
+								break;
+						}
 
-							if($row_outgoing->projektarbeitstitel != '')
-							{
-								$projektarbeitszusatz = 'Thesis: "'.$row_outgoing->projektarbeitstitel.'"';
-							}
-							else
-								$projektarbeitszusatz = '';
+						if($row_outgoing->projektarbeitstitel != '')
+						{
+							$projektarbeitszusatz = 'Thesis: "'.$row_outgoing->projektarbeitstitel.'"';
+						}
+						else
+							$projektarbeitszusatz = '';
 
-							echo '<lv>
+						echo '<lv>
 								<lehrform_kurzbz></lehrform_kurzbz>
 								<benotungsdatum>'.$benotungsdatum_outgoing.'</benotungsdatum>
 								<sws>'.$sws.'</sws>
@@ -933,23 +937,24 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
 								<ects>'.$row_outgoing->ects.'</ects>
 								<semesterstunden>'.$row_outgoing->semesterstunden.'</semesterstunden>
 								<note>'.$note_outgoing.'</note>
+								<note_positiv>'.$note_positiv_outgoing.'</note_positiv>
 								<lv_id></lv_id>
 							</lv>';
 
-							$ects_total +=$row_outgoing->ects;
-							$semester_ects+=$row_outgoing->ects;
-						}
+						$ects_total +=$row_outgoing->ects;
+						$semester_ects+=$row_outgoing->ects;
 					}
 				}
-				echo '<ects_gesamt>'.$semester_ects.'</ects_gesamt>';
-				echo "</semesters>";
 			}
-			echo "</studiensemester>";
-			echo " <ects_total>$ects_total</ects_total>";
-			echo '	</supplement>';
+			echo '<ects_gesamt>'.$semester_ects.'</ects_gesamt>';
+			echo "</semesters>";
 		}
+		echo "</studiensemester>";
+		echo " <ects_total>$ects_total</ects_total>";
+		echo '	</supplement>';
+	}
 }
-	echo "</supplements>";
+echo "</supplements>";
 
 // die beiden noten werden verglichen und die mit höherer priorität(niedrigerer index) wird genommen
 // return true wenn neue note genommen werden soll

rdf/projektarbeit.rdf.php

@@ -33,6 +33,7 @@ require_once('../config/vilesci.config.inc.php');
 require_once('../include/projektarbeit.class.php');
 require_once('../include/datum.class.php');
 require_once('../include/lehreinheit.class.php');
+require_once('../include/functions.inc.php');
 
 $rdf_url='http://www.technikum-wien.at/projektarbeit';
 
@@ -76,8 +77,8 @@ function draw_content($row)
             <PROJEKTARBEIT:projektarbeit_id><![CDATA['.$row->projektarbeit_id.']]></PROJEKTARBEIT:projektarbeit_id>
             <PROJEKTARBEIT:projekttyp_kurzbz><![CDATA['.$row->projekttyp_kurzbz.']]></PROJEKTARBEIT:projekttyp_kurzbz>
             <PROJEKTARBEIT:bezeichnung><![CDATA['.$row->bezeichnung.']]></PROJEKTARBEIT:bezeichnung>
-            <PROJEKTARBEIT:titel><![CDATA['.$row->titel.']]></PROJEKTARBEIT:titel>
-            <PROJEKTARBEIT:titel_english><![CDATA['.$row->titel_english.']]></PROJEKTARBEIT:titel_english>
+            <PROJEKTARBEIT:titel><![CDATA['.xmlclean($row->titel).']]></PROJEKTARBEIT:titel>
+            <PROJEKTARBEIT:titel_english><![CDATA['.xmlclean($row->titel_english).']]></PROJEKTARBEIT:titel_english>
             <PROJEKTARBEIT:lehreinheit_id><![CDATA['.$row->lehreinheit_id.']]></PROJEKTARBEIT:lehreinheit_id>
             <PROJEKTARBEIT:lehreinheit_stsem><![CDATA['.$lehreinheit->studiensemester_kurzbz.']]></PROJEKTARBEIT:lehreinheit_stsem>
             <PROJEKTARBEIT:lehrveranstaltung_id><![CDATA['.$lehreinheit->lehrveranstaltung_id.']]></PROJEKTARBEIT:lehrveranstaltung_id>
@@ -106,4 +107,4 @@ function draw_content($row)
 }
 ?>
    </RDF:Seq>
-</RDF:RDF>
+</RDF:RDF>

rdf/studienerfolg.rdf.php

@@ -242,6 +242,7 @@ function draw_studienerfolg($uid, $studiensemester_kurzbz)
 				$xml .= "				<bezeichnung_englisch><![CDATA[".$row->lehrveranstaltung_bezeichnung_english."]]></bezeichnung_englisch>";
 				$xml .= "				<note>".$note."</note>";
 				$xml .= "				<note_idx>".$row->note."</note_idx>";
+				$xml .= "				<note_positiv>".$row->note_positiv."</note_positiv>";
 				$sws = sprintf('%.1F',$row->semesterstunden/$wochen);
 				$xml .= "				<sws>".$sws."</sws>";
 				$sws_lv = sprintf('%.1F',$row->sws);

rdf/zeugnis.rdf.php

@@ -385,6 +385,7 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
 						$xml .= "\n			<unterrichtsfach>";
 						$xml .= "				<bezeichnung><![CDATA[".$bezeichnung."]]></bezeichnung>";
 						$xml .= "				<bezeichnung_englisch><![CDATA[".$bezeichnung_englisch."]]></bezeichnung_englisch>";
+						$xml .= "				<note_positiv><![CDATA[".$row->note_positiv."]]></note_positiv>";
 						$xml .= "				<note><![CDATA[".$note2."]]></note>";
 						$xml .= "				<sws><![CDATA[".($row->semesterstunden==0?'':number_format(sprintf('%.1F',$row->semesterstunden/$wochen),1))."]]></sws>";
 						$xml .= "				<sws_lv><![CDATA[".($row->sws==0?'':number_format(sprintf('%.1F',$row->sws),1))."]]></sws_lv>";

soap/datenverbund_client.php

@@ -251,7 +251,7 @@ if (isset($_REQUEST['submit']))
 				if ($reservierteNummern !== false)
 					echo '<br><b>Reservierte Nummern:</b>'.print_r($reservierteNummern, true);
 				else
-					echo '<br><b>Fehlgeschlagen:</b>'.$data->errormsg;
+					echo '<br><b>Fehlgeschlagen:</b>'.$result->errormsg;
 			}
 			break;
 
@@ -264,7 +264,7 @@ if (isset($_REQUEST['submit']))
 				if ($kontingent !== false)
 					echo '<br><b>Kontingent:</b>'.print_r($kontingent, true);
 				else
-					echo '<br><b>Fehlgeschlagen:</b>'.$data->errormsg;
+					echo '<br><b>Fehlgeschlagen:</b>'.$result->errormsg;
 			}
 			break;
 
@@ -285,7 +285,7 @@ if (isset($_REQUEST['submit']))
 			if (ErrorHandler::isSuccess($result))
 				echo '<br><b>Erfolgreich gemeldet</b>';
 			else
-				echo '<br><b>Fehlgeschlagen:</b>'.$data->errormsg;
+				echo '<br><b>Fehlgeschlagen:</b>'.$result->errormsg;
 			break;
 
 		case 'assignMatrikelnummer':
@@ -295,7 +295,7 @@ if (isset($_REQUEST['submit']))
 				echo '<br><b>OK</b>';
 			}
 			else
-				echo '<br><b>Fehlgeschlagen:</b>'.$data->errormsg;
+				echo '<br><b>Fehlgeschlagen:</b>'.$result->errormsg;
 			break;
 
 		case 'getBPK':

system/checkStudenten.php

@@ -662,7 +662,7 @@ if ($result = $db->db_query($qry))
 }
 
 /*
- * Nation der Adresse ist ungleich Österreicher, die Gemeinde ist aber in der Gemeinde Tabelle enthalten
+ * Nation der Adresse ist ungleich Österreich, die Gemeinde ist aber in der Gemeinde Tabelle enthalten
  */
 $text .= "<br><br>Adressnation ausserhalb Österreich mit Gemeinde in Gemeindetabelle<br><br>";
 $lastSem = $studiensemester->getPreviousFrom($aktSem);
@@ -692,6 +692,47 @@ if ($result = $db->db_query($qry))
 	}
 }
 
+/*
+ *	 Personen ohne Abschlussstatus
+ */
+$text .= "<br><br>Suche Personen ohne Abschlussstatus.<br><br>";
+
+$qry = "
+SELECT
+	distinct tbl_prestudent.prestudent_id, tbl_person.vorname, tbl_person.nachname, tbl_prestudent.studiengang_kz as studiengang
+FROM
+	public.tbl_prestudent
+	JOIN public.tbl_person USING(person_id)
+WHERE
+	NOT EXISTS(
+		SELECT
+			1
+		FROM
+			public.tbl_prestudentstatus ps
+			JOIN public.tbl_studiensemester USING(studiensemester_kurzbz)
+		WHERE
+			prestudent_id=tbl_prestudent.prestudent_id
+			AND tbl_studiensemester.ende>now()
+	)
+	AND '2018-01-01'<(SELECT max(datum) FROM public.tbl_prestudentstatus WHERE prestudent_id=tbl_prestudent.prestudent_id)
+	AND NOT EXISTS(SELECT 1 FROM public.tbl_prestudentstatus ps
+		WHERE
+			prestudent_id=tbl_prestudent.prestudent_id
+			AND status_kurzbz IN('Abbrecher','Abgewiesener','Absolvent','Incoming')
+	)";
+
+if ($studiengang_kz != '')
+	$qry .= " AND tbl_prestudent.studiengang_kz=".$db->db_add_param($studiengang_kz, FHC_INTEGER);
+
+if ($result = $db->db_query($qry))
+{
+	while ($row = $db->db_fetch_object($result))
+	{
+		$ausgabe[$row->studiengang][17][] = $row->vorname.' '.$row->nachname.' (PreStudent '.$row->prestudent_id.')';
+		$text .= $row->vorname.' '.$row->nachname.' (PreStudent '.$row->prestudent_id.")<br>";
+	}
+}
+
 
 // Ausgabe der Studenten
 foreach ($ausgabe as $stg_kz => $value)
@@ -869,6 +910,15 @@ foreach ($ausgabe as $stg_kz => $value)
 						<td colspan='4'><b>Folgende Personen haben eine Adresse mit Nation Österreichs, die Gemeinde liegt aber in Österreich</b></td>
 					</tr>";
 				break;
+			case 17:
+				echo "
+					<tr>
+						<td>&nbsp;</td>
+					</tr>
+					<tr>
+						<td colspan='4'><b>Folgende Personen haben keinen Endstatus (Absolvent, Abbrecher oder Abgewiesener) (nicht BIS relevant)</b></td>
+					</tr>";
+				break;
 			default:
 				echo "<tr><td>&nbsp;</td></tr><tr><td colspan='4'><b>Ungültiger Code</b></td></tr>";
 				break;

system/dbupdate_3.3.php

@@ -656,6 +656,62 @@ if(!@$db->db_query("SELECT updateamum FROM public.tbl_rt_person LIMIT 1"))
 		echo '<br>Spalte updateamum in public.tbl_rt_person hinzugefügt';
 }
 
+// ADD COLUMN studiengang_kz to testtool.vw_auswertung_ablauf
+if(!$result = @$db->db_query("SELECT studiengang_kz FROM testtool.vw_auswertung_ablauf LIMIT 1"))
+{
+	// CREATE OR REPLACE VIEW testtool.vw_auswertung_ablauf and grants privileges
+	$qry = '
+		CREATE OR REPLACE VIEW testtool.vw_auswertung_ablauf AS (
+			SELECT 
+				tbl_gebiet.gebiet_id,
+				tbl_gebiet.bezeichnung AS gebiet,
+				tbl_ablauf.reihung,
+				tbl_gebiet.maxpunkte,
+				tbl_pruefling.pruefling_id,
+				tbl_pruefling.prestudent_id,
+				tbl_person.vorname,
+				tbl_person.nachname,
+				tbl_person.gebdatum,
+				tbl_person.geschlecht,
+				tbl_pruefling.semester,
+				upper(tbl_studiengang.typ::character varying(1)::text || tbl_studiengang.kurzbz::text) AS stg_kurzbz,
+				tbl_studiengang.bezeichnung AS stg_bez,
+				tbl_pruefling.registriert,
+				tbl_pruefling.idnachweis,
+				( SELECT sum(tbl_vorschlag.punkte) AS sum
+					   FROM testtool.tbl_vorschlag
+						 JOIN testtool.tbl_antwort USING (vorschlag_id)
+						 JOIN testtool.tbl_frage USING (frage_id)
+					  WHERE tbl_antwort.pruefling_id = tbl_pruefling.pruefling_id AND tbl_frage.gebiet_id = tbl_gebiet.gebiet_id
+				) AS punkte,
+				tbl_rt_person.rt_id AS reihungstest_id,
+				tbl_ablauf.gewicht,
+				tbl_studiengang.studiengang_kz
+			FROM 
+				testtool.tbl_pruefling
+			 JOIN testtool.tbl_ablauf ON tbl_ablauf.studiengang_kz = tbl_pruefling.studiengang_kz
+			 JOIN testtool.tbl_gebiet USING (gebiet_id)
+			 JOIN public.tbl_prestudent USING (prestudent_id)
+			 JOIN public.tbl_person USING (person_id)
+			 JOIN public.tbl_rt_person USING (person_id)
+			 JOIN lehre.tbl_studienplan ON tbl_studienplan.studienplan_id = tbl_rt_person.studienplan_id
+			 JOIN lehre.tbl_studienordnung ON tbl_studienordnung.studienordnung_id = tbl_studienplan.studienordnung_id
+			 JOIN public.tbl_studiengang ON tbl_prestudent.studiengang_kz = tbl_studiengang.studiengang_kz
+			WHERE NOT (tbl_ablauf.gebiet_id IN 
+				( 
+				SELECT tbl_kategorie.gebiet_id 
+				FROM testtool.tbl_kategorie
+				)
+			) AND tbl_studienordnung.studiengang_kz = tbl_pruefling.studiengang_kz
+           )';
+
+	if(!$db->db_query($qry))
+		echo '<strong>testtool.vw_auswertung_ablauf: '.$db->db_last_error().'</strong><br>';
+	else
+		echo '<br>testtool.vw_auswertung_ablauf view created';
+}
+
+
 // ADD COLUMN updatevon to public.tbl_rt_person
 if(!@$db->db_query("SELECT updatevon FROM public.tbl_rt_person LIMIT 1"))
 {
@@ -2767,6 +2823,32 @@ if(!$result = @$db->db_query("SELECT * FROM public.tbl_servicekategorie LIMIT 1"
 		echo '<br>Servicekategorie zu Services hinzugefügt';
 }
 
+$qry_column_desc = "
+	SELECT
+		pgd.description
+	FROM
+		pg_catalog.pg_statio_all_tables as st
+		JOIN pg_catalog.pg_description pgd ON (pgd.objoid=st.relid)
+		JOIN information_schema.columns c ON (pgd.objsubid=c.ordinal_position AND  c.table_schema=st.schemaname AND c.table_name=st.relname)
+	WHERE
+		table_schema = 'lehre' AND table_name = 'tbl_projektarbeit' AND column_name='faktor'";
+if($result = $db->db_query($qry_column_desc))
+{
+	if($db->db_num_rows($result)==0)
+	{
+		$qry = "
+			COMMENT ON COLUMN lehre.tbl_projektarbeit.faktor IS 'DEPRECATED';
+			COMMENT ON COLUMN lehre.tbl_projektarbeit.stundensatz IS 'DEPRECATED';
+			COMMENT ON COLUMN lehre.tbl_projektarbeit.gesamtstunden IS 'DEPRECATED';
+			";
+
+		if(!$db->db_query($qry))
+			echo '<strong>tbl_projektarbeit Comment: '.$db->db_last_error().'</strong><br>';
+		else
+			echo '<br>tbl_projektarbeit: faktor, stundensatz und gesamtstunden als deprecated markiert';
+	}
+}
+
 // *** Pruefung und hinzufuegen der neuen Attribute und Tabellen
 echo '<H2>Pruefe Tabellen und Attribute!</H2>';
 

system/xsl/ZeugnisEngNeu_0.xsl

@@ -1,669 +0,0 @@
-<?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="zeugnisse">
-
-<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="Mangal2" svg:font-family="Mangal"/>
-        <style:font-face style:name="Mangal" svg:font-family="Mangal" style:font-family-generic="roman"/>
-        <style:font-face style:name="Liberation Serif" svg:font-family="&apos;Liberation Serif&apos;" style:font-family-generic="roman" style:font-pitch="variable"/>
-        <style:font-face style:name="Arial" svg:font-family="Arial" style:font-adornments="Standard" style:font-family-generic="swiss" 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="Liberation Sans1" svg:font-family="&apos;Liberation Sans&apos;" style:font-family-generic="system" style:font-pitch="variable"/>
-        <style:font-face style:name="Mangal1" 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="SimSun" svg:font-family="SimSun" style:font-family-generic="system" style:font-pitch="variable"/>
-        <style:font-face style:name="Tahoma" svg:font-family="Tahoma" 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.401cm" fo:margin-top="0.199cm" fo:margin-bottom="0cm" table:align="margins"/>
-        </style:style>
-        <style:style style:name="Tabelle1.A" style:family="table-column">
-            <style:table-column-properties style:column-width="10.437cm" style:rel-column-width="41702*"/>
-        </style:style>
-        <style:style style:name="Tabelle1.B" style:family="table-column">
-            <style:table-column-properties style:column-width="1.988cm" style:rel-column-width="7944*"/>
-        </style:style>
-        <style:style style:name="Tabelle1.D" style:family="table-column">
-            <style:table-column-properties style:column-width="1.988cm" style:rel-column-width="7945*"/>
-        </style:style>
-        <style:style style:name="Tabelle1.1" style:family="table-row">
-            <style:table-row-properties style:min-row-height="0.75cm"/>
-        </style:style>
-        <style:style style:name="Tabelle1.A1" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:background-color="#999999" fo:padding-left="0.101cm" fo:padding-right="0.101cm" fo:padding-top="0.079cm" fo:padding-bottom="0.079cm" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="0.05pt solid #000000" fo:border-bottom="0.05pt solid #000000">
-                <style:background-image/>
-            </style:table-cell-properties>
-        </style:style>
-        <style:style style:name="Tabelle1.D1" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:background-color="#999999" fo:padding-left="0.101cm" fo:padding-right="0.101cm" fo:padding-top="0.079cm" fo:padding-bottom="0.079cm" fo:border="0.05pt solid #000000">
-                <style:background-image/>
-            </style:table-cell-properties>
-        </style:style>
-        <style:style style:name="Tabelle1.A2" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:padding-left="0.101cm" fo:padding-right="0.101cm" fo:padding-top="0.07cm" fo:padding-bottom="0.07cm" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-        </style:style>
-        <style:style style:name="Tabelle1.B2" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:padding-left="0.101cm" fo:padding-right="0.101cm" fo:padding-top="0.07cm" fo:padding-bottom="0.07cm" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-        </style:style>
-        <style:style style:name="Tabelle1.C2" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:padding-left="0.101cm" fo:padding-right="0.101cm" fo:padding-top="0.07cm" fo:padding-bottom="0.07cm" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-        </style:style>
-        <style:style style:name="Tabelle1.D2" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:padding-left="0.101cm" fo:padding-right="0.101cm" fo:padding-top="0.07cm" fo:padding-bottom="0.07cm" fo:border-left="0.05pt solid #000000" fo:border-right="0.05pt solid #000000" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-        </style:style>
-        <style:style style:name="Tabelle1.A3" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:padding-left="0.101cm" fo:padding-right="0.101cm" fo:padding-top="0.07cm" fo:padding-bottom="0.07cm" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-        </style:style>
-        <style:style style:name="Tabelle1.B3" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:padding-left="0.101cm" fo:padding-right="0.101cm" fo:padding-top="0.07cm" fo:padding-bottom="0.07cm" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-        </style:style>
-        <style:style style:name="Tabelle1.C3" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:padding-left="0.101cm" fo:padding-right="0.101cm" fo:padding-top="0.07cm" fo:padding-bottom="0.07cm" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-        </style:style>
-        <style:style style:name="Tabelle1.D3" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:padding-left="0.101cm" fo:padding-right="0.101cm" fo:padding-top="0.07cm" fo:padding-bottom="0.07cm" fo:border-left="0.05pt solid #000000" fo:border-right="0.05pt solid #000000" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-        </style:style>
-        <style:style style:name="Tabelle1.A4" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:padding-left="0.101cm" fo:padding-right="0.101cm" fo:padding-top="0.07cm" fo:padding-bottom="0.07cm" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-        </style:style>
-        <style:style style:name="Tabelle1.B4" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:padding-left="0.101cm" fo:padding-right="0.101cm" fo:padding-top="0.07cm" fo:padding-bottom="0.07cm" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-        </style:style>
-        <style:style style:name="Tabelle1.C4" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:padding-left="0.101cm" fo:padding-right="0.101cm" fo:padding-top="0.07cm" fo:padding-bottom="0.07cm" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-        </style:style>
-        <style:style style:name="Tabelle1.D4" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:padding-left="0.101cm" fo:padding-right="0.101cm" fo:padding-top="0.07cm" fo:padding-bottom="0.07cm" fo:border-left="0.05pt solid #000000" fo:border-right="0.05pt solid #000000" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-        </style:style>
-        <style:style style:name="Tabelle1.A5" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:padding-left="0.101cm" fo:padding-right="0.101cm" fo:padding-top="0.07cm" fo:padding-bottom="0.07cm" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-        </style:style>
-        <style:style style:name="Tabelle1.B5" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:padding-left="0.101cm" fo:padding-right="0.101cm" fo:padding-top="0.07cm" fo:padding-bottom="0.07cm" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-        </style:style>
-        <style:style style:name="Tabelle1.C5" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:padding-left="0.101cm" fo:padding-right="0.101cm" fo:padding-top="0.07cm" fo:padding-bottom="0.07cm" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-        </style:style>
-        <style:style style:name="Tabelle1.D5" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:padding-left="0.101cm" fo:padding-right="0.101cm" fo:padding-top="0.07cm" fo:padding-bottom="0.07cm" fo:border-left="0.05pt solid #000000" fo:border-right="0.05pt solid #000000" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-        </style:style>
-        <style:style style:name="Tabelle1.A6" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:padding-left="0.101cm" fo:padding-right="0.101cm" fo:padding-top="0.07cm" fo:padding-bottom="0.07cm" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-        </style:style>
-        <style:style style:name="Tabelle1.B6" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:padding-left="0.101cm" fo:padding-right="0.101cm" fo:padding-top="0.07cm" fo:padding-bottom="0.07cm" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-        </style:style>
-        <style:style style:name="Tabelle1.C6" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:padding-left="0.101cm" fo:padding-right="0.101cm" fo:padding-top="0.07cm" fo:padding-bottom="0.07cm" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-        </style:style>
-        <style:style style:name="Tabelle1.D6" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:padding-left="0.101cm" fo:padding-right="0.101cm" fo:padding-top="0.07cm" fo:padding-bottom="0.07cm" fo:border-left="0.05pt solid #000000" fo:border-right="0.05pt solid #000000" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-        </style:style>
-        <style:style style:name="Tabelle1.A7" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:padding-left="0.101cm" fo:padding-right="0.101cm" fo:padding-top="0.07cm" fo:padding-bottom="0.07cm" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-        </style:style>
-        <style:style style:name="Tabelle1.B7" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:padding-left="0.101cm" fo:padding-right="0.101cm" fo:padding-top="0.07cm" fo:padding-bottom="0.07cm" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-        </style:style>
-        <style:style style:name="Tabelle1.C7" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:padding-left="0.101cm" fo:padding-right="0.101cm" fo:padding-top="0.079cm" fo:padding-bottom="0.079cm" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-        </style:style>
-        <style:style style:name="Tabelle1.D7" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:padding-left="0.101cm" fo:padding-right="0.101cm" fo:padding-top="0.079cm" fo:padding-bottom="0.079cm" fo:border-left="0.05pt solid #000000" fo:border-right="0.05pt solid #000000" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-        </style:style>
-        <style:style style:name="Tabelle1.A8" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:padding-left="0.101cm" fo:padding-right="0.101cm" fo:padding-top="0.079cm" fo:padding-bottom="0.079cm" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-        </style:style>
-        <style:style style:name="Tabelle1.B8" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:padding-left="0.101cm" fo:padding-right="0.101cm" fo:padding-top="0.079cm" fo:padding-bottom="0.079cm" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-        </style:style>
-        <style:style style:name="Tabelle1.C8" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:padding-left="0.101cm" fo:padding-right="0.101cm" fo:padding-top="0.079cm" fo:padding-bottom="0.079cm" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-        </style:style>
-        <style:style style:name="Tabelle1.D8" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:padding-left="0.101cm" fo:padding-right="0.101cm" fo:padding-top="0.079cm" fo:padding-bottom="0.079cm" fo:border-left="0.05pt solid #000000" fo:border-right="0.05pt solid #000000" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-        </style:style>
-        <style:style style:name="Tabelle2" style:family="table">
-            <style:table-properties style:width="16.401cm" table:align="margins"/>
-        </style:style>
-        <style:style style:name="Tabelle2.A" style:family="table-column">
-            <style:table-column-properties style:column-width="10.437cm" style:rel-column-width="41702*"/>
-        </style:style>
-        <style:style style:name="Tabelle2.B" style:family="table-column">
-            <style:table-column-properties style:column-width="5.964cm" style:rel-column-width="23833*"/>
-        </style:style>
-        <style:style style:name="Tabelle2.1" style:family="table-row">
-            <style:table-row-properties style:min-row-height="0.75cm"/>
-        </style:style>
-        <style:style style:name="Tabelle2.A1" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:background-color="#999999" fo:padding="0.097cm" fo:border="0.05pt solid #000000">
-                <style:background-image/>
-            </style:table-cell-properties>
-        </style:style>
-        <style:style style:name="Tabelle2.A2" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:padding="0.097cm" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-        </style:style>
-        <style:style style:name="Tabelle2.B2" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:padding="0.097cm" fo:border-left="0.05pt solid #000000" fo:border-right="0.05pt solid #000000" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-        </style:style>
-        <style:style style:name="Tabelle3" style:family="table">
-            <style:table-properties style:width="16.401cm" fo:margin-top="0cm" fo:margin-bottom="0cm" table:align="margins" style:may-break-between-rows="false"/>
-        </style:style>
-        <style:style style:name="Tabelle3.A" style:family="table-column">
-            <style:table-column-properties style:column-width="5.001cm" style:rel-column-width="19981*"/>
-        </style:style>
-        <style:style style:name="Tabelle3.B" style:family="table-column">
-            <style:table-column-properties style:column-width="3.9cm" style:rel-column-width="15583*"/>
-        </style:style>
-        <style:style style:name="Tabelle3.C" style:family="table-column">
-            <style:table-column-properties style:column-width="7.5cm" style:rel-column-width="29971*"/>
-        </style:style>
-        <style:style style:name="Tabelle3.A1" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="" fo:padding-left="0cm" fo:padding-right="0cm" fo:padding-top="0.101cm" fo:padding-bottom="0.101cm" fo:border-left="none" fo:border-right="none" fo:border-top="none" fo:border-bottom="1pt dotted #000000"/>
-        </style:style>
-        <style:style style:name="Tabelle3.B1" style:family="table-cell">
-            <style:table-cell-properties fo:padding-left="0cm" fo:padding-right="0cm" fo:padding-top="0.101cm" fo:padding-bottom="0.101cm" fo:border="none"/>
-        </style:style>
-        <style:style style:name="Tabelle3.C1" style:family="table-cell">
-            <style:table-cell-properties fo:padding-left="0cm" fo:padding-right="0cm" fo:padding-top="0.101cm" fo:padding-bottom="0.101cm" fo:border-left="none" fo:border-right="none" fo:border-top="none" fo:border-bottom="1pt dotted #000000"/>
-        </style:style>
-        <style:style style:name="Tabelle3.A2" style:family="table-cell">
-            <style:table-cell-properties fo:padding-left="0cm" fo:padding-right="0cm" fo:padding-top="0.101cm" fo:padding-bottom="0.101cm" fo:border="none"/>
-        </style:style>
-        <style:style style:name="Tabelle3.B2" style:family="table-cell">
-            <style:table-cell-properties fo:padding-left="0cm" fo:padding-right="0cm" fo:padding-top="0.101cm" fo:padding-bottom="0.101cm" fo:border="none"/>
-        </style:style>
-        <style:style style:name="Tabelle3.C2" style:family="table-cell">
-            <style:table-cell-properties fo:padding-left="0cm" fo:padding-right="0cm" fo:padding-top="0.101cm" fo:padding-bottom="0.101cm" fo:border="none"/>
-        </style:style>
-        <style:style style:name="P1" style:family="paragraph" style:parent-style-name="Standard">
-            <style:text-properties fo:font-size="9pt" officeooo:rsid="000de2a1" officeooo:paragraph-rsid="000de2a1" style:font-size-asian="9pt" style:font-size-complex="9pt"/>
-        </style:style>
-        <style:style style:name="P2" style:family="paragraph" style:parent-style-name="Standard">
-            <style:paragraph-properties fo:text-align="end" style:justify-single-word="false"/>
-            <style:text-properties fo:font-size="9pt" officeooo:rsid="000f65a0" officeooo:paragraph-rsid="000f65a0" style:font-size-asian="9pt" style:font-size-complex="9pt"/>
-        </style:style>
-        <style:style style:name="P3" style:family="paragraph" style:parent-style-name="Standard">
-            <style:text-properties fo:font-size="9pt" officeooo:rsid="000f65a0" officeooo:paragraph-rsid="000f65a0" style:font-size-asian="9pt" style:font-size-complex="9pt"/>
-        </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="4.498cm"/>
-                </style:tab-stops>
-            </style:paragraph-properties>
-            <style:text-properties fo:font-size="9pt" officeooo:rsid="000f65a0" officeooo:paragraph-rsid="000f65a0" 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:text-properties fo:font-size="16pt" officeooo:rsid="000de2a1" officeooo:paragraph-rsid="000de2a1" style:font-size-asian="16pt" style:font-size-complex="16pt"/>
-        </style:style>
-        <style:style style:name="P6" style:family="paragraph" style:parent-style-name="Standard">
-            <style:text-properties fo:font-size="16pt" fo:font-weight="bold" officeooo:rsid="000de2a1" officeooo:paragraph-rsid="000de2a1" style:font-size-asian="16pt" style:font-weight-asian="bold" style:font-size-complex="16pt" style:font-weight-complex="bold"/>
-        </style:style>
-        <style:style style:name="P7" style:family="paragraph" style:parent-style-name="Standard">
-            <style:text-properties fo:font-size="6pt" officeooo:rsid="000f65a0" officeooo:paragraph-rsid="000f65a0" style:font-size-asian="5.25pt" style:font-size-complex="6pt"/>
-        </style:style>
-        <style:style style:name="P8" style:family="paragraph" style:parent-style-name="Table_20_Contents">
-            <style:text-properties fo:font-size="9pt" officeooo:rsid="000f65a0" officeooo:paragraph-rsid="000f65a0" style:font-size-asian="9pt" style:font-size-complex="9pt"/>
-        </style:style>
-        <style:style style:name="P9" style:family="paragraph" style:parent-style-name="Table_20_Contents">
-            <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
-            <style:text-properties fo:font-size="9pt" officeooo:rsid="000f65a0" officeooo:paragraph-rsid="000f65a0" style:font-size-asian="9pt" style:font-size-complex="9pt"/>
-        </style:style>
-        <style:style style:name="P10" style:family="paragraph" style:parent-style-name="Table_20_Contents">
-            <style:paragraph-properties fo:text-align="start" style:justify-single-word="false"/>
-            <style:text-properties fo:font-size="9pt" officeooo:rsid="000f65a0" officeooo:paragraph-rsid="000f65a0" style:font-size-asian="9pt" style:font-size-complex="9pt"/>
-        </style:style>
-        <style:style style:name="P11" style:family="paragraph" style:parent-style-name="Table_20_Contents">
-            <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
-            <style:text-properties fo:font-size="9pt" officeooo:rsid="0010009a" officeooo:paragraph-rsid="0010009a" style:font-size-asian="9pt" style:font-size-complex="9pt"/>
-        </style:style>
-        <style:style style:name="P12" style:family="paragraph" style:parent-style-name="Table_20_Contents">
-            <style:paragraph-properties fo:text-align="start" style:justify-single-word="false"/>
-            <style:text-properties fo:font-size="9pt" officeooo:rsid="0010009a" officeooo:paragraph-rsid="0010009a" style:font-size-asian="9pt" style:font-size-complex="9pt"/>
-        </style:style>
-        <style:style style:name="P13" style:family="paragraph" style:parent-style-name="Table_20_Contents">
-            <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
-            <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="Table_20_Contents">
-            <style:paragraph-properties fo:text-align="start" style:justify-single-word="false"/>
-            <style:text-properties fo:font-size="9pt" fo:font-weight="bold" officeooo:rsid="000f65a0" officeooo:paragraph-rsid="000f65a0" style:font-size-asian="9pt" style:font-weight-asian="bold" style:font-size-complex="9pt" style:font-weight-complex="bold"/>
-        </style:style>
-        <style:style style:name="P15" style:family="paragraph" style:parent-style-name="Table_20_Contents">
-            <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
-            <style:text-properties fo:font-size="9pt" fo:font-weight="bold" officeooo:rsid="000f65a0" officeooo:paragraph-rsid="000f65a0" style:font-size-asian="9pt" style:font-weight-asian="bold" style:font-size-complex="9pt" style:font-weight-complex="bold"/>
-        </style:style>
-        <style:style style:name="P16" style:family="paragraph" style:parent-style-name="Table_20_Contents">
-            <style:text-properties fo:font-size="9pt" style:font-size-complex="9pt"/>
-        </style:style>
-        <style:style style:name="P17" style:family="paragraph" style:parent-style-name="Table_20_Contents">
-            <style:text-properties fo:font-size="9pt" officeooo:rsid="0013c612" officeooo:paragraph-rsid="0013c612" style:font-size-complex="9pt"/>
-        </style:style>
-        <style:style style:name="P18" style:family="paragraph" style:parent-style-name="Table_20_Contents">
-            <style:paragraph-properties fo:background-color="#999999">
-                <style:background-image/>
-            </style:paragraph-properties>
-            <style:text-properties fo:font-size="9pt" fo:font-weight="bold" officeooo:rsid="000f65a0" officeooo:paragraph-rsid="000f65a0" style:font-size-asian="9pt" style:font-weight-asian="bold" style:font-size-complex="9pt" style:font-weight-complex="bold"/>
-        </style:style>
-        <style:style style:name="P19" style:family="paragraph" style:parent-style-name="Standard">
-            <style:text-properties fo:font-size="9pt" officeooo:rsid="0013c612" officeooo:paragraph-rsid="0010009a" style:font-size-asian="7.84999990463257pt" style:font-size-complex="9pt"/>
-        </style:style>
-        <style:style style:name="P20" style:family="paragraph" style:parent-style-name="Standard">
-            <style:text-properties fo:font-size="9pt" officeooo:rsid="000de2a1" officeooo:paragraph-rsid="000de2a1" style:font-size-asian="9pt" style:font-size-complex="9pt"/>
-        </style:style>
-        <style:style style:name="P21" style:family="paragraph" style:parent-style-name="Standard">
-            <style:text-properties fo:font-size="9pt" officeooo:rsid="000f65a0" officeooo:paragraph-rsid="000f65a0" style:font-size-asian="9pt" style:font-size-complex="9pt"/>
-        </style:style>
-        <style:style style:name="P22" style:family="paragraph" style:parent-style-name="Standard">
-            <style:paragraph-properties>
-                <style:tab-stops>
-                    <style:tab-stop style:position="1.499cm"/>
-                </style:tab-stops>
-            </style:paragraph-properties>
-            <style:text-properties fo:font-size="6pt" officeooo:rsid="000f65a0" officeooo:paragraph-rsid="0024d69b" style:font-size-asian="6pt" style:font-size-complex="6pt"/>
-        </style:style>
-        <style:style style:name="P23" style:family="paragraph" style:parent-style-name="Standard">
-            <style:paragraph-properties>
-                <style:tab-stops>
-                    <style:tab-stop style:position="1.499cm"/>
-                </style:tab-stops>
-            </style:paragraph-properties>
-            <style:text-properties fo:font-size="6pt" officeooo:rsid="0010009a" officeooo:paragraph-rsid="0010009a" style:font-size-asian="6pt" style:font-size-complex="6pt"/>
-        </style:style>
-        <style:style style:name="P24" style:family="paragraph" style:parent-style-name="Standard">
-            <style:text-properties fo:font-size="16pt" fo:font-weight="bold" officeooo:rsid="000de2a1" officeooo:paragraph-rsid="000de2a1" style:font-size-asian="16pt" style:font-weight-asian="bold" style:font-size-complex="16pt" style:font-weight-complex="bold"/>
-        </style:style>
-        <style:style style:name="P25" style:family="paragraph" style:parent-style-name="Standard">
-            <style:text-properties fo:font-size="16pt" officeooo:rsid="000de2a1" officeooo:paragraph-rsid="000de2a1" style:font-size-asian="16pt" style:font-size-complex="16pt"/>
-        </style:style>
-        <style:style style:name="P26" style:family="paragraph" style:parent-style-name="Standard">
-            <style:text-properties fo:font-size="2pt" officeooo:rsid="000f65a0" officeooo:paragraph-rsid="000f65a0" style:font-size-asian="1.75pt" style:font-size-complex="2pt"/>
-        </style:style>
-        <style:style style:name="P27" style:family="paragraph" style:parent-style-name="Standard">
-            <style:text-properties fo:font-size="5pt" officeooo:rsid="000f65a0" officeooo:paragraph-rsid="000f65a0" style:font-size-asian="1.75pt" style:font-size-complex="2pt"/>
-        </style:style>
-        <style:style style:name="P28" style:family="paragraph" style:parent-style-name="Table_20_Contents">
-            <style:paragraph-properties fo:text-align="start" style:justify-single-word="false"/>
-            <style:text-properties fo:font-size="9pt" fo:color="#ffffff" fo:font-weight="bold" officeooo:rsid="000f65a0" officeooo:paragraph-rsid="000f65a0" style:font-size-asian="9pt" style:font-weight-asian="bold" style:font-size-complex="9pt" style:font-weight-complex="bold"/>
-        </style:style>
-        <style:style style:name="P29" style:family="paragraph" style:parent-style-name="Table_20_Contents">
-            <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
-            <style:text-properties fo:font-size="9pt" fo:color="#ffffff" fo:font-weight="bold" officeooo:rsid="000f65a0" officeooo:paragraph-rsid="000f65a0" style:font-size-asian="9pt" style:font-weight-asian="bold" style:font-size-complex="9pt" style:font-weight-complex="bold"/>
-        </style:style>
-        <style:style style:name="Seitenumbruch" style:family="paragraph" style:parent-style-name="Standard">
-            <style:paragraph-properties fo:break-before="page"/>
-            <style:text-properties fo:font-size="16pt" fo:font-weight="bold" officeooo:rsid="000de2a1" officeooo:paragraph-rsid="000de2a1" style:font-size-asian="16pt" style:font-weight-asian="bold" style:font-size-complex="16pt" style:font-weight-complex="bold"/>
-        </style:style>
-        <style:style style:name="T1" style:family="text">
-            <style:text-properties fo:font-weight="bold" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
-        </style:style>
-        <style:style style:name="T2" style:family="text">
-            <style:text-properties officeooo:rsid="0024d69b"/>
-        </style:style>
-        <style:style style:name="T3" style:family="text">
-            <style:text-properties officeooo:rsid="0027b377"/>
-        </style:style>
-        <style:style style:name="T4" style:family="text">
-	      <style:text-properties style:text-position="super 58%"/>
-	    </style:style>
-        <style:style style:name="fr1" style:family="graphic" style:parent-style-name="Frame">
-            <style:graphic-properties style:wrap="run-through" style:number-wrapped-paragraphs="no-limit" style:vertical-pos="from-top" style:vertical-rel="page-content" style:horizontal-pos="center" style:horizontal-rel="page-content" fo:padding="0cm" fo:border="none" style:shadow="none" draw:shadow-opacity="100%"/>
-        </style:style>
-        <style:style style:name="fr2" style:family="graphic" style:parent-style-name="Frame">
-            <style:graphic-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:margin-top="0cm" fo:margin-bottom="0cm" style:vertical-pos="top" style:vertical-rel="paragraph-content" style:horizontal-pos="left" style:horizontal-rel="paragraph" fo:padding="0cm" fo:border="none" style:shadow="none" draw:shadow-opacity="100%"/>
-        </style:style>
-        <style:style style:name="fr3" style:family="graphic" style:parent-style-name="Graphics">
-            <style:graphic-properties style:run-through="foreground" style:wrap="run-through" style:number-wrapped-paragraphs="no-limit" style:vertical-pos="bottom" style:vertical-rel="page-content" style:horizontal-pos="from-left" style:horizontal-rel="page-content" 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:style>
-    </office:automatic-styles>
-	<office:body>
-		<xsl:apply-templates select="zeugnis"/>
-	</office:body>
-</office:document-content>
-</xsl:template>
-
-<xsl:template match="zeugnis">
-        <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:sequence-decls>
-                <text:sequence-decl text:display-outline-level="0" text:name="Illustration"/>
-                <text:sequence-decl text:display-outline-level="0" text:name="Table"/>
-                <text:sequence-decl text:display-outline-level="0" text:name="Text"/>
-                <text:sequence-decl text:display-outline-level="0" text:name="Drawing"/>
-            </text:sequence-decls>
-			<!-- Wichtig für Mehrfachdruck (mehrere Studenten ausgewählt): Wenn ein Element (in diesem Fall Stempel und Unterschriftenblock) relativ zur SEITE ausgerichtet werden soll, 
-			muss für jedes Dokument (jeder neue Durchlauf der Schleife) ein draw:frame-Tag definiert werden. Diese müssen ALLE VOR den ersten text:p-Elementen stehen.
-			Deshalb wirde erst die Schleife für die draw:frames aufgerufen, dann folg tder Inhalt -->
-			<xsl:if test="position()=1">
-				<xsl:for-each select="../zeugnis">
-					<xsl:variable select="position()" name="number"/><!-- Variable number definieren, die nach jedem Dokument um eines erhöht wird (position) -->
-						<draw:frame draw:style-name="fr1" draw:name="Rahmen{$number}" text:anchor-type="page" text:anchor-page-number="{$number}" svg:y="21.001cm" draw:z-index="0">
-		                <draw:text-box fo:min-height="0.499cm" fo:min-width="2cm">
-		                    <table:table table:name="Tabelle3" table:style-name="Tabelle3">
-		                        <table:table-column table:style-name="Tabelle3.A"/>
-		                        <table:table-column table:style-name="Tabelle3.B"/>
-		                        <table:table-column table:style-name="Tabelle3.C"/>
-		                        <table:table-row>
-		                            <table:table-cell table:style-name="Tabelle3.A1" office:value-type="string">
-		                                <text:p text:style-name="P17">Vienna, <xsl:value-of select="ort_datum" /></text:p>
-		                            </table:table-cell>
-		                            <table:table-cell table:style-name="Tabelle3.B1" office:value-type="string">
-		                                <text:p text:style-name="P16"/>
-		                            </table:table-cell>
-		                            <table:table-cell table:style-name="Tabelle3.C1" office:value-type="string">
-		                                <text:p text:style-name="P16"/>
-		                            </table:table-cell>
-		                        </table:table-row>
-		                        <table:table-row>
-		                            <table:table-cell table:style-name="Tabelle3.A2" office:value-type="string">
-		                                <text:p text:style-name="P17">Place, Date</text:p>
-		                            </table:table-cell>
-		                            <table:table-cell table:style-name="Tabelle3.B2" office:value-type="string">
-		                                <text:p text:style-name="P16"/>
-		                            </table:table-cell>
-		                            <table:table-cell table:style-name="Tabelle3.C2" office:value-type="string">
-		                                <text:p text:style-name="P17"><xsl:value-of select="studiengangsleiter" /></text:p>
-		                                <text:p text:style-name="P17">Program Director</text:p>
-		                            </table:table-cell>
-		                        </table:table-row>
-		                    </table:table>
-		                </draw:text-box>
-		            </draw:frame>
-		            <draw:frame xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" draw:style-name="fr3" draw:name="Bild{$number}" text:anchor-type="page" text:anchor-page-number="{$number}" svg:x="5.2cm" svg:width="3.51cm" svg:height="3.51cm" draw:z-index="1">
-		                <draw:image xlink:href="Pictures/10000201000002290000022939997AEC.png" xlink:type="simple" xlink:show="embed" xlink:actuate="onLoad"/>
-		            </draw:frame>
-				</xsl:for-each>
-			</xsl:if>
-            <text:p text:style-name="Seitenumbruch">Transcript of Records</text:p>
-            <text:p text:style-name="P6">
-            	<xsl:choose>
-					<xsl:when test="string-length(semester_bezeichnung)=0">
-						<xsl:value-of select="stsem"/>
-					</xsl:when>
-					<xsl:otherwise>
-						<xsl:value-of select="semester"/>
-						<xsl:choose>
-							<xsl:when test="semester=1">
-								<xsl:text>st</xsl:text>
-							</xsl:when>
-							<xsl:when test="semester=2">
-								<xsl:text>nd</xsl:text>
-							</xsl:when>
-							<xsl:when test="semester=3">
-								<xsl:text>rd</xsl:text>
-							</xsl:when>
-							<xsl:otherwise>
-								<xsl:text>th</xsl:text>
-							</xsl:otherwise>
-						</xsl:choose>
-						<xsl:text> Semester (</xsl:text>
-						<xsl:value-of select="stsem"/>
-						<xsl:text>)</xsl:text>
-					</xsl:otherwise>
-				</xsl:choose>
-            </text:p>
-            <text:p text:style-name="P5"/>
-            <text:p text:style-name="P5">
-			<xsl:choose>
-				<xsl:when test="studiengang_art='Bachelor'">
-					<xsl:text>Bachelor's</xsl:text>
-				</xsl:when>
-				<xsl:when test="studiengang_art='Master'">
-					<xsl:text>Master's</xsl:text>
-				</xsl:when>
-				<xsl:otherwise>
-					<xsl:value-of select="studiengang_art"/>
-				</xsl:otherwise>
-			</xsl:choose> Degree Program
-			</text:p>
-            <text:p text:style-name="P6"><xsl:value-of select="studiengang_englisch"/></text:p>
-            <text:p text:style-name="P1"/>
-            <text:p text:style-name="P1"/>
-            <text:p text:style-name="P1"/>
-            <text:p text:style-name="P2">Student ID: <xsl:value-of select="matrikelnr" /></text:p>
-            <text:p text:style-name="P2">Program Code: <xsl:value-of select="studiengang_kz" /></text:p>
-            <text:p text:style-name="P2"/>
-            <text:p text:style-name="P3"/>
-            <text:p text:style-name="P3"/>
-            <text:p text:style-name="P4">First Name/Last Name:<text:tab/>
-                <text:span text:style-name="T1"><xsl:value-of select="name"/></text:span>
-            </text:p>
-            <text:p text:style-name="P27"/>
-            <text:p text:style-name="P4">Date of Birth:<text:tab/><xsl:value-of select="gebdatum" /></text:p>
-            <table:table table:name="Tabelle1" table:style-name="Tabelle1">
-                <table:table-column table:style-name="Tabelle1.A"/>
-                <table:table-column table:style-name="Tabelle1.B" table:number-columns-repeated="2"/>
-                <table:table-column table:style-name="Tabelle1.D"/>
-                <table:table-row table:style-name="Tabelle1.1">
-                    <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
-                        <text:p text:style-name="P14">Course</text:p>
-                    </table:table-cell>
-                    <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
-                        <text:p text:style-name="P15">SP/W<text:span text:style-name="T4">1</text:span></text:p>
-                    </table:table-cell>
-                    <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
-                        <text:p text:style-name="P15">ECTS</text:p>
-                    </table:table-cell>
-                    <table:table-cell table:style-name="Tabelle1.D1" office:value-type="string">
-                        <text:p text:style-name="P15">Grade<text:span text:style-name="T4">2</text:span></text:p>
-                    </table:table-cell>
-                </table:table-row>
-                <xsl:apply-templates select="unterrichtsfach"/>
-                <table:table-row>
-                    <table:table-cell table:style-name="Tabelle1.A7" office:value-type="string">
-                        <text:p text:style-name="P10">Total</text:p>
-                    </table:table-cell>
-                    <table:table-cell table:style-name="Tabelle1.B7" office:value-type="string">
-                        <text:p text:style-name="P13">-</text:p>
-                    </table:table-cell>
-                    <table:table-cell table:style-name="Tabelle1.C7" office:value-type="string">
-                        <text:p text:style-name="P13"><xsl:value-of select="ects_gesamt"/></text:p>
-                    </table:table-cell>
-                    <table:table-cell table:style-name="Tabelle1.D7" office:value-type="string">
-                        <text:p text:style-name="P9">-</text:p>
-                    </table:table-cell>
-                </table:table-row>            
-                <xsl:apply-templates select="fussnote"/> 
-            </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">
-                <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"/>
-            <xsl:if test="abschlusspruefung_typ">
-	            <table:table table:name="Tabelle2" table:style-name="Tabelle2">
-	                <table:table-column table:style-name="Tabelle2.A"/>
-	                <table:table-column table:style-name="Tabelle2.B"/>
-	                <table:table-row table:style-name="Tabelle2.1">
-	                    <table:table-cell table:style-name="Tabelle2.A1" table:number-columns-spanned="2" office:value-type="string">
-	                        <text:p text:style-name="P18">Final Examination</text:p>
-	                    </table:table-cell>
-	                    <table:covered-table-cell/>
-	                </table:table-row>
-	                <table:table-row table:style-name="Tabelle2.1">
-	                    <table:table-cell table:style-name="Tabelle2.A2" office:value-type="string">
-	                        <xsl:if test="abschlusspruefung_typ='Bachelor'" >
-								<text:p text:style-name="P8">Bachelor's Examination on <xsl:value-of select="abschlusspruefung_datum" /></text:p>
-							</xsl:if>
-							<xsl:if test="abschlusspruefung_typ='Diplom'" >
-								<text:p text:style-name="P8">Master's Examination on <xsl:value-of select="abschlusspruefung_datum" /></text:p>
-							</xsl:if>
-							
-	                    </table:table-cell>
-	                    <table:table-cell table:style-name="Tabelle2.B2" office:value-type="string">
-	                        <text:p text:style-name="P8"><xsl:value-of select="abschlusspruefung_note_english" /></text:p>
-	                    </table:table-cell>
-	                </table:table-row>
-	            </table:table>
-	            <text:p text:style-name="P26"/>
-	            <text:p text:style-name="P23">Grades:<text:tab/>Passed with distinction, Passed with merit, Passed</text:p>
-	            <text:p text:style-name="P19"/>
-            </xsl:if>
-        </office:text>
-</xsl:template>
-<xsl:template match="unterrichtsfach">
-<table:table-row>
-    <table:table-cell table:style-name="Tabelle1.A7" office:value-type="string">
-    	<xsl:choose>
-			<xsl:when test="bisio_von">
-                        <text:p text:style-name="P12">International Semester Abroad: <xsl:value-of select="bisio_von"/>-<xsl:value-of select="bisio_bis"/>, at <xsl:value-of select="bisio_ort"/>, <xsl:value-of select="bisio_universitaet"/></text:p>
-                        <text:p text:style-name="P12">All credits earned during the International Semester Abroad (ISA) are fully credited for the 
-                        <xsl:value-of select="../semester"/>
-							<xsl:choose>
-								<xsl:when test="../semester=1">
-									<xsl:text>st</xsl:text>
-								</xsl:when>
-								<xsl:when test="../semester=2">
-									<xsl:text>nd</xsl:text>
-								</xsl:when>
-								<xsl:when test="../semester=3">
-									<xsl:text>rd</xsl:text>
-								</xsl:when>
-								<xsl:otherwise>
-									<xsl:text>th</xsl:text>
-								</xsl:otherwise>
-							</xsl:choose>
-                        semester at the UAS Technikum Wien. (see Transcript of Records)</text:p>
-			</xsl:when>
-			<xsl:otherwise>
-			<text:p text:style-name="P10">
-				<xsl:choose>
-					<xsl:when test="string-length(bezeichnung_englisch)!=0">
-						<xsl:value-of select="bezeichnung_englisch"/>
-					</xsl:when>
-					<xsl:otherwise>
-						<xsl:text>[ACHTUNG: Keine englische Bezeichung für "</xsl:text><xsl:value-of select="bezeichnung"/><xsl:text>" in der Datenbank!]</xsl:text>
-					</xsl:otherwise>
-				</xsl:choose>
-			</text:p>
-			</xsl:otherwise>
-		</xsl:choose>
-    </table:table-cell>
-    <table:table-cell table:style-name="Tabelle1.B2" office:value-type="string">
-        <text:p text:style-name="P9">
-        <xsl:if test="sws=''">
-			<xsl:text>-</xsl:text>
-		</xsl:if>
-		<xsl:value-of select="sws"/>
-        </text:p>
-    </table:table-cell>
-    <table:table-cell table:style-name="Tabelle1.C2" office:value-type="string">
-        <text:p text:style-name="P9">
-	        <xsl:if test="ects=''">
-				<xsl:text>-</xsl:text>
-			</xsl:if>
-			<xsl:value-of select="ects"/>
-		</text:p>
-    </table:table-cell>
-    <table:table-cell table:style-name="Tabelle1.D2" office:value-type="string">
-        <text:p text:style-name="P9">
-	        <xsl:if test="note=''">
-				<xsl:text>-</xsl:text>
-			</xsl:if>
-			<xsl:value-of select="note"/>
-		</text:p>
-    </table:table-cell>
-</table:table-row>
-</xsl:template>
-<xsl:template match="fussnote">
-<table:table-row>
-    <table:table-cell table:style-name="Tabelle1.A8" office:value-type="string">
-    	<xsl:choose>
-			<xsl:when test="themenbereich!=''">
-		        <text:p text:style-name="P10"><xsl:value-of select="fussnotenzeichen"/>
-			        <xsl:text> </xsl:text>
-			        <text:span text:style-name="T1">
-			        	<xsl:choose>
-							<xsl:when test="themenbereich!=''">
-								<xsl:text>Subject Area:</xsl:text>
-							</xsl:when>
-							<xsl:otherwise>
-								<xsl:text></xsl:text>
-							</xsl:otherwise>
-						</xsl:choose>
-			        </text:span>
-			        <xsl:text> </xsl:text><xsl:value-of select="themenbereich"/>
-		        </text:p>
-		        <text:p text:style-name="P10">
-		       <xsl:text> </xsl:text>
-		       <text:span text:style-name="T1">
-			     <xsl:choose>
-					<xsl:when test="titel_kurzbz='Bachelor'">
-						<xsl:text>Bachelor's Thesis:</xsl:text>
-					</xsl:when>
-					<xsl:when test="titel_kurzbz='Diplom'">
-						<xsl:text>Master's Thesis:</xsl:text>
-					</xsl:when>
-					<xsl:otherwise>
-						<xsl:text></xsl:text>
-					</xsl:otherwise>
-				</xsl:choose>
-		       </text:span>
-		       <xsl:text> </xsl:text>
-		       <xsl:choose>
-					<xsl:when test="string-length(titel_en)!=0">
-						<xsl:value-of select="titel_en"/>
-					</xsl:when>
-					<xsl:otherwise>
-						<xsl:value-of select="titel"/>
-					</xsl:otherwise>
-				</xsl:choose>
-		       </text:p>
-        	</xsl:when>
-        	<xsl:otherwise>
-        		<text:p text:style-name="P10"><xsl:value-of select="fussnotenzeichen"/>
-				<xsl:text> </xsl:text>
-				<text:span text:style-name="T1">
-			     <xsl:choose>
-					<xsl:when test="titel_kurzbz='Bachelor'">
-						<xsl:text>Bachelor's Thesis:</xsl:text>
-					</xsl:when>
-					<xsl:when test="titel_kurzbz='Diplom'">
-						<xsl:text>Master's Thesis:</xsl:text>
-					</xsl:when>
-					<xsl:otherwise>
-						<xsl:text></xsl:text>
-					</xsl:otherwise>
-				</xsl:choose>
-		       </text:span>
-		       <xsl:text> </xsl:text>
-		       <xsl:choose>
-					<xsl:when test="string-length(titel_en)!=0">
-						<xsl:value-of select="titel_en"/>
-					</xsl:when>
-					<xsl:otherwise>
-						<xsl:value-of select="titel"/>
-					</xsl:otherwise>
-				</xsl:choose>
-				</text:p>
-        	</xsl:otherwise>
-		</xsl:choose>
-    </table:table-cell>
-    <table:table-cell table:style-name="Tabelle1.B8" office:value-type="string">
-        <text:p text:style-name="P13">
-        	<xsl:value-of select="sws"/>
-		</text:p>
-    </table:table-cell>
-    <table:table-cell table:style-name="Tabelle1.C8" office:value-type="string">
-        <text:p text:style-name="P13">
-        	<xsl:value-of select="ects"/>
-        </text:p>
-    </table:table-cell>
-    <table:table-cell table:style-name="Tabelle1.D8" office:value-type="string">
-        <text:p text:style-name="P13">
-        	<xsl:if test="../projektarbeit_note_anzeige='true'">
-				<xsl:value-of select="note"/>
-			</xsl:if>
-        </text:p>
-    </table:table-cell>
-</table:table-row>
-</xsl:template>
-</xsl:stylesheet>

system/xsl/ZeugnisEngNeu_Lehrgaenge.xsl

@@ -1,657 +0,0 @@
-<?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="zeugnisse">
-
-<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="Mangal2" svg:font-family="Mangal"/>
-        <style:font-face style:name="Mangal" svg:font-family="Mangal" style:font-family-generic="roman"/>
-        <style:font-face style:name="Liberation Serif" svg:font-family="&apos;Liberation Serif&apos;" style:font-family-generic="roman" style:font-pitch="variable"/>
-        <style:font-face style:name="Arial" svg:font-family="Arial" style:font-adornments="Standard" style:font-family-generic="swiss" 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="Liberation Sans1" svg:font-family="&apos;Liberation Sans&apos;" style:font-family-generic="system" style:font-pitch="variable"/>
-        <style:font-face style:name="Mangal1" 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="SimSun" svg:font-family="SimSun" style:font-family-generic="system" style:font-pitch="variable"/>
-        <style:font-face style:name="Tahoma" svg:font-family="Tahoma" 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.401cm" fo:margin-top="0.199cm" fo:margin-bottom="0cm" table:align="margins"/>
-        </style:style>
-        <style:style style:name="Tabelle1.A" style:family="table-column">
-            <style:table-column-properties style:column-width="10.437cm" style:rel-column-width="41702*"/>
-        </style:style>
-        <style:style style:name="Tabelle1.B" style:family="table-column">
-            <style:table-column-properties style:column-width="1.988cm" style:rel-column-width="7944*"/>
-        </style:style>
-        <style:style style:name="Tabelle1.D" style:family="table-column">
-            <style:table-column-properties style:column-width="1.988cm" style:rel-column-width="7945*"/>
-        </style:style>
-        <style:style style:name="Tabelle1.1" style:family="table-row">
-            <style:table-row-properties style:min-row-height="0.75cm"/>
-        </style:style>
-        <style:style style:name="Tabelle1.A1" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:background-color="#999999" fo:padding-left="0.101cm" fo:padding-right="0.101cm" fo:padding-top="0.079cm" fo:padding-bottom="0.079cm" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="0.05pt solid #000000" fo:border-bottom="0.05pt solid #000000">
-                <style:background-image/>
-            </style:table-cell-properties>
-        </style:style>
-        <style:style style:name="Tabelle1.D1" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:background-color="#999999" fo:padding-left="0.101cm" fo:padding-right="0.101cm" fo:padding-top="0.079cm" fo:padding-bottom="0.079cm" fo:border="0.05pt solid #000000">
-                <style:background-image/>
-            </style:table-cell-properties>
-        </style:style>
-        <style:style style:name="Tabelle1.A2" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:padding-left="0.101cm" fo:padding-right="0.101cm" fo:padding-top="0.07cm" fo:padding-bottom="0.07cm" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-        </style:style>
-        <style:style style:name="Tabelle1.B2" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:padding-left="0.101cm" fo:padding-right="0.101cm" fo:padding-top="0.07cm" fo:padding-bottom="0.07cm" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-        </style:style>
-        <style:style style:name="Tabelle1.C2" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:padding-left="0.101cm" fo:padding-right="0.101cm" fo:padding-top="0.07cm" fo:padding-bottom="0.07cm" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-        </style:style>
-        <style:style style:name="Tabelle1.D2" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:padding-left="0.101cm" fo:padding-right="0.101cm" fo:padding-top="0.07cm" fo:padding-bottom="0.07cm" fo:border-left="0.05pt solid #000000" fo:border-right="0.05pt solid #000000" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-        </style:style>
-        <style:style style:name="Tabelle1.A3" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:padding-left="0.101cm" fo:padding-right="0.101cm" fo:padding-top="0.07cm" fo:padding-bottom="0.07cm" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-        </style:style>
-        <style:style style:name="Tabelle1.B3" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:padding-left="0.101cm" fo:padding-right="0.101cm" fo:padding-top="0.07cm" fo:padding-bottom="0.07cm" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-        </style:style>
-        <style:style style:name="Tabelle1.C3" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:padding-left="0.101cm" fo:padding-right="0.101cm" fo:padding-top="0.07cm" fo:padding-bottom="0.07cm" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-        </style:style>
-        <style:style style:name="Tabelle1.D3" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:padding-left="0.101cm" fo:padding-right="0.101cm" fo:padding-top="0.07cm" fo:padding-bottom="0.07cm" fo:border-left="0.05pt solid #000000" fo:border-right="0.05pt solid #000000" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-        </style:style>
-        <style:style style:name="Tabelle1.A4" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:padding-left="0.101cm" fo:padding-right="0.101cm" fo:padding-top="0.07cm" fo:padding-bottom="0.07cm" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-        </style:style>
-        <style:style style:name="Tabelle1.B4" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:padding-left="0.101cm" fo:padding-right="0.101cm" fo:padding-top="0.07cm" fo:padding-bottom="0.07cm" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-        </style:style>
-        <style:style style:name="Tabelle1.C4" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:padding-left="0.101cm" fo:padding-right="0.101cm" fo:padding-top="0.07cm" fo:padding-bottom="0.07cm" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-        </style:style>
-        <style:style style:name="Tabelle1.D4" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:padding-left="0.101cm" fo:padding-right="0.101cm" fo:padding-top="0.07cm" fo:padding-bottom="0.07cm" fo:border-left="0.05pt solid #000000" fo:border-right="0.05pt solid #000000" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-        </style:style>
-        <style:style style:name="Tabelle1.A5" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:padding-left="0.101cm" fo:padding-right="0.101cm" fo:padding-top="0.07cm" fo:padding-bottom="0.07cm" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-        </style:style>
-        <style:style style:name="Tabelle1.B5" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:padding-left="0.101cm" fo:padding-right="0.101cm" fo:padding-top="0.07cm" fo:padding-bottom="0.07cm" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-        </style:style>
-        <style:style style:name="Tabelle1.C5" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:padding-left="0.101cm" fo:padding-right="0.101cm" fo:padding-top="0.07cm" fo:padding-bottom="0.07cm" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-        </style:style>
-        <style:style style:name="Tabelle1.D5" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:padding-left="0.101cm" fo:padding-right="0.101cm" fo:padding-top="0.07cm" fo:padding-bottom="0.07cm" fo:border-left="0.05pt solid #000000" fo:border-right="0.05pt solid #000000" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-        </style:style>
-        <style:style style:name="Tabelle1.A6" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:padding-left="0.101cm" fo:padding-right="0.101cm" fo:padding-top="0.07cm" fo:padding-bottom="0.07cm" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-        </style:style>
-        <style:style style:name="Tabelle1.B6" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:padding-left="0.101cm" fo:padding-right="0.101cm" fo:padding-top="0.07cm" fo:padding-bottom="0.07cm" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-        </style:style>
-        <style:style style:name="Tabelle1.C6" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:padding-left="0.101cm" fo:padding-right="0.101cm" fo:padding-top="0.07cm" fo:padding-bottom="0.07cm" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-        </style:style>
-        <style:style style:name="Tabelle1.D6" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:padding-left="0.101cm" fo:padding-right="0.101cm" fo:padding-top="0.07cm" fo:padding-bottom="0.07cm" fo:border-left="0.05pt solid #000000" fo:border-right="0.05pt solid #000000" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-        </style:style>
-        <style:style style:name="Tabelle1.A7" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:padding-left="0.101cm" fo:padding-right="0.101cm" fo:padding-top="0.07cm" fo:padding-bottom="0.07cm" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-        </style:style>
-        <style:style style:name="Tabelle1.B7" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:padding-left="0.101cm" fo:padding-right="0.101cm" fo:padding-top="0.07cm" fo:padding-bottom="0.07cm" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-        </style:style>
-        <style:style style:name="Tabelle1.C7" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:padding-left="0.101cm" fo:padding-right="0.101cm" fo:padding-top="0.079cm" fo:padding-bottom="0.079cm" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-        </style:style>
-        <style:style style:name="Tabelle1.D7" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:padding-left="0.101cm" fo:padding-right="0.101cm" fo:padding-top="0.079cm" fo:padding-bottom="0.079cm" fo:border-left="0.05pt solid #000000" fo:border-right="0.05pt solid #000000" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-        </style:style>
-        <style:style style:name="Tabelle1.A8" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:padding-left="0.101cm" fo:padding-right="0.101cm" fo:padding-top="0.079cm" fo:padding-bottom="0.079cm" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-        </style:style>
-        <style:style style:name="Tabelle1.B8" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:padding-left="0.101cm" fo:padding-right="0.101cm" fo:padding-top="0.079cm" fo:padding-bottom="0.079cm" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-        </style:style>
-        <style:style style:name="Tabelle1.C8" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:padding-left="0.101cm" fo:padding-right="0.101cm" fo:padding-top="0.079cm" fo:padding-bottom="0.079cm" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-        </style:style>
-        <style:style style:name="Tabelle1.D8" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:padding-left="0.101cm" fo:padding-right="0.101cm" fo:padding-top="0.079cm" fo:padding-bottom="0.079cm" fo:border-left="0.05pt solid #000000" fo:border-right="0.05pt solid #000000" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-        </style:style>
-        <style:style style:name="Tabelle2" style:family="table">
-            <style:table-properties style:width="16.401cm" table:align="margins"/>
-        </style:style>
-        <style:style style:name="Tabelle2.A" style:family="table-column">
-            <style:table-column-properties style:column-width="10.437cm" style:rel-column-width="41702*"/>
-        </style:style>
-        <style:style style:name="Tabelle2.B" style:family="table-column">
-            <style:table-column-properties style:column-width="5.964cm" style:rel-column-width="23833*"/>
-        </style:style>
-        <style:style style:name="Tabelle2.1" style:family="table-row">
-            <style:table-row-properties style:min-row-height="0.75cm"/>
-        </style:style>
-        <style:style style:name="Tabelle2.A1" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:background-color="#999999" fo:padding="0.097cm" fo:border="0.05pt solid #000000">
-                <style:background-image/>
-            </style:table-cell-properties>
-        </style:style>
-        <style:style style:name="Tabelle2.A2" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:padding="0.097cm" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-        </style:style>
-        <style:style style:name="Tabelle2.B2" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:padding="0.097cm" fo:border-left="0.05pt solid #000000" fo:border-right="0.05pt solid #000000" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-        </style:style>
-        <style:style style:name="Tabelle3" style:family="table">
-            <style:table-properties style:width="16.401cm" fo:margin-top="0cm" fo:margin-bottom="0cm" table:align="margins" style:may-break-between-rows="false"/>
-        </style:style>
-        <style:style style:name="Tabelle3.A" style:family="table-column">
-            <style:table-column-properties style:column-width="5.001cm" style:rel-column-width="19981*"/>
-        </style:style>
-        <style:style style:name="Tabelle3.B" style:family="table-column">
-            <style:table-column-properties style:column-width="3.9cm" style:rel-column-width="15583*"/>
-        </style:style>
-        <style:style style:name="Tabelle3.C" style:family="table-column">
-            <style:table-column-properties style:column-width="7.5cm" style:rel-column-width="29971*"/>
-        </style:style>
-        <style:style style:name="Tabelle3.A1" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="" fo:padding-left="0cm" fo:padding-right="0cm" fo:padding-top="0.101cm" fo:padding-bottom="0.101cm" fo:border-left="none" fo:border-right="none" fo:border-top="none" fo:border-bottom="1pt dotted #000000"/>
-        </style:style>
-        <style:style style:name="Tabelle3.B1" style:family="table-cell">
-            <style:table-cell-properties fo:padding-left="0cm" fo:padding-right="0cm" fo:padding-top="0.101cm" fo:padding-bottom="0.101cm" fo:border="none"/>
-        </style:style>
-        <style:style style:name="Tabelle3.C1" style:family="table-cell">
-            <style:table-cell-properties fo:padding-left="0cm" fo:padding-right="0cm" fo:padding-top="0.101cm" fo:padding-bottom="0.101cm" fo:border-left="none" fo:border-right="none" fo:border-top="none" fo:border-bottom="1pt dotted #000000"/>
-        </style:style>
-        <style:style style:name="Tabelle3.A2" style:family="table-cell">
-            <style:table-cell-properties fo:padding-left="0cm" fo:padding-right="0cm" fo:padding-top="0.101cm" fo:padding-bottom="0.101cm" fo:border="none"/>
-        </style:style>
-        <style:style style:name="Tabelle3.B2" style:family="table-cell">
-            <style:table-cell-properties fo:padding-left="0cm" fo:padding-right="0cm" fo:padding-top="0.101cm" fo:padding-bottom="0.101cm" fo:border="none"/>
-        </style:style>
-        <style:style style:name="Tabelle3.C2" style:family="table-cell">
-            <style:table-cell-properties fo:padding-left="0cm" fo:padding-right="0cm" fo:padding-top="0.101cm" fo:padding-bottom="0.101cm" fo:border="none"/>
-        </style:style>
-        <style:style style:name="P1" style:family="paragraph" style:parent-style-name="Standard">
-            <style:text-properties fo:font-size="9pt" officeooo:rsid="000de2a1" officeooo:paragraph-rsid="000de2a1" style:font-size-asian="9pt" style:font-size-complex="9pt"/>
-        </style:style>
-        <style:style style:name="P2" style:family="paragraph" style:parent-style-name="Standard">
-            <style:paragraph-properties fo:text-align="end" style:justify-single-word="false"/>
-            <style:text-properties fo:font-size="9pt" officeooo:rsid="000f65a0" officeooo:paragraph-rsid="000f65a0" style:font-size-asian="9pt" style:font-size-complex="9pt"/>
-        </style:style>
-        <style:style style:name="P3" style:family="paragraph" style:parent-style-name="Standard">
-            <style:text-properties fo:font-size="9pt" officeooo:rsid="000f65a0" officeooo:paragraph-rsid="000f65a0" style:font-size-asian="9pt" style:font-size-complex="9pt"/>
-        </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="4.498cm"/>
-                </style:tab-stops>
-            </style:paragraph-properties>
-            <style:text-properties fo:font-size="9pt" officeooo:rsid="000f65a0" officeooo:paragraph-rsid="000f65a0" 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:text-properties fo:font-size="16pt" officeooo:rsid="000de2a1" officeooo:paragraph-rsid="000de2a1" style:font-size-asian="16pt" style:font-size-complex="16pt"/>
-        </style:style>
-        <style:style style:name="P6" style:family="paragraph" style:parent-style-name="Standard">
-            <style:text-properties fo:font-size="16pt" fo:font-weight="bold" officeooo:rsid="000de2a1" officeooo:paragraph-rsid="000de2a1" style:font-size-asian="16pt" style:font-weight-asian="bold" style:font-size-complex="16pt" style:font-weight-complex="bold"/>
-        </style:style>
-        <style:style style:name="P7" style:family="paragraph" style:parent-style-name="Standard">
-            <style:text-properties fo:font-size="6pt" officeooo:rsid="000f65a0" officeooo:paragraph-rsid="000f65a0" style:font-size-asian="5.25pt" style:font-size-complex="6pt"/>
-        </style:style>
-        <style:style style:name="P8" style:family="paragraph" style:parent-style-name="Table_20_Contents">
-            <style:text-properties fo:font-size="9pt" officeooo:rsid="000f65a0" officeooo:paragraph-rsid="000f65a0" style:font-size-asian="9pt" style:font-size-complex="9pt"/>
-        </style:style>
-        <style:style style:name="P9" style:family="paragraph" style:parent-style-name="Table_20_Contents">
-            <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
-            <style:text-properties fo:font-size="9pt" officeooo:rsid="000f65a0" officeooo:paragraph-rsid="000f65a0" style:font-size-asian="9pt" style:font-size-complex="9pt"/>
-        </style:style>
-        <style:style style:name="P10" style:family="paragraph" style:parent-style-name="Table_20_Contents">
-            <style:paragraph-properties fo:text-align="start" style:justify-single-word="false"/>
-            <style:text-properties fo:font-size="9pt" officeooo:rsid="000f65a0" officeooo:paragraph-rsid="000f65a0" style:font-size-asian="9pt" style:font-size-complex="9pt"/>
-        </style:style>
-        <style:style style:name="P11" style:family="paragraph" style:parent-style-name="Table_20_Contents">
-            <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
-            <style:text-properties fo:font-size="9pt" officeooo:rsid="0010009a" officeooo:paragraph-rsid="0010009a" style:font-size-asian="9pt" style:font-size-complex="9pt"/>
-        </style:style>
-        <style:style style:name="P12" style:family="paragraph" style:parent-style-name="Table_20_Contents">
-            <style:paragraph-properties fo:text-align="start" style:justify-single-word="false"/>
-            <style:text-properties fo:font-size="9pt" officeooo:rsid="0010009a" officeooo:paragraph-rsid="0010009a" style:font-size-asian="9pt" style:font-size-complex="9pt"/>
-        </style:style>
-        <style:style style:name="P13" style:family="paragraph" style:parent-style-name="Table_20_Contents">
-            <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
-            <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="Table_20_Contents">
-            <style:paragraph-properties fo:text-align="start" style:justify-single-word="false"/>
-            <style:text-properties fo:font-size="9pt" fo:font-weight="bold" officeooo:rsid="000f65a0" officeooo:paragraph-rsid="000f65a0" style:font-size-asian="9pt" style:font-weight-asian="bold" style:font-size-complex="9pt" style:font-weight-complex="bold"/>
-        </style:style>
-        <style:style style:name="P15" style:family="paragraph" style:parent-style-name="Table_20_Contents">
-            <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
-            <style:text-properties fo:font-size="9pt" fo:font-weight="bold" officeooo:rsid="000f65a0" officeooo:paragraph-rsid="000f65a0" style:font-size-asian="9pt" style:font-weight-asian="bold" style:font-size-complex="9pt" style:font-weight-complex="bold"/>
-        </style:style>
-        <style:style style:name="P16" style:family="paragraph" style:parent-style-name="Table_20_Contents">
-            <style:text-properties fo:font-size="9pt" style:font-size-complex="9pt"/>
-        </style:style>
-        <style:style style:name="P17" style:family="paragraph" style:parent-style-name="Table_20_Contents">
-            <style:text-properties fo:font-size="9pt" officeooo:rsid="0013c612" officeooo:paragraph-rsid="0013c612" style:font-size-complex="9pt"/>
-        </style:style>
-        <style:style style:name="P18" style:family="paragraph" style:parent-style-name="Table_20_Contents">
-            <style:paragraph-properties fo:background-color="#999999">
-                <style:background-image/>
-            </style:paragraph-properties>
-            <style:text-properties fo:font-size="9pt" fo:font-weight="bold" officeooo:rsid="000f65a0" officeooo:paragraph-rsid="000f65a0" style:font-size-asian="9pt" style:font-weight-asian="bold" style:font-size-complex="9pt" style:font-weight-complex="bold"/>
-        </style:style>
-        <style:style style:name="P19" style:family="paragraph" style:parent-style-name="Standard">
-            <style:text-properties fo:font-size="9pt" officeooo:rsid="0013c612" officeooo:paragraph-rsid="0010009a" style:font-size-asian="7.84999990463257pt" style:font-size-complex="9pt"/>
-        </style:style>
-        <style:style style:name="P20" style:family="paragraph" style:parent-style-name="Standard">
-            <style:text-properties fo:font-size="9pt" officeooo:rsid="000de2a1" officeooo:paragraph-rsid="000de2a1" style:font-size-asian="9pt" style:font-size-complex="9pt"/>
-        </style:style>
-        <style:style style:name="P21" style:family="paragraph" style:parent-style-name="Standard">
-            <style:text-properties fo:font-size="9pt" officeooo:rsid="000f65a0" officeooo:paragraph-rsid="000f65a0" style:font-size-asian="9pt" style:font-size-complex="9pt"/>
-        </style:style>
-        <style:style style:name="P22" style:family="paragraph" style:parent-style-name="Standard">
-            <style:paragraph-properties>
-                <style:tab-stops>
-                    <style:tab-stop style:position="1.499cm"/>
-                </style:tab-stops>
-            </style:paragraph-properties>
-            <style:text-properties fo:font-size="6pt" officeooo:rsid="000f65a0" officeooo:paragraph-rsid="0024d69b" style:font-size-asian="6pt" style:font-size-complex="6pt"/>
-        </style:style>
-        <style:style style:name="P23" style:family="paragraph" style:parent-style-name="Standard">
-            <style:paragraph-properties>
-                <style:tab-stops>
-                    <style:tab-stop style:position="1.499cm"/>
-                </style:tab-stops>
-            </style:paragraph-properties>
-            <style:text-properties fo:font-size="6pt" officeooo:rsid="0010009a" officeooo:paragraph-rsid="0010009a" style:font-size-asian="6pt" style:font-size-complex="6pt"/>
-        </style:style>
-        <style:style style:name="P24" style:family="paragraph" style:parent-style-name="Standard">
-            <style:text-properties fo:font-size="16pt" fo:font-weight="bold" officeooo:rsid="000de2a1" officeooo:paragraph-rsid="000de2a1" style:font-size-asian="16pt" style:font-weight-asian="bold" style:font-size-complex="16pt" style:font-weight-complex="bold"/>
-        </style:style>
-        <style:style style:name="P25" style:family="paragraph" style:parent-style-name="Standard">
-            <style:text-properties fo:font-size="16pt" officeooo:rsid="000de2a1" officeooo:paragraph-rsid="000de2a1" style:font-size-asian="16pt" style:font-size-complex="16pt"/>
-        </style:style>
-        <style:style style:name="P26" style:family="paragraph" style:parent-style-name="Standard">
-            <style:text-properties fo:font-size="2pt" officeooo:rsid="000f65a0" officeooo:paragraph-rsid="000f65a0" style:font-size-asian="1.75pt" style:font-size-complex="2pt"/>
-        </style:style>
-        <style:style style:name="P27" style:family="paragraph" style:parent-style-name="Standard">
-            <style:text-properties fo:font-size="5pt" officeooo:rsid="000f65a0" officeooo:paragraph-rsid="000f65a0" style:font-size-asian="1.75pt" style:font-size-complex="2pt"/>
-        </style:style>
-        <style:style style:name="P28" style:family="paragraph" style:parent-style-name="Table_20_Contents">
-            <style:paragraph-properties fo:text-align="start" style:justify-single-word="false"/>
-            <style:text-properties fo:font-size="9pt" fo:color="#ffffff" fo:font-weight="bold" officeooo:rsid="000f65a0" officeooo:paragraph-rsid="000f65a0" style:font-size-asian="9pt" style:font-weight-asian="bold" style:font-size-complex="9pt" style:font-weight-complex="bold"/>
-        </style:style>
-        <style:style style:name="P29" style:family="paragraph" style:parent-style-name="Table_20_Contents">
-            <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
-            <style:text-properties fo:font-size="9pt" fo:color="#ffffff" fo:font-weight="bold" officeooo:rsid="000f65a0" officeooo:paragraph-rsid="000f65a0" style:font-size-asian="9pt" style:font-weight-asian="bold" style:font-size-complex="9pt" style:font-weight-complex="bold"/>
-        </style:style>
-        <style:style style:name="Seitenumbruch" style:family="paragraph" style:parent-style-name="Standard">
-            <style:paragraph-properties fo:break-before="page"/>
-            <style:text-properties fo:font-size="16pt" fo:font-weight="bold" officeooo:rsid="000de2a1" officeooo:paragraph-rsid="000de2a1" style:font-size-asian="16pt" style:font-weight-asian="bold" style:font-size-complex="16pt" style:font-weight-complex="bold"/>
-        </style:style>
-        <style:style style:name="T1" style:family="text">
-            <style:text-properties fo:font-weight="bold" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
-        </style:style>
-        <style:style style:name="T2" style:family="text">
-            <style:text-properties officeooo:rsid="0024d69b"/>
-        </style:style>
-        <style:style style:name="T3" style:family="text">
-            <style:text-properties officeooo:rsid="0027b377"/>
-        </style:style>
-        <style:style style:name="T4" style:family="text">
-	      <style:text-properties style:text-position="super 58%"/>
-	    </style:style>
-        <style:style style:name="fr1" style:family="graphic" style:parent-style-name="Frame">
-            <style:graphic-properties style:wrap="run-through" style:number-wrapped-paragraphs="no-limit" style:vertical-pos="from-top" style:vertical-rel="page-content" style:horizontal-pos="center" style:horizontal-rel="page-content" fo:padding="0cm" fo:border="none" style:shadow="none" draw:shadow-opacity="100%"/>
-        </style:style>
-        <style:style style:name="fr2" style:family="graphic" style:parent-style-name="Frame">
-            <style:graphic-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:margin-top="0cm" fo:margin-bottom="0cm" style:vertical-pos="top" style:vertical-rel="paragraph-content" style:horizontal-pos="left" style:horizontal-rel="paragraph" fo:padding="0cm" fo:border="none" style:shadow="none" draw:shadow-opacity="100%"/>
-        </style:style>
-        <style:style style:name="fr3" style:family="graphic" style:parent-style-name="Graphics">
-            <style:graphic-properties style:run-through="foreground" style:wrap="run-through" style:number-wrapped-paragraphs="no-limit" style:vertical-pos="bottom" style:vertical-rel="page-content" style:horizontal-pos="from-left" style:horizontal-rel="page-content" 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:style>
-    </office:automatic-styles>
-	<office:body>
-		<xsl:apply-templates select="zeugnis"/>
-	</office:body>
-</office:document-content>
-</xsl:template>
-
-<xsl:template match="zeugnis">
-        <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:sequence-decls>
-                <text:sequence-decl text:display-outline-level="0" text:name="Illustration"/>
-                <text:sequence-decl text:display-outline-level="0" text:name="Table"/>
-                <text:sequence-decl text:display-outline-level="0" text:name="Text"/>
-                <text:sequence-decl text:display-outline-level="0" text:name="Drawing"/>
-            </text:sequence-decls>
-			<!-- Wichtig für Mehrfachdruck (mehrere Studenten ausgewählt): Wenn ein Element (in diesem Fall Stempel und Unterschriftenblock) relativ zur SEITE ausgerichtet werden soll, 
-			muss für jedes Dokument (jeder neue Durchlauf der Schleife) ein draw:frame-Tag definiert werden. Diese müssen ALLE VOR den ersten text:p-Elementen stehen.
-			Deshalb wirde erst die Schleife für die draw:frames aufgerufen, dann folg tder Inhalt -->
-			<xsl:if test="position()=1">
-				<xsl:for-each select="../zeugnis">
-					<xsl:variable select="position()" name="number"/><!-- Variable number definieren, die nach jedem Dokument um eines erhöht wird (position) -->
-						<draw:frame draw:style-name="fr1" draw:name="Rahmen{$number}" text:anchor-type="page" text:anchor-page-number="{$number}" svg:y="21.001cm" draw:z-index="0">
-		                <draw:text-box fo:min-height="0.499cm" fo:min-width="2cm">
-		                    <table:table table:name="Tabelle3" table:style-name="Tabelle3">
-		                        <table:table-column table:style-name="Tabelle3.A"/>
-		                        <table:table-column table:style-name="Tabelle3.B"/>
-		                        <table:table-column table:style-name="Tabelle3.C"/>
-		                        <table:table-row>
-		                            <table:table-cell table:style-name="Tabelle3.A1" office:value-type="string">
-		                                <text:p text:style-name="P17">Vienna, <xsl:value-of select="ort_datum" /></text:p>
-		                            </table:table-cell>
-		                            <table:table-cell table:style-name="Tabelle3.B1" office:value-type="string">
-		                                <text:p text:style-name="P16"/>
-		                            </table:table-cell>
-		                            <table:table-cell table:style-name="Tabelle3.C1" office:value-type="string">
-		                                <text:p text:style-name="P16"/>
-		                            </table:table-cell>
-		                        </table:table-row>
-		                        <table:table-row>
-		                            <table:table-cell table:style-name="Tabelle3.A2" office:value-type="string">
-		                                <text:p text:style-name="P17">Place, Date</text:p>
-		                            </table:table-cell>
-		                            <table:table-cell table:style-name="Tabelle3.B2" office:value-type="string">
-		                                <text:p text:style-name="P16"/>
-		                            </table:table-cell>
-		                            <table:table-cell table:style-name="Tabelle3.C2" office:value-type="string">
-		                                <text:p text:style-name="P17"><xsl:value-of select="studiengangsleiter" /></text:p>
-		                                <text:p text:style-name="P17">Director of Certificate Program</text:p>
-		                            </table:table-cell>
-		                        </table:table-row>
-		                    </table:table>
-		                </draw:text-box>
-		            </draw:frame>
-		            <draw:frame xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" draw:style-name="fr3" draw:name="Bild{$number}" text:anchor-type="page" text:anchor-page-number="{$number}" svg:x="5.2cm" svg:width="3.51cm" svg:height="3.51cm" draw:z-index="1">
-		                <draw:image xlink:href="Pictures/10000201000002290000022939997AEC.png" xlink:type="simple" xlink:show="embed" xlink:actuate="onLoad"/>
-		            </draw:frame>
-				</xsl:for-each>
-			</xsl:if>
-            <text:p text:style-name="Seitenumbruch">Transcript of Records</text:p>
-            <text:p text:style-name="P6">
-            	<xsl:choose>
-					<xsl:when test="string-length(semester_bezeichnung)=0">
-						<xsl:value-of select="stsem"/>
-					</xsl:when>
-					<xsl:otherwise>
-						<xsl:value-of select="semester"/>
-						<xsl:choose>
-							<xsl:when test="semester=1">
-								<xsl:text>st</xsl:text>
-							</xsl:when>
-							<xsl:when test="semester=2">
-								<xsl:text>nd</xsl:text>
-							</xsl:when>
-							<xsl:when test="semester=3">
-								<xsl:text>rd</xsl:text>
-							</xsl:when>
-							<xsl:otherwise>
-								<xsl:text>th</xsl:text>
-							</xsl:otherwise>
-						</xsl:choose>
-						<xsl:text> Semester (</xsl:text>
-						<xsl:value-of select="stsem"/>
-						<xsl:text>)</xsl:text>
-					</xsl:otherwise>
-				</xsl:choose>
-            </text:p>
-            <text:p text:style-name="P5"/>
-            <text:p text:style-name="P5">Certificate Program for Further Education subjected to § 9 FHStG</text:p>
-            <text:p text:style-name="P6"><xsl:value-of select="studiengang_englisch"/></text:p>
-            <text:p text:style-name="P1"/>
-            <text:p text:style-name="P1"/>
-            <text:p text:style-name="P1"/>
-            <text:p text:style-name="P2">Student ID: <xsl:value-of select="matrikelnr" /></text:p>
-            <text:p text:style-name="P2">Program Code: <xsl:value-of select="studiengang_kz" /></text:p>
-            <text:p text:style-name="P2"/>
-            <text:p text:style-name="P3"/>
-            <text:p text:style-name="P3"/>
-            <text:p text:style-name="P4">First Name/Last Name:<text:tab/>
-                <text:span text:style-name="T1"><xsl:value-of select="name"/></text:span>
-            </text:p>
-            <text:p text:style-name="P27"/>
-            <text:p text:style-name="P4">Date of Birth:<text:tab/><xsl:value-of select="gebdatum" /></text:p>
-            <table:table table:name="Tabelle1" table:style-name="Tabelle1">
-                <table:table-column table:style-name="Tabelle1.A"/>
-                <table:table-column table:style-name="Tabelle1.B" table:number-columns-repeated="2"/>
-                <table:table-column table:style-name="Tabelle1.D"/>
-                <table:table-row table:style-name="Tabelle1.1">
-                    <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
-                        <text:p text:style-name="P14">Course</text:p>
-                    </table:table-cell>
-                    <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
-                        <text:p text:style-name="P15">SP/W<text:span text:style-name="T4">1</text:span></text:p>
-                    </table:table-cell>
-                    <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
-                        <text:p text:style-name="P15">ECTS</text:p>
-                    </table:table-cell>
-                    <table:table-cell table:style-name="Tabelle1.D1" office:value-type="string">
-                        <text:p text:style-name="P15">Grade<text:span text:style-name="T4">2</text:span></text:p>
-                    </table:table-cell>
-                </table:table-row>
-                <xsl:apply-templates select="unterrichtsfach"/>
-                <table:table-row>
-                    <table:table-cell table:style-name="Tabelle1.A7" office:value-type="string">
-                        <text:p text:style-name="P10">Total</text:p>
-                    </table:table-cell>
-                    <table:table-cell table:style-name="Tabelle1.B7" office:value-type="string">
-                        <text:p text:style-name="P13">-</text:p>
-                    </table:table-cell>
-                    <table:table-cell table:style-name="Tabelle1.C7" office:value-type="string">
-                        <text:p text:style-name="P13"><xsl:value-of select="ects_gesamt"/></text:p>
-                    </table:table-cell>
-                    <table:table-cell table:style-name="Tabelle1.D7" office:value-type="string">
-                        <text:p text:style-name="P9">-</text:p>
-                    </table:table-cell>
-                </table:table-row>            
-                <xsl:apply-templates select="fussnote"/> 
-            </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">
-                <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"/>
-            <xsl:if test="abschlusspruefung_typ">
-	            <table:table table:name="Tabelle2" table:style-name="Tabelle2">
-	                <table:table-column table:style-name="Tabelle2.A"/>
-	                <table:table-column table:style-name="Tabelle2.B"/>
-	                <table:table-row table:style-name="Tabelle2.1">
-	                    <table:table-cell table:style-name="Tabelle2.A1" table:number-columns-spanned="2" office:value-type="string">
-	                        <text:p text:style-name="P18">Final Examination</text:p>
-	                    </table:table-cell>
-	                    <table:covered-table-cell/>
-	                </table:table-row>
-	                <table:table-row table:style-name="Tabelle2.1">
-	                    <table:table-cell table:style-name="Tabelle2.A2" office:value-type="string">
-	                        <xsl:if test="abschlusspruefung_typ='Bachelor'" >
-								<text:p text:style-name="P8">Bachelor's Examination on <xsl:value-of select="abschlusspruefung_datum" /></text:p>
-							</xsl:if>
-							<xsl:if test="abschlusspruefung_typ='Diplom'" >
-								<text:p text:style-name="P8">Master's Examination on <xsl:value-of select="abschlusspruefung_datum" /></text:p>
-							</xsl:if>
-							
-	                    </table:table-cell>
-	                    <table:table-cell table:style-name="Tabelle2.B2" office:value-type="string">
-	                        <text:p text:style-name="P8"><xsl:value-of select="abschlusspruefung_note_english" /></text:p>
-	                    </table:table-cell>
-	                </table:table-row>
-	            </table:table>
-	            <text:p text:style-name="P26"/>
-	            <text:p text:style-name="P23">Grades:<text:tab/>Passed with distinction, Passed with merit, Passed</text:p>
-	            <text:p text:style-name="P19"/>
-            </xsl:if>
-        </office:text>
-</xsl:template>
-<xsl:template match="unterrichtsfach">
-<table:table-row>
-    <table:table-cell table:style-name="Tabelle1.A7" office:value-type="string">
-    	<xsl:choose>
-			<xsl:when test="bisio_von">
-                        <text:p text:style-name="P12">International Semester Abroad: <xsl:value-of select="bisio_von"/>-<xsl:value-of select="bisio_bis"/>, at <xsl:value-of select="bisio_ort"/>, <xsl:value-of select="bisio_universitaet"/></text:p>
-                        <text:p text:style-name="P12">All credits earned during the International Semester Abroad (ISA) are fully credited for the 
-                        <xsl:value-of select="../semester"/>
-							<xsl:choose>
-								<xsl:when test="../semester=1">
-									<xsl:text>st</xsl:text>
-								</xsl:when>
-								<xsl:when test="../semester=2">
-									<xsl:text>nd</xsl:text>
-								</xsl:when>
-								<xsl:when test="../semester=3">
-									<xsl:text>rd</xsl:text>
-								</xsl:when>
-								<xsl:otherwise>
-									<xsl:text>th</xsl:text>
-								</xsl:otherwise>
-							</xsl:choose>
-                        semester at the UAS Technikum Wien. (see Transcript of Records)</text:p>
-			</xsl:when>
-			<xsl:otherwise>
-			<text:p text:style-name="P10">
-				<xsl:choose>
-					<xsl:when test="string-length(bezeichnung_englisch)!=0">
-						<xsl:value-of select="bezeichnung_englisch"/>
-					</xsl:when>
-					<xsl:otherwise>
-						<xsl:text>[ACHTUNG: Keine englische Bezeichung für "</xsl:text><xsl:value-of select="bezeichnung"/><xsl:text>" in der Datenbank!]</xsl:text>
-					</xsl:otherwise>
-				</xsl:choose>
-			</text:p>
-			</xsl:otherwise>
-		</xsl:choose>
-    </table:table-cell>
-    <table:table-cell table:style-name="Tabelle1.B2" office:value-type="string">
-        <text:p text:style-name="P9">
-        <xsl:if test="sws=''">
-			<xsl:text>-</xsl:text>
-		</xsl:if>
-		<xsl:value-of select="sws"/>
-        </text:p>
-    </table:table-cell>
-    <table:table-cell table:style-name="Tabelle1.C2" office:value-type="string">
-        <text:p text:style-name="P9">
-	        <xsl:if test="ects=''">
-				<xsl:text>-</xsl:text>
-			</xsl:if>
-			<xsl:value-of select="ects"/>
-		</text:p>
-    </table:table-cell>
-    <table:table-cell table:style-name="Tabelle1.D2" office:value-type="string">
-        <text:p text:style-name="P9">
-	        <xsl:if test="note=''">
-				<xsl:text>-</xsl:text>
-			</xsl:if>
-			<xsl:value-of select="note"/>
-		</text:p>
-    </table:table-cell>
-</table:table-row>
-</xsl:template>
-<xsl:template match="fussnote">
-<table:table-row>
-    <table:table-cell table:style-name="Tabelle1.A8" office:value-type="string">
-    	<xsl:choose>
-			<xsl:when test="themenbereich!=''">
-		        <text:p text:style-name="P10"><xsl:value-of select="fussnotenzeichen"/>
-			        <xsl:text> </xsl:text>
-			        <text:span text:style-name="T1">
-			        	<xsl:choose>
-							<xsl:when test="themenbereich!=''">
-								<xsl:text>Subject Area:</xsl:text>
-							</xsl:when>
-							<xsl:otherwise>
-								<xsl:text></xsl:text>
-							</xsl:otherwise>
-						</xsl:choose>
-			        </text:span>
-			        <xsl:text> </xsl:text><xsl:value-of select="themenbereich"/>
-		        </text:p>
-		        <text:p text:style-name="P10">
-		       <xsl:text> </xsl:text>
-		       <text:span text:style-name="T1">
-			     <xsl:choose>
-					<xsl:when test="titel_kurzbz='Bachelor'">
-						<xsl:text>Bachelor's Thesis:</xsl:text>
-					</xsl:when>
-					<xsl:when test="titel_kurzbz='Diplom'">
-						<xsl:text>Master's Thesis:</xsl:text>
-					</xsl:when>
-					<xsl:otherwise>
-						<xsl:text></xsl:text>
-					</xsl:otherwise>
-				</xsl:choose>
-		       </text:span>
-		       <xsl:text> </xsl:text>
-		       <xsl:choose>
-					<xsl:when test="string-length(titel_en)!=0">
-						<xsl:value-of select="titel_en"/>
-					</xsl:when>
-					<xsl:otherwise>
-						<xsl:value-of select="titel"/>
-					</xsl:otherwise>
-				</xsl:choose>
-		       </text:p>
-        	</xsl:when>
-        	<xsl:otherwise>
-        		<text:p text:style-name="P10"><xsl:value-of select="fussnotenzeichen"/>
-				<xsl:text> </xsl:text>
-				<text:span text:style-name="T1">
-			     <xsl:choose>
-					<xsl:when test="titel_kurzbz='Bachelor'">
-						<xsl:text>Bachelor's Thesis:</xsl:text>
-					</xsl:when>
-					<xsl:when test="titel_kurzbz='Diplom'">
-						<xsl:text>Master's Thesis:</xsl:text>
-					</xsl:when>
-					<xsl:otherwise>
-						<xsl:text></xsl:text>
-					</xsl:otherwise>
-				</xsl:choose>
-		       </text:span>
-		       <xsl:text> </xsl:text>
-		       <xsl:choose>
-					<xsl:when test="string-length(titel_en)!=0">
-						<xsl:value-of select="titel_en"/>
-					</xsl:when>
-					<xsl:otherwise>
-						<xsl:value-of select="titel"/>
-					</xsl:otherwise>
-				</xsl:choose>
-				</text:p>
-        	</xsl:otherwise>
-		</xsl:choose>
-    </table:table-cell>
-    <table:table-cell table:style-name="Tabelle1.B8" office:value-type="string">
-        <text:p text:style-name="P13">
-        	<xsl:value-of select="sws"/>
-		</text:p>
-    </table:table-cell>
-    <table:table-cell table:style-name="Tabelle1.C8" office:value-type="string">
-        <text:p text:style-name="P13">
-        	<xsl:value-of select="ects"/>
-        </text:p>
-    </table:table-cell>
-    <table:table-cell table:style-name="Tabelle1.D8" office:value-type="string">
-        <text:p text:style-name="P13">
-        	<xsl:if test="../projektarbeit_note_anzeige='true'">
-				<xsl:value-of select="note"/>
-			</xsl:if>
-        </text:p>
-    </table:table-cell>
-</table:table-row>
-</xsl:template>
-</xsl:stylesheet>

system/xsl/ZeugnisEng_0.xsl

@@ -488,9 +488,9 @@ 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), 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">² Grades:<text:tab/>excellent (1), good (2), satisfactory (3), sufficient (4), Credit based on previous experience/work (ar), Participated with success (met), passed (b),</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:tab/>successfully completed (ea), participated (tg)</text:p>
 		<text:p text:style-name="P7"/>
 		<xsl:if test="abschlusspruefung_typ">
 			<table:table table:name="Tabelle2" table:style-name="Tabelle2">
@@ -530,68 +530,70 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
 	</office:text>
 </xsl:template>
 <xsl:template match="unterrichtsfach">
-<table:table-row>
-	<table:table-cell table:style-name="Tabelle1.A7" office:value-type="string">
-		<xsl:choose>
-		<xsl:when test="bisio_von">
-			<text:p text:style-name="P12">International Semester Abroad: <xsl:value-of select="bisio_von"/>-<xsl:value-of select="bisio_bis"/>, at <xsl:value-of select="bisio_ort"/>, <xsl:value-of select="bisio_universitaet"/></text:p>
-			<text:p text:style-name="P12">All credits earned during the International Semester Abroad (ISA) are fully credited for the 
-			<xsl:value-of select="../semester"/>
-			<xsl:choose>
-				<xsl:when test="../semester=1">
-					<xsl:text>st</xsl:text>
-				</xsl:when>
-				<xsl:when test="../semester=2">
-					<xsl:text>nd</xsl:text>
-				</xsl:when>
-				<xsl:when test="../semester=3">
-					<xsl:text>rd</xsl:text>
-				</xsl:when>
-				<xsl:otherwise>
-					<xsl:text>th</xsl:text>
-				</xsl:otherwise>
-			</xsl:choose>
-			semester at the UAS Technikum Wien. (see Transcript of Records)</text:p>
-		</xsl:when>
-		<xsl:otherwise>
-		<text:p text:style-name="P10">
-			<xsl:choose>
-				<xsl:when test="string-length(bezeichnung_englisch)!=0">
-					<xsl:value-of select="bezeichnung_englisch"/>
-				</xsl:when>
-				<xsl:otherwise>
-					<xsl:text>[ACHTUNG: Keine englische Bezeichung für "</xsl:text><xsl:value-of select="bezeichnung"/><xsl:text>" in der Datenbank!]</xsl:text>
-				</xsl:otherwise>
-			</xsl:choose>
-		</text:p>
-		</xsl:otherwise>
-	</xsl:choose>
-	</table:table-cell>
-	<table:table-cell table:style-name="Tabelle1.B2" office:value-type="string">
-		<text:p text:style-name="P9">
-			<xsl:if test="sws_lv=''">
-				<xsl:text>-</xsl:text>
-			</xsl:if>
-			<xsl:value-of select="sws_lv"/>
-		</text:p>
-	</table:table-cell>
-	<table:table-cell table:style-name="Tabelle1.C2" office:value-type="string">
-		<text:p text:style-name="P9">
-		<xsl:if test="ects=''">
-			<xsl:text>-</xsl:text>
-		</xsl:if>
-		<xsl:value-of select="ects"/>
-	</text:p>
-	</table:table-cell>
-	<table:table-cell table:style-name="Tabelle1.D2" office:value-type="string">
-		<text:p text:style-name="P9">
-		<xsl:if test="note=''">
-			<xsl:text>-</xsl:text>
-		</xsl:if>
-		<xsl:value-of select="note"/>
-	</text:p>
-	</table:table-cell>
-</table:table-row>
+<xsl:if test="note_positiv='1'">
+    <table:table-row>
+        <table:table-cell table:style-name="Tabelle1.A7" office:value-type="string">
+            <xsl:choose>
+            <xsl:when test="bisio_von">
+                <text:p text:style-name="P12">International Semester Abroad: <xsl:value-of select="bisio_von"/>-<xsl:value-of select="bisio_bis"/>, at <xsl:value-of select="bisio_ort"/>, <xsl:value-of select="bisio_universitaet"/></text:p>
+                <text:p text:style-name="P12">All credits earned during the International Semester Abroad (ISA) are fully credited for the
+                <xsl:value-of select="../semester"/>
+                <xsl:choose>
+                    <xsl:when test="../semester=1">
+                        <xsl:text>st</xsl:text>
+                    </xsl:when>
+                    <xsl:when test="../semester=2">
+                        <xsl:text>nd</xsl:text>
+                    </xsl:when>
+                    <xsl:when test="../semester=3">
+                        <xsl:text>rd</xsl:text>
+                    </xsl:when>
+                    <xsl:otherwise>
+                        <xsl:text>th</xsl:text>
+                    </xsl:otherwise>
+                </xsl:choose>
+                semester at the UAS Technikum Wien. (see Transcript of Records)</text:p>
+            </xsl:when>
+            <xsl:otherwise>
+            <text:p text:style-name="P10">
+                <xsl:choose>
+                    <xsl:when test="string-length(bezeichnung_englisch)!=0">
+                        <xsl:value-of select="bezeichnung_englisch"/>
+                    </xsl:when>
+                    <xsl:otherwise>
+                        <xsl:text>[ACHTUNG: Keine englische Bezeichung für "</xsl:text><xsl:value-of select="bezeichnung"/><xsl:text>" in der Datenbank!]</xsl:text>
+                    </xsl:otherwise>
+                </xsl:choose>
+            </text:p>
+            </xsl:otherwise>
+        </xsl:choose>
+        </table:table-cell>
+        <table:table-cell table:style-name="Tabelle1.B2" office:value-type="string">
+            <text:p text:style-name="P9">
+                <xsl:if test="sws_lv=''">
+                    <xsl:text>-</xsl:text>
+                </xsl:if>
+                <xsl:value-of select="sws_lv"/>
+            </text:p>
+        </table:table-cell>
+        <table:table-cell table:style-name="Tabelle1.C2" office:value-type="string">
+            <text:p text:style-name="P9">
+            <xsl:if test="ects=''">
+                <xsl:text>-</xsl:text>
+            </xsl:if>
+            <xsl:value-of select="ects"/>
+        </text:p>
+        </table:table-cell>
+        <table:table-cell table:style-name="Tabelle1.D2" office:value-type="string">
+            <text:p text:style-name="P9">
+            <xsl:if test="note=''">
+                <xsl:text>-</xsl:text>
+            </xsl:if>
+            <xsl:value-of select="note"/>
+        </text:p>
+        </table:table-cell>
+    </table:table-row>
+</xsl:if>
 </xsl:template>
 <xsl:template match="fussnote">
 <table:table-row>

system/xsl/ZeugnisEng_Lehrgaenge.xsl

@@ -476,9 +476,9 @@ 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), 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">² Grades:<text:tab/>excellent (1), good (2), satisfactory (3), sufficient (4), Credit based on previous experience/work (ar), Participated with success (met), passed (b),</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:tab/>successfully completed (ea), participated (tg)</text:p>
             <text:p text:style-name="P7"/>
             <xsl:if test="abschlusspruefung_typ and abschlusspruefung_typ!='lgabschluss'">
 	            <table:table table:name="Tabelle2" table:style-name="Tabelle2">
@@ -519,68 +519,70 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
         </office:text>
 </xsl:template>
 <xsl:template match="unterrichtsfach">
-<table:table-row>
-    <table:table-cell table:style-name="Tabelle1.A7" office:value-type="string">
-    	<xsl:choose>
-			<xsl:when test="bisio_von">
-                        <text:p text:style-name="P12">International Semester Abroad: <xsl:value-of select="bisio_von"/>-<xsl:value-of select="bisio_bis"/>, at <xsl:value-of select="bisio_ort"/>, <xsl:value-of select="bisio_universitaet"/></text:p>
-                        <text:p text:style-name="P12">All credits earned during the International Semester Abroad (ISA) are fully credited for the
-                        <xsl:value-of select="../semester"/>
-							<xsl:choose>
-								<xsl:when test="../semester=1">
-									<xsl:text>st</xsl:text>
-								</xsl:when>
-								<xsl:when test="../semester=2">
-									<xsl:text>nd</xsl:text>
-								</xsl:when>
-								<xsl:when test="../semester=3">
-									<xsl:text>rd</xsl:text>
-								</xsl:when>
-								<xsl:otherwise>
-									<xsl:text>th</xsl:text>
-								</xsl:otherwise>
-							</xsl:choose>
-                        semester at the UAS Technikum Wien. (see Transcript of Records)</text:p>
-			</xsl:when>
-			<xsl:otherwise>
-			<text:p text:style-name="P10">
-				<xsl:choose>
-					<xsl:when test="string-length(bezeichnung_englisch)!=0">
-						<xsl:value-of select="bezeichnung_englisch"/>
-					</xsl:when>
-					<xsl:otherwise>
-						<xsl:text>[ACHTUNG: Keine englische Bezeichung für "</xsl:text><xsl:value-of select="bezeichnung"/><xsl:text>" in der Datenbank!]</xsl:text>
-					</xsl:otherwise>
-				</xsl:choose>
-			</text:p>
-			</xsl:otherwise>
-		</xsl:choose>
-    </table:table-cell>
-    <table:table-cell table:style-name="Tabelle1.B2" office:value-type="string">
-        <text:p text:style-name="P9">
-        <xsl:if test="sws_lv=''">
-			<xsl:text>-</xsl:text>
-		</xsl:if>
-		<xsl:value-of select="sws_lv"/>
-        </text:p>
-    </table:table-cell>
-    <table:table-cell table:style-name="Tabelle1.C2" office:value-type="string">
-        <text:p text:style-name="P9">
-	        <xsl:if test="ects=''">
-				<xsl:text>-</xsl:text>
-			</xsl:if>
-			<xsl:value-of select="ects"/>
-		</text:p>
-    </table:table-cell>
-    <table:table-cell table:style-name="Tabelle1.D2" office:value-type="string">
-        <text:p text:style-name="P9">
-	        <xsl:if test="note=''">
-				<xsl:text>-</xsl:text>
-			</xsl:if>
-			<xsl:value-of select="note"/>
-		</text:p>
-    </table:table-cell>
-</table:table-row>
+<xsl:if test="note_positiv='1'">
+    <table:table-row>
+        <table:table-cell table:style-name="Tabelle1.A7" office:value-type="string">
+            <xsl:choose>
+                <xsl:when test="bisio_von">
+                            <text:p text:style-name="P12">International Semester Abroad: <xsl:value-of select="bisio_von"/>-<xsl:value-of select="bisio_bis"/>, at <xsl:value-of select="bisio_ort"/>, <xsl:value-of select="bisio_universitaet"/></text:p>
+                            <text:p text:style-name="P12">All credits earned during the International Semester Abroad (ISA) are fully credited for the
+                            <xsl:value-of select="../semester"/>
+                                <xsl:choose>
+                                    <xsl:when test="../semester=1">
+                                        <xsl:text>st</xsl:text>
+                                    </xsl:when>
+                                    <xsl:when test="../semester=2">
+                                        <xsl:text>nd</xsl:text>
+                                    </xsl:when>
+                                    <xsl:when test="../semester=3">
+                                        <xsl:text>rd</xsl:text>
+                                    </xsl:when>
+                                    <xsl:otherwise>
+                                        <xsl:text>th</xsl:text>
+                                    </xsl:otherwise>
+                                </xsl:choose>
+                            semester at the UAS Technikum Wien. (see Transcript of Records)</text:p>
+                </xsl:when>
+                <xsl:otherwise>
+                <text:p text:style-name="P10">
+                    <xsl:choose>
+                        <xsl:when test="string-length(bezeichnung_englisch)!=0">
+                            <xsl:value-of select="bezeichnung_englisch"/>
+                        </xsl:when>
+                        <xsl:otherwise>
+                            <xsl:text>[ACHTUNG: Keine englische Bezeichung für "</xsl:text><xsl:value-of select="bezeichnung"/><xsl:text>" in der Datenbank!]</xsl:text>
+                        </xsl:otherwise>
+                    </xsl:choose>
+                </text:p>
+                </xsl:otherwise>
+            </xsl:choose>
+        </table:table-cell>
+        <table:table-cell table:style-name="Tabelle1.B2" office:value-type="string">
+            <text:p text:style-name="P9">
+            <xsl:if test="sws_lv=''">
+                <xsl:text>-</xsl:text>
+            </xsl:if>
+            <xsl:value-of select="sws_lv"/>
+            </text:p>
+        </table:table-cell>
+        <table:table-cell table:style-name="Tabelle1.C2" office:value-type="string">
+            <text:p text:style-name="P9">
+                <xsl:if test="ects=''">
+                    <xsl:text>-</xsl:text>
+                </xsl:if>
+                <xsl:value-of select="ects"/>
+            </text:p>
+        </table:table-cell>
+        <table:table-cell table:style-name="Tabelle1.D2" office:value-type="string">
+            <text:p text:style-name="P9">
+                <xsl:if test="note=''">
+                    <xsl:text>-</xsl:text>
+                </xsl:if>
+                <xsl:value-of select="note"/>
+            </text:p>
+        </table:table-cell>
+    </table:table-row>
+</xsl:if>
 </xsl:template>
 <xsl:template match="fussnote">
 <table:table-row>

system/xsl/ZeugnisNeu_0.xsl

@@ -1,562 +0,0 @@
-<?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="zeugnisse">
-
-<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="Mangal2" svg:font-family="Mangal"/>
-        <style:font-face style:name="Mangal" svg:font-family="Mangal" style:font-family-generic="roman"/>
-        <style:font-face style:name="Liberation Serif" svg:font-family="&apos;Liberation Serif&apos;" style:font-family-generic="roman" style:font-pitch="variable"/>
-        <style:font-face style:name="Arial" svg:font-family="Arial" style:font-adornments="Standard" style:font-family-generic="swiss" 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="Liberation Sans1" svg:font-family="&apos;Liberation Sans&apos;" style:font-family-generic="system" style:font-pitch="variable"/>
-        <style:font-face style:name="Mangal1" 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="SimSun" svg:font-family="SimSun" style:font-family-generic="system" style:font-pitch="variable"/>
-        <style:font-face style:name="Tahoma" svg:font-family="Tahoma" 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.401cm" fo:margin-top="0.199cm" fo:margin-bottom="0cm" table:align="margins"/>
-        </style:style>
-        <style:style style:name="Tabelle1.A" style:family="table-column">
-            <style:table-column-properties style:column-width="10.437cm" style:rel-column-width="41702*"/>
-        </style:style>
-        <style:style style:name="Tabelle1.B" style:family="table-column">
-            <style:table-column-properties style:column-width="1.988cm" style:rel-column-width="7944*"/>
-        </style:style>
-        <style:style style:name="Tabelle1.D" style:family="table-column">
-            <style:table-column-properties style:column-width="1.988cm" style:rel-column-width="7945*"/>
-        </style:style>
-        <style:style style:name="Tabelle1.1" style:family="table-row">
-            <style:table-row-properties style:min-row-height="0.75cm"/>
-        </style:style>
-        <style:style style:name="Tabelle1.A1" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:background-color="#999999" fo:padding-left="0.101cm" fo:padding-right="0.101cm" fo:padding-top="0.079cm" fo:padding-bottom="0.079cm" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="0.05pt solid #000000" fo:border-bottom="0.05pt solid #000000">
-                <style:background-image/>
-            </style:table-cell-properties>
-        </style:style>
-        <style:style style:name="Tabelle1.D1" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:background-color="#999999" fo:padding-left="0.101cm" fo:padding-right="0.101cm" fo:padding-top="0.079cm" fo:padding-bottom="0.079cm" fo:border="0.05pt solid #000000">
-                <style:background-image/>
-            </style:table-cell-properties>
-        </style:style>
-        <style:style style:name="Tabelle1.A2" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:padding-left="0.101cm" fo:padding-right="0.101cm" fo:padding-top="0.07cm" fo:padding-bottom="0.07cm" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-        </style:style>
-        <style:style style:name="Tabelle1.B2" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:padding-left="0.101cm" fo:padding-right="0.101cm" fo:padding-top="0.07cm" fo:padding-bottom="0.07cm" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-        </style:style>
-        <style:style style:name="Tabelle1.C2" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:padding-left="0.101cm" fo:padding-right="0.101cm" fo:padding-top="0.07cm" fo:padding-bottom="0.07cm" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-        </style:style>
-        <style:style style:name="Tabelle1.D2" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:padding-left="0.101cm" fo:padding-right="0.101cm" fo:padding-top="0.07cm" fo:padding-bottom="0.07cm" fo:border-left="0.05pt solid #000000" fo:border-right="0.05pt solid #000000" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-        </style:style>
-        <style:style style:name="Tabelle1.A3" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:padding-left="0.101cm" fo:padding-right="0.101cm" fo:padding-top="0.07cm" fo:padding-bottom="0.07cm" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-        </style:style>
-        <style:style style:name="Tabelle1.B3" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:padding-left="0.101cm" fo:padding-right="0.101cm" fo:padding-top="0.07cm" fo:padding-bottom="0.07cm" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-        </style:style>
-        <style:style style:name="Tabelle1.C3" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:padding-left="0.101cm" fo:padding-right="0.101cm" fo:padding-top="0.07cm" fo:padding-bottom="0.07cm" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-        </style:style>
-        <style:style style:name="Tabelle1.D3" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:padding-left="0.101cm" fo:padding-right="0.101cm" fo:padding-top="0.07cm" fo:padding-bottom="0.07cm" fo:border-left="0.05pt solid #000000" fo:border-right="0.05pt solid #000000" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-        </style:style>
-        <style:style style:name="Tabelle1.A4" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:padding-left="0.101cm" fo:padding-right="0.101cm" fo:padding-top="0.07cm" fo:padding-bottom="0.07cm" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-        </style:style>
-        <style:style style:name="Tabelle1.B4" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:padding-left="0.101cm" fo:padding-right="0.101cm" fo:padding-top="0.07cm" fo:padding-bottom="0.07cm" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-        </style:style>
-        <style:style style:name="Tabelle1.C4" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:padding-left="0.101cm" fo:padding-right="0.101cm" fo:padding-top="0.07cm" fo:padding-bottom="0.07cm" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-        </style:style>
-        <style:style style:name="Tabelle1.D4" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:padding-left="0.101cm" fo:padding-right="0.101cm" fo:padding-top="0.07cm" fo:padding-bottom="0.07cm" fo:border-left="0.05pt solid #000000" fo:border-right="0.05pt solid #000000" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-        </style:style>
-        <style:style style:name="Tabelle1.A5" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:padding-left="0.101cm" fo:padding-right="0.101cm" fo:padding-top="0.07cm" fo:padding-bottom="0.07cm" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-        </style:style>
-        <style:style style:name="Tabelle1.B5" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:padding-left="0.101cm" fo:padding-right="0.101cm" fo:padding-top="0.07cm" fo:padding-bottom="0.07cm" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-        </style:style>
-        <style:style style:name="Tabelle1.C5" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:padding-left="0.101cm" fo:padding-right="0.101cm" fo:padding-top="0.07cm" fo:padding-bottom="0.07cm" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-        </style:style>
-        <style:style style:name="Tabelle1.D5" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:padding-left="0.101cm" fo:padding-right="0.101cm" fo:padding-top="0.07cm" fo:padding-bottom="0.07cm" fo:border-left="0.05pt solid #000000" fo:border-right="0.05pt solid #000000" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-        </style:style>
-        <style:style style:name="Tabelle1.A6" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:padding-left="0.101cm" fo:padding-right="0.101cm" fo:padding-top="0.07cm" fo:padding-bottom="0.07cm" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-        </style:style>
-        <style:style style:name="Tabelle1.B6" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:padding-left="0.101cm" fo:padding-right="0.101cm" fo:padding-top="0.07cm" fo:padding-bottom="0.07cm" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-        </style:style>
-        <style:style style:name="Tabelle1.C6" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:padding-left="0.101cm" fo:padding-right="0.101cm" fo:padding-top="0.07cm" fo:padding-bottom="0.07cm" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-        </style:style>
-        <style:style style:name="Tabelle1.D6" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:padding-left="0.101cm" fo:padding-right="0.101cm" fo:padding-top="0.07cm" fo:padding-bottom="0.07cm" fo:border-left="0.05pt solid #000000" fo:border-right="0.05pt solid #000000" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-        </style:style>
-        <style:style style:name="Tabelle1.A7" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:padding-left="0.101cm" fo:padding-right="0.101cm" fo:padding-top="0.07cm" fo:padding-bottom="0.07cm" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-        </style:style>
-        <style:style style:name="Tabelle1.B7" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:padding-left="0.101cm" fo:padding-right="0.101cm" fo:padding-top="0.07cm" fo:padding-bottom="0.07cm" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-        </style:style>
-        <style:style style:name="Tabelle1.C7" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:padding-left="0.101cm" fo:padding-right="0.101cm" fo:padding-top="0.079cm" fo:padding-bottom="0.079cm" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-        </style:style>
-        <style:style style:name="Tabelle1.D7" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:padding-left="0.101cm" fo:padding-right="0.101cm" fo:padding-top="0.079cm" fo:padding-bottom="0.079cm" fo:border-left="0.05pt solid #000000" fo:border-right="0.05pt solid #000000" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-        </style:style>
-        <style:style style:name="Tabelle1.A8" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:padding-left="0.101cm" fo:padding-right="0.101cm" fo:padding-top="0.079cm" fo:padding-bottom="0.079cm" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-        </style:style>
-        <style:style style:name="Tabelle1.B8" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:padding-left="0.101cm" fo:padding-right="0.101cm" fo:padding-top="0.079cm" fo:padding-bottom="0.079cm" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-        </style:style>
-        <style:style style:name="Tabelle1.C8" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:padding-left="0.101cm" fo:padding-right="0.101cm" fo:padding-top="0.079cm" fo:padding-bottom="0.079cm" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-        </style:style>
-        <style:style style:name="Tabelle1.D8" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:padding-left="0.101cm" fo:padding-right="0.101cm" fo:padding-top="0.079cm" fo:padding-bottom="0.079cm" fo:border-left="0.05pt solid #000000" fo:border-right="0.05pt solid #000000" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-        </style:style>
-        <style:style style:name="Tabelle2" style:family="table">
-            <style:table-properties style:width="16.401cm" table:align="margins"/>
-        </style:style>
-        <style:style style:name="Tabelle2.A" style:family="table-column">
-            <style:table-column-properties style:column-width="10.437cm" style:rel-column-width="41702*"/>
-        </style:style>
-        <style:style style:name="Tabelle2.B" style:family="table-column">
-            <style:table-column-properties style:column-width="5.964cm" style:rel-column-width="23833*"/>
-        </style:style>
-        <style:style style:name="Tabelle2.1" style:family="table-row">
-            <style:table-row-properties style:min-row-height="0.75cm"/>
-        </style:style>
-        <style:style style:name="Tabelle2.A1" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:background-color="#999999" fo:padding="0.097cm" fo:border="0.05pt solid #000000">
-                <style:background-image/>
-            </style:table-cell-properties>
-        </style:style>
-        <style:style style:name="Tabelle2.A2" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:padding="0.097cm" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-        </style:style>
-        <style:style style:name="Tabelle2.B2" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:padding="0.097cm" fo:border-left="0.05pt solid #000000" fo:border-right="0.05pt solid #000000" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-        </style:style>
-        <style:style style:name="Tabelle3" style:family="table">
-            <style:table-properties style:width="16.401cm" fo:margin-top="0cm" fo:margin-bottom="0cm" table:align="margins" style:may-break-between-rows="false"/>
-        </style:style>
-        <style:style style:name="Tabelle3.A" style:family="table-column">
-            <style:table-column-properties style:column-width="5.001cm" style:rel-column-width="19981*"/>
-        </style:style>
-        <style:style style:name="Tabelle3.B" style:family="table-column">
-            <style:table-column-properties style:column-width="3.9cm" style:rel-column-width="15583*"/>
-        </style:style>
-        <style:style style:name="Tabelle3.C" style:family="table-column">
-            <style:table-column-properties style:column-width="7.5cm" style:rel-column-width="29971*"/>
-        </style:style>
-        <style:style style:name="Tabelle3.A1" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="" fo:padding-left="0cm" fo:padding-right="0cm" fo:padding-top="0.101cm" fo:padding-bottom="0.101cm" fo:border-left="none" fo:border-right="none" fo:border-top="none" fo:border-bottom="1pt dotted #000000"/>
-        </style:style>
-        <style:style style:name="Tabelle3.B1" style:family="table-cell">
-            <style:table-cell-properties fo:padding-left="0cm" fo:padding-right="0cm" fo:padding-top="0.101cm" fo:padding-bottom="0.101cm" fo:border="none"/>
-        </style:style>
-        <style:style style:name="Tabelle3.C1" style:family="table-cell">
-            <style:table-cell-properties fo:padding-left="0cm" fo:padding-right="0cm" fo:padding-top="0.101cm" fo:padding-bottom="0.101cm" fo:border-left="none" fo:border-right="none" fo:border-top="none" fo:border-bottom="1pt dotted #000000"/>
-        </style:style>
-        <style:style style:name="Tabelle3.A2" style:family="table-cell">
-            <style:table-cell-properties fo:padding-left="0cm" fo:padding-right="0cm" fo:padding-top="0.101cm" fo:padding-bottom="0.101cm" fo:border="none"/>
-        </style:style>
-        <style:style style:name="Tabelle3.B2" style:family="table-cell">
-            <style:table-cell-properties fo:padding-left="0cm" fo:padding-right="0cm" fo:padding-top="0.101cm" fo:padding-bottom="0.101cm" fo:border="none"/>
-        </style:style>
-        <style:style style:name="Tabelle3.C2" style:family="table-cell">
-            <style:table-cell-properties fo:padding-left="0cm" fo:padding-right="0cm" fo:padding-top="0.101cm" fo:padding-bottom="0.101cm" fo:border="none"/>
-        </style:style>
-        <style:style style:name="P1" style:family="paragraph" style:parent-style-name="Standard">
-            <style:text-properties fo:font-size="9pt" officeooo:rsid="000de2a1" officeooo:paragraph-rsid="000de2a1" style:font-size-asian="9pt" style:font-size-complex="9pt"/>
-        </style:style>
-        <style:style style:name="P2" style:family="paragraph" style:parent-style-name="Standard">
-            <style:paragraph-properties fo:text-align="end" style:justify-single-word="false"/>
-            <style:text-properties fo:font-size="9pt" officeooo:rsid="000f65a0" officeooo:paragraph-rsid="000f65a0" style:font-size-asian="9pt" style:font-size-complex="9pt"/>
-        </style:style>
-        <style:style style:name="P3" style:family="paragraph" style:parent-style-name="Standard">
-            <style:text-properties fo:font-size="9pt" officeooo:rsid="000f65a0" officeooo:paragraph-rsid="000f65a0" style:font-size-asian="9pt" style:font-size-complex="9pt"/>
-        </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="4.498cm"/>
-                </style:tab-stops>
-            </style:paragraph-properties>
-            <style:text-properties fo:font-size="9pt" officeooo:rsid="000f65a0" officeooo:paragraph-rsid="000f65a0" 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:text-properties fo:font-size="16pt" officeooo:rsid="000de2a1" officeooo:paragraph-rsid="000de2a1" style:font-size-asian="16pt" style:font-size-complex="16pt"/>
-        </style:style>
-        <style:style style:name="P6" style:family="paragraph" style:parent-style-name="Standard">
-            <style:text-properties fo:font-size="16pt" fo:font-weight="bold" officeooo:rsid="000de2a1" officeooo:paragraph-rsid="000de2a1" style:font-size-asian="16pt" style:font-weight-asian="bold" style:font-size-complex="16pt" style:font-weight-complex="bold"/>
-        </style:style>
-        <style:style style:name="P7" style:family="paragraph" style:parent-style-name="Standard">
-            <style:text-properties fo:font-size="6pt" officeooo:rsid="000f65a0" officeooo:paragraph-rsid="000f65a0" style:font-size-asian="5.25pt" style:font-size-complex="6pt"/>
-        </style:style>
-        <style:style style:name="P8" style:family="paragraph" style:parent-style-name="Table_20_Contents">
-            <style:text-properties fo:font-size="9pt" officeooo:rsid="000f65a0" officeooo:paragraph-rsid="000f65a0" style:font-size-asian="9pt" style:font-size-complex="9pt"/>
-        </style:style>
-        <style:style style:name="P9" style:family="paragraph" style:parent-style-name="Table_20_Contents">
-            <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
-            <style:text-properties fo:font-size="9pt" officeooo:rsid="000f65a0" officeooo:paragraph-rsid="000f65a0" style:font-size-asian="9pt" style:font-size-complex="9pt"/>
-        </style:style>
-        <style:style style:name="P10" style:family="paragraph" style:parent-style-name="Table_20_Contents">
-            <style:paragraph-properties fo:text-align="start" style:justify-single-word="false"/>
-            <style:text-properties fo:font-size="9pt" officeooo:rsid="000f65a0" officeooo:paragraph-rsid="000f65a0" style:font-size-asian="9pt" style:font-size-complex="9pt"/>
-        </style:style>
-        <style:style style:name="P11" style:family="paragraph" style:parent-style-name="Table_20_Contents">
-            <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
-            <style:text-properties fo:font-size="9pt" officeooo:rsid="0010009a" officeooo:paragraph-rsid="0010009a" style:font-size-asian="9pt" style:font-size-complex="9pt"/>
-        </style:style>
-        <style:style style:name="P12" style:family="paragraph" style:parent-style-name="Table_20_Contents">
-            <style:paragraph-properties fo:text-align="start" style:justify-single-word="false"/>
-            <style:text-properties fo:font-size="9pt" officeooo:rsid="0010009a" officeooo:paragraph-rsid="0010009a" style:font-size-asian="9pt" style:font-size-complex="9pt"/>
-        </style:style>
-        <style:style style:name="P13" style:family="paragraph" style:parent-style-name="Table_20_Contents">
-            <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
-            <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="Table_20_Contents">
-            <style:paragraph-properties fo:text-align="start" style:justify-single-word="false"/>
-            <style:text-properties fo:font-size="9pt" fo:font-weight="bold" officeooo:rsid="000f65a0" officeooo:paragraph-rsid="000f65a0" style:font-size-asian="9pt" style:font-weight-asian="bold" style:font-size-complex="9pt" style:font-weight-complex="bold"/>
-        </style:style>
-        <style:style style:name="P15" style:family="paragraph" style:parent-style-name="Table_20_Contents">
-            <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
-            <style:text-properties fo:font-size="9pt" fo:font-weight="bold" officeooo:rsid="000f65a0" officeooo:paragraph-rsid="000f65a0" style:font-size-asian="9pt" style:font-weight-asian="bold" style:font-size-complex="9pt" style:font-weight-complex="bold"/>
-        </style:style>
-        <style:style style:name="P16" style:family="paragraph" style:parent-style-name="Table_20_Contents">
-            <style:text-properties fo:font-size="9pt" style:font-size-complex="9pt"/>
-        </style:style>
-        <style:style style:name="P17" style:family="paragraph" style:parent-style-name="Table_20_Contents">
-            <style:text-properties fo:font-size="9pt" officeooo:rsid="0013c612" officeooo:paragraph-rsid="0013c612" style:font-size-complex="9pt"/>
-        </style:style>
-        <style:style style:name="P18" style:family="paragraph" style:parent-style-name="Table_20_Contents">
-            <style:paragraph-properties fo:background-color="#999999">
-                <style:background-image/>
-            </style:paragraph-properties>
-            <style:text-properties fo:font-size="9pt" fo:font-weight="bold" officeooo:rsid="000f65a0" officeooo:paragraph-rsid="000f65a0" style:font-size-asian="9pt" style:font-weight-asian="bold" style:font-size-complex="9pt" style:font-weight-complex="bold"/>
-        </style:style>
-        <style:style style:name="P19" style:family="paragraph" style:parent-style-name="Standard">
-            <style:text-properties fo:font-size="9pt" officeooo:rsid="0013c612" officeooo:paragraph-rsid="0010009a" style:font-size-asian="7.84999990463257pt" style:font-size-complex="9pt"/>
-        </style:style>
-        <style:style style:name="P20" style:family="paragraph" style:parent-style-name="Standard">
-            <style:text-properties fo:font-size="9pt" officeooo:rsid="000de2a1" officeooo:paragraph-rsid="000de2a1" style:font-size-asian="9pt" style:font-size-complex="9pt"/>
-        </style:style>
-        <style:style style:name="P21" style:family="paragraph" style:parent-style-name="Standard">
-            <style:text-properties fo:font-size="9pt" officeooo:rsid="000f65a0" officeooo:paragraph-rsid="000f65a0" style:font-size-asian="9pt" style:font-size-complex="9pt"/>
-        </style:style>
-        <style:style style:name="P22" style:family="paragraph" style:parent-style-name="Standard">
-            <style:paragraph-properties>
-                <style:tab-stops>
-                    <style:tab-stop style:position="1.499cm"/>
-                </style:tab-stops>
-            </style:paragraph-properties>
-            <style:text-properties fo:font-size="6pt" officeooo:rsid="000f65a0" officeooo:paragraph-rsid="0024d69b" style:font-size-asian="6pt" style:font-size-complex="6pt"/>
-        </style:style>
-        <style:style style:name="P23" style:family="paragraph" style:parent-style-name="Standard">
-            <style:paragraph-properties>
-                <style:tab-stops>
-                    <style:tab-stop style:position="1.499cm"/>
-                </style:tab-stops>
-            </style:paragraph-properties>
-            <style:text-properties fo:font-size="6pt" officeooo:rsid="0010009a" officeooo:paragraph-rsid="0010009a" style:font-size-asian="6pt" style:font-size-complex="6pt"/>
-        </style:style>
-        <style:style style:name="P24" style:family="paragraph" style:parent-style-name="Standard">
-            <style:text-properties fo:font-size="16pt" fo:font-weight="bold" officeooo:rsid="000de2a1" officeooo:paragraph-rsid="000de2a1" style:font-size-asian="16pt" style:font-weight-asian="bold" style:font-size-complex="16pt" style:font-weight-complex="bold"/>
-        </style:style>
-        <style:style style:name="P25" style:family="paragraph" style:parent-style-name="Standard">
-            <style:text-properties fo:font-size="16pt" officeooo:rsid="000de2a1" officeooo:paragraph-rsid="000de2a1" style:font-size-asian="16pt" style:font-size-complex="16pt"/>
-        </style:style>
-        <style:style style:name="P26" style:family="paragraph" style:parent-style-name="Standard">
-            <style:text-properties fo:font-size="2pt" officeooo:rsid="000f65a0" officeooo:paragraph-rsid="000f65a0" style:font-size-asian="1.75pt" style:font-size-complex="2pt"/>
-        </style:style>
-        <style:style style:name="P27" style:family="paragraph" style:parent-style-name="Standard">
-            <style:text-properties fo:font-size="5pt" officeooo:rsid="000f65a0" officeooo:paragraph-rsid="000f65a0" style:font-size-asian="1.75pt" style:font-size-complex="2pt"/>
-        </style:style>
-        <style:style style:name="P28" style:family="paragraph" style:parent-style-name="Table_20_Contents">
-            <style:paragraph-properties fo:text-align="start" style:justify-single-word="false"/>
-            <style:text-properties fo:font-size="9pt" fo:color="#ffffff" fo:font-weight="bold" officeooo:rsid="000f65a0" officeooo:paragraph-rsid="000f65a0" style:font-size-asian="9pt" style:font-weight-asian="bold" style:font-size-complex="9pt" style:font-weight-complex="bold"/>
-        </style:style>
-        <style:style style:name="P29" style:family="paragraph" style:parent-style-name="Table_20_Contents">
-            <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
-            <style:text-properties fo:font-size="9pt" fo:color="#ffffff" fo:font-weight="bold" officeooo:rsid="000f65a0" officeooo:paragraph-rsid="000f65a0" style:font-size-asian="9pt" style:font-weight-asian="bold" style:font-size-complex="9pt" style:font-weight-complex="bold"/>
-        </style:style>
-        <style:style style:name="Seitenumbruch" style:family="paragraph" style:parent-style-name="Standard">
-            <style:paragraph-properties fo:break-before="page"/>
-            <style:text-properties fo:font-size="16pt" fo:font-weight="bold" officeooo:rsid="000de2a1" officeooo:paragraph-rsid="000de2a1" style:font-size-asian="16pt" style:font-weight-asian="bold" style:font-size-complex="16pt" style:font-weight-complex="bold"/>
-        </style:style>
-        <style:style style:name="T1" style:family="text">
-            <style:text-properties fo:font-weight="bold" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
-        </style:style>
-        <style:style style:name="T2" style:family="text">
-            <style:text-properties officeooo:rsid="0024d69b"/>
-        </style:style>
-        <style:style style:name="T3" style:family="text">
-            <style:text-properties officeooo:rsid="0027b377"/>
-        </style:style>
-        <style:style style:name="fr1" style:family="graphic" style:parent-style-name="Frame">
-            <style:graphic-properties style:wrap="run-through" style:number-wrapped-paragraphs="no-limit" style:vertical-pos="from-top" style:vertical-rel="page-content" style:horizontal-pos="center" style:horizontal-rel="page-content" fo:padding="0cm" fo:border="none" style:shadow="none" draw:shadow-opacity="100%"/>
-        </style:style>
-        <style:style style:name="fr2" style:family="graphic" style:parent-style-name="Frame">
-            <style:graphic-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:margin-top="0cm" fo:margin-bottom="0cm" style:vertical-pos="top" style:vertical-rel="paragraph-content" style:horizontal-pos="left" style:horizontal-rel="paragraph" fo:padding="0cm" fo:border="none" style:shadow="none" draw:shadow-opacity="100%"/>
-        </style:style>
-        <style:style style:name="fr3" style:family="graphic" style:parent-style-name="Graphics">
-            <style:graphic-properties style:run-through="foreground" style:wrap="run-through" style:number-wrapped-paragraphs="no-limit" style:vertical-pos="bottom" style:vertical-rel="page-content" style:horizontal-pos="from-left" style:horizontal-rel="page-content" 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:style>
-    </office:automatic-styles>
-	<office:body>
-		<xsl:apply-templates select="zeugnis"/>
-	</office:body>
-</office:document-content>
-</xsl:template>
-
-<xsl:template match="zeugnis">
-        <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:sequence-decls>
-                <text:sequence-decl text:display-outline-level="0" text:name="Illustration"/>
-                <text:sequence-decl text:display-outline-level="0" text:name="Table"/>
-                <text:sequence-decl text:display-outline-level="0" text:name="Text"/>
-                <text:sequence-decl text:display-outline-level="0" text:name="Drawing"/>
-            </text:sequence-decls>
-			<!-- Wichtig für Mehrfachdruck (mehrere Studenten ausgewählt): Wenn ein Element (in diesem Fall Stempel und Unterschriftenblock) relativ zur SEITE ausgerichtet werden soll, 
-			muss für jedes Dokument (jeder neue Durchlauf der Schleife) ein draw:frame-Tag definiert werden. Diese müssen ALLE VOR den ersten text:p-Elementen stehen.
-			Deshalb wirde erst die Schleife für die draw:frames aufgerufen, dann folg tder Inhalt -->
-			<xsl:if test="position()=1">
-				<xsl:for-each select="../zeugnis">
-					<xsl:variable select="position()" name="number"/><!-- Variable number definieren, die nach jedem Dokument um eines erhöht wird (position) -->
-						<draw:frame draw:style-name="fr1" draw:name="Rahmen{$number}" text:anchor-type="page" text:anchor-page-number="{$number}" svg:y="21.001cm" draw:z-index="0">
-		                <draw:text-box fo:min-height="0.499cm" fo:min-width="2cm">
-		                    <table:table table:name="Tabelle3" table:style-name="Tabelle3">
-		                        <table:table-column table:style-name="Tabelle3.A"/>
-		                        <table:table-column table:style-name="Tabelle3.B"/>
-		                        <table:table-column table:style-name="Tabelle3.C"/>
-		                        <table:table-row>
-		                            <table:table-cell table:style-name="Tabelle3.A1" office:value-type="string">
-		                                <text:p text:style-name="P17">Wien, am <xsl:value-of select="ort_datum" /></text:p>
-		                            </table:table-cell>
-		                            <table:table-cell table:style-name="Tabelle3.B1" office:value-type="string">
-		                                <text:p text:style-name="P16"/>
-		                            </table:table-cell>
-		                            <table:table-cell table:style-name="Tabelle3.C1" office:value-type="string">
-		                                <text:p text:style-name="P16"/>
-		                            </table:table-cell>
-		                        </table:table-row>
-		                        <table:table-row>
-		                            <table:table-cell table:style-name="Tabelle3.A2" office:value-type="string">
-		                                <text:p text:style-name="P17">Ort, Datum</text:p>
-		                            </table:table-cell>
-		                            <table:table-cell table:style-name="Tabelle3.B2" office:value-type="string">
-		                                <text:p text:style-name="P16"/>
-		                            </table:table-cell>
-		                            <table:table-cell table:style-name="Tabelle3.C2" office:value-type="string">
-		                                <text:p text:style-name="P17"><xsl:value-of select="studiengangsleiter" /></text:p>
-		                                <text:p text:style-name="P17">Studiengangsleitung</text:p>
-		                            </table:table-cell>
-		                        </table:table-row>
-		                    </table:table>
-		                </draw:text-box>
-		            </draw:frame>
-		            <draw:frame xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" draw:style-name="fr3" draw:name="Bild{$number}" text:anchor-type="page" text:anchor-page-number="{$number}" svg:x="5.2cm" svg:width="3.51cm" svg:height="3.51cm" draw:z-index="1">
-		                <draw:image xlink:href="Pictures/10000201000002290000022939997AEC.png" xlink:type="simple" xlink:show="embed" xlink:actuate="onLoad"/>
-		            </draw:frame>
-				</xsl:for-each>
-			</xsl:if>
-            <text:p text:style-name="Seitenumbruch">ZEUGNIS</text:p>
-            <text:p text:style-name="P6">
-            	<xsl:choose>
-					<xsl:when test="string-length(semester_bezeichnung)=0">
-						<xsl:value-of select="stsem"/>
-					</xsl:when>
-					<xsl:otherwise>
-						<xsl:value-of select="semester_bezeichnung"/>
-						<xsl:text> (</xsl:text>
-						<xsl:value-of select="stsem"/>
-						<xsl:text>)</xsl:text>
-					</xsl:otherwise>
-				</xsl:choose>
-            </text:p>
-            <text:p text:style-name="P5"/>
-            <text:p text:style-name="P5"><xsl:value-of select="studiengang_art"/>-Studiengang</text:p>
-            <text:p text:style-name="P6"><xsl:value-of select="studiengang"/></text:p>
-            <text:p text:style-name="P1"/>
-            <text:p text:style-name="P1"/>
-            <text:p text:style-name="P1"/>
-            <text:p text:style-name="P2">Personenkennzeichen: <xsl:value-of select="matrikelnr" /></text:p>
-            <text:p text:style-name="P2">Kennzahl des Studienganges: <xsl:value-of select="studiengang_kz" /></text:p>
-            <text:p text:style-name="P2"/>
-            <text:p text:style-name="P3"/>
-            <text:p text:style-name="P3"/>
-            <text:p text:style-name="P4">Vorname/Familienname:<text:tab/>
-                <text:span text:style-name="T1"><xsl:value-of select="name"/></text:span>
-            </text:p>
-            <text:p text:style-name="P27"/>
-            <text:p text:style-name="P4">Geburtsdatum:<text:tab/><xsl:value-of select="gebdatum" /></text:p>
-            <table:table table:name="Tabelle1" table:style-name="Tabelle1">
-                <table:table-column table:style-name="Tabelle1.A"/>
-                <table:table-column table:style-name="Tabelle1.B" table:number-columns-repeated="2"/>
-                <table:table-column table:style-name="Tabelle1.D"/>
-                <table:table-row table:style-name="Tabelle1.1">
-                    <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
-                        <text:p text:style-name="P14">Lehrveranstaltung</text:p>
-                    </table:table-cell>
-                    <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
-                        <text:p text:style-name="P15">SWS</text:p>
-                    </table:table-cell>
-                    <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
-                        <text:p text:style-name="P15">ECTS</text:p>
-                    </table:table-cell>
-                    <table:table-cell table:style-name="Tabelle1.D1" office:value-type="string">
-                        <text:p text:style-name="P15">Note</text:p>
-                    </table:table-cell>
-                </table:table-row>
-                <xsl:apply-templates select="unterrichtsfach"/>
-                <table:table-row>
-                    <table:table-cell table:style-name="Tabelle1.A7" office:value-type="string">
-                        <text:p text:style-name="P10">Gesamt</text:p>
-                    </table:table-cell>
-                    <table:table-cell table:style-name="Tabelle1.B7" office:value-type="string">
-                        <text:p text:style-name="P13">-</text:p>
-                    </table:table-cell>
-                    <table:table-cell table:style-name="Tabelle1.C7" office:value-type="string">
-                        <text:p text:style-name="P13"><xsl:value-of select="ects_gesamt"/></text:p>
-                    </table:table-cell>
-                    <table:table-cell table:style-name="Tabelle1.D7" office:value-type="string">
-                        <text:p text:style-name="P9">-</text:p>
-                    </table:table-cell>
-                </table:table-row>            
-                <xsl:apply-templates select="fussnote"/> 
-            </table:table>
-            <text:p text:style-name="P26"/>
-            <text:p text:style-name="P22">Notenstufen:<text:tab/>Sehr gut (1), Gut (2), Befriedigend (3), Genügend (4), Nicht genügend (5), mit Erfolg teilgenommen (met), nicht teilgenommen (nt), teilgenommen(tg),</text:p>
-            <text:p text:style-name="P22">
-                <text:tab/>angerechnet (ar), nicht beurteilt (nb), bestanden (b), erfolgreich absolviert (ea), nicht erfolgreich absolviert (nea)</text:p>
-            <text:p text:style-name="P7"/>
-            <xsl:if test="abschlusspruefung_typ">
-	            <table:table table:name="Tabelle2" table:style-name="Tabelle2">
-	                <table:table-column table:style-name="Tabelle2.A"/>
-	                <table:table-column table:style-name="Tabelle2.B"/>
-	                <table:table-row table:style-name="Tabelle2.1">
-	                    <table:table-cell table:style-name="Tabelle2.A1" table:number-columns-spanned="2" office:value-type="string">
-	                        <text:p text:style-name="P18">Kommissionelle Abschlussprüfung</text:p>
-	                    </table:table-cell>
-	                    <table:covered-table-cell/>
-	                </table:table-row>
-	                <table:table-row table:style-name="Tabelle2.1">
-	                    <table:table-cell table:style-name="Tabelle2.A2" office:value-type="string">
-	                        <xsl:if test="abschlusspruefung_typ='Bachelor'" >
-								<text:p text:style-name="P8">Bachelorprüfung vom <xsl:value-of select="abschlusspruefung_datum" /></text:p>
-							</xsl:if>
-							<xsl:if test="abschlusspruefung_typ='Diplom'" >
-								<text:p text:style-name="P8">Masterprüfung vom <xsl:value-of select="abschlusspruefung_datum" /></text:p>
-							</xsl:if>
-							
-	                    </table:table-cell>
-	                    <table:table-cell table:style-name="Tabelle2.B2" office:value-type="string">
-	                        <text:p text:style-name="P8"><xsl:value-of select="abschlusspruefung_note" /></text:p>
-	                    </table:table-cell>
-	                </table:table-row>
-	            </table:table>
-	            <text:p text:style-name="P26"/>
-	            <text:p text:style-name="P23">Notenstufen:<text:tab/>mit ausgezeichnetem Erfolg bestanden, mit gutem Erfolg bestanden, bestanden</text:p>
-	            <text:p text:style-name="P19"/>
-            </xsl:if>
-        </office:text>
-</xsl:template>
-<xsl:template match="unterrichtsfach">
-<table:table-row>
-    <table:table-cell table:style-name="Tabelle1.A7" office:value-type="string">
-    	<xsl:choose>
-			<xsl:when test="bisio_von">
-                        <text:p text:style-name="P12">Auslandsaufenthalt: <xsl:value-of select="bisio_von"/>-<xsl:value-of select="bisio_bis"/>, <xsl:value-of select="bisio_ort"/>, <xsl:value-of select="bisio_universitaet"/></text:p>
-                        <text:p text:style-name="P12">Die im Ausland absolvierten Lehrveranstaltungen werden für das <xsl:value-of select="../semester"/>. Semester des Studiums an der Fachhochschule Technikum Wien angerechnet (Details siehe Transcript of Records der Gasthochschule).</text:p>
-			</xsl:when>
-			<xsl:otherwise>
-				<text:p text:style-name="P10"><xsl:value-of select="bezeichnung"/></text:p>
-			</xsl:otherwise>
-		</xsl:choose>
-    </table:table-cell>
-    <table:table-cell table:style-name="Tabelle1.B2" office:value-type="string">
-        <text:p text:style-name="P9">
-        <xsl:if test="sws=''">
-			<xsl:text>-</xsl:text>
-		</xsl:if>
-		<xsl:value-of select="sws"/>
-        </text:p>
-    </table:table-cell>
-    <table:table-cell table:style-name="Tabelle1.C2" office:value-type="string">
-        <text:p text:style-name="P9">
-	        <xsl:if test="ects=''">
-				<xsl:text>-</xsl:text>
-			</xsl:if>
-			<xsl:value-of select="ects"/>
-		</text:p>
-    </table:table-cell>
-    <table:table-cell table:style-name="Tabelle1.D2" office:value-type="string">
-        <text:p text:style-name="P9">
-	        <xsl:if test="note=''">
-				<xsl:text>-</xsl:text>
-			</xsl:if>
-			<xsl:value-of select="note"/>
-		</text:p>
-    </table:table-cell>
-</table:table-row>
-</xsl:template>
-<xsl:template match="fussnote">
-<table:table-row>
-    <table:table-cell table:style-name="Tabelle1.A8" office:value-type="string">
-    	<xsl:choose>
-			<xsl:when test="themenbereich!=''">
-				<text:p text:style-name="P10"><xsl:value-of select="fussnotenzeichen"/>
-		        	<xsl:text> </xsl:text><text:span text:style-name="T1">Themenbereich:</text:span>
-		        	<xsl:text> </xsl:text><xsl:value-of select="themenbereich"/>
-		        </text:p>
-		        <text:p text:style-name="P10">
-		        	<xsl:text> </xsl:text><text:span text:style-name="T1"><xsl:value-of select="titel_bezeichnung"/>:</text:span>
-       				<xsl:text> </xsl:text><xsl:value-of select="titel"/>
-	        	</text:p>
-			</xsl:when>
-			<xsl:otherwise>
-				<text:p text:style-name="P10"><xsl:value-of select="fussnotenzeichen"/>
-		        	<xsl:text> </xsl:text><text:span text:style-name="T1"><xsl:value-of select="titel_bezeichnung"/>:</text:span>
-      				 <xsl:text> </xsl:text><xsl:value-of select="titel"/>
-        		</text:p>
-        	</xsl:otherwise>
-		</xsl:choose>
-    </table:table-cell>
-    <table:table-cell table:style-name="Tabelle1.B8" office:value-type="string">
-        <text:p text:style-name="P13">
-        	<xsl:value-of select="sws"/>
-		</text:p>
-    </table:table-cell>
-    <table:table-cell table:style-name="Tabelle1.C8" office:value-type="string">
-        <text:p text:style-name="P13">
-        	<xsl:value-of select="ects"/>
-        </text:p>
-    </table:table-cell>
-    <table:table-cell table:style-name="Tabelle1.D8" office:value-type="string">
-        <text:p text:style-name="P13">
-        	<xsl:if test="../projektarbeit_note_anzeige='true'">
-				<xsl:value-of select="note"/>
-			</xsl:if>
-        </text:p>
-    </table:table-cell>
-</table:table-row>
-</xsl:template>
-</xsl:stylesheet>

system/xsl/ZeugnisNeu_Lehrgaenge.xsl

@@ -1,562 +0,0 @@
-<?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="zeugnisse">
-
-<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="Mangal2" svg:font-family="Mangal"/>
-        <style:font-face style:name="Mangal" svg:font-family="Mangal" style:font-family-generic="roman"/>
-        <style:font-face style:name="Liberation Serif" svg:font-family="&apos;Liberation Serif&apos;" style:font-family-generic="roman" style:font-pitch="variable"/>
-        <style:font-face style:name="Arial" svg:font-family="Arial" style:font-adornments="Standard" style:font-family-generic="swiss" 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="Liberation Sans1" svg:font-family="&apos;Liberation Sans&apos;" style:font-family-generic="system" style:font-pitch="variable"/>
-        <style:font-face style:name="Mangal1" 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="SimSun" svg:font-family="SimSun" style:font-family-generic="system" style:font-pitch="variable"/>
-        <style:font-face style:name="Tahoma" svg:font-family="Tahoma" 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.401cm" fo:margin-top="0.199cm" fo:margin-bottom="0cm" table:align="margins"/>
-        </style:style>
-        <style:style style:name="Tabelle1.A" style:family="table-column">
-            <style:table-column-properties style:column-width="10.437cm" style:rel-column-width="41702*"/>
-        </style:style>
-        <style:style style:name="Tabelle1.B" style:family="table-column">
-            <style:table-column-properties style:column-width="1.988cm" style:rel-column-width="7944*"/>
-        </style:style>
-        <style:style style:name="Tabelle1.D" style:family="table-column">
-            <style:table-column-properties style:column-width="1.988cm" style:rel-column-width="7945*"/>
-        </style:style>
-        <style:style style:name="Tabelle1.1" style:family="table-row">
-            <style:table-row-properties style:min-row-height="0.75cm"/>
-        </style:style>
-        <style:style style:name="Tabelle1.A1" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:background-color="#999999" fo:padding-left="0.101cm" fo:padding-right="0.101cm" fo:padding-top="0.079cm" fo:padding-bottom="0.079cm" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="0.05pt solid #000000" fo:border-bottom="0.05pt solid #000000">
-                <style:background-image/>
-            </style:table-cell-properties>
-        </style:style>
-        <style:style style:name="Tabelle1.D1" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:background-color="#999999" fo:padding-left="0.101cm" fo:padding-right="0.101cm" fo:padding-top="0.079cm" fo:padding-bottom="0.079cm" fo:border="0.05pt solid #000000">
-                <style:background-image/>
-            </style:table-cell-properties>
-        </style:style>
-        <style:style style:name="Tabelle1.A2" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:padding-left="0.101cm" fo:padding-right="0.101cm" fo:padding-top="0.07cm" fo:padding-bottom="0.07cm" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-        </style:style>
-        <style:style style:name="Tabelle1.B2" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:padding-left="0.101cm" fo:padding-right="0.101cm" fo:padding-top="0.07cm" fo:padding-bottom="0.07cm" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-        </style:style>
-        <style:style style:name="Tabelle1.C2" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:padding-left="0.101cm" fo:padding-right="0.101cm" fo:padding-top="0.07cm" fo:padding-bottom="0.07cm" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-        </style:style>
-        <style:style style:name="Tabelle1.D2" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:padding-left="0.101cm" fo:padding-right="0.101cm" fo:padding-top="0.07cm" fo:padding-bottom="0.07cm" fo:border-left="0.05pt solid #000000" fo:border-right="0.05pt solid #000000" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-        </style:style>
-        <style:style style:name="Tabelle1.A3" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:padding-left="0.101cm" fo:padding-right="0.101cm" fo:padding-top="0.07cm" fo:padding-bottom="0.07cm" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-        </style:style>
-        <style:style style:name="Tabelle1.B3" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:padding-left="0.101cm" fo:padding-right="0.101cm" fo:padding-top="0.07cm" fo:padding-bottom="0.07cm" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-        </style:style>
-        <style:style style:name="Tabelle1.C3" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:padding-left="0.101cm" fo:padding-right="0.101cm" fo:padding-top="0.07cm" fo:padding-bottom="0.07cm" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-        </style:style>
-        <style:style style:name="Tabelle1.D3" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:padding-left="0.101cm" fo:padding-right="0.101cm" fo:padding-top="0.07cm" fo:padding-bottom="0.07cm" fo:border-left="0.05pt solid #000000" fo:border-right="0.05pt solid #000000" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-        </style:style>
-        <style:style style:name="Tabelle1.A4" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:padding-left="0.101cm" fo:padding-right="0.101cm" fo:padding-top="0.07cm" fo:padding-bottom="0.07cm" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-        </style:style>
-        <style:style style:name="Tabelle1.B4" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:padding-left="0.101cm" fo:padding-right="0.101cm" fo:padding-top="0.07cm" fo:padding-bottom="0.07cm" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-        </style:style>
-        <style:style style:name="Tabelle1.C4" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:padding-left="0.101cm" fo:padding-right="0.101cm" fo:padding-top="0.07cm" fo:padding-bottom="0.07cm" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-        </style:style>
-        <style:style style:name="Tabelle1.D4" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:padding-left="0.101cm" fo:padding-right="0.101cm" fo:padding-top="0.07cm" fo:padding-bottom="0.07cm" fo:border-left="0.05pt solid #000000" fo:border-right="0.05pt solid #000000" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-        </style:style>
-        <style:style style:name="Tabelle1.A5" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:padding-left="0.101cm" fo:padding-right="0.101cm" fo:padding-top="0.07cm" fo:padding-bottom="0.07cm" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-        </style:style>
-        <style:style style:name="Tabelle1.B5" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:padding-left="0.101cm" fo:padding-right="0.101cm" fo:padding-top="0.07cm" fo:padding-bottom="0.07cm" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-        </style:style>
-        <style:style style:name="Tabelle1.C5" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:padding-left="0.101cm" fo:padding-right="0.101cm" fo:padding-top="0.07cm" fo:padding-bottom="0.07cm" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-        </style:style>
-        <style:style style:name="Tabelle1.D5" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:padding-left="0.101cm" fo:padding-right="0.101cm" fo:padding-top="0.07cm" fo:padding-bottom="0.07cm" fo:border-left="0.05pt solid #000000" fo:border-right="0.05pt solid #000000" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-        </style:style>
-        <style:style style:name="Tabelle1.A6" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:padding-left="0.101cm" fo:padding-right="0.101cm" fo:padding-top="0.07cm" fo:padding-bottom="0.07cm" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-        </style:style>
-        <style:style style:name="Tabelle1.B6" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:padding-left="0.101cm" fo:padding-right="0.101cm" fo:padding-top="0.07cm" fo:padding-bottom="0.07cm" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-        </style:style>
-        <style:style style:name="Tabelle1.C6" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:padding-left="0.101cm" fo:padding-right="0.101cm" fo:padding-top="0.07cm" fo:padding-bottom="0.07cm" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-        </style:style>
-        <style:style style:name="Tabelle1.D6" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:padding-left="0.101cm" fo:padding-right="0.101cm" fo:padding-top="0.07cm" fo:padding-bottom="0.07cm" fo:border-left="0.05pt solid #000000" fo:border-right="0.05pt solid #000000" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-        </style:style>
-        <style:style style:name="Tabelle1.A7" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:padding-left="0.101cm" fo:padding-right="0.101cm" fo:padding-top="0.07cm" fo:padding-bottom="0.07cm" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-        </style:style>
-        <style:style style:name="Tabelle1.B7" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:padding-left="0.101cm" fo:padding-right="0.101cm" fo:padding-top="0.07cm" fo:padding-bottom="0.07cm" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-        </style:style>
-        <style:style style:name="Tabelle1.C7" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:padding-left="0.101cm" fo:padding-right="0.101cm" fo:padding-top="0.079cm" fo:padding-bottom="0.079cm" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-        </style:style>
-        <style:style style:name="Tabelle1.D7" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:padding-left="0.101cm" fo:padding-right="0.101cm" fo:padding-top="0.079cm" fo:padding-bottom="0.079cm" fo:border-left="0.05pt solid #000000" fo:border-right="0.05pt solid #000000" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-        </style:style>
-        <style:style style:name="Tabelle1.A8" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:padding-left="0.101cm" fo:padding-right="0.101cm" fo:padding-top="0.079cm" fo:padding-bottom="0.079cm" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-        </style:style>
-        <style:style style:name="Tabelle1.B8" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:padding-left="0.101cm" fo:padding-right="0.101cm" fo:padding-top="0.079cm" fo:padding-bottom="0.079cm" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-        </style:style>
-        <style:style style:name="Tabelle1.C8" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:padding-left="0.101cm" fo:padding-right="0.101cm" fo:padding-top="0.079cm" fo:padding-bottom="0.079cm" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-        </style:style>
-        <style:style style:name="Tabelle1.D8" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:padding-left="0.101cm" fo:padding-right="0.101cm" fo:padding-top="0.079cm" fo:padding-bottom="0.079cm" fo:border-left="0.05pt solid #000000" fo:border-right="0.05pt solid #000000" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-        </style:style>
-        <style:style style:name="Tabelle2" style:family="table">
-            <style:table-properties style:width="16.401cm" table:align="margins"/>
-        </style:style>
-        <style:style style:name="Tabelle2.A" style:family="table-column">
-            <style:table-column-properties style:column-width="10.437cm" style:rel-column-width="41702*"/>
-        </style:style>
-        <style:style style:name="Tabelle2.B" style:family="table-column">
-            <style:table-column-properties style:column-width="5.964cm" style:rel-column-width="23833*"/>
-        </style:style>
-        <style:style style:name="Tabelle2.1" style:family="table-row">
-            <style:table-row-properties style:min-row-height="0.75cm"/>
-        </style:style>
-        <style:style style:name="Tabelle2.A1" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:background-color="#999999" fo:padding="0.097cm" fo:border="0.05pt solid #000000">
-                <style:background-image/>
-            </style:table-cell-properties>
-        </style:style>
-        <style:style style:name="Tabelle2.A2" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:padding="0.097cm" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-        </style:style>
-        <style:style style:name="Tabelle2.B2" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="middle" fo:padding="0.097cm" fo:border-left="0.05pt solid #000000" fo:border-right="0.05pt solid #000000" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-        </style:style>
-        <style:style style:name="Tabelle3" style:family="table">
-            <style:table-properties style:width="16.401cm" fo:margin-top="0cm" fo:margin-bottom="0cm" table:align="margins" style:may-break-between-rows="false"/>
-        </style:style>
-        <style:style style:name="Tabelle3.A" style:family="table-column">
-            <style:table-column-properties style:column-width="5.001cm" style:rel-column-width="19981*"/>
-        </style:style>
-        <style:style style:name="Tabelle3.B" style:family="table-column">
-            <style:table-column-properties style:column-width="3.9cm" style:rel-column-width="15583*"/>
-        </style:style>
-        <style:style style:name="Tabelle3.C" style:family="table-column">
-            <style:table-column-properties style:column-width="7.5cm" style:rel-column-width="29971*"/>
-        </style:style>
-        <style:style style:name="Tabelle3.A1" style:family="table-cell">
-            <style:table-cell-properties style:vertical-align="" fo:padding-left="0cm" fo:padding-right="0cm" fo:padding-top="0.101cm" fo:padding-bottom="0.101cm" fo:border-left="none" fo:border-right="none" fo:border-top="none" fo:border-bottom="1pt dotted #000000"/>
-        </style:style>
-        <style:style style:name="Tabelle3.B1" style:family="table-cell">
-            <style:table-cell-properties fo:padding-left="0cm" fo:padding-right="0cm" fo:padding-top="0.101cm" fo:padding-bottom="0.101cm" fo:border="none"/>
-        </style:style>
-        <style:style style:name="Tabelle3.C1" style:family="table-cell">
-            <style:table-cell-properties fo:padding-left="0cm" fo:padding-right="0cm" fo:padding-top="0.101cm" fo:padding-bottom="0.101cm" fo:border-left="none" fo:border-right="none" fo:border-top="none" fo:border-bottom="1pt dotted #000000"/>
-        </style:style>
-        <style:style style:name="Tabelle3.A2" style:family="table-cell">
-            <style:table-cell-properties fo:padding-left="0cm" fo:padding-right="0cm" fo:padding-top="0.101cm" fo:padding-bottom="0.101cm" fo:border="none"/>
-        </style:style>
-        <style:style style:name="Tabelle3.B2" style:family="table-cell">
-            <style:table-cell-properties fo:padding-left="0cm" fo:padding-right="0cm" fo:padding-top="0.101cm" fo:padding-bottom="0.101cm" fo:border="none"/>
-        </style:style>
-        <style:style style:name="Tabelle3.C2" style:family="table-cell">
-            <style:table-cell-properties fo:padding-left="0cm" fo:padding-right="0cm" fo:padding-top="0.101cm" fo:padding-bottom="0.101cm" fo:border="none"/>
-        </style:style>
-        <style:style style:name="P1" style:family="paragraph" style:parent-style-name="Standard">
-            <style:text-properties fo:font-size="9pt" officeooo:rsid="000de2a1" officeooo:paragraph-rsid="000de2a1" style:font-size-asian="9pt" style:font-size-complex="9pt"/>
-        </style:style>
-        <style:style style:name="P2" style:family="paragraph" style:parent-style-name="Standard">
-            <style:paragraph-properties fo:text-align="end" style:justify-single-word="false"/>
-            <style:text-properties fo:font-size="9pt" officeooo:rsid="000f65a0" officeooo:paragraph-rsid="000f65a0" style:font-size-asian="9pt" style:font-size-complex="9pt"/>
-        </style:style>
-        <style:style style:name="P3" style:family="paragraph" style:parent-style-name="Standard">
-            <style:text-properties fo:font-size="9pt" officeooo:rsid="000f65a0" officeooo:paragraph-rsid="000f65a0" style:font-size-asian="9pt" style:font-size-complex="9pt"/>
-        </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="4.498cm"/>
-                </style:tab-stops>
-            </style:paragraph-properties>
-            <style:text-properties fo:font-size="9pt" officeooo:rsid="000f65a0" officeooo:paragraph-rsid="000f65a0" 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:text-properties fo:font-size="16pt" officeooo:rsid="000de2a1" officeooo:paragraph-rsid="000de2a1" style:font-size-asian="16pt" style:font-size-complex="16pt"/>
-        </style:style>
-        <style:style style:name="P6" style:family="paragraph" style:parent-style-name="Standard">
-            <style:text-properties fo:font-size="16pt" fo:font-weight="bold" officeooo:rsid="000de2a1" officeooo:paragraph-rsid="000de2a1" style:font-size-asian="16pt" style:font-weight-asian="bold" style:font-size-complex="16pt" style:font-weight-complex="bold"/>
-        </style:style>
-        <style:style style:name="P7" style:family="paragraph" style:parent-style-name="Standard">
-            <style:text-properties fo:font-size="6pt" officeooo:rsid="000f65a0" officeooo:paragraph-rsid="000f65a0" style:font-size-asian="5.25pt" style:font-size-complex="6pt"/>
-        </style:style>
-        <style:style style:name="P8" style:family="paragraph" style:parent-style-name="Table_20_Contents">
-            <style:text-properties fo:font-size="9pt" officeooo:rsid="000f65a0" officeooo:paragraph-rsid="000f65a0" style:font-size-asian="9pt" style:font-size-complex="9pt"/>
-        </style:style>
-        <style:style style:name="P9" style:family="paragraph" style:parent-style-name="Table_20_Contents">
-            <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
-            <style:text-properties fo:font-size="9pt" officeooo:rsid="000f65a0" officeooo:paragraph-rsid="000f65a0" style:font-size-asian="9pt" style:font-size-complex="9pt"/>
-        </style:style>
-        <style:style style:name="P10" style:family="paragraph" style:parent-style-name="Table_20_Contents">
-            <style:paragraph-properties fo:text-align="start" style:justify-single-word="false"/>
-            <style:text-properties fo:font-size="9pt" officeooo:rsid="000f65a0" officeooo:paragraph-rsid="000f65a0" style:font-size-asian="9pt" style:font-size-complex="9pt"/>
-        </style:style>
-        <style:style style:name="P11" style:family="paragraph" style:parent-style-name="Table_20_Contents">
-            <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
-            <style:text-properties fo:font-size="9pt" officeooo:rsid="0010009a" officeooo:paragraph-rsid="0010009a" style:font-size-asian="9pt" style:font-size-complex="9pt"/>
-        </style:style>
-        <style:style style:name="P12" style:family="paragraph" style:parent-style-name="Table_20_Contents">
-            <style:paragraph-properties fo:text-align="start" style:justify-single-word="false"/>
-            <style:text-properties fo:font-size="9pt" officeooo:rsid="0010009a" officeooo:paragraph-rsid="0010009a" style:font-size-asian="9pt" style:font-size-complex="9pt"/>
-        </style:style>
-        <style:style style:name="P13" style:family="paragraph" style:parent-style-name="Table_20_Contents">
-            <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
-            <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="Table_20_Contents">
-            <style:paragraph-properties fo:text-align="start" style:justify-single-word="false"/>
-            <style:text-properties fo:font-size="9pt" fo:font-weight="bold" officeooo:rsid="000f65a0" officeooo:paragraph-rsid="000f65a0" style:font-size-asian="9pt" style:font-weight-asian="bold" style:font-size-complex="9pt" style:font-weight-complex="bold"/>
-        </style:style>
-        <style:style style:name="P15" style:family="paragraph" style:parent-style-name="Table_20_Contents">
-            <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
-            <style:text-properties fo:font-size="9pt" fo:font-weight="bold" officeooo:rsid="000f65a0" officeooo:paragraph-rsid="000f65a0" style:font-size-asian="9pt" style:font-weight-asian="bold" style:font-size-complex="9pt" style:font-weight-complex="bold"/>
-        </style:style>
-        <style:style style:name="P16" style:family="paragraph" style:parent-style-name="Table_20_Contents">
-            <style:text-properties fo:font-size="9pt" style:font-size-complex="9pt"/>
-        </style:style>
-        <style:style style:name="P17" style:family="paragraph" style:parent-style-name="Table_20_Contents">
-            <style:text-properties fo:font-size="9pt" officeooo:rsid="0013c612" officeooo:paragraph-rsid="0013c612" style:font-size-complex="9pt"/>
-        </style:style>
-        <style:style style:name="P18" style:family="paragraph" style:parent-style-name="Table_20_Contents">
-            <style:paragraph-properties fo:background-color="#999999">
-                <style:background-image/>
-            </style:paragraph-properties>
-            <style:text-properties fo:font-size="9pt" fo:font-weight="bold" officeooo:rsid="000f65a0" officeooo:paragraph-rsid="000f65a0" style:font-size-asian="9pt" style:font-weight-asian="bold" style:font-size-complex="9pt" style:font-weight-complex="bold"/>
-        </style:style>
-        <style:style style:name="P19" style:family="paragraph" style:parent-style-name="Standard">
-            <style:text-properties fo:font-size="9pt" officeooo:rsid="0013c612" officeooo:paragraph-rsid="0010009a" style:font-size-asian="7.84999990463257pt" style:font-size-complex="9pt"/>
-        </style:style>
-        <style:style style:name="P20" style:family="paragraph" style:parent-style-name="Standard">
-            <style:text-properties fo:font-size="9pt" officeooo:rsid="000de2a1" officeooo:paragraph-rsid="000de2a1" style:font-size-asian="9pt" style:font-size-complex="9pt"/>
-        </style:style>
-        <style:style style:name="P21" style:family="paragraph" style:parent-style-name="Standard">
-            <style:text-properties fo:font-size="9pt" officeooo:rsid="000f65a0" officeooo:paragraph-rsid="000f65a0" style:font-size-asian="9pt" style:font-size-complex="9pt"/>
-        </style:style>
-        <style:style style:name="P22" style:family="paragraph" style:parent-style-name="Standard">
-            <style:paragraph-properties>
-                <style:tab-stops>
-                    <style:tab-stop style:position="1.499cm"/>
-                </style:tab-stops>
-            </style:paragraph-properties>
-            <style:text-properties fo:font-size="6pt" officeooo:rsid="000f65a0" officeooo:paragraph-rsid="0024d69b" style:font-size-asian="6pt" style:font-size-complex="6pt"/>
-        </style:style>
-        <style:style style:name="P23" style:family="paragraph" style:parent-style-name="Standard">
-            <style:paragraph-properties>
-                <style:tab-stops>
-                    <style:tab-stop style:position="1.499cm"/>
-                </style:tab-stops>
-            </style:paragraph-properties>
-            <style:text-properties fo:font-size="6pt" officeooo:rsid="0010009a" officeooo:paragraph-rsid="0010009a" style:font-size-asian="6pt" style:font-size-complex="6pt"/>
-        </style:style>
-        <style:style style:name="P24" style:family="paragraph" style:parent-style-name="Standard">
-            <style:text-properties fo:font-size="16pt" fo:font-weight="bold" officeooo:rsid="000de2a1" officeooo:paragraph-rsid="000de2a1" style:font-size-asian="16pt" style:font-weight-asian="bold" style:font-size-complex="16pt" style:font-weight-complex="bold"/>
-        </style:style>
-        <style:style style:name="P25" style:family="paragraph" style:parent-style-name="Standard">
-            <style:text-properties fo:font-size="16pt" officeooo:rsid="000de2a1" officeooo:paragraph-rsid="000de2a1" style:font-size-asian="16pt" style:font-size-complex="16pt"/>
-        </style:style>
-        <style:style style:name="P26" style:family="paragraph" style:parent-style-name="Standard">
-            <style:text-properties fo:font-size="2pt" officeooo:rsid="000f65a0" officeooo:paragraph-rsid="000f65a0" style:font-size-asian="1.75pt" style:font-size-complex="2pt"/>
-        </style:style>
-        <style:style style:name="P27" style:family="paragraph" style:parent-style-name="Standard">
-            <style:text-properties fo:font-size="5pt" officeooo:rsid="000f65a0" officeooo:paragraph-rsid="000f65a0" style:font-size-asian="1.75pt" style:font-size-complex="2pt"/>
-        </style:style>
-        <style:style style:name="P28" style:family="paragraph" style:parent-style-name="Table_20_Contents">
-            <style:paragraph-properties fo:text-align="start" style:justify-single-word="false"/>
-            <style:text-properties fo:font-size="9pt" fo:color="#ffffff" fo:font-weight="bold" officeooo:rsid="000f65a0" officeooo:paragraph-rsid="000f65a0" style:font-size-asian="9pt" style:font-weight-asian="bold" style:font-size-complex="9pt" style:font-weight-complex="bold"/>
-        </style:style>
-        <style:style style:name="P29" style:family="paragraph" style:parent-style-name="Table_20_Contents">
-            <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
-            <style:text-properties fo:font-size="9pt" fo:color="#ffffff" fo:font-weight="bold" officeooo:rsid="000f65a0" officeooo:paragraph-rsid="000f65a0" style:font-size-asian="9pt" style:font-weight-asian="bold" style:font-size-complex="9pt" style:font-weight-complex="bold"/>
-        </style:style>
-        <style:style style:name="Seitenumbruch" style:family="paragraph" style:parent-style-name="Standard">
-            <style:paragraph-properties fo:break-before="page"/>
-            <style:text-properties fo:font-size="16pt" fo:font-weight="bold" officeooo:rsid="000de2a1" officeooo:paragraph-rsid="000de2a1" style:font-size-asian="16pt" style:font-weight-asian="bold" style:font-size-complex="16pt" style:font-weight-complex="bold"/>
-        </style:style>
-        <style:style style:name="T1" style:family="text">
-            <style:text-properties fo:font-weight="bold" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
-        </style:style>
-        <style:style style:name="T2" style:family="text">
-            <style:text-properties officeooo:rsid="0024d69b"/>
-        </style:style>
-        <style:style style:name="T3" style:family="text">
-            <style:text-properties officeooo:rsid="0027b377"/>
-        </style:style>
-        <style:style style:name="fr1" style:family="graphic" style:parent-style-name="Frame">
-            <style:graphic-properties style:wrap="run-through" style:number-wrapped-paragraphs="no-limit" style:vertical-pos="from-top" style:vertical-rel="page-content" style:horizontal-pos="center" style:horizontal-rel="page-content" fo:padding="0cm" fo:border="none" style:shadow="none" draw:shadow-opacity="100%"/>
-        </style:style>
-        <style:style style:name="fr2" style:family="graphic" style:parent-style-name="Frame">
-            <style:graphic-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:margin-top="0cm" fo:margin-bottom="0cm" style:vertical-pos="top" style:vertical-rel="paragraph-content" style:horizontal-pos="left" style:horizontal-rel="paragraph" fo:padding="0cm" fo:border="none" style:shadow="none" draw:shadow-opacity="100%"/>
-        </style:style>
-        <style:style style:name="fr3" style:family="graphic" style:parent-style-name="Graphics">
-            <style:graphic-properties style:run-through="foreground" style:wrap="run-through" style:number-wrapped-paragraphs="no-limit" style:vertical-pos="bottom" style:vertical-rel="page-content" style:horizontal-pos="from-left" style:horizontal-rel="page-content" 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:style>
-    </office:automatic-styles>
-	<office:body>
-		<xsl:apply-templates select="zeugnis"/>
-	</office:body>
-</office:document-content>
-</xsl:template>
-
-<xsl:template match="zeugnis">
-        <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:sequence-decls>
-                <text:sequence-decl text:display-outline-level="0" text:name="Illustration"/>
-                <text:sequence-decl text:display-outline-level="0" text:name="Table"/>
-                <text:sequence-decl text:display-outline-level="0" text:name="Text"/>
-                <text:sequence-decl text:display-outline-level="0" text:name="Drawing"/>
-            </text:sequence-decls>
-			<!-- Wichtig für Mehrfachdruck (mehrere Studenten ausgewählt): Wenn ein Element (in diesem Fall Stempel und Unterschriftenblock) relativ zur SEITE ausgerichtet werden soll, 
-			muss für jedes Dokument (jeder neue Durchlauf der Schleife) ein draw:frame-Tag definiert werden. Diese müssen ALLE VOR den ersten text:p-Elementen stehen.
-			Deshalb wirde erst die Schleife für die draw:frames aufgerufen, dann folg tder Inhalt -->
-			<xsl:if test="position()=1">
-				<xsl:for-each select="../zeugnis">
-					<xsl:variable select="position()" name="number"/><!-- Variable number definieren, die nach jedem Dokument um eines erhöht wird (position) -->
-						<draw:frame draw:style-name="fr1" draw:name="Rahmen{$number}" text:anchor-type="page" text:anchor-page-number="{$number}" svg:y="21.001cm" draw:z-index="0">
-		                <draw:text-box fo:min-height="0.499cm" fo:min-width="2cm">
-		                    <table:table table:name="Tabelle3" table:style-name="Tabelle3">
-		                        <table:table-column table:style-name="Tabelle3.A"/>
-		                        <table:table-column table:style-name="Tabelle3.B"/>
-		                        <table:table-column table:style-name="Tabelle3.C"/>
-		                        <table:table-row>
-		                            <table:table-cell table:style-name="Tabelle3.A1" office:value-type="string">
-		                                <text:p text:style-name="P17">Wien, am <xsl:value-of select="ort_datum" /></text:p>
-		                            </table:table-cell>
-		                            <table:table-cell table:style-name="Tabelle3.B1" office:value-type="string">
-		                                <text:p text:style-name="P16"/>
-		                            </table:table-cell>
-		                            <table:table-cell table:style-name="Tabelle3.C1" office:value-type="string">
-		                                <text:p text:style-name="P16"/>
-		                            </table:table-cell>
-		                        </table:table-row>
-		                        <table:table-row>
-		                            <table:table-cell table:style-name="Tabelle3.A2" office:value-type="string">
-		                                <text:p text:style-name="P17">Ort, Datum</text:p>
-		                            </table:table-cell>
-		                            <table:table-cell table:style-name="Tabelle3.B2" office:value-type="string">
-		                                <text:p text:style-name="P16"/>
-		                            </table:table-cell>
-		                            <table:table-cell table:style-name="Tabelle3.C2" office:value-type="string">
-		                                <text:p text:style-name="P17"><xsl:value-of select="studiengangsleiter" /></text:p>
-		                                <text:p text:style-name="P17">Lehrgangsleitung</text:p>
-		                            </table:table-cell>
-		                        </table:table-row>
-		                    </table:table>
-		                </draw:text-box>
-		            </draw:frame>
-		            <draw:frame xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" draw:style-name="fr3" draw:name="Bild{$number}" text:anchor-type="page" text:anchor-page-number="{$number}" svg:x="5.2cm" svg:width="3.51cm" svg:height="3.51cm" draw:z-index="1">
-		                <draw:image xlink:href="Pictures/10000201000002290000022939997AEC.png" xlink:type="simple" xlink:show="embed" xlink:actuate="onLoad"/>
-		            </draw:frame>
-				</xsl:for-each>
-			</xsl:if>
-            <text:p text:style-name="Seitenumbruch">ZEUGNIS</text:p>
-            <text:p text:style-name="P6">
-            	<xsl:choose>
-					<xsl:when test="string-length(semester_bezeichnung)=0">
-						<xsl:value-of select="stsem"/>
-					</xsl:when>
-					<xsl:otherwise>
-						<xsl:value-of select="semester_bezeichnung"/>
-						<xsl:text> (</xsl:text>
-						<xsl:value-of select="stsem"/>
-						<xsl:text>)</xsl:text>
-					</xsl:otherwise>
-				</xsl:choose>
-            </text:p>
-            <text:p text:style-name="P5"/>
-            <text:p text:style-name="P5">Lehrgang zur Weiterbildung nach §9 FHStG idgF</text:p>
-            <text:p text:style-name="P6"><xsl:value-of select="studiengang"/></text:p>
-            <text:p text:style-name="P1"/>
-            <text:p text:style-name="P1"/>
-            <text:p text:style-name="P1"/>
-            <text:p text:style-name="P2">Personenkennzeichen: <xsl:value-of select="matrikelnr" /></text:p>
-            <text:p text:style-name="P2">Lehrgangsnummer: <xsl:value-of select="studiengang_kz" /></text:p>
-            <text:p text:style-name="P2"/>
-            <text:p text:style-name="P3"/>
-            <text:p text:style-name="P3"/>
-            <text:p text:style-name="P4">Vorname/Familienname:<text:tab/>
-                <text:span text:style-name="T1"><xsl:value-of select="name"/></text:span>
-            </text:p>
-            <text:p text:style-name="P27"/>
-            <text:p text:style-name="P4">Geburtsdatum:<text:tab/><xsl:value-of select="gebdatum" /></text:p>
-            <table:table table:name="Tabelle1" table:style-name="Tabelle1">
-                <table:table-column table:style-name="Tabelle1.A"/>
-                <table:table-column table:style-name="Tabelle1.B" table:number-columns-repeated="2"/>
-                <table:table-column table:style-name="Tabelle1.D"/>
-                <table:table-row table:style-name="Tabelle1.1">
-                    <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
-                        <text:p text:style-name="P14">Lehrveranstaltung</text:p>
-                    </table:table-cell>
-                    <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
-                        <text:p text:style-name="P15">SWS</text:p>
-                    </table:table-cell>
-                    <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
-                        <text:p text:style-name="P15">ECTS</text:p>
-                    </table:table-cell>
-                    <table:table-cell table:style-name="Tabelle1.D1" office:value-type="string">
-                        <text:p text:style-name="P15">Note</text:p>
-                    </table:table-cell>
-                </table:table-row>
-                <xsl:apply-templates select="unterrichtsfach"/>
-                <table:table-row>
-                    <table:table-cell table:style-name="Tabelle1.A7" office:value-type="string">
-                        <text:p text:style-name="P10">Gesamt</text:p>
-                    </table:table-cell>
-                    <table:table-cell table:style-name="Tabelle1.B7" office:value-type="string">
-                        <text:p text:style-name="P13">-</text:p>
-                    </table:table-cell>
-                    <table:table-cell table:style-name="Tabelle1.C7" office:value-type="string">
-                        <text:p text:style-name="P13"><xsl:value-of select="ects_gesamt"/></text:p>
-                    </table:table-cell>
-                    <table:table-cell table:style-name="Tabelle1.D7" office:value-type="string">
-                        <text:p text:style-name="P9">-</text:p>
-                    </table:table-cell>
-                </table:table-row>            
-                <xsl:apply-templates select="fussnote"/> 
-            </table:table>
-            <text:p text:style-name="P26"/>
-            <text:p text:style-name="P22">Notenstufen:<text:tab/>Sehr gut (1), Gut (2), Befriedigend (3), Genügend (4), Nicht genügend (5), mit Erfolg teilgenommen (met), nicht teilgenommen (nt), teilgenommen(tg),</text:p>
-            <text:p text:style-name="P22">
-                <text:tab/>angerechnet (ar), nicht beurteilt (nb), bestanden (b), erfolgreich absolviert (ea), nicht erfolgreich absolviert (nea)</text:p>
-            <text:p text:style-name="P7"/>
-            <xsl:if test="abschlusspruefung_typ">
-	            <table:table table:name="Tabelle2" table:style-name="Tabelle2">
-	                <table:table-column table:style-name="Tabelle2.A"/>
-	                <table:table-column table:style-name="Tabelle2.B"/>
-	                <table:table-row table:style-name="Tabelle2.1">
-	                    <table:table-cell table:style-name="Tabelle2.A1" table:number-columns-spanned="2" office:value-type="string">
-	                        <text:p text:style-name="P18">Kommissionelle Abschlussprüfung</text:p>
-	                    </table:table-cell>
-	                    <table:covered-table-cell/>
-	                </table:table-row>
-	                <table:table-row table:style-name="Tabelle2.1">
-	                    <table:table-cell table:style-name="Tabelle2.A2" office:value-type="string">
-	                        <xsl:if test="abschlusspruefung_typ='Bachelor'" >
-								<text:p text:style-name="P8">Bachelorprüfung vom <xsl:value-of select="abschlusspruefung_datum" /></text:p>
-							</xsl:if>
-							<xsl:if test="abschlusspruefung_typ='Diplom'" >
-								<text:p text:style-name="P8">Masterprüfung vom <xsl:value-of select="abschlusspruefung_datum" /></text:p>
-							</xsl:if>
-							
-	                    </table:table-cell>
-	                    <table:table-cell table:style-name="Tabelle2.B2" office:value-type="string">
-	                        <text:p text:style-name="P8"><xsl:value-of select="abschlusspruefung_note" /></text:p>
-	                    </table:table-cell>
-	                </table:table-row>
-	            </table:table>
-	            <text:p text:style-name="P26"/>
-	            <text:p text:style-name="P23">Notenstufen:<text:tab/>mit ausgezeichnetem Erfolg bestanden, mit gutem Erfolg bestanden, bestanden</text:p>
-	            <text:p text:style-name="P19"/>
-            </xsl:if>
-        </office:text>
-</xsl:template>
-<xsl:template match="unterrichtsfach">
-<table:table-row>
-    <table:table-cell table:style-name="Tabelle1.A7" office:value-type="string">
-    	<xsl:choose>
-			<xsl:when test="bisio_von">
-                        <text:p text:style-name="P12">Auslandsaufenthalt: <xsl:value-of select="bisio_von"/>-<xsl:value-of select="bisio_bis"/>, <xsl:value-of select="bisio_ort"/>, <xsl:value-of select="bisio_universitaet"/></text:p>
-                        <text:p text:style-name="P12">Die im Ausland absolvierten Lehrveranstaltungen werden für das <xsl:value-of select="../semester"/>. Semester des Studiums an der Fachhochschule Technikum Wien angerechnet (Details siehe Transcript of Records der Gasthochschule).</text:p>
-			</xsl:when>
-			<xsl:otherwise>
-				<text:p text:style-name="P10"><xsl:value-of select="bezeichnung"/></text:p>
-			</xsl:otherwise>
-		</xsl:choose>
-    </table:table-cell>
-    <table:table-cell table:style-name="Tabelle1.B2" office:value-type="string">
-        <text:p text:style-name="P9">
-        <xsl:if test="sws=''">
-			<xsl:text>-</xsl:text>
-		</xsl:if>
-		<xsl:value-of select="sws"/>
-        </text:p>
-    </table:table-cell>
-    <table:table-cell table:style-name="Tabelle1.C2" office:value-type="string">
-        <text:p text:style-name="P9">
-	        <xsl:if test="ects=''">
-				<xsl:text>-</xsl:text>
-			</xsl:if>
-			<xsl:value-of select="ects"/>
-		</text:p>
-    </table:table-cell>
-    <table:table-cell table:style-name="Tabelle1.D2" office:value-type="string">
-        <text:p text:style-name="P9">
-	        <xsl:if test="note=''">
-				<xsl:text>-</xsl:text>
-			</xsl:if>
-			<xsl:value-of select="note"/>
-		</text:p>
-    </table:table-cell>
-</table:table-row>
-</xsl:template>
-<xsl:template match="fussnote">
-<table:table-row>
-    <table:table-cell table:style-name="Tabelle1.A8" office:value-type="string">
-    	<xsl:choose>
-			<xsl:when test="themenbereich!=''">
-				<text:p text:style-name="P10"><xsl:value-of select="fussnotenzeichen"/>
-		        	<xsl:text> </xsl:text><text:span text:style-name="T1">Themenbereich:</text:span>
-		        	<xsl:text> </xsl:text><xsl:value-of select="themenbereich"/>
-		        </text:p>
-		        <text:p text:style-name="P10">
-		        	<xsl:text> </xsl:text><text:span text:style-name="T1"><xsl:value-of select="titel_bezeichnung"/>:</text:span>
-       				<xsl:text> </xsl:text><xsl:value-of select="titel"/>
-	        	</text:p>
-			</xsl:when>
-			<xsl:otherwise>
-				<text:p text:style-name="P10"><xsl:value-of select="fussnotenzeichen"/>
-		        	<xsl:text> </xsl:text><text:span text:style-name="T1"><xsl:value-of select="titel_bezeichnung"/>:</text:span>
-      				 <xsl:text> </xsl:text><xsl:value-of select="titel"/>
-        		</text:p>
-        	</xsl:otherwise>
-		</xsl:choose>
-    </table:table-cell>
-    <table:table-cell table:style-name="Tabelle1.B8" office:value-type="string">
-        <text:p text:style-name="P13">
-        	<xsl:value-of select="sws"/>
-		</text:p>
-    </table:table-cell>
-    <table:table-cell table:style-name="Tabelle1.C8" office:value-type="string">
-        <text:p text:style-name="P13">
-        	<xsl:value-of select="ects"/>
-        </text:p>
-    </table:table-cell>
-    <table:table-cell table:style-name="Tabelle1.D8" office:value-type="string">
-        <text:p text:style-name="P13">
-        	<xsl:if test="../projektarbeit_note_anzeige='true'">
-				<xsl:value-of select="note"/>
-			</xsl:if>
-        </text:p>
-    </table:table-cell>
-</table:table-row>
-</xsl:template>
-</xsl:stylesheet>

system/xsl/Zeugnis_0.xsl

@@ -459,9 +459,12 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
 			<xsl:apply-templates select="fussnote"/> 
 		</table:table>
 		<text:p text:style-name="P26"/>
-		<text:p text:style-name="P22">Notenstufen:<text:tab/>Sehr gut (1), Gut (2), Befriedigend (3), Genügend (4), Nicht genügend (5), mit Erfolg teilgenommen (met), nicht teilgenommen (nt), teilgenommen(tg),</text:p>
+		<text:p text:style-name="P22">Notenstufen:<text:tab/>Sehr gut (1), Gut (2), Befriedigend (3), Genügend (4), mit Erfolg teilgenommen (met), teilgenommen (tg),
+			angerechnet (ar), bestanden (b),
+		</text:p>
 		<text:p text:style-name="P22">
-			<text:tab/>angerechnet (ar), nicht beurteilt (nb), bestanden (b), erfolgreich absolviert (ea), nicht erfolgreich absolviert (nea)</text:p>
+			<text:tab/>erfolgreich absolviert (ea)
+		</text:p>
 		<text:p text:style-name="P7"/>
 		<xsl:if test="abschlusspruefung_typ">
 			<table:table table:name="Tabelle2" table:style-name="Tabelle2">
@@ -481,7 +484,7 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
 						<xsl:if test="abschlusspruefung_typ='Diplom'" >
 							<text:p text:style-name="P8">Masterprüfung vom <xsl:value-of select="abschlusspruefung_datum" /></text:p>
 						</xsl:if>
-						
+
 					</table:table-cell>
 					<table:table-cell table:style-name="Tabelle2.B2" office:value-type="string">
 						<text:p text:style-name="P8"><xsl:value-of select="abschlusspruefung_note" /></text:p>
@@ -502,43 +505,45 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
 	</office:text>
 </xsl:template>
 <xsl:template match="unterrichtsfach">
-<table:table-row>
-	<table:table-cell table:style-name="Tabelle1.A7" office:value-type="string">
-		<xsl:choose>
-			<xsl:when test="bisio_von">
-						<text:p text:style-name="P12">Auslandsaufenthalt: <xsl:value-of select="bisio_von"/>-<xsl:value-of select="bisio_bis"/>, <xsl:value-of select="bisio_ort"/>, <xsl:value-of select="bisio_universitaet"/></text:p>
-						<text:p text:style-name="P12">Die im Ausland absolvierten Lehrveranstaltungen werden für das <xsl:value-of select="../semester"/>. Semester des Studiums an der Fachhochschule Technikum Wien angerechnet (Details siehe Transcript of Records der Gasthochschule).</text:p>
-			</xsl:when>
-			<xsl:otherwise>
-				<text:p text:style-name="P10"><xsl:value-of select="bezeichnung"/></text:p>
-			</xsl:otherwise>
-		</xsl:choose>
-	</table:table-cell>
-	<table:table-cell table:style-name="Tabelle1.B2" office:value-type="string">
-		<text:p text:style-name="P9">
-		<xsl:if test="sws_lv=''">
-			<xsl:text>-</xsl:text>
-		</xsl:if>
-		<xsl:value-of select="sws_lv"/>
-		</text:p>
-	</table:table-cell>
-	<table:table-cell table:style-name="Tabelle1.C2" office:value-type="string">
-		<text:p text:style-name="P9">
-			<xsl:if test="ects=''">
+<xsl:if test="note_positiv='1'">
+	<table:table-row>
+		<table:table-cell table:style-name="Tabelle1.A7" office:value-type="string">
+			<xsl:choose>
+				<xsl:when test="bisio_von">
+							<text:p text:style-name="P12">Auslandsaufenthalt: <xsl:value-of select="bisio_von"/>-<xsl:value-of select="bisio_bis"/>, <xsl:value-of select="bisio_ort"/>, <xsl:value-of select="bisio_universitaet"/></text:p>
+							<text:p text:style-name="P12">Die im Ausland absolvierten Lehrveranstaltungen werden für das <xsl:value-of select="../semester"/>. Semester des Studiums an der Fachhochschule Technikum Wien angerechnet (Details siehe Transcript of Records der Gasthochschule).</text:p>
+				</xsl:when>
+				<xsl:otherwise>
+					<text:p text:style-name="P10"><xsl:value-of select="bezeichnung"/></text:p>
+				</xsl:otherwise>
+			</xsl:choose>
+		</table:table-cell>
+		<table:table-cell table:style-name="Tabelle1.B2" office:value-type="string">
+			<text:p text:style-name="P9">
+			<xsl:if test="sws_lv=''">
 				<xsl:text>-</xsl:text>
 			</xsl:if>
-			<xsl:value-of select="ects"/>
-		</text:p>
-	</table:table-cell>
-	<table:table-cell table:style-name="Tabelle1.D2" office:value-type="string">
-		<text:p text:style-name="P9">
-			<xsl:if test="note=''">
-				<xsl:text>-</xsl:text>
-			</xsl:if>
-			<xsl:value-of select="note"/>
-		</text:p>
-	</table:table-cell>
-</table:table-row>
+			<xsl:value-of select="sws_lv"/>
+			</text:p>
+		</table:table-cell>
+		<table:table-cell table:style-name="Tabelle1.C2" office:value-type="string">
+			<text:p text:style-name="P9">
+				<xsl:if test="ects=''">
+					<xsl:text>-</xsl:text>
+				</xsl:if>
+				<xsl:value-of select="ects"/>
+			</text:p>
+		</table:table-cell>
+		<table:table-cell table:style-name="Tabelle1.D2" office:value-type="string">
+			<text:p text:style-name="P9">
+				<xsl:if test="note=''">
+					<xsl:text>-</xsl:text>
+				</xsl:if>
+				<xsl:value-of select="note"/>
+			</text:p>
+		</table:table-cell>
+	</table:table-row>
+	</xsl:if>
 </xsl:template>
 <xsl:template match="fussnote">
 <table:table-row>

system/xsl/Zeugnis_Lehrgaenge.xsl

@@ -458,9 +458,12 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
                 <xsl:apply-templates select="fussnote"/>
             </table:table>
             <text:p text:style-name="P26"/>
-            <text:p text:style-name="P22">Notenstufen:<text:tab/>Sehr gut (1), Gut (2), Befriedigend (3), Genügend (4), Nicht genügend (5), mit Erfolg teilgenommen (met), nicht teilgenommen (nt), teilgenommen(tg),</text:p>
+            <text:p text:style-name="P22">Notenstufen:<text:tab/>Sehr gut (1), Gut (2), Befriedigend (3), Genügend (4), mit Erfolg teilgenommen (met), teilgenommen (tg),
+                angerechnet (ar), bestanden (b),
+            </text:p>
             <text:p text:style-name="P22">
-                <text:tab/>angerechnet (ar), nicht beurteilt (nb), bestanden (b), erfolgreich absolviert (ea), nicht erfolgreich absolviert (nea)</text:p>
+                <text:tab/>erfolgreich absolviert (ea)
+            </text:p>
             <text:p text:style-name="P7"/>
             <xsl:if test="abschlusspruefung_typ and abschlusspruefung_typ!='lgabschluss'">
 	            <table:table table:name="Tabelle2" table:style-name="Tabelle2">
@@ -501,43 +504,45 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
         </office:text>
 </xsl:template>
 <xsl:template match="unterrichtsfach">
-<table:table-row>
-    <table:table-cell table:style-name="Tabelle1.A7" office:value-type="string">
-    	<xsl:choose>
-			<xsl:when test="bisio_von">
-                        <text:p text:style-name="P12">Auslandsaufenthalt: <xsl:value-of select="bisio_von"/>-<xsl:value-of select="bisio_bis"/>, <xsl:value-of select="bisio_ort"/>, <xsl:value-of select="bisio_universitaet"/></text:p>
-                        <text:p text:style-name="P12">Die im Ausland absolvierten Lehrveranstaltungen werden für das <xsl:value-of select="../semester"/>. Semester des Studiums an der Fachhochschule Technikum Wien angerechnet (Details siehe Transcript of Records der Gasthochschule).</text:p>
-			</xsl:when>
-			<xsl:otherwise>
-				<text:p text:style-name="P10"><xsl:value-of select="bezeichnung"/></text:p>
-			</xsl:otherwise>
-		</xsl:choose>
-    </table:table-cell>
-    <table:table-cell table:style-name="Tabelle1.B2" office:value-type="string">
-        <text:p text:style-name="P9">
-        <xsl:if test="sws_lv=''">
-			<xsl:text>-</xsl:text>
-		</xsl:if>
-		<xsl:value-of select="sws_lv"/>
-        </text:p>
-    </table:table-cell>
-    <table:table-cell table:style-name="Tabelle1.C2" office:value-type="string">
-        <text:p text:style-name="P9">
-	        <xsl:if test="ects=''">
-				<xsl:text>-</xsl:text>
-			</xsl:if>
-			<xsl:value-of select="ects"/>
-		</text:p>
-    </table:table-cell>
-    <table:table-cell table:style-name="Tabelle1.D2" office:value-type="string">
-        <text:p text:style-name="P9">
-	        <xsl:if test="note=''">
-				<xsl:text>-</xsl:text>
-			</xsl:if>
-			<xsl:value-of select="note"/>
-		</text:p>
-    </table:table-cell>
-</table:table-row>
+<xsl:if test="note_positiv='1'">
+    <table:table-row>
+        <table:table-cell table:style-name="Tabelle1.A7" office:value-type="string">
+            <xsl:choose>
+                <xsl:when test="bisio_von">
+                            <text:p text:style-name="P12">Auslandsaufenthalt: <xsl:value-of select="bisio_von"/>-<xsl:value-of select="bisio_bis"/>, <xsl:value-of select="bisio_ort"/>, <xsl:value-of select="bisio_universitaet"/></text:p>
+                            <text:p text:style-name="P12">Die im Ausland absolvierten Lehrveranstaltungen werden für das <xsl:value-of select="../semester"/>. Semester des Studiums an der Fachhochschule Technikum Wien angerechnet (Details siehe Transcript of Records der Gasthochschule).</text:p>
+                </xsl:when>
+                <xsl:otherwise>
+                    <text:p text:style-name="P10"><xsl:value-of select="bezeichnung"/></text:p>
+                </xsl:otherwise>
+            </xsl:choose>
+        </table:table-cell>
+        <table:table-cell table:style-name="Tabelle1.B2" office:value-type="string">
+            <text:p text:style-name="P9">
+            <xsl:if test="sws_lv=''">
+                <xsl:text>-</xsl:text>
+            </xsl:if>
+            <xsl:value-of select="sws_lv"/>
+            </text:p>
+        </table:table-cell>
+        <table:table-cell table:style-name="Tabelle1.C2" office:value-type="string">
+            <text:p text:style-name="P9">
+                <xsl:if test="ects=''">
+                    <xsl:text>-</xsl:text>
+                </xsl:if>
+                <xsl:value-of select="ects"/>
+            </text:p>
+        </table:table-cell>
+        <table:table-cell table:style-name="Tabelle1.D2" office:value-type="string">
+            <text:p text:style-name="P9">
+                <xsl:if test="note=''">
+                    <xsl:text>-</xsl:text>
+                </xsl:if>
+                <xsl:value-of select="note"/>
+            </text:p>
+        </table:table-cell>
+    </table:table-row>
+</xsl:if>
 </xsl:template>
 <xsl:template match="fussnote">
 <table:table-row>

system/xsl/diplomaSupp_0.xsl

@@ -1104,7 +1104,7 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
 	</style:style>
 	<style:style style:name="P55" style:family="paragraph" style:parent-style-name="Heading_20_4" style:master-page-name="Standard">
 		<style:text-properties style:use-window-font-color="true"/>
-	</style:style> 
+	</style:style>
 	<style:style style:name="P56" style:family="paragraph" style:parent-style-name="Heading_20_4" style:master-page-name="Convert_20_1">
 		<style:paragraph-properties style:page-number="auto"/>
 		<style:text-properties style:use-window-font-color="true" fo:language="en" fo:country="US"/>
@@ -1278,7 +1278,7 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
 	</office:document-content>
  </xsl:template>
 <xsl:template match="supplement">
-		
+
 		<text:sequence-decls 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:sequence-decl text:display-outline-level="0" text:name="Illustration"/>
 		<text:sequence-decl text:display-outline-level="0" text:name="Table"/>
@@ -2381,15 +2381,15 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
 		<text:p text:style-name="P25">Neben den ordentlichen Studien, die oben beschrieben wurden, gibt es auch außerordentliche Studien, die an Universitäten entweder ein Universitätslehrgang oder der Besuch einzelner Lehrveranstaltungen, im Fachhochschulbereich ein Lehrgang zur Weiterbildung oder der Besuch einzelner Lehrveranstaltungen und an Pädagogischen Hochschulen ein Hochschullehrgang sein können.</text:p>
 		<text:p text:style-name="P24"/>
 		<text:p text:style-name="P41">Bachelorstudium</text:p>
-		<text:p text:style-name="P24">Die Zulassung zu einem Bachelorstudium erfolgt auf der Grundlage eines österreichischen oder gleichwertigen ausländischen Reifezeugnisses, eines Zeugnisses über die Studienberechtigungsprüfung oder eines Zeugnisses über die Berufsreifeprüfung, in künstlerischen Studien auf der Grundlage einer Zulassungsprüfung. Die Zulassung zu einem Fachhochschul-Bachelorstudiengang kann auch auf der Grundlage einer einschlägigen beruflichen Qualifikation erfolgen. In einigen Bachelorstudien an Universitäten, in den meisten Fachhochschul-Bachelorstudiengängen und in Bachelorstudien an Pädagogischen Hochschulen findet ein Auswahlverfahren statt.</text:p> 
+		<text:p text:style-name="P24">Die Zulassung zu einem Bachelorstudium erfolgt auf der Grundlage eines österreichischen oder gleichwertigen ausländischen Reifezeugnisses, eines Zeugnisses über die Studienberechtigungsprüfung oder eines Zeugnisses über die Berufsreifeprüfung, in künstlerischen Studien auf der Grundlage einer Zulassungsprüfung. Die Zulassung zu einem Fachhochschul-Bachelorstudiengang kann auch auf der Grundlage einer einschlägigen beruflichen Qualifikation erfolgen. In einigen Bachelorstudien an Universitäten, in den meisten Fachhochschul-Bachelorstudiengängen und in Bachelorstudien an Pädagogischen Hochschulen findet ein Auswahlverfahren statt.</text:p>
 		<text:p text:style-name="P24">Die Fächer/Module und ihre Inhalte sind im Curriculum festgelegt. In der Regel sind zwei Bachelorarbeiten im Rahmen von Lehrveranstaltungen abzufassen. Fachhochschul-Bachelorstudiengänge, Bachelorstudien an Pädagogischen Hochschulen und einige Bachelorstudien an Universitäten umfassen ein angeleitetes Praktikum. Das Studium kann mit einer Bachelorprüfung abgeschlossen werden.</text:p>
 		<text:p text:style-name="P24"/>
 		<text:p text:style-name="P41"><text:soft-page-break/>Masterstudium</text:p>
-		<text:p text:style-name="P24">Die Zulassung zu einem Masterstudium erfolgt auf der Grundlage eines abgeschlossenen facheinschlägigen Bachelorstudiums oder gleichwertigen postsekundären Abschlusses. In einigen Studien findet ein Auswahlverfahren statt</text:p> 
+		<text:p text:style-name="P24">Die Zulassung zu einem Masterstudium erfolgt auf der Grundlage eines abgeschlossenen facheinschlägigen Bachelorstudiums oder gleichwertigen postsekundären Abschlusses. In einigen Studien findet ein Auswahlverfahren statt</text:p>
 		<text:p text:style-name="P24">Die Fächer/Module und ihre Inhalte sind im Curriculum festgelegt. Ein Schwerpunkt des Studiums liegt auf der Erstellung der Masterarbeit. Das Studium wird mit einer Masterprüfung abgeschlossen. Die Zulassung zur Masterprüfung setzt die Approbation der Masterarbeit voraus.</text:p>
 		<text:p text:style-name="P24"/>
 		<text:p text:style-name="P41">Diplomstudium</text:p>
-		<text:p text:style-name="P24">Die Zulassung zu einem Diplomstudium erfolgt auf der Grundlage eines österreichischen oder gleichwertigen ausländischen Reifezeugnisses, eines Zeugnisses über die Studienberechtigungsprüfung oder eines Zeugnisses über die Berufsreifeprüfung, in künstlerischen Studien auf der Grundlage einer Zulassungsprüfung. Die Zulassung zu einem Fachhochschul-Diplomstudiengang kann auch auf der Grundlage einer einschlägigen beruflichen Qualifikation erfolgen. In einigen Studien (z.B. Humanmedizin und Zahnmedizin sowie in Fachhochschul-Diplomstudiengängen) findet ein Auswahlverfahren statt.</text:p> 
+		<text:p text:style-name="P24">Die Zulassung zu einem Diplomstudium erfolgt auf der Grundlage eines österreichischen oder gleichwertigen ausländischen Reifezeugnisses, eines Zeugnisses über die Studienberechtigungsprüfung oder eines Zeugnisses über die Berufsreifeprüfung, in künstlerischen Studien auf der Grundlage einer Zulassungsprüfung. Die Zulassung zu einem Fachhochschul-Diplomstudiengang kann auch auf der Grundlage einer einschlägigen beruflichen Qualifikation erfolgen. In einigen Studien (z.B. Humanmedizin und Zahnmedizin sowie in Fachhochschul-Diplomstudiengängen) findet ein Auswahlverfahren statt.</text:p>
 		<text:p text:style-name="P24">Das Studium kann in Studienabschnitte unterteilt sein. Die Dauer jedes Studienabschnitts, die Fächer und ihre Inhalte sind im Curriculum festgelegt. Sie gliedern sich in Pflichtfächer und Wahlfächer. Jeder Studienabschnitt wird mit einer Diplomprüfung abgeschlossen. Fachhochschul-Diplomstudiengänge und einige Diplomstudien an Universitäten umfassen ein angeleitetes Praktikum. Die Zulassung zur letzten Diplomprüfung setzt die Approbation der Diplomarbeit voraus.</text:p>
 		<text:p text:style-name="P24"/>
 		<text:p text:style-name="P24"/>
@@ -2567,13 +2567,13 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
 			<text:p text:style-name="P53">The <text:span text:style-name="T14">new system</text:span> is based on the distinction between undergraduate and graduate studies. Upon completion of an undergraduate programme (<text:span text:style-name="T15">Bachelorstudium</text:span> at universities and university colleges of education or, respectively, <text:span text:style-name="T15">Fachhochschul-Bachelorstudiengang</text:span> at universities of applied sciences, comprising 180 to 240 ECTS credits), a bachelor’s degree (designation: "Bachelor of/in ..." ) is awarded. Upon completion of a graduate program (<text:span text:style-name="T15">Masterstudium</text:span> at universities and university colleges of education or, respectively, <text:span text:style-name="T15">Fachhochschul-Masterstudiengang</text:span> at universities of applied sciences, comprising 60 to 120 ECTS credits), a master’s degree (designation: "Master of/in ..." ) is awarded. In the fields of engineering, the designation of the master’s degree can also be "Diplom-Ingenieur/in".</text:p>
 		</text:list-item>
 		<text:list-item>
-			<text:p text:style-name="P53">Under the auspices of the <text:span text:style-name="T14">older system</text:span> of diploma degree programmes (<text:span text:style-name="T15">Diplomstudien</text:span>), the first degree awarded is the diploma degree (<text:span text:style-name="T15">Diplomgrad</text:span>). An Austrian higher secondary school leaving certificate or its equivalent is the general qualification necessary for enrolling in a diploma degree programme; conclusion of a diploma degree programme entitles degree holders to enrol in doctoral programmes. A diploma degree (<text:span text:style-name="T15">Diplomgrad</text:span>) is awarded by Austrian universities after a course of study consisting of 240 to 360 ECTS credits. Full degree titles are gender specific designations: <text:span text:style-name="T15">Magister</text:span> for men; <text:span text:style-name="T15">Magistra</text:span> for women. Degree titles also include a general description of the field of study in which they were obtained, e.g. <text:span text:style-name="T15">Magister philosophiae</text:span>. In the fields of engineering, the degree titles are <text:span text:style-name="T15">Diplom-Ingenieur/in</text:span>. 
+			<text:p text:style-name="P53">Under the auspices of the <text:span text:style-name="T14">older system</text:span> of diploma degree programmes (<text:span text:style-name="T15">Diplomstudien</text:span>), the first degree awarded is the diploma degree (<text:span text:style-name="T15">Diplomgrad</text:span>). An Austrian higher secondary school leaving certificate or its equivalent is the general qualification necessary for enrolling in a diploma degree programme; conclusion of a diploma degree programme entitles degree holders to enrol in doctoral programmes. A diploma degree (<text:span text:style-name="T15">Diplomgrad</text:span>) is awarded by Austrian universities after a course of study consisting of 240 to 360 ECTS credits. Full degree titles are gender specific designations: <text:span text:style-name="T15">Magister</text:span> for men; <text:span text:style-name="T15">Magistra</text:span> for women. Degree titles also include a general description of the field of study in which they were obtained, e.g. <text:span text:style-name="T15">Magister philosophiae</text:span>. In the fields of engineering, the degree titles are <text:span text:style-name="T15">Diplom-Ingenieur/in</text:span>.
 											Degrees awarded in medicine and dentistry are exceptions to the above. The first degrees awarded after the completion of these degree programmes consisting of 360 ECTS credits are <text:span text:style-name="T15">Doctor medicinae universae</text:span> and <text:span text:style-name="T15">Doctor medicinae dentalis</text:span>, respectively.</text:p>
 			<text:p text:style-name="P53">Graduates of university of applied sciences programmes that consist of 240 to 300 ECTS credits are awarded, analogous to university studies, a university of applied science diploma degree (<text:span text:style-name="T15">Fachhochschul-Diplomgrad</text:span>) contingent upon <text:soft-page-break/>discipline: either a <text:span text:style-name="T15">Diplom-Ingenieur/in (FH)</text:span> for fields of engineering or <text:span text:style-name="T15">Magister/Magistra (FH)</text:span> in other fields of study.</text:p>
 		</text:list-item>
 		</text:list>
 		<text:p text:style-name="P17"/>
-		<text:p text:style-name="P17">The study programmes for teachers’ qualifications are offered jointly between universities and university colleges of education.</text:p>	 
+		<text:p text:style-name="P17">The study programmes for teachers’ qualifications are offered jointly between universities and university colleges of education.</text:p>
 		<text:p text:style-name="P17"/>
 		<text:p text:style-name="P17">Recipients of the diploma degrees from the old system or master’s degrees from the new system (including the ones awarded in both cases by the universities of applied sciences) are entitled to enrol in doctoral programmes (<text:span text:style-name="T15">Doktoratsstudium</text:span>) at universities. A doctoral degree with the designation either <text:span text:style-name="T15">"Doktor/in"</text:span> or "Doctor of Philosophy" (PhD) is awarded upon completion of a doctoral programme with a minimum duration of three years.</text:p>
 		<text:p text:style-name="P17"/>
@@ -2669,8 +2669,8 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
 		</table:table-row>
 		</table:table>
 		<text:p text:style-name="P17"/>
-		
-		
+
+
 		<text:p text:style-name="P75">Grades for comprehensive examinations, i.e. examinations covering materials from various subjects:</text:p>
 		<table:table table:name="Table15" table:style-name="Table15">
 		 <table:table-column table:style-name="Table15.B" />
@@ -2699,13 +2699,13 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
 		<text:p text:style-name="P75">Federal Ministry of Science, Research and Economy</text:p>
 		<text:p text:style-name="P75">Unit VI/7</text:p>
 		<text:p text:style-name="P13"/>
-		
+
 		<text:p text:style-name="P48">
 		<draw:frame xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" draw:style-name="fr2" draw:name="graphics3" text:anchor-type="paragraph" svg:width="17cm" svg:height="24.042cm" draw:z-index="14" >
 			<draw:image xlink:href="Pictures/100000000000092300000CECE56EC0B3.tif" xlink:type="simple" xlink:show="embed" xlink:actuate="onLoad"/>
 		</draw:frame>
 		</text:p>
-		
+
 
 		<text:p><text:span text:style-name="T12">TRANSCRIPT OF RECORDS</text:span></text:p>
 
@@ -2784,7 +2784,7 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
 		<text:p text:style-name="P15"/>
 		<text:p text:style-name="P23">¹ Type: Laboratory (LAB), Lecture (VO), Integrated Course (ILV), Seminar (SE), Tutorial (TUT), Project (PRJ), Exercise (UE), Distance Learning (FL), Other (SO)</text:p>
 		<text:p text:style-name="P23">² 1 Semester period per week = 45 minutes</text:p>
-		<text:p text:style-name="P23">³ Grading Scheme: excellent (1), good (2), satisfactory (3), sufficient (4), insufficient (5), not graded (nb), Credit based on previous experience/work (ar), successfully completed (ea), not successfully completed (nea), Participated with success (met), participated (tg)</text:p>
+		<text:p text:style-name="P23">³ Grading Scheme: excellent (1), good (2), satisfactory (3), sufficient (4), Credit based on previous experience/work (ar), successfully completed (ea), Participated with success (met), participated (tg)</text:p>
 		<text:p text:style-name="P18">
 		<text:soft-page-break/>
 		</text:p>
@@ -2902,38 +2902,40 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
 
 	</xsl:template>
 	<xsl:template match="lv">
-	<table:table-row 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" table:style-name="Table12.1">
-		<table:table-cell table:style-name="Table12.A5" office:value-type="string">
-		<text:p text:style-name="P20">
-			<xsl:value-of select="benotungsdatum"/>
-		</text:p>
-		</table:table-cell>
-		<table:table-cell table:style-name="Table12.B5" office:value-type="string">
-		<text:p text:style-name="P58">
-			<xsl:value-of select="bezeichnung_englisch"/>
-		</text:p>
-		</table:table-cell>
-		<table:table-cell table:style-name="Table12.C5" office:value-type="string">
-		<text:p text:style-name="P65">
-			<xsl:value-of select="lehrform_kurzbz"/>
-		</text:p>
-		</table:table-cell>
-		<table:table-cell table:style-name="Table12.D5" office:value-type="string">
-		<text:p text:style-name="P65">
-			<xsl:value-of select="sws_lv"/>
-		</text:p>
-		</table:table-cell>
-		<table:table-cell table:style-name="Table12.E5" office:value-type="string">
-		<text:p text:style-name="P65">
-			<xsl:value-of select="ects"/>
-		</text:p>
-		</table:table-cell>
-		<table:table-cell table:style-name="Table12.F5" office:value-type="string">
-		<text:p text:style-name="P65">
-			<xsl:value-of select="note"/>
-		</text:p>
-		</table:table-cell>
-	</table:table-row>
+		<xsl:if test="note_positiv='1'">
+			<table:table-row 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" table:style-name="Table12.1">
+				<table:table-cell table:style-name="Table12.A5" office:value-type="string">
+                <text:p text:style-name="P20">
+                    <xsl:value-of select="benotungsdatum"/>
+                </text:p>
+				</table:table-cell>
+				<table:table-cell table:style-name="Table12.B5" office:value-type="string">
+                <text:p text:style-name="P58">
+                    <xsl:value-of select="bezeichnung_englisch"/>
+                </text:p>
+				</table:table-cell>
+				<table:table-cell table:style-name="Table12.C5" office:value-type="string">
+                <text:p text:style-name="P65">
+                    <xsl:value-of select="lehrform_kurzbz"/>
+                </text:p>
+				</table:table-cell>
+				<table:table-cell table:style-name="Table12.D5" office:value-type="string">
+                <text:p text:style-name="P65">
+                    <xsl:value-of select="sws_lv"/>
+                </text:p>
+				</table:table-cell>
+				<table:table-cell table:style-name="Table12.E5" office:value-type="string">
+                <text:p text:style-name="P65">
+                    <xsl:value-of select="ects"/>
+                </text:p>
+				</table:table-cell>
+				<table:table-cell table:style-name="Table12.F5" office:value-type="string">
+                <text:p text:style-name="P65">
+                    <xsl:value-of select="note"/>
+                </text:p>
+				</table:table-cell>
+			</table:table-row>
+		</xsl:if>
 	</xsl:template>
 
 </xsl:stylesheet>

system/xsl/diplomaSupp_Lehrgaenge.xsl

@@ -2788,7 +2788,7 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
 		<text:p text:style-name="P15"/>
 		<text:p text:style-name="P23">¹ Type: Laboratory (LAB), Lecture (VO), Integrated Course (ILV), Seminar (SE), Tutorial (TUT), Project (PRJ), Exercise (UE), Distance Learning (FL), Other (SO)</text:p>
 		<text:p text:style-name="P23">² 1 Semester period per week = 45 minutes</text:p>
-		<text:p text:style-name="P23">³ Grading Scheme: excellent (1), good (2), satisfactory (3), sufficient (4), insufficient (5), not graded (nb), Credit based on previous experience/work (ar), successfully completed (ea), not successfully completed (nea), Participated with success (met), participated (tg)</text:p>
+		<text:p text:style-name="P23">³ Grading Scheme: excellent (1), good (2), satisfactory (3), sufficient (4), Credit based on previous experience/work (ar), successfully completed (ea), Participated with success (met), participated (tg)</text:p>
 		<text:p text:style-name="P18">
 		<text:soft-page-break/>
 		</text:p>
@@ -2908,38 +2908,40 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
 
 	</xsl:template>
 	<xsl:template match="lv">
-	<table:table-row 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" table:style-name="Table12.1">
-		<table:table-cell table:style-name="Table12.A5" office:value-type="string">
-		<text:p text:style-name="P20">
-			<xsl:value-of select="benotungsdatum"/>
-		</text:p>
-		</table:table-cell>
-		<table:table-cell table:style-name="Table12.B5" office:value-type="string">
-		<text:p text:style-name="P58">
-			<xsl:value-of select="bezeichnung_englisch"/>
-		</text:p>
-		</table:table-cell>
-		<table:table-cell table:style-name="Table12.C5" office:value-type="string">
-		<text:p text:style-name="P65">
-			<xsl:value-of select="lehrform_kurzbz"/>
-		</text:p>
-		</table:table-cell>
-		<table:table-cell table:style-name="Table12.D5" office:value-type="string">
-		<text:p text:style-name="P65">
-			<xsl:value-of select="sws_lv"/>
-		</text:p>
-		</table:table-cell>
-		<table:table-cell table:style-name="Table12.E5" office:value-type="string">
-		<text:p text:style-name="P65">
-			<xsl:value-of select="ects"/>
-		</text:p>
-		</table:table-cell>
-		<table:table-cell table:style-name="Table12.F5" office:value-type="string">
-		<text:p text:style-name="P65">
-			<xsl:value-of select="note"/>
-		</text:p>
-		</table:table-cell>
-	</table:table-row>
+    <xsl:if test="note_positiv='1'">
+        <table:table-row 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" table:style-name="Table12.1">
+            <table:table-cell table:style-name="Table12.A5" office:value-type="string">
+            <text:p text:style-name="P20">
+                <xsl:value-of select="benotungsdatum"/>
+            </text:p>
+            </table:table-cell>
+            <table:table-cell table:style-name="Table12.B5" office:value-type="string">
+            <text:p text:style-name="P58">
+                <xsl:value-of select="bezeichnung_englisch"/>
+            </text:p>
+            </table:table-cell>
+            <table:table-cell table:style-name="Table12.C5" office:value-type="string">
+            <text:p text:style-name="P65">
+                <xsl:value-of select="lehrform_kurzbz"/>
+            </text:p>
+            </table:table-cell>
+            <table:table-cell table:style-name="Table12.D5" office:value-type="string">
+            <text:p text:style-name="P65">
+                <xsl:value-of select="sws_lv"/>
+            </text:p>
+            </table:table-cell>
+            <table:table-cell table:style-name="Table12.E5" office:value-type="string">
+            <text:p text:style-name="P65">
+                <xsl:value-of select="ects"/>
+            </text:p>
+            </table:table-cell>
+            <table:table-cell table:style-name="Table12.F5" office:value-type="string">
+            <text:p text:style-name="P65">
+                <xsl:value-of select="note"/>
+            </text:p>
+            </table:table-cell>
+        </table:table-row>
+	</xsl:if>
 	</xsl:template>
 
 </xsl:stylesheet>

system/xsl/fotoliste_0.xsl

@@ -1,307 +1,221 @@
 <?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"
-    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:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
+<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"
+		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:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0"
 >
 
-    <xsl:output method="xml" version="1.0" indent="yes"/>
-    <xsl:template match="fotoliste">
+	<xsl:output method="xml" version="1.0" indent="yes"/>
+	<xsl:template match="fotoliste">
 
-        <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="Liberation Serif" svg:font-family="&apos;Liberation Serif&apos;" style:font-family-generic="roman" style:font-pitch="variable"/>
-                <style:font-face style:name="Arial" svg:font-family="Arial" style:font-family-generic="swiss" 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="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="SimSun" svg:font-family="SimSun" 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="17.013cm" fo:margin-left="0cm" table:align="left" style:shadow="none"/>
-                </style:style>
-                <style:style style:name="Tabelle1.A" style:family="table-column">
-                    <style:table-column-properties style:column-width="2.805cm"/>
-                </style:style>
-                <style:style style:name="Tabelle1.B" style:family="table-column">
-                    <style:table-column-properties style:column-width="6.8cm"/>
-                </style:style>
-                <style:style style:name="Tabelle1.C" style:family="table-column">
-                    <style:table-column-properties style:column-width="2.514cm"/>
-                </style:style>
-                <style:style style:name="Tabelle1.D" style:family="table-column">
-                    <style:table-column-properties style:column-width="2.937cm"/>
-                </style:style>
-                <style:style style:name="Tabelle1.E" style:family="table-column">
-                    <style:table-column-properties style:column-width="1.958cm"/>
-                </style:style>
-                <style:style style:name="Tabelle1.1" style:family="table-row">
-                    <style:table-row-properties style:min-row-height="1.191cm"/>
-                </style:style>
-                <style:style style:name="Tabelle1.A1" style:family="table-cell">
-                    <style:table-cell-properties style:vertical-align="middle" fo:padding="0.097cm" fo:border-left="0.05pt solid #666666" fo:border-right="none" fo:border-top="0.05pt solid #666666" fo:border-bottom="0.05pt solid #666666"/>
-                </style:style>
-                <style:style style:name="Tabelle1.E1" style:family="table-cell">
-                    <style:table-cell-properties style:vertical-align="middle" fo:padding="0.097cm" fo:border="0.05pt solid #666666"/>
-                </style:style>
-                <style:style style:name="Tabelle1.A2" style:family="table-cell">
-                    <style:table-cell-properties fo:padding="0.097cm" fo:border-left="0.05pt solid #b2b2b2" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #b2b2b2"/>
-                </style:style>
-                <style:style style:name="Tabelle1.B2" style:family="table-cell">
-                    <style:table-cell-properties style:vertical-align="middle" fo:padding="0.097cm" fo:border-left="0.05pt solid #b2b2b2" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #b2b2b2"/>
-                </style:style>
-                <style:style style:name="Tabelle1.E2" style:family="table-cell">
-                    <style:table-cell-properties style:vertical-align="middle" fo:padding="0.097cm" fo:border-left="0.05pt solid #b2b2b2" fo:border-right="0.05pt solid #b2b2b2" fo:border-top="none" fo:border-bottom="0.05pt solid #b2b2b2"/>
-                </style:style>
-                <style:style style:name="Tabelle1.A3" style:family="table-cell">
-                    <style:table-cell-properties fo:padding="0.097cm" fo:border-left="0.05pt solid #b2b2b2" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #b2b2b2"/>
-                </style:style>
-                <style:style style:name="Tabelle1.A4" style:family="table-cell">
-                    <style:table-cell-properties fo:padding="0.097cm" fo:border-left="0.05pt solid #b2b2b2" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #b2b2b2"/>
-                </style:style>
-                <style:style style:name="Tabelle1.A5" style:family="table-cell">
-                    <style:table-cell-properties fo:padding="0.097cm" fo:border-left="0.05pt solid #b2b2b2" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #b2b2b2"/>
-                </style:style>
-                <style:style style:name="Tabelle1.A6" style:family="table-cell">
-                    <style:table-cell-properties fo:padding="0.097cm" fo:border-left="0.05pt solid #b2b2b2" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #b2b2b2"/>
-                </style:style>
-                <style:style style:name="P1" style:family="paragraph" style:parent-style-name="Header">
-                    <style:text-properties officeooo:rsid="001d5274" officeooo:paragraph-rsid="001d5274"/>
-                </style:style>
-                <style:style style:name="P2" style:family="paragraph" style:parent-style-name="Standard">
-                    <style:text-properties style:font-name="Arial" fo:font-size="10pt" officeooo:rsid="00085c86" officeooo:paragraph-rsid="00085c86" style:font-size-asian="8.75pt" style:font-size-complex="10pt"/>
-                </style:style>
-                <style:style style:name="P3" style:family="paragraph" style:parent-style-name="Standard">
-                    <style:text-properties style:font-name="Arial" fo:font-size="10pt" officeooo:rsid="00085c86" officeooo:paragraph-rsid="000e668c" style:font-size-asian="8.75pt" style:font-size-complex="10pt"/>
-                </style:style>
-                <style:style style:name="P4" style:family="paragraph" style:parent-style-name="Standard">
-                    <style:text-properties style:font-name="Arial" fo:font-size="10pt" officeooo:rsid="00085c86" officeooo:paragraph-rsid="000f7747" style:font-size-asian="8.75pt" style:font-size-complex="10pt"/>
-                </style:style>
-                <style:style style:name="P5" style:family="paragraph" style:parent-style-name="Standard">
-                    <style:text-properties style:font-name="Arial" fo:font-size="10pt" officeooo:rsid="000a058f" officeooo:paragraph-rsid="000a058f" style:font-size-asian="8.75pt" style:font-size-complex="10pt"/>
-                </style:style>
-                <style:style style:name="P6" style:family="paragraph" style:parent-style-name="Standard">
-                    <style:text-properties style:font-name="Arial" fo:font-size="10pt" officeooo:rsid="000a058f" officeooo:paragraph-rsid="00085c86" style:font-size-asian="8.75pt" style:font-size-complex="10pt"/>
-                </style:style>
-                <style:style style:name="P7" style:family="paragraph" style:parent-style-name="Standard">
-                    <style:text-properties style:font-name="Arial" fo:font-size="10pt" officeooo:rsid="000a058f" officeooo:paragraph-rsid="000e668c" style:font-size-asian="8.75pt" style:font-size-complex="10pt"/>
-                </style:style>
-                <style:style style:name="P8" style:family="paragraph" style:parent-style-name="Standard">
-                    <style:text-properties style:font-name="Arial" fo:font-size="10pt" officeooo:rsid="0017ca52" officeooo:paragraph-rsid="0017ca52" style:font-size-asian="8.75pt" style:font-size-complex="10pt"/>
-                </style:style>
-                <style:style style:name="P9" style:family="paragraph" style:parent-style-name="Standard">
-                    <style:text-properties style:font-name="Arial" fo:font-size="14pt" officeooo:rsid="00085c86" officeooo:paragraph-rsid="00085c86" style:font-size-asian="14pt" style:font-size-complex="14pt"/>
-                </style:style>
-                <style:style style:name="P10" style:family="paragraph" style:parent-style-name="Table_20_Contents">
-                    <style:text-properties style:font-name="Arial" fo:font-size="10pt" style:font-size-asian="8.75pt" style:font-size-complex="10pt"/>
-                </style:style>
-                <style:style style:name="P11" style:family="paragraph" style:parent-style-name="Table_20_Contents">
-                    <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
-                    <style:text-properties style:font-name="Arial" fo:font-size="10pt" officeooo:rsid="000e3cb7" officeooo:paragraph-rsid="000e3cb7" style:font-size-asian="8.75pt" style:font-size-complex="10pt"/>
-                </style:style>
-                <style:style style:name="P12" style:family="paragraph" style:parent-style-name="Table_20_Contents">
-                    <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
-                    <style:text-properties style:font-name="Arial" fo:font-size="10pt" officeooo:rsid="000c0ae7" officeooo:paragraph-rsid="000c0ae7" style:font-size-asian="8.75pt" style:font-size-complex="10pt"/>
-                </style:style>
-                <style:style style:name="P13" style:family="paragraph" style:parent-style-name="Table_20_Contents">
-                    <style:text-properties style:font-name="Arial" fo:font-size="12pt" fo:font-weight="normal" officeooo:rsid="00085c86" officeooo:paragraph-rsid="00085c86" style:font-size-asian="12pt" style:font-weight-asian="normal" style:font-size-complex="12pt" style:font-weight-complex="normal"/>
-                </style:style>
-                <style:style style:name="P14" style:family="paragraph" style:parent-style-name="Table_20_Contents">
-                    <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
-                    <style:text-properties style:font-name="Arial" fo:font-size="12pt" fo:font-weight="normal" officeooo:rsid="00085c86" officeooo:paragraph-rsid="000a058f" style:font-size-asian="12pt" style:font-weight-asian="normal" style:font-size-complex="12pt" style:font-weight-complex="normal"/>
-                </style:style>
-                <style:style style:name="P15" style:family="paragraph" style:parent-style-name="Table_20_Contents">
-                    <style:text-properties style:font-name="Arial" fo:font-size="12pt" fo:font-weight="normal" officeooo:rsid="000a058f" officeooo:paragraph-rsid="000a058f" style:font-size-asian="12pt" style:font-weight-asian="normal" style:font-size-complex="12pt" style:font-weight-complex="normal"/>
-                </style:style>
-                <style:style style:name="P16" style:family="paragraph" style:parent-style-name="Table_20_Contents">
-                    <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
-                    <style:text-properties style:font-name="Arial" fo:font-size="12pt" fo:font-weight="normal" officeooo:rsid="000e3cb7" officeooo:paragraph-rsid="000e3cb7" style:font-size-asian="12pt" style:font-weight-asian="normal" style:font-size-complex="12pt" style:font-weight-complex="normal"/>
-                </style:style>
-                <style:style style:name="P17" style:family="paragraph" style:parent-style-name="Table_20_Contents">
-                    <style:paragraph-properties fo:margin-left="0.499cm" fo:margin-right="0cm" fo:text-indent="0cm" style:auto-text-indent="false" style:writing-mode="page"/>
-                    <style:text-properties style:font-name="Arial" fo:font-size="10pt" officeooo:rsid="000c0ae7" officeooo:paragraph-rsid="000e3cb7" style:font-size-asian="8.75pt" style:font-size-complex="10pt"/>
-                </style:style>
-                <style:style style:name="P18" style:family="paragraph" style:parent-style-name="Standard">
-                    <style:text-properties style:font-name="Arial" fo:font-size="10pt" officeooo:rsid="002126bf" officeooo:paragraph-rsid="002126bf" style:font-size-asian="8.75pt" style:font-size-complex="10pt"/>
-                </style:style>
-                <style:style style:name="T1" style:family="text">
-                    <style:text-properties style:font-name="Arial" fo:font-size="8pt" style:font-size-asian="8pt" style:font-size-complex="8pt"/>
-                </style:style>
-                <style:style style:name="T2" style:family="text">
-                    <style:text-properties style:font-name="Arial" fo:font-size="8pt" officeooo:rsid="000bc4a4" style:font-size-asian="8pt" style:font-size-complex="8pt"/>
-                </style:style>
-                <style:style style:name="T3" style:family="text">
-                    <style:text-properties officeooo:rsid="000cdaaf"/>
-                </style:style>
-                <style:style style:name="T4" style:family="text">
-                    <style:text-properties fo:font-weight="bold" officeooo:rsid="000e3cb7" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
-                </style:style>
-                <style:style style:name="fr1" style:family="graphic" style:parent-style-name="Graphics">
-                    <style:graphic-properties style:vertical-pos="top" style:vertical-rel="baseline" 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:style>
-                <style:style style:name="fr2" style:family="graphic" style:parent-style-name="Graphics">
-                    <style:graphic-properties style:vertical-pos="from-top" style:vertical-rel="page" style:horizontal-pos="from-left" style:horizontal-rel="page" 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: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:sequence-decls>
-                        <text:sequence-decl text:display-outline-level="0" text:name="Illustration"/>
-                        <text:sequence-decl text:display-outline-level="0" text:name="Table"/>
-                        <text:sequence-decl text:display-outline-level="0" text:name="Text"/>
-                        <text:sequence-decl text:display-outline-level="0" text:name="Drawing"/>
-                    </text:sequence-decls>
-                    <draw:frame draw:style-name="fr2" draw:name="logo" text:anchor-type="page" text:anchor-page-number="1" svg:x="14.81cm" svg:y="2.939cm" svg:width="4.2cm" svg:height="2.24cm" draw:z-index="5">
-                        <draw:image xlink:href="Pictures/10000201000000FD00000082B4907F4517CEC4AC.png" xlink:type="simple" xlink:show="embed" xlink:actuate="onLoad"/>
-                    </draw:frame>
-                    <text:p text:style-name="P9">Fotoliste <xsl:value-of select="lehrveranstaltung" /></text:p>
-                    <text:p text:style-name="P6"/>
-                    <text:p text:style-name="P7">Studiengang: <xsl:value-of select="studiengang" /> - <xsl:value-of select="studiengangs_typ" /></text:p>
-                    <text:p text:style-name="P2">Studiensemester: <xsl:value-of select="studiensemester" /></text:p>
-                    <text:p text:style-name="P3">Gruppe: <xsl:value-of select="studiengruppe" /></text:p>
-                    <text:p text:style-name="P8">Anzahl Studierende: <xsl:value-of select="anzahl_studierende" /></text:p>
-                    <text:p text:style-name="P18"/>
-                    <text:p text:style-name="P2"/>
-                    <text:p text:style-name="P2"/>
-                    <table:table table:name="Tabelle1" table:style-name="Tabelle1">
-                        <table:table-column table:style-name="Tabelle1.A"/>
-                        <table:table-column table:style-name="Tabelle1.B"/>
-                        <table:table-column table:style-name="Tabelle1.C"/>
-                        <table:table-column table:style-name="Tabelle1.D"/>
-                        <table:table-column table:style-name="Tabelle1.E"/>
-                        <table:table-row table:style-name="Tabelle1.1">
-                            <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
-                                <text:p text:style-name="P13">Foto</text:p>
-                            </table:table-cell>
-                            <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
-                                <text:p text:style-name="P15">Name</text:p>
-                            </table:table-cell>
-                            <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
-                                <text:p text:style-name="P16">Geschlecht</text:p>
-                            </table:table-cell>
-                            <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
-                                <text:p text:style-name="P14">Kennzeichen</text:p>
-                            </table:table-cell>
-                            <table:table-cell table:style-name="Tabelle1.E1" office:value-type="string">
-                                <text:p text:style-name="P14">Gruppe</text:p>
-                            </table:table-cell>
-                        </table:table-row>
-                        <xsl:apply-templates select="studierende"/>	
-    
-                    </table:table>
-                    <text:p text:style-name="P1">
-                        <text:soft-page-break/>
-                    </text:p>
-                    <text:p text:style-name="P6"/>
-                    <text:p text:style-name="P2">(i) … Incoming</text:p>
-                    <text:p text:style-name="P2">(o) … Outgoing</text:p>
-                    <text:p text:style-name="P2">(ar) … angerechnet</text:p>
-                </office:text>
-            </office:body>
-        </office:document-content>
-    </xsl:template>
-        
-    <xsl:template match="studierende">
-        <table:table-row>
-            <table:table-cell table:style-name="Tabelle1.A3" office:value-type="string">
-                <text:p text:style-name="P4">
-                    <xsl:choose>
-                        <xsl:when test="foto_gesperrt='f' and foto_url != ''">
-                            <draw:frame draw:style-name="fr1" draw:name="Bild" text:anchor-type="as-char" svg:width="2.57cm" svg:height="3.431cm" draw:z-index="0">
-                                <draw:image xlink:href="{foto_url}" xlink:type="simple" xlink:show="embed" xlink:actuate="onLoad"/>
-                            </draw:frame>
-                        </xsl:when>
-                        <xsl:when test="foto_gesperrt='t'">
-                            <draw:frame draw:style-name="fr1" draw:name="Bild2" text:anchor-type="as-char" svg:width="2.57cm" svg:height="3.431cm" draw:z-index="0">
-								<draw:image xlink:href="Pictures/10000000000000F000000140BF2FB93E89B12D34.jpg" xlink:type="simple" xlink:show="embed" xlink:actuate="onLoad"/>
-                            </draw:frame>
-                        </xsl:when>
-						<xsl:when test="foto_url=''">
-                            <draw:frame draw:style-name="fr1" draw:name="dummy" text:anchor-type="as-char" svg:width="2.57cm" svg:height="3.431cm" draw:z-index="0">
-                                <draw:image xlink:href="Pictures/dummyfoto_keinBildVorhanden.jpg" xlink:type="simple" xlink:show="embed" xlink:actuate="onLoad"/>
-                            </draw:frame>
-                        </xsl:when>
-                    </xsl:choose>
-                </text:p>
-            </table:table-cell>
-            <table:table-cell table:style-name="Tabelle1.B2" office:value-type="string">
-                <text:p text:style-name="P17">
-                    <text:span text:style-name="T4">
-                        <xsl:value-of select="nachname" />
-                    </text:span>
-                    <xsl:text> </xsl:text>
-                    <xsl:value-of select="vorname" />
-                    <xsl:text> </xsl:text>
-                    <xsl:value-of select="zusatz" />
-                </text:p>
-            </table:table-cell>
-            <table:table-cell table:style-name="Tabelle1.B2" office:value-type="string">
-                <text:p text:style-name="P11">
-                    <xsl:value-of select="geschlecht" />
-                </text:p>
-            </table:table-cell>
-            <table:table-cell table:style-name="Tabelle1.B2" office:value-type="string">
-                <text:p text:style-name="P12">
-                    <xsl:value-of select="personenkennzeichen" />
-                </text:p>
-            </table:table-cell>
-            <table:table-cell table:style-name="Tabelle1.E2" office:value-type="string">
-                <text:p text:style-name="P12">
-                    <xsl:value-of select="studiengruppe" />
-                    <xsl:value-of select="verband" />
-                    <xsl:value-of select="gruppe" />
-                </text:p>
-            </table:table-cell>
-        </table:table-row>
-    </xsl:template>
+		<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="Liberation Serif" svg:font-family="&apos;Liberation Serif&apos;" style:font-family-generic="roman" style:font-pitch="variable"/>
+			<style:font-face style:name="Arial" svg:font-family="Arial" style:font-family-generic="swiss" 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="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="SimSun" svg:font-family="SimSun" 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="25.7cm" table:align="margins" style:shadow="none" fo:keep-with-next="auto" style:may-break-between-rows="true"/>
+			</style:style>
+			<style:style style:name="Tabelle1.1" style:family="table-row">
+				<style:table-row-properties fo:keep-together="always"/>
+			</style:style>
+			<style:style style:name="Tabelle1.A" style:family="table-column">
+				<style:table-column-properties style:column-width="4.283cm" style:rel-column-width="10922*"/>
+			</style:style>
+			<style:style style:name="Tabelle1.A1" style:family="table-cell">
+				<style:table-cell-properties fo:padding="0.097cm" fo:border-left="0.05pt solid #b2b2b2" fo:border-right="0.05pt solid #b2b2b2" fo:border-top="0.05pt solid #b2b2b2" fo:border-bottom="0.05pt solid #b2b2b2"/>
+			</style:style>
+			<style:style style:name="P1" style:family="paragraph" style:parent-style-name="Standard">
+				<style:text-properties style:font-name="Arial" fo:font-size="10pt" style:font-size-asian="10pt" style:font-size-complex="10pt"/>
+			</style:style>
+			<style:style style:name="P2" style:family="paragraph" style:parent-style-name="Standard">
+				<style:text-properties style:font-name="Arial" fo:font-size="10pt" officeooo:rsid="00095c8f" officeooo:paragraph-rsid="00095c8f" style:font-size-asian="10pt" style:font-size-complex="10pt"/>
+			</style:style>
+			<style:style style:name="P3" style:family="paragraph" style:parent-style-name="Standard">
+				<style:text-properties style:font-name="Arial" fo:font-size="10pt" officeooo:rsid="00095c8f" officeooo:paragraph-rsid="000a1f77" style:font-size-asian="10pt" style:font-size-complex="10pt"/>
+			</style:style>
+			<style:style style:name="P4" style:family="paragraph" style:parent-style-name="Standard">
+				<style:text-properties style:font-name="Arial" fo:font-size="10pt" officeooo:paragraph-rsid="000a1f77" style:font-size-asian="10pt" style:font-size-complex="10pt"/>
+			</style:style>
+			<style:style style:name="P5" style:family="paragraph" style:parent-style-name="Standard">
+				<style:text-properties style:font-name="Arial" fo:font-size="10pt" officeooo:rsid="0007e187" officeooo:paragraph-rsid="000a1f77" style:font-size-asian="10pt" style:font-size-complex="10pt"/>
+			</style:style>
+			<style:style style:name="P6" style:family="paragraph" style:parent-style-name="Standard">
+				<style:text-properties style:font-name="Arial" fo:font-size="14pt" style:font-size-asian="14pt" style:font-size-complex="14pt"/>
+			</style:style>
+			<style:style style:name="P7" style:family="paragraph" style:parent-style-name="Table_20_Contents">
+				<style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
+				<style:text-properties style:font-name="Arial" fo:font-size="10pt" style:font-size-asian="10pt" style:font-size-complex="10pt"/>
+			</style:style>
+			<style:style style:name="P8" style:family="paragraph" style:parent-style-name="Table_20_Contents">
+				<style:paragraph-properties fo:margin-top="0.101cm" fo:margin-bottom="0cm" loext:contextual-spacing="false" fo:text-align="center" style:justify-single-word="false" style:writing-mode="page"/>
+				<style:text-properties style:font-name="Arial" fo:font-size="10pt" officeooo:rsid="0007e187" officeooo:paragraph-rsid="0007e187" style:font-size-asian="10pt" style:font-size-complex="10pt"/>
+			</style:style>
+			<style:style style:name="P9" style:family="paragraph" style:parent-style-name="Footer">
+				<style:paragraph-properties fo:text-align="start" style:justify-single-word="false"/>
+				<style:text-properties style:font-name="Arial" fo:font-size="10pt" officeooo:rsid="0007e187" officeooo:paragraph-rsid="000a1f77" style:font-size-asian="10pt" style:font-size-complex="10pt"/>
+			</style:style>
+			<style:style style:name="P10" style:family="paragraph" style:parent-style-name="Footer">
+				<style:paragraph-properties fo:text-align="start" style:justify-single-word="false"/>
+				<style:text-properties style:font-name="Arial" officeooo:paragraph-rsid="000a1f77"/>
+			</style:style>
+			<style:style style:name="T1" style:family="text">
+				<style:text-properties fo:font-weight="bold" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
+			</style:style>
+			<style:style style:name="T2" style:family="text">
+				<style:text-properties officeooo:rsid="00095c8f"/>
+			</style:style>
+			<style:style style:name="T3" style:family="text">
+				<style:text-properties fo:font-size="10pt" style:font-size-asian="10pt" style:font-size-complex="10pt"/>
+			</style:style>
+			<style:style style:name="T4" style:family="text">
+				<style:text-properties fo:font-size="10pt" officeooo:rsid="0007e187" style:font-size-asian="10pt" style:font-size-complex="10pt"/>
+			</style:style>
+			<style:style style:name="T5" style:family="text">
+				<style:text-properties fo:font-size="10pt" officeooo:rsid="00095c8f" style:font-size-asian="10pt" style:font-size-complex="10pt"/>
+			</style:style>
+			<style:style style:name="fr1" style:family="graphic" style:parent-style-name="Graphics">
+				<style:graphic-properties style:vertical-pos="from-top" style:vertical-rel="page" style:horizontal-pos="from-left" style:horizontal-rel="page" 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:style>
+			<style:style style:name="fr2" style:family="graphic" style:parent-style-name="Graphics">
+				<style:graphic-properties style:vertical-pos="top" style:vertical-rel="baseline" 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: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">
+				<office:forms form:automatic-focus="false" form:apply-design-mode="false"/>
+				<text:sequence-decls>
+					<text:sequence-decl text:display-outline-level="0" text:name="Illustration"/>
+					<text:sequence-decl text:display-outline-level="0" text:name="Table"/>
+					<text:sequence-decl text:display-outline-level="0" text:name="Text"/>
+					<text:sequence-decl text:display-outline-level="0" text:name="Drawing"/>
+				</text:sequence-decls>
+				<draw:frame draw:style-name="fr1" draw:name="logo" text:anchor-type="page" text:anchor-page-number="1" svg:x="23.49cm" svg:y="1cm" svg:width="4.2cm" svg:height="2.24cm" draw:z-index="0">
+					<draw:image xlink:href="Pictures/logo_fhtw.png" xlink:type="simple" xlink:show="embed" xlink:actuate="onLoad" loext:mime-type="image/png"/>
+				</draw:frame>
+				<text:p text:style-name="P6">Fotoliste <xsl:value-of select="lehrveranstaltung" /></text:p>
+				<text:p text:style-name="P1"/>
+				<text:p text:style-name="P1">Studiengang: <xsl:value-of select="studiengang" /> - <xsl:value-of select="studiengangs_typ" /></text:p>
+				<text:p text:style-name="P1">Studiensemester: <xsl:value-of select="studiensemester" /></text:p>
+				<text:p text:style-name="P1">Gruppe: <xsl:value-of select="studiengruppe" /></text:p>
+				<text:p text:style-name="P1">Anzahl Studierende: <xsl:value-of select="anzahl_studierende" /></text:p>
+				<text:p text:style-name="P1"/>
+				<table:table table:name="Tabelle1" table:style-name="Tabelle1">
+					<table:table-column table:style-name="Tabelle1.A" table:number-columns-repeated="6"/>
+
+					<xsl:call-template name="row" />
+
+				</table:table>
+			</office:text>
+		</office:body>
+		</office:document-content>
+	</xsl:template>
+
+	<xsl:template name="row">
+		<xsl:param select="ceiling(count(//studierende) div 6)" name="anzahl_zeilen"/>
+		<xsl:param name="index" select="0" />
+		<xsl:param name="total" select="$anzahl_zeilen" />
+		<xsl:param name="position" select="1" />
+
+			<xsl:if test="not($index = $total)">
+				<table:table-row table:style-name="Tabelle1.1">
+					<xsl:apply-templates select="studierende[$position]" />
+					<xsl:apply-templates select="studierende[$position+1]" />
+					<xsl:apply-templates select="studierende[$position+2]" />
+					<xsl:apply-templates select="studierende[$position+3]" />
+					<xsl:apply-templates select="studierende[$position+4]" />
+					<xsl:apply-templates select="studierende[$position+5]" />
+				</table:table-row>
+				<xsl:call-template name="row">
+					<xsl:with-param name="index" select="$index + 1" />
+					<xsl:with-param name="position" select="$position + 6" />
+				</xsl:call-template>
+			</xsl:if>
+	</xsl:template>
+
+	<xsl:template match="studierende">
+		<table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
+			<text:p text:style-name="P7">
+				<xsl:choose>
+					<xsl:when test="foto_gesperrt='f' and foto_url != ''">
+						<draw:frame draw:style-name="fr2" draw:name="Bild" text:anchor-type="as-char" svg:width="2.39cm" svg:height="3.20cm" draw:z-index="1">
+							<draw:image xlink:href="{foto_url}" xlink:type="simple" xlink:show="embed" xlink:actuate="onLoad"/>
+						</draw:frame>
+					</xsl:when>
+					<xsl:when test="foto_gesperrt='t'">
+						<draw:frame draw:style-name="fr2" draw:name="Bild2" text:anchor-type="as-char" svg:width="2.39cm" svg:height="3.20cm" draw:z-index="0">
+							<draw:image xlink:href="Pictures/dummyfoto_bildVonUserGesperrt.jpg" xlink:type="simple" xlink:show="embed" xlink:actuate="onLoad"/>
+						</draw:frame>
+					</xsl:when>
+					<xsl:when test="foto_url=''">
+						<draw:frame draw:style-name="fr2" draw:name="dummy" text:anchor-type="as-char" svg:width="2.39cm" svg:height="3.20cm" draw:z-index="0">
+							<draw:image xlink:href="Pictures/dummyfoto_keinBildVorhanden.jpg" xlink:type="simple" xlink:show="embed" xlink:actuate="onLoad"/>
+						</draw:frame>
+					</xsl:when>
+				</xsl:choose>
+			</text:p>
+			<text:p text:style-name="P8">
+				<text:span text:style-name="T1"><xsl:value-of select="nachname" /></text:span>
+				<xsl:text> </xsl:text>
+				<xsl:value-of select="vorname" />
+				<xsl:text> </xsl:text>
+				(<xsl:value-of select="geschlecht" />)
+				<text:span text:style-name="T2"><xsl:value-of select="zusatz" /></text:span>
+			</text:p>
+		</table:table-cell>
+	</xsl:template>
 </xsl:stylesheet>

system/xsl/lehrtaetigkeit_0.xsl

@@ -0,0 +1,229 @@
+<?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"
+        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:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0"
+>
+
+    <xsl:output method="xml" version="1.0" indent="yes"/>
+    <xsl:template match="lehrtaetigkeit">
+
+<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="Liberation Serif" svg:font-family="&apos;Liberation Serif&apos;"
+                         style:font-family-generic="roman" style:font-pitch="variable"/>
+        <style:font-face style:name="Arial" svg:font-family="Arial" style:font-adornments="Standard"
+                         style:font-family-generic="swiss" 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="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="SimSun" svg:font-family="SimSun" 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="17cm" table:align="margins"/>
+        </style:style>
+        <style:style style:name="Tabelle1.A" style:family="table-column">
+            <style:table-column-properties style:column-width="8.5cm" style:rel-column-width="32767*"/>
+        </style:style>
+        <style:style style:name="Tabelle1.B" style:family="table-column">
+            <style:table-column-properties style:column-width="8.5cm" style:rel-column-width="32768*"/>
+        </style:style>
+        <style:style style:name="Tabelle1.A1" style:family="table-cell">
+            <style:table-cell-properties fo:padding="0.097cm" fo:border-left="0.05pt solid #cccccc"
+                                         fo:border-right="none" fo:border-top="0.05pt solid #cccccc"
+                                         fo:border-bottom="0.05pt solid #cccccc"/>
+        </style:style>
+        <style:style style:name="Tabelle1.B1" style:family="table-cell">
+            <style:table-cell-properties fo:padding="0.097cm" fo:border="0.05pt solid #cccccc"/>
+        </style:style>
+        <style:style style:name="Tabelle1.A2" style:family="table-cell">
+            <style:table-cell-properties fo:padding="0.097cm" fo:border-left="0.05pt solid #cccccc"
+                                         fo:border-right="none" fo:border-top="none"
+                                         fo:border-bottom="0.05pt solid #cccccc"/>
+        </style:style>
+        <style:style style:name="Tabelle1.B2" style:family="table-cell">
+            <style:table-cell-properties fo:padding="0.097cm" fo:border-left="0.05pt solid #cccccc"
+                                         fo:border-right="0.05pt solid #cccccc" fo:border-top="none"
+                                         fo:border-bottom="0.05pt solid #cccccc"/>
+        </style:style>
+        <style:style style:name="P1" style:family="paragraph" style:parent-style-name="Standard">
+            <style:paragraph-properties fo:line-height="115%"/>
+            <style:text-properties style:font-name="Arial" fo:font-size="11pt" officeooo:rsid="0019e1ef"
+                                   officeooo:paragraph-rsid="0019e1ef" style:font-size-asian="10.5pt"
+                                   loext:shadow="none"/>
+        </style:style>
+        <style:style style:name="P2" style:family="paragraph" style:parent-style-name="Standard">
+            <style:paragraph-properties fo:line-height="115%" fo:text-align="end" style:justify-single-word="false"/>
+            <style:text-properties style:font-name="Arial" fo:font-size="11pt" officeooo:rsid="0019e1ef"
+                                   officeooo:paragraph-rsid="0019e1ef" style:font-size-asian="10.5pt"
+                                   loext:shadow="none"/>
+        </style:style>
+        <style:style style:name="P3" style:family="paragraph" style:parent-style-name="Standard">
+            <style:paragraph-properties fo:line-height="115%" fo:text-align="justify"
+                                        style:justify-single-word="false"/>
+            <style:text-properties style:font-name="Arial" fo:font-size="11pt" officeooo:rsid="0019e1ef"
+                                   officeooo:paragraph-rsid="0019e1ef" style:font-size-asian="10.5pt"
+                                   loext:shadow="none"/>
+        </style:style>
+        <style:style style:name="P4" style:family="paragraph" style:parent-style-name="Standard">
+            <style:paragraph-properties fo:line-height="115%"/>
+            <style:text-properties style:font-name="Arial" fo:font-size="13pt" officeooo:rsid="0019e1ef"
+                                   officeooo:paragraph-rsid="0019e1ef" style:font-size-asian="13pt"
+                                   style:font-size-complex="13pt" loext:shadow="none"/>
+        </style:style>
+        <style:style style:name="P5" style:family="paragraph" style:parent-style-name="Table_20_Contents">
+            <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
+            <style:text-properties style:font-name="Arial" fo:font-size="11pt" officeooo:rsid="0019e1ef"
+                                   officeooo:paragraph-rsid="0019e1ef" style:font-size-asian="10.5pt"/>
+        </style:style>
+        <style:style style:name="P6" style:family="paragraph" style:parent-style-name="Table_20_Contents">
+            <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
+            <style:text-properties style:font-name="Arial" fo:font-size="11pt" fo:font-weight="bold"
+                                   officeooo:rsid="0019e1ef" officeooo:paragraph-rsid="0019e1ef"
+                                   style:font-size-asian="10.5pt" style:font-weight-asian="bold"
+                                   style:font-weight-complex="bold"/>
+        </style:style>
+        <style:style style:name="P7" style:family="paragraph" style:parent-style-name="Standard">
+            <style:paragraph-properties fo:line-height="115%"/>
+            <style:text-properties style:font-name="Arial" fo:font-size="11pt" officeooo:rsid="0019e1ef"
+                                   officeooo:paragraph-rsid="0019e1ef" style:font-size-asian="10.5pt"
+                                   loext:shadow="none"/>
+        </style:style>
+        <style:style style:name="fr1" style:family="graphic" style:parent-style-name="Graphics">
+            <style:graphic-properties style:vertical-pos="from-top" style:vertical-rel="paragraph"
+                                      style:horizontal-pos="from-left" style:horizontal-rel="paragraph"
+                                      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:style>
+    </office:automatic-styles>
+    <office:body>
+        <office:text>
+            <text:sequence-decls>
+                <text:sequence-decl text:display-outline-level="0" text:name="Illustration"/>
+                <text:sequence-decl text:display-outline-level="0" text:name="Table"/>
+                <text:sequence-decl text:display-outline-level="0" text:name="Text"/>
+                <text:sequence-decl text:display-outline-level="0" text:name="Drawing"/>
+            </text:sequence-decls>
+            <text:p text:style-name="P4">Bestätigung über Lehrtätigkeit</text:p>
+            <text:p text:style-name="P1"/>
+            <text:p text:style-name="P1"/>
+            <text:p text:style-name="P3">Hiermit wird bestätigt, dass <xsl:value-of select="anrede" /> <xsl:text> </xsl:text><xsl:value-of select="full_name" />,
+                geboren am <xsl:value-of select="birthday" />,
+                <xsl:choose>
+                    <xsl:when test="end_date != ''">
+                        in der Zeit von <xsl:value-of select="begin_date" /> bis <xsl:value-of select="end_date" />
+                        für die FH Technikum Wien als Hochschullehrer tätig war.
+                        Seine Tätigkeit umfasste die Konzeption, Organisation und Abhaltung von Lehrveranstaltungen.
+                    </xsl:when>
+                    <xsl:otherwise>
+                        seit <xsl:value-of select="begin_date" />
+                        für die FH Technikum Wien als Hochschullehrer tätig ist.
+                        Seine Tätigkeit umfasst die Konzeption, Organisation und Abhaltung von Lehrveranstaltungen.
+                    </xsl:otherwise>
+                </xsl:choose>
+            </text:p>
+            <text:p text:style-name="P3"/>
+            <text:p text:style-name="P1">Nachstehend eine detaillierte Aufstellung der Lehraufträge:</text:p>
+            <text:p text:style-name="P1"/>
+            <table:table table:name="Tabelle1" table:style-name="Tabelle1">
+                <table:table-column table:style-name="Tabelle1.A" table:number-columns-repeated="2"/>
+                <table:table-row>
+                    <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
+                        <text:p text:style-name="P6">Semester</text:p>
+                    </table:table-cell>
+                    <table:table-cell table:style-name="Tabelle1.B1" office:value-type="string">
+                        <text:p text:style-name="P6">Semesterstunden pro Semester</text:p>
+                    </table:table-cell>
+                </table:table-row>
+                <!--apply dynamic table rows-->
+                <xsl:for-each select="total_ss_per_semester">
+                    <xsl:if test="total_semesterstunden > 0">
+                        <table:table-row>
+                            <table:table-cell table:style-name="Tabelle1.A2" office:value-type="string">
+                                <text:p text:style-name="P5"><xsl:value-of select="studiensemester_kurzbz" /></text:p>
+                            </table:table-cell>
+                            <table:table-cell table:style-name="Tabelle1.B2" office:value-type="string">
+                                <text:p text:style-name="P5"><xsl:value-of select="total_semesterstunden" /></text:p>
+                            </table:table-cell>
+                        </table:table-row>
+                    </xsl:if>
+                </xsl:for-each>
+            </table:table>
+            <text:p text:style-name="P1"/>
+            <xsl:if test="total_ss_actual_semester != ''">
+                <text:p text:style-name="P1"/>
+                <text:p text:style-name="P1">Für das aktuelle Semester <xsl:value-of select="total_ss_actual_semester/studiensemester_kurzbz" /> sind derzeit <xsl:value-of select="total_ss_actual_semester/total_semesterstunden" /> Semesterstunden beauftragt.
+                </text:p>
+            </xsl:if>
+            <text:p text:style-name="P1"/>
+            <text:p text:style-name="P1"/>
+            <text:p text:style-name="P1">FACHHOCHSCHULE TECHNIKUM WIEN</text:p>
+            <text:p text:style-name="P1"/>
+            <text:p text:style-name="P1"/>
+            <text:p text:style-name="P1"/>
+            <text:p text:style-name="P1">
+                <draw:frame draw:style-name="fr1" draw:name="Bild1" text:anchor-type="paragraph" svg:x="0.183cm"
+                            svg:y="0.025cm" svg:width="5.226cm" svg:height="2.182cm" draw:z-index="0">
+                    <draw:image xlink:href="Pictures/10000000000001AF000000B49D9770EDA3C5B4C0.jpg" xlink:type="simple"
+                                xlink:show="embed" xlink:actuate="onLoad"/>
+                </draw:frame>
+            </text:p>
+            <text:p text:style-name="P1"/>
+            <text:p text:style-name="P1"/>
+            <text:p text:style-name="P2">Wien, 04.04.2019</text:p>
+        </office:text>
+    </office:body>
+</office:document-content>
+
+    </xsl:template>
+
+</xsl:stylesheet>

system/xsl/studienerfolgEng_0.xsl

@@ -609,41 +609,43 @@ xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0"
 			</table:table>
 			<text:p text:style-name="P19"/>
 			<text:p text:style-name="P20">¹ 1 Semester period per week = 45 minutes</text:p>
-			<text:p text:style-name="P20">² 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:tab/>Participated with success (met), passed (b), successfully completed (ea), not successfully completed (nea), did not participate (nt), <text:tab/>participated(tg)</text:p>
+			<text:p text:style-name="P20">² Grades:<text:tab/>excellent (1), very good (2), good (3), satisfactory (4), Credit based on previous experience/work (ar),</text:p><text:p text:style-name="P20"><text:tab/>Participated with success (met), passed (b), successfully completed (ea), participated (tg)</text:p>
 		</office:text>
 </xsl:template>
 <xsl:template match="unterrichtsfach">
-	<table:table-row table:style-name="Tabelle3.1">
-		<table:table-cell table:style-name="Tabelle3.A2" office:value-type="string">
-			<text:p text:style-name="P26">
-				<xsl:choose>
-					<xsl:when test="string-length(bezeichnung_englisch)!=0">
-						<xsl:value-of select="bezeichnung_englisch"/>
-					</xsl:when>
-					<xsl:otherwise>
-						<xsl:text>[ACHTUNG: Keine englische Bezeichung für "</xsl:text><xsl:value-of select="bezeichnung"/><xsl:text>" in der Datenbank!]</xsl:text>
-					</xsl:otherwise>
-				</xsl:choose>
-			</text:p>
-		</table:table-cell>
-		<table:table-cell table:style-name="Tabelle3.A2" office:value-type="string">
-			<text:p text:style-name="P27"><xsl:value-of select="../studiensemester_kurzbz" /></text:p>
-		</table:table-cell>
-		<table:table-cell table:style-name="Tabelle3.A2" office:value-type="string">
-			<text:p text:style-name="P27"><xsl:value-of select="../semester" /></text:p>
-		</table:table-cell>
-		<table:table-cell table:style-name="Tabelle3.A2" office:value-type="string">
-			<text:p text:style-name="P27"><xsl:value-of select="sws_lv" /></text:p>
-		</table:table-cell>
-		<table:table-cell table:style-name="Tabelle3.A2" office:value-type="string">
-			<text:p text:style-name="P27"><xsl:value-of select="ects" /></text:p>
-		</table:table-cell>
-		<table:table-cell table:style-name="Tabelle3.A2" office:value-type="string">
-			<text:p text:style-name="P27"><xsl:value-of select="benotungsdatum" /></text:p>
-		</table:table-cell>
-		<table:table-cell table:style-name="Tabelle3.G2" office:value-type="string">
-			<text:p text:style-name="P27"><xsl:value-of select="note" /></text:p>
-		</table:table-cell>
-	</table:table-row>
+	<xsl:if test="note_positiv='1'">
+		<table:table-row table:style-name="Tabelle3.1">
+			<table:table-cell table:style-name="Tabelle3.A2" office:value-type="string">
+				<text:p text:style-name="P26">
+					<xsl:choose>
+						<xsl:when test="string-length(bezeichnung_englisch)!=0">
+							<xsl:value-of select="bezeichnung_englisch"/>
+						</xsl:when>
+						<xsl:otherwise>
+							<xsl:text>[ACHTUNG: Keine englische Bezeichung für "</xsl:text><xsl:value-of select="bezeichnung"/><xsl:text>" in der Datenbank!]</xsl:text>
+						</xsl:otherwise>
+					</xsl:choose>
+				</text:p>
+			</table:table-cell>
+			<table:table-cell table:style-name="Tabelle3.A2" office:value-type="string">
+				<text:p text:style-name="P27"><xsl:value-of select="../studiensemester_kurzbz" /></text:p>
+			</table:table-cell>
+			<table:table-cell table:style-name="Tabelle3.A2" office:value-type="string">
+				<text:p text:style-name="P27"><xsl:value-of select="../semester" /></text:p>
+			</table:table-cell>
+			<table:table-cell table:style-name="Tabelle3.A2" office:value-type="string">
+				<text:p text:style-name="P27"><xsl:value-of select="sws_lv" /></text:p>
+			</table:table-cell>
+			<table:table-cell table:style-name="Tabelle3.A2" office:value-type="string">
+				<text:p text:style-name="P27"><xsl:value-of select="ects" /></text:p>
+			</table:table-cell>
+			<table:table-cell table:style-name="Tabelle3.A2" office:value-type="string">
+				<text:p text:style-name="P27"><xsl:value-of select="benotungsdatum" /></text:p>
+			</table:table-cell>
+			<table:table-cell table:style-name="Tabelle3.G2" office:value-type="string">
+				<text:p text:style-name="P27"><xsl:value-of select="note" /></text:p>
+			</table:table-cell>
+		</table:table-row>
+	</xsl:if>
 </xsl:template>
 </xsl:stylesheet>

system/xsl/studienerfolgEng_Lehrgaenge.xsl

@@ -600,41 +600,44 @@ xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0"
 			</table:table>
 			<text:p text:style-name="P19"/>
 			<text:p text:style-name="P20">¹ 1 Semester period per week = 45 minutes</text:p>
-			<text:p text:style-name="P20">² 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:tab/>Participated with success (met), passed (b), successfully completed (ea), not successfully completed (nea), did not participate (nt), <text:tab/>participated(tg)</text:p>			
+			<text:p text:style-name="P20">² Grades:<text:tab/>excellent (1), very good (2), good (3), satisfactory (4), Credit based on previous experience/work (ar),</text:p>
+			<text:p text:style-name="P20"><text:tab/>Participated with success (met), passed (b), successfully completed (ea), participated (tg)</text:p>
 		</office:text>
 </xsl:template>
 <xsl:template match="unterrichtsfach">
-	<table:table-row table:style-name="Tabelle3.1">
-		<table:table-cell table:style-name="Tabelle3.A2" office:value-type="string">
-			<text:p text:style-name="P26">
-				<xsl:choose>
-					<xsl:when test="string-length(bezeichnung_englisch)!=0">
-						<xsl:value-of select="bezeichnung_englisch"/>
-					</xsl:when>
-					<xsl:otherwise>
-						<xsl:text>[ACHTUNG: Keine englische Bezeichung für "</xsl:text><xsl:value-of select="bezeichnung"/><xsl:text>" in der Datenbank!]</xsl:text>
-					</xsl:otherwise>
-				</xsl:choose>
-			</text:p>
-		</table:table-cell>
-		<table:table-cell table:style-name="Tabelle3.A2" office:value-type="string">
-			<text:p text:style-name="P27"><xsl:value-of select="../studiensemester_kurzbz" /></text:p>
-		</table:table-cell>
-		<table:table-cell table:style-name="Tabelle3.A2" office:value-type="string">
-			<text:p text:style-name="P27"><xsl:value-of select="../semester" /></text:p>
-		</table:table-cell>
-		<table:table-cell table:style-name="Tabelle3.A2" office:value-type="string">
-			<text:p text:style-name="P27"><xsl:value-of select="sws_lv" /></text:p>
-		</table:table-cell>
-		<table:table-cell table:style-name="Tabelle3.A2" office:value-type="string">
-			<text:p text:style-name="P27"><xsl:value-of select="ects" /></text:p>
-		</table:table-cell>
-		<table:table-cell table:style-name="Tabelle3.A2" office:value-type="string">
-			<text:p text:style-name="P27"><xsl:value-of select="benotungsdatum" /></text:p>
-		</table:table-cell>
-		<table:table-cell table:style-name="Tabelle3.G2" office:value-type="string">
-			<text:p text:style-name="P27"><xsl:value-of select="note" /></text:p>
-		</table:table-cell>
-	</table:table-row>
+	<xsl:if test="note_positiv='1'">
+		<table:table-row table:style-name="Tabelle3.1">
+			<table:table-cell table:style-name="Tabelle3.A2" office:value-type="string">
+				<text:p text:style-name="P26">
+					<xsl:choose>
+						<xsl:when test="string-length(bezeichnung_englisch)!=0">
+							<xsl:value-of select="bezeichnung_englisch"/>
+						</xsl:when>
+						<xsl:otherwise>
+							<xsl:text>[ACHTUNG: Keine englische Bezeichung für "</xsl:text><xsl:value-of select="bezeichnung"/><xsl:text>" in der Datenbank!]</xsl:text>
+						</xsl:otherwise>
+					</xsl:choose>
+				</text:p>
+			</table:table-cell>
+			<table:table-cell table:style-name="Tabelle3.A2" office:value-type="string">
+				<text:p text:style-name="P27"><xsl:value-of select="../studiensemester_kurzbz" /></text:p>
+			</table:table-cell>
+			<table:table-cell table:style-name="Tabelle3.A2" office:value-type="string">
+				<text:p text:style-name="P27"><xsl:value-of select="../semester" /></text:p>
+			</table:table-cell>
+			<table:table-cell table:style-name="Tabelle3.A2" office:value-type="string">
+				<text:p text:style-name="P27"><xsl:value-of select="sws_lv" /></text:p>
+			</table:table-cell>
+			<table:table-cell table:style-name="Tabelle3.A2" office:value-type="string">
+				<text:p text:style-name="P27"><xsl:value-of select="ects" /></text:p>
+			</table:table-cell>
+			<table:table-cell table:style-name="Tabelle3.A2" office:value-type="string">
+				<text:p text:style-name="P27"><xsl:value-of select="benotungsdatum" /></text:p>
+			</table:table-cell>
+			<table:table-cell table:style-name="Tabelle3.G2" office:value-type="string">
+				<text:p text:style-name="P27"><xsl:value-of select="note" /></text:p>
+			</table:table-cell>
+		</table:table-row>
+	</xsl:if>
 </xsl:template>
 </xsl:stylesheet>

system/xsl/studienerfolg_0.xsl

@@ -607,33 +607,35 @@ xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0"
 			</table:table>
 			<text:p text:style-name="P19"/>
 			<text:p text:style-name="P20">Benotung:<text:tab/>
-				<text:span text:style-name="T9">Sehr gut (1), Gut (2), Befriedigend (3), Genügend (4), Nicht genügend (5), mit Erfolg teilgenommen (met), nicht teilgenommen (nt), <text:tab/>teilgenommen(tg), angerechnet (ar), nicht beurteilt (nb), bestanden (b), erfolgreich absolviert (ea), nicht erfolgreich absolviert (nea)</text:span>
+				<text:span text:style-name="T9">Sehr gut (1), Gut (2), Befriedigend (3), Genügend (4), mit Erfolg teilgenommen (met), teilgenommen (tg), angerechnet (ar), <text:tab/>bestanden (b), erfolgreich absolviert (ea)</text:span>
 			</text:p>
 		</office:text>
 </xsl:template>
 <xsl:template match="unterrichtsfach">
-	<table:table-row table:style-name="Tabelle3.1">
-		<table:table-cell table:style-name="Tabelle3.A2" office:value-type="string">
-			<text:p text:style-name="P26"><xsl:value-of select="bezeichnung" /></text:p>
-		</table:table-cell>
-		<table:table-cell table:style-name="Tabelle3.A2" office:value-type="string">
-			<text:p text:style-name="P27"><xsl:value-of select="../studiensemester_kurzbz" /></text:p>
-		</table:table-cell>
-		<table:table-cell table:style-name="Tabelle3.A2" office:value-type="string">
-			<text:p text:style-name="P27"><xsl:value-of select="../semester" /></text:p>
-		</table:table-cell>
-		<table:table-cell table:style-name="Tabelle3.A2" office:value-type="string">
-			<text:p text:style-name="P27"><xsl:value-of select="sws_lv" /></text:p>
-		</table:table-cell>
-		<table:table-cell table:style-name="Tabelle3.A2" office:value-type="string">
-			<text:p text:style-name="P27"><xsl:value-of select="ects" /></text:p>
-		</table:table-cell>
-		<table:table-cell table:style-name="Tabelle3.A2" office:value-type="string">
-			<text:p text:style-name="P27"><xsl:value-of select="benotungsdatum" /></text:p>
-		</table:table-cell>
-		<table:table-cell table:style-name="Tabelle3.G2" office:value-type="string">
-			<text:p text:style-name="P27"><xsl:value-of select="note" /></text:p>
-		</table:table-cell>
-	</table:table-row>
+	<xsl:if test="note_positiv='1'">
+		<table:table-row table:style-name="Tabelle3.1">
+			<table:table-cell table:style-name="Tabelle3.A2" office:value-type="string">
+				<text:p text:style-name="P26"><xsl:value-of select="bezeichnung" /></text:p>
+			</table:table-cell>
+			<table:table-cell table:style-name="Tabelle3.A2" office:value-type="string">
+				<text:p text:style-name="P27"><xsl:value-of select="../studiensemester_kurzbz" /></text:p>
+			</table:table-cell>
+			<table:table-cell table:style-name="Tabelle3.A2" office:value-type="string">
+				<text:p text:style-name="P27"><xsl:value-of select="../semester" /></text:p>
+			</table:table-cell>
+			<table:table-cell table:style-name="Tabelle3.A2" office:value-type="string">
+				<text:p text:style-name="P27"><xsl:value-of select="sws_lv" /></text:p>
+			</table:table-cell>
+			<table:table-cell table:style-name="Tabelle3.A2" office:value-type="string">
+				<text:p text:style-name="P27"><xsl:value-of select="ects" /></text:p>
+			</table:table-cell>
+			<table:table-cell table:style-name="Tabelle3.A2" office:value-type="string">
+				<text:p text:style-name="P27"><xsl:value-of select="benotungsdatum" /></text:p>
+			</table:table-cell>
+			<table:table-cell table:style-name="Tabelle3.G2" office:value-type="string">
+				<text:p text:style-name="P27"><xsl:value-of select="note" /></text:p>
+			</table:table-cell>
+		</table:table-row>
+	</xsl:if>
 </xsl:template>
 </xsl:stylesheet>

system/xsl/studienerfolg_Lehrgaenge.xsl

@@ -598,33 +598,35 @@ xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0"
 			</table:table>
 			<text:p text:style-name="P19"/>
 			<text:p text:style-name="P20">Benotung:<text:tab/>
-				<text:span text:style-name="T9">Sehr gut (1), Gut (2), Befriedigend (3), Genügend (4), Nicht genügend (5), mit Erfolg teilgenommen (met), nicht teilgenommen (nt), <text:tab/>teilgenommen(tg), angerechnet (ar), nicht beurteilt (nb), bestanden (b), erfolgreich absolviert (ea), nicht erfolgreich absolviert (nea)</text:span>
+				<text:span text:style-name="T9">Sehr gut (1), Gut (2), Befriedigend (3), Genügend (4), mit Erfolg teilgenommen (met), teilgenommen (tg), angerechnet (ar), <text:tab/>bestanden (b), erfolgreich absolviert (ea)</text:span>
 			</text:p>
 		</office:text>
 </xsl:template>
 <xsl:template match="unterrichtsfach">
-	<table:table-row table:style-name="Tabelle3.1">
-		<table:table-cell table:style-name="Tabelle3.A2" office:value-type="string">
-			<text:p text:style-name="P26"><xsl:value-of select="bezeichnung" /></text:p>
-		</table:table-cell>
-		<table:table-cell table:style-name="Tabelle3.A2" office:value-type="string">
-			<text:p text:style-name="P27"><xsl:value-of select="../studiensemester_kurzbz" /></text:p>
-		</table:table-cell>
-		<table:table-cell table:style-name="Tabelle3.A2" office:value-type="string">
-			<text:p text:style-name="P27"><xsl:value-of select="../semester" /></text:p>
-		</table:table-cell>
-		<table:table-cell table:style-name="Tabelle3.A2" office:value-type="string">
-			<text:p text:style-name="P27"><xsl:value-of select="sws_lv" /></text:p>
-		</table:table-cell>
-		<table:table-cell table:style-name="Tabelle3.A2" office:value-type="string">
-			<text:p text:style-name="P27"><xsl:value-of select="ects" /></text:p>
-		</table:table-cell>
-		<table:table-cell table:style-name="Tabelle3.A2" office:value-type="string">
-			<text:p text:style-name="P27"><xsl:value-of select="benotungsdatum" /></text:p>
-		</table:table-cell>
-		<table:table-cell table:style-name="Tabelle3.G2" office:value-type="string">
-			<text:p text:style-name="P27"><xsl:value-of select="note" /></text:p>
-		</table:table-cell>
-	</table:table-row>
+	<xsl:if test="note_positiv='1'">
+		<table:table-row table:style-name="Tabelle3.1">
+			<table:table-cell table:style-name="Tabelle3.A2" office:value-type="string">
+				<text:p text:style-name="P26"><xsl:value-of select="bezeichnung" /></text:p>
+			</table:table-cell>
+			<table:table-cell table:style-name="Tabelle3.A2" office:value-type="string">
+				<text:p text:style-name="P27"><xsl:value-of select="../studiensemester_kurzbz" /></text:p>
+			</table:table-cell>
+			<table:table-cell table:style-name="Tabelle3.A2" office:value-type="string">
+				<text:p text:style-name="P27"><xsl:value-of select="../semester" /></text:p>
+			</table:table-cell>
+			<table:table-cell table:style-name="Tabelle3.A2" office:value-type="string">
+				<text:p text:style-name="P27"><xsl:value-of select="sws_lv" /></text:p>
+			</table:table-cell>
+			<table:table-cell table:style-name="Tabelle3.A2" office:value-type="string">
+				<text:p text:style-name="P27"><xsl:value-of select="ects" /></text:p>
+			</table:table-cell>
+			<table:table-cell table:style-name="Tabelle3.A2" office:value-type="string">
+				<text:p text:style-name="P27"><xsl:value-of select="benotungsdatum" /></text:p>
+			</table:table-cell>
+			<table:table-cell table:style-name="Tabelle3.G2" office:value-type="string">
+				<text:p text:style-name="P27"><xsl:value-of select="note" /></text:p>
+			</table:table-cell>
+		</table:table-row>
+	</xsl:if>
 </xsl:template>
 </xsl:stylesheet>

system/xsl/uebernahmebestaetigung_0.xsl

@@ -194,7 +194,6 @@ xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0"
 			<text:p text:style-name="P6"/>
 			<text:p text:style-name="P6">Name:<text:tab/><xsl:value-of select="name_gesamt" />
 			</text:p>
-			<text:p text:style-name="P6">Geburtsdatum:<text:tab/><xsl:value-of select="geburtsdatum" /></text:p>
 			<text:p text:style-name="P6"/>
 			<table:table table:name="Tabelle2" table:style-name="Tabelle2">
 				<table:table-column table:style-name="Tabelle2.A"/>

vilesci/personen/import/interessentenimport.php

@@ -178,11 +178,11 @@ if (isset($_GET['type']) && $_GET['type'] == 'getstudienplancontent' && isset($_
 <head>
 	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 	<link href="../../../skin/styles/tw.css" rel="stylesheet" type="text/css">
-	<link rel="stylesheet" type="text/css" href="../../../skin/jquery-ui-1.9.2.custom.min.css">
-	<script type="text/javascript" src="../../../vendor/jquery/jqueryV1/jquery-1.12.4.min.js"></script>
-	<script type="text/javascript" src="../../../vendor/christianbach/tablesorter/jquery.tablesorter.min.js"></script>
-	<script type="text/javascript" src="../../../vendor/components/jqueryui/jquery-ui.min.js"></script>
-	<script type="text/javascript" src="../../../include/js/jquery.ui.datepicker.translation.js"></script>
+	<link rel="stylesheet" type="text/css" href="../../../skin/jquery-ui-1.9.2.custom.min.css">
+	<script type="text/javascript" src="../../../vendor/jquery/jqueryV1/jquery-1.12.4.min.js"></script>
+	<script type="text/javascript" src="../../../vendor/christianbach/tablesorter/jquery.tablesorter.min.js"></script>
+	<script type="text/javascript" src="../../../vendor/components/jqueryui/jquery-ui.min.js"></script>
+	<script type="text/javascript" src="../../../include/js/jquery.ui.datepicker.translation.js"></script>
 	<script type="text/javascript" src="../../../vendor/jquery/sizzle/sizzle.js"></script>
 	<link rel="stylesheet" href="../../../skin/tablesort.css" type="text/css">
 	<script type="text/Javascript">
@@ -344,6 +344,13 @@ if (isset($_GET['type']) && $_GET['type'] == 'getstudienplancontent' && isset($_
 			$( "#studienplandiv" ).html(html);
 		});
 	}
+
+	function changeGebnation()
+	{
+		var nation = document.getElementById('adresse_nation').value;
+		document.getElementById('geburtsnation').value = nation;
+		document.getElementById('staatsbuergerschaft').value = nation;
+	}
 	</script>
 </head>
 <body>
@@ -416,6 +423,8 @@ if ($gemeinde == '' && $ort != '')
 	$ort = '';
 }
 $email = (isset($_REQUEST['email'])?$_REQUEST['email']:'');
+$geburtsnation = (isset($_REQUEST['geburtsnation'])?$_REQUEST['geburtsnation']:'A');
+$staatsbuergerschaft = (isset($_REQUEST['staatsbuergerschaft'])?$_REQUEST['staatsbuergerschaft']:'A');
 $telefon = (isset($_REQUEST['telefon'])?$_REQUEST['telefon']:'');
 $mobil = (isset($_REQUEST['mobil'])?$_REQUEST['mobil']:'');
 $letzteausbildung = (isset($_REQUEST['letzteausbildung'])?$_REQUEST['letzteausbildung']:'');
@@ -551,8 +560,8 @@ if (isset($_POST['save']))
 		$person->vornamen = $vornamen;
 		$person->geschlecht = $geschlecht;
 		$person->gebdatum = $datum_obj->formatDatum($geburtsdatum,'Y-m-d');
-		$person->geburtsnation = 'A';
-		$person->staatsbuergerschaft = 'A';
+		$person->geburtsnation = $geburtsnation;
+		$person->staatsbuergerschaft = $staatsbuergerschaft;
 		$person->aktiv = true;
 		$person->insertamum = date('Y-m-d H:i:s');
 		$person->insertvon = $user;
@@ -928,7 +937,7 @@ echo '<tr><td>Anrede</td><td><input type="text" id="anrede" name="anrede" maxlen
 echo '<tr><td>Titel(Pre)</td><td><input type="text" id="titel" name="titel" maxlength="64" value="'.$titel.'" /></td></tr>';
 echo '<tr><td>Vorname </td><td><input type="text" id="vorname" maxlength="32" name="vorname" value="'.$vorname.'" /></td></tr>';
 echo '<tr><td>Weitere Vornamen </td><td><input type="text" id="vornamen" maxlength="32" name="vornamen" value="'.$vornamen.'" /></td></tr>';
-echo '<tr><td>Nachname *</td><td><input type="text" maxlength="64" id="nachname" name="nachname" value="'.$nachname.'" /></td></tr>';
+echo '<tr><td>Nachname *</td><td><input type="text" maxlength="64" id="nachname" name="nachname" value="'.$nachname.'" required="required" autofocus/></td></tr>';
 echo '<tr><td>Titel(Post)</td><td><input type="text" id="titelpost" name="titelpost" maxlength="64" value="'.$titelpost.'" /></td></tr>';
 echo '<tr><td>Geschlecht *</td><td><SELECT id="geschlecht" name="geschlecht">';
 echo '<OPTION value="m" '.($geschlecht=='m'?'selected':'').'>m&auml;nnlich</OPTION>';
@@ -943,7 +952,7 @@ if (isset($adresse_nation) && $adresse_nation == 'A' && isset($plz) && $plz > 10
 	$nationstyle = 'style="border: 1px solid red"';
 else
 	$nationstyle = '';
-echo '<tr><td>Nation</td><td><SELECT name="adresse_nation" id="adresse_nation" onchange="loadGemeindeData()" '.$nationstyle.'>';
+echo '<tr><td>Land</td><td><SELECT name="adresse_nation" id="adresse_nation" onchange="loadGemeindeData();changeGebnation()" '.$nationstyle.'>';
 $nation =  new nation();
 $nation->getAll();
 foreach ($nation->nation as $row)
@@ -989,6 +998,30 @@ echo '<div style="display: none;" id="ueb1"><input type="radio" id="ueberschreib
 echo '<div style="display: none;" id="ueb2"><input type="radio" id="ueberschreiben2" name="ueberschreiben" value="Nein" onclick="disablefields2(false)" checked>Adresse hinzufügen</div>';
 echo '<div style="display: none;" id="ueb3"><input type="radio" id="ueberschreiben3" name="ueberschreiben" value="" onclick="disablefields2(true)">Adresse nicht anlegen</div>';
 echo '</fieldset></td></tr>';
+echo '<tr><td>Geburtsnation</td><td><SELECT name="geburtsnation" id="geburtsnation">';
+$nation =  new nation();
+$nation->getAll();
+foreach ($nation->nation as $row)
+{
+	if ($row->code == $geburtsnation)
+		$selected = 'selected';
+	else
+		$selected = '';
+	echo "<option value='$row->code' $selected>$row->langtext</option>";
+}
+echo '</SELECT></td></tr>';
+echo '<tr><td>Staatsbürgerschaft</td><td><SELECT name="staatsbuergerschaft" id="staatsbuergerschaft">';
+$nation =  new nation();
+$nation->getAll();
+foreach ($nation->nation as $row)
+{
+	if ($row->code == $staatsbuergerschaft)
+		$selected = 'selected';
+	else
+		$selected = '';
+	echo "<option value='$row->code' $selected>$row->langtext</option>";
+}
+echo '</SELECT></td></tr>';
 echo '<tr><td>EMail</td><td><input type="text" id="email" maxlength="128" name="email" value="'.$email.'" /></td></tr>';
 echo '<tr><td>Telefon</td><td><input type="text" id="telefon" maxlength="128" name="telefon" value="'.$telefon.'" /></td></tr>';
 echo '<tr><td>Mobil</td><td><input type="text" id="mobil" maxlength="128" name="mobil" value="'.$mobil.'" /></td></tr>';

vilesci/stammdaten/raum_uebersicht.php

@@ -1,437 +1,428 @@
-<?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/functions.inc.php');
-require_once('../../include/ort.class.php');
-require_once('../../include/benutzerberechtigung.class.php');
-require_once('../../include/organisationseinheit.class.php');
-require_once('../../include/standort.class.php');
-
-if (!$db = new basis_db())
-	die('Es konnte keine Verbindung zum Server aufgebaut werden.');
-
-$user = get_uid();
-
-$rechte = new benutzerberechtigung();
-$rechte->getBerechtigungen($user);
-
-if(!$rechte->isBerechtigt('basis/ort', null, 's'))
-	die($rechte->errormsg);
-
-$organisationseinheit = new organisationseinheit();
-$organisationseinheit->getAll();
-$oe_arr = array();
-foreach ($organisationseinheit->result as $oe)
-{
-	$oe_arr[$oe->oe_kurzbz] = $oe->organisationseinheittyp_kurzbz.' '.$oe->bezeichnung;
-}
-
-$lehre = (isset($_GET['selectlehre'])?true:'');
-$reservieren = (isset($_GET['selectreservieren'])?true:'');
-$aktiv = (isset($_GET['sendform'])?(isset($_GET['selectaktiv'])?true:''):true);
-$standort_id = (isset($_GET['standort_id'])?$_GET['standort_id']:'');
-$gebaeudeteil = (isset($_GET['selectgebaeudeteil'])?$_GET['selectgebaeudeteil']:'');
-$oe_kurzbz = (isset($_GET['oe_kurzbz'])?$_GET['oe_kurzbz']:'');
-
-// Speichern der Daten
-if(isset($_POST['ort_kurzbz']))
-{
-	// Die Aenderungen werden per Ajax Request durchgefuehrt,
-	// daher wird nach dem Speichern mittels exit beendet
-
-	//Lehre Feld setzen
-	if(isset($_POST['lehre']))
-	{
-		if(!$rechte->isBerechtigt('basis/ort', null, 'sui'))
-			die($rechte->errormsg);
-
-		$lv_obj = new ort();
-		if($lv_obj->load($_POST['ort_kurzbz']))
-		{
-			$lv_obj->lehre=($_POST['lehre']=='true'?false:true);
-			$lv_obj->updateamum = date('Y-m-d H:i:s');
-			$lv_obj->updatevon = $user;
-			if($lv_obj->save(false))
-				exit('true');
-			else 
-				exit('Fehler beim Speichern:'.$lv_obj->errormsg);
-		}
-		else 
-			exit('Fehler beim Laden der LV:'.$lv_obj->errormsg);
-	}
-	
-	//Reservieren Feld setzen
-	if(isset($_POST['reservieren']))
-	{
-		if(!$rechte->isBerechtigt('basis/ort', null, 'sui'))
-			die($rechte->errormsg);
-		$lv_obj = new ort();
-		if($lv_obj->load($_POST['ort_kurzbz']))
-		{
-			$lv_obj->reservieren=($_POST['reservieren']=='true'?false:true);
-			$lv_obj->updateamum = date('Y-m-d H:i:s');
-			$lv_obj->updatevon = $user;
-			if($lv_obj->save(false))
-				exit('true');
-			else 
-				exit('Fehler beim Speichern:'.$lv_obj->errormsg);
-		}
-		else 
-			exit('Fehler beim Laden der LV:'.$lv_obj->errormsg);
-	}
-	
-	//Aktiv Feld setzen
-	if(isset($_POST['aktiv']))
-	{
-		if(!$rechte->isBerechtigt('basis/ort', null, 'sui'))
-			die($rechte->errormsg);
-		$lv_obj = new ort();
-		if($lv_obj->load($_POST['ort_kurzbz']))
-		{
-			$lv_obj->aktiv=($_POST['aktiv']=='true'?false:true);
-			$lv_obj->updateamum = date('Y-m-d H:i:s');
-			$lv_obj->updatevon = $user;
-			if($lv_obj->save(false))
-				exit('true');
-			else 
-				exit('Fehler beim Speichern:'.$lv_obj->errormsg);
-		}
-		else 
-			exit('Fehler beim Laden der LV:'.$lv_obj->errormsg);
-	}
-}
-
-$htmlstr = '<a href="raum_details.php" target="detail_raum">Neuer Raum </a><br>';
-	
-	
-$htmlstr .= '<form action="'.$_SERVER['PHP_SELF'].'" method="GET">';
-
-$htmlstr.= ' Lehre<INPUT type="checkbox" name="selectlehre" id="selectlehre" '.($lehre=='true'?'checked':'').'>';
-$htmlstr.= '  Reservieren<INPUT type="checkbox" name="selectreservieren" id="selectreservieren" '.($reservieren=='true'?'checked':'').'>';
-$htmlstr.= '  Aktiv<INPUT type="checkbox" name="selectaktiv" id="selectaktiv" '.($aktiv=='true'?'checked':'').'>';
-$htmlstr.= '<br>';
-
-// Select Standort ID
-$htmlstr.= 'Standort <SELECT name="standort_id">
-			<OPTION value="">-- keine Auswahl --</OPTION>';
-
-$standort = new standort();
-if($standort->getStandorteWithTyp('Intern'))
-{
-	foreach($standort->result as $row)
-	{
-		if($row->standort_id == $standort_id)
-			$selected = 'selected';
-		else
-			$selected = '';
-			
-		$htmlstr.='<OPTION value="'.$row->standort_id.'" '.$selected.'>'.$row->kurzbz.'</OPTION>';
-	}
-}
-$htmlstr.= '</SELECT>';
-
-// Input Gebäudeteil
-$htmlstr.= '  Gebäudeteil <INPUT type="text" name="selectgebaeudeteil" id="selectgebaeudeteil" value="'.$gebaeudeteil.'" style="width: 30px">';
-
-// Select oe_kurzbz
-$oe=new organisationseinheit();
-$oe->getAll();
-$htmlstr.='  Organisationseinheit <SELECT name="oe_kurzbz">';
-$htmlstr.='<OPTION value="">-- keine Auswahl --</option>';
-foreach($oe->result as $row_oe)
-{
-	if($row_oe->oe_kurzbz == $oe_kurzbz)
-		$selected = 'selected';
-	else
-		$selected = '';
-	
-	$htmlstr .= '<OPTION value="'.$row_oe->oe_kurzbz.'" '.$selected.'>'.$row_oe->organisationseinheittyp_kurzbz.' '.$row_oe->bezeichnung.'</OPTION>';
-}
-$htmlstr.='</SELECT>';
-
-$htmlstr.= '<input type="hidden" name="sendform">';
-$htmlstr .= '<br><br><input type="submit" value="Anzeigen">';
-$htmlstr .= '</form>';
-
-$tooltiptext = '
-<div class="tooltiptext">
-	<div class="table">
-		<div class="table-caption">Sie können die folgenden Optionen zum filtern verwenden</div>
-		<div class="tr">
-			<div class="td"><code>|</code> oder <code>OR</code></div>
-			<div class="td">Logisches "oder"</div>
-		</div>
-		<div class="tr">
-			<div class="td"><code>&&</code> oder <code>AND</code></div>
-			<div class="td">Logisches "und"</div>
-		</div>
-		<div class="tr">
-			<div class="td"><code>/\d/</code></div>
-			<div class="td">Regular Expression</div>
-		</div>
-		<div class="tr">
-			<div class="td"><code>< <= >= ></code></div>
-			<div class="td">Alphabetisches oder numerisches größer/kleiner gleich</div>
-		</div>
-		<div class="tr">
-			<div class="td"><code>!</code> oder <code>!=</code></div>
-			<div class="td">Verneinung (not)</div>
-		</div>
-		<div class="tr">
-			<div class="td"><code>"</code> oder <code>=</code></div>
-			<div class="td">Exake übereinstimmung</div>
-		</div>
-		<div class="tr">
-			<div class="td"><code> - </code> oder <code> to </code></div>
-			<div class="td">Bereichssuche (Leerzeichen beachten)</div>
-		</div>
-		<div class="tr">
-			<div class="td"><code>?</code></div>
-			<div class="td">Platzhalter für ein einzelnes Zeichen (nicht Leerzeichen)</div>
-		</div>
-		<div class="tr">
-			<div class="td"><code>+</code></div>
-			<div class="td">Platzhalter für mehrere Zeichen (nicht Leerzeichen)</div>
-		</div>
-		<div class="tr">
-			<div class="td"><code>~</code></div>
-			<div class="td">Unscharfe suche</div>
-		</div>
-	</div>
-</div>
-';
-
-if (isset($_GET['sendform']))
-{
-	$htmlstr .= '
-	<table class="tablesorter" id="t1">
-	<thead>
-		<tr>
-			<th><button type="button" class="resetsaved" title="Reset Filter">Reset Filter</button>
-				<span class="tooltip"><img src="../../skin/images/information.png" height="20px" name="infoicon"/>
-				'.$tooltiptext.'
-				</span>
-			</th>
-			<th>Kurzbezeichnung</th>
-			<th>Bezeichnung</th>
-			<th>Planbezeichnung</th>
-			<th>Max. Person</th>
-			<th>Arbeitsplaetze</th>
-			<th>Quadratmeter</th>
-			<th>Organisationseinheit</th>
-			<th>Lehre</th>
-			<th>Reservieren</th>
-			<th>Aktiv</th>
-			<th>Kosten</th>
-			<th>Stockwerk</th>
-	   </tr>
-	</thead>
-	<tbody>';
-	
-	$sg = new ort();
-	if (!$sg->getOrte($lehre, $reservieren, $aktiv, $standort_id, $gebaeudeteil, $oe_kurzbz))
-		die($sg->errormsg);
-	
-	foreach ($sg->result as $twraum)
-	{
-		$htmlstr .= "	<tr>\n";
-		$htmlstr .= '		<td><a href="raum_details.php?type=raumtyp&ort_kurzbz='.$twraum->ort_kurzbz.'" target="detail_raum" title="Raumtyp zuteilen" ><img src="../../skin/images/entitlement-pot.png" height="20px"/></a></td>';
-		$htmlstr .= "		<td><a href='raum_details.php?ort_kurzbz=".$twraum->ort_kurzbz."' target='detail_raum'>".$twraum->ort_kurzbz."</a></td>\n";
-		$htmlstr .= "		<td>".$twraum->bezeichnung."</td>\n";
-		$htmlstr .= "		<td>".$twraum->planbezeichnung."</td>\n";
-		$htmlstr .= "		<td>".$twraum->max_person."</td>\n";
-		$htmlstr .= "		<td>".$twraum->arbeitsplaetze."</td>\n";
-		$htmlstr .= "		<td>".$twraum->m2."</td>\n";
-		$htmlstr .= "		<td>".(isset($oe_arr[$twraum->oe_kurzbz])?$oe_arr[$twraum->oe_kurzbz]:'')."</td>\n";
-		
-		// Lehre boolean setzen
-		
-		$htmlstr .= "		<td style='white-space:nowrap;' align='center'><div style='display: none'>".($twraum->lehre==true?"t":"f")."</div> <a href='#Lehre' onclick='changeboolean(\"".$twraum->ort_kurzbz."\",\"lehre\"); return false'>";
-		$htmlstr .= "		<input type='hidden' id='lehre".$twraum->ort_kurzbz."' value='".($twraum->lehre==true?"true":"false")."'>";
-		$htmlstr .= "		<img id='lehreimg".$twraum->ort_kurzbz."' title='Lehre' src='../../skin/images/".($twraum->lehre==true?"true.png":"false.png")."' height='20'>";
-		$htmlstr .= "		</a></td>";
-		
-		// Reservieren boolean setzen
-		
-		$htmlstr .= "		<td style='white-space:nowrap;' align='center'><div style='display: none'>".($twraum->reservieren==true?"t":"f")."</div> <a href='#Reservieren' onclick='changeboolean(\"".$twraum->ort_kurzbz."\",\"reservieren\"); return false'>";
-		$htmlstr .= "		<input type='hidden' id='reservieren".$twraum->ort_kurzbz."' value='".($twraum->reservieren==true?"true":"false")."'>";
-		$htmlstr .= "		<img id='reservierenimg".$twraum->ort_kurzbz."' title='Reservieren' src='../../skin/images/".($twraum->reservieren==true?"true.png":"false.png")."' style='margin:0;' height='20'>";
-		$htmlstr .= "		</a></td>";
-		
-		// Aktiv boolean setzen
-		
-		$htmlstr .= "		<td style='white-space:nowrap;' align='center'><div style='display: none'>".($twraum->aktiv==true?"t":"f")."</div> <a href='#Aktiv' onclick='changeboolean(\"".$twraum->ort_kurzbz."\",\"aktiv\"); return false'>";
-		$htmlstr .= "		<input type='hidden' id='aktiv".$twraum->ort_kurzbz."' value='".($twraum->aktiv==true?"true":"false")."'>";
-		$htmlstr .= "		<img id='aktivimg".$twraum->ort_kurzbz."' title='Aktiv' src='../../skin/images/".($twraum->aktiv==true?"true.png":"false.png")."' style='margin:0;' height='20'>";
-		$htmlstr .= "		</a></td>";
-		
-		$htmlstr .= "		<td>".$twraum->kosten."</td>\n";
-		$htmlstr .= "		<td>".$twraum->stockwerk."</td>\n";
-	
-		$htmlstr .= "	</tr>\n";
-	}
-	$htmlstr .= "</tbody></table>\n";
-}
-
-
-?>
-<html>
-<head>
-	<title>R&auml;ume &Uuml;bersicht</title>
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-	<link rel="stylesheet" href="../../skin/vilesci.css" type="text/css">
+<?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/functions.inc.php');
+require_once('../../include/ort.class.php');
+require_once('../../include/benutzerberechtigung.class.php');
+require_once('../../include/organisationseinheit.class.php');
+require_once('../../include/standort.class.php');
+
+if (!$db = new basis_db())
+	die('Es konnte keine Verbindung zum Server aufgebaut werden.');
+
+$user = get_uid();
+
+$rechte = new benutzerberechtigung();
+$rechte->getBerechtigungen($user);
+
+if(!$rechte->isBerechtigt('basis/ort', null, 's'))
+	die($rechte->errormsg);
+
+$organisationseinheit = new organisationseinheit();
+$organisationseinheit->getAll();
+$oe_arr = array();
+foreach ($organisationseinheit->result as $oe)
+{
+	$oe_arr[$oe->oe_kurzbz] = $oe->organisationseinheittyp_kurzbz.' '.$oe->bezeichnung;
+}
+
+$lehre = (isset($_GET['selectlehre'])?true:'');
+$reservieren = (isset($_GET['selectreservieren'])?true:'');
+$aktiv = (isset($_GET['sendform'])?(isset($_GET['selectaktiv'])?true:''):true);
+$standort_id = (isset($_GET['standort_id'])?$_GET['standort_id']:'');
+$gebaeudeteil = (isset($_GET['selectgebaeudeteil'])?$_GET['selectgebaeudeteil']:'');
+$oe_kurzbz = (isset($_GET['oe_kurzbz'])?$_GET['oe_kurzbz']:'');
+
+// Speichern der Daten
+if(isset($_POST['ort_kurzbz']))
+{
+	// Die Aenderungen werden per Ajax Request durchgefuehrt,
+	// daher wird nach dem Speichern mittels exit beendet
+
+	//Lehre Feld setzen
+	if(isset($_POST['lehre']))
+	{
+		if(!$rechte->isBerechtigt('basis/ort', null, 'sui'))
+			die($rechte->errormsg);
+
+		$lv_obj = new ort();
+		if($lv_obj->load($_POST['ort_kurzbz']))
+		{
+			$lv_obj->lehre=($_POST['lehre']=='true'?false:true);
+			$lv_obj->updateamum = date('Y-m-d H:i:s');
+			$lv_obj->updatevon = $user;
+			if($lv_obj->save(false))
+				exit('true');
+			else 
+				exit('Fehler beim Speichern:'.$lv_obj->errormsg);
+		}
+		else 
+			exit('Fehler beim Laden der LV:'.$lv_obj->errormsg);
+	}
+	
+	//Reservieren Feld setzen
+	if(isset($_POST['reservieren']))
+	{
+		if(!$rechte->isBerechtigt('basis/ort', null, 'sui'))
+			die($rechte->errormsg);
+		$lv_obj = new ort();
+		if($lv_obj->load($_POST['ort_kurzbz']))
+		{
+			$lv_obj->reservieren=($_POST['reservieren']=='true'?false:true);
+			$lv_obj->updateamum = date('Y-m-d H:i:s');
+			$lv_obj->updatevon = $user;
+			if($lv_obj->save(false))
+				exit('true');
+			else 
+				exit('Fehler beim Speichern:'.$lv_obj->errormsg);
+		}
+		else 
+			exit('Fehler beim Laden der LV:'.$lv_obj->errormsg);
+	}
+	
+	//Aktiv Feld setzen
+	if(isset($_POST['aktiv']))
+	{
+		if(!$rechte->isBerechtigt('basis/ort', null, 'sui'))
+			die($rechte->errormsg);
+		$lv_obj = new ort();
+		if($lv_obj->load($_POST['ort_kurzbz']))
+		{
+			$lv_obj->aktiv=($_POST['aktiv']=='true'?false:true);
+			$lv_obj->updateamum = date('Y-m-d H:i:s');
+			$lv_obj->updatevon = $user;
+			if($lv_obj->save(false))
+				exit('true');
+			else 
+				exit('Fehler beim Speichern:'.$lv_obj->errormsg);
+		}
+		else 
+			exit('Fehler beim Laden der LV:'.$lv_obj->errormsg);
+	}
+}
+
+$htmlstr = '<a href="raum_details.php" target="detail_raum">Neuer Raum </a><br>';
+	
+	
+$htmlstr .= '<form action="'.$_SERVER['PHP_SELF'].'" method="GET">';
+
+$htmlstr.= ' Lehre<INPUT type="checkbox" name="selectlehre" id="selectlehre" '.($lehre=='true'?'checked':'').'>';
+$htmlstr.= '  Reservieren<INPUT type="checkbox" name="selectreservieren" id="selectreservieren" '.($reservieren=='true'?'checked':'').'>';
+$htmlstr.= '  Aktiv<INPUT type="checkbox" name="selectaktiv" id="selectaktiv" '.($aktiv=='true'?'checked':'').'>';
+$htmlstr.= '<br>';
+
+// Select Standort ID
+$htmlstr.= 'Standort <SELECT name="standort_id">
+			<OPTION value="">-- keine Auswahl --</OPTION>';
+
+$standort = new standort();
+if($standort->getStandorteWithTyp('Intern'))
+{
+	foreach($standort->result as $row)
+	{
+		if($row->standort_id == $standort_id)
+			$selected = 'selected';
+		else
+			$selected = '';
+			
+		$htmlstr.='<OPTION value="'.$row->standort_id.'" '.$selected.'>'.$row->kurzbz.'</OPTION>';
+	}
+}
+$htmlstr.= '</SELECT>';
+
+// Input Gebäudeteil
+$htmlstr.= '  Gebäudeteil <INPUT type="text" name="selectgebaeudeteil" id="selectgebaeudeteil" value="'.$gebaeudeteil.'" style="width: 30px">';
+
+// Select oe_kurzbz
+$oe=new organisationseinheit();
+$oe->getAll();
+$htmlstr.='  Organisationseinheit <SELECT name="oe_kurzbz">';
+$htmlstr.='<OPTION value="">-- keine Auswahl --</option>';
+foreach($oe->result as $row_oe)
+{
+	if($row_oe->oe_kurzbz == $oe_kurzbz)
+		$selected = 'selected';
+	else
+		$selected = '';
+	
+	$htmlstr .= '<OPTION value="'.$row_oe->oe_kurzbz.'" '.$selected.'>'.$row_oe->organisationseinheittyp_kurzbz.' '.$row_oe->bezeichnung.'</OPTION>';
+}
+$htmlstr.='</SELECT>';
+
+$htmlstr.= '<input type="hidden" name="sendform">';
+$htmlstr .= '<br><br><input type="submit" value="Anzeigen">';
+$htmlstr .= '</form>';
+
+$tooltiptext = '
+<div class="tooltiptext">
+	<div class="table">
+		<div class="table-caption">Sie können die folgenden Optionen zum filtern verwenden</div>
+		<div class="tr">
+			<div class="td"><code>|</code> oder <code>OR</code></div>
+			<div class="td">Logisches "oder"</div>
+		</div>
+		<div class="tr">
+			<div class="td"><code>&&</code> oder <code>AND</code></div>
+			<div class="td">Logisches "und"</div>
+		</div>
+		<div class="tr">
+			<div class="td"><code>/\d/</code></div>
+			<div class="td">Regular Expression</div>
+		</div>
+		<div class="tr">
+			<div class="td"><code>< <= >= ></code></div>
+			<div class="td">Alphabetisches oder numerisches größer/kleiner gleich</div>
+		</div>
+		<div class="tr">
+			<div class="td"><code>!</code> oder <code>!=</code></div>
+			<div class="td">Verneinung (not)</div>
+		</div>
+		<div class="tr">
+			<div class="td"><code>"</code> oder <code>=</code></div>
+			<div class="td">Exake übereinstimmung</div>
+		</div>
+		<div class="tr">
+			<div class="td"><code> - </code> oder <code> to </code></div>
+			<div class="td">Bereichssuche (Leerzeichen beachten)</div>
+		</div>
+		<div class="tr">
+			<div class="td"><code>?</code></div>
+			<div class="td">Platzhalter für ein einzelnes Zeichen (nicht Leerzeichen)</div>
+		</div>
+		<div class="tr">
+			<div class="td"><code>+</code></div>
+			<div class="td">Platzhalter für mehrere Zeichen (nicht Leerzeichen)</div>
+		</div>
+		<div class="tr">
+			<div class="td"><code>~</code></div>
+			<div class="td">Unscharfe suche</div>
+		</div>
+	</div>
+</div>
+';
+
+if (isset($_GET['sendform']))
+{
+	$htmlstr .= '
+	<table class="tablesorter" id="t1">
+	<thead>
+		<tr>
+			<th><span class="tooltip"><img src="../../skin/images/information.png" height="20px" name="infoicon"/>
+				'.$tooltiptext.'
+				</span>
+			</th>
+			<th>Kurzbezeichnung</th>
+			<th>Bezeichnung</th>
+			<th>Planbezeichnung</th>
+			<th>Max. Person</th>
+			<th>Arbeitsplaetze</th>
+			<th>Quadratmeter</th>
+			<th>Organisationseinheit</th>
+			<th>Lehre</th>
+			<th>Reservieren</th>
+			<th>Aktiv</th>
+			<th>Kosten</th>
+			<th>Stockwerk</th>
+	   </tr>
+	</thead>
+	<tbody>';
+	
+	$sg = new ort();
+	if (!$sg->getOrte($lehre, $reservieren, $aktiv, $standort_id, $gebaeudeteil, $oe_kurzbz))
+		die($sg->errormsg);
+	
+	foreach ($sg->result as $twraum)
+	{
+		$htmlstr .= "	<tr>\n";
+		$htmlstr .= '		<td><a href="raum_details.php?type=raumtyp&ort_kurzbz='.$twraum->ort_kurzbz.'" target="detail_raum" title="Raumtyp zuteilen" ><img src="../../skin/images/entitlement-pot.png" height="20px"/></a></td>';
+		$htmlstr .= "		<td><a href='raum_details.php?ort_kurzbz=".$twraum->ort_kurzbz."' target='detail_raum'>".$twraum->ort_kurzbz."</a></td>\n";
+		$htmlstr .= "		<td>".$twraum->bezeichnung."</td>\n";
+		$htmlstr .= "		<td>".$twraum->planbezeichnung."</td>\n";
+		$htmlstr .= "		<td>".$twraum->max_person."</td>\n";
+		$htmlstr .= "		<td>".$twraum->arbeitsplaetze."</td>\n";
+		$htmlstr .= "		<td>".$twraum->m2."</td>\n";
+		$htmlstr .= "		<td>".(isset($oe_arr[$twraum->oe_kurzbz])?$oe_arr[$twraum->oe_kurzbz]:'')."</td>\n";
+		
+		// Lehre boolean setzen
+		
+		$htmlstr .= "		<td style='white-space:nowrap;' align='center'><div style='display: none'>".($twraum->lehre==true?"t":"f")."</div> <a href='#Lehre' onclick='changeboolean(\"".$twraum->ort_kurzbz."\",\"lehre\"); return false'>";
+		$htmlstr .= "		<input type='hidden' id='lehre".$twraum->ort_kurzbz."' value='".($twraum->lehre==true?"true":"false")."'>";
+		$htmlstr .= "		<img id='lehreimg".$twraum->ort_kurzbz."' title='Lehre' src='../../skin/images/".($twraum->lehre==true?"true.png":"false.png")."' height='20'>";
+		$htmlstr .= "		</a></td>";
+		
+		// Reservieren boolean setzen
+		
+		$htmlstr .= "		<td style='white-space:nowrap;' align='center'><div style='display: none'>".($twraum->reservieren==true?"t":"f")."</div> <a href='#Reservieren' onclick='changeboolean(\"".$twraum->ort_kurzbz."\",\"reservieren\"); return false'>";
+		$htmlstr .= "		<input type='hidden' id='reservieren".$twraum->ort_kurzbz."' value='".($twraum->reservieren==true?"true":"false")."'>";
+		$htmlstr .= "		<img id='reservierenimg".$twraum->ort_kurzbz."' title='Reservieren' src='../../skin/images/".($twraum->reservieren==true?"true.png":"false.png")."' style='margin:0;' height='20'>";
+		$htmlstr .= "		</a></td>";
+		
+		// Aktiv boolean setzen
+		
+		$htmlstr .= "		<td style='white-space:nowrap;' align='center'><div style='display: none'>".($twraum->aktiv==true?"t":"f")."</div> <a href='#Aktiv' onclick='changeboolean(\"".$twraum->ort_kurzbz."\",\"aktiv\"); return false'>";
+		$htmlstr .= "		<input type='hidden' id='aktiv".$twraum->ort_kurzbz."' value='".($twraum->aktiv==true?"true":"false")."'>";
+		$htmlstr .= "		<img id='aktivimg".$twraum->ort_kurzbz."' title='Aktiv' src='../../skin/images/".($twraum->aktiv==true?"true.png":"false.png")."' style='margin:0;' height='20'>";
+		$htmlstr .= "		</a></td>";
+		
+		$htmlstr .= "		<td>".$twraum->kosten."</td>\n";
+		$htmlstr .= "		<td>".$twraum->stockwerk."</td>\n";
+	
+		$htmlstr .= "	</tr>\n";
+	}
+	$htmlstr .= "</tbody></table>\n";
+}
+
+
+?>
+<html>
+<head>
+	<title>R&auml;ume &Uuml;bersicht</title>
+	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../skin/vilesci.css" type="text/css">
 	<link rel="stylesheet" type="text/css" href="../../skin/jquery-ui-1.9.2.custom.min.css">
-
-	<?php 
-	include('../../include/meta/jquery.php');
-	include('../../include/meta/jquery-tablesorter.php');
-	?>
-		
-	<link rel="stylesheet" href="../../skin/tablesort.css" type="text/css"/>
-	<style>
-	table.tablesorter tbody td
-	{
-		margin: 0;
-		padding: 0;
-		vertical-align: middle;
-	}
-	div.table { 
-		display: table; 
-		border-collapse:collapse; 
-	}
-	div.tr { 
-		display:table-row; 
-	}
-	div.table-caption { 
-		display:table-caption; 
-	}
-	div.td { 
-		display:table-cell; 
-		border:thin solid black; 
-		padding:5px; 
-	}
-	 /* Tooltip container */
-	.tooltip 
-	{
-		position: relative;
-		display: inline;
-	}
-	.tooltip .tooltiptext 
-	{
-		visibility: hidden;
-		width: 400px;
-		background-color: #555;
-		color: #fff;
-		text-align: center;
-		border-radius: 6px;
-		padding: 5px 0;
-		
-		/* Position the tooltip */
-		position: absolute;
-		z-index: 1;
-		top: -5px;
-		left: 105%;
-	}
-	/* Show the tooltip text when you mouse over the tooltip container */
-	.tooltip:hover .tooltiptext 
-	{
-		visibility: visible;
-		opacity: 1;
-	}
-	</style>
-	<script language="JavaScript" type="text/javascript">
-	$(document).ready(function() 
-	{ 
-		$("#t1").tablesorter(
-		{
-			sortList: [[3,0]],
-			widgets: ["saveSort", "zebra", "filter", "stickyHeaders"],
-			headers: { 	0: { filter: false,  sorter: false }},
-			widgetOptions : {	filter_saveFilters : true,
-								filter_functions : {
-									// Add select menu to this column
-									8 : {
-									"True" : function(e, n, f, i, $r, c, data) { return /t/.test(e); },
-									"False" : function(e, n, f, i, $r, c, data) { return /f/.test(e); }
-									},
-									9 : {
-									"True" : function(e, n, f, i, $r, c, data) { return /t/.test(e); },
-									"False" : function(e, n, f, i, $r, c, data) { return /f/.test(e); }
-									},
-									10 : {
-									"True" : function(e, n, f, i, $r, c, data) { return /t/.test(e); },
-									"False" : function(e, n, f, i, $r, c, data) { return /f/.test(e); }
-									}
-				}}
-		}); 
-
-		$('.resetsaved').click(function()
-		{
-			$("#t1").trigger("filterReset");
-			location.reload(forceGet);
-			return false;
-		});
-	});
-		
-	function changeboolean(ort_kurzbz, name)
-	{
-		value=document.getElementById(name+ort_kurzbz).value;
-	
-		var dataObj = {};
-		dataObj["ort_kurzbz"]=ort_kurzbz;
-		dataObj[name]=value;
-
-		$.ajax({
-			type:"POST",
-			url:"raum_uebersicht.php", 
-			data:dataObj,
-			success: function(data) 
-			{
-				if(data=="true")
-				{
-					//Image und Value aendern
-					if(value=="true")
-						value="false";
-					else
-						value="true";
-					document.getElementById(name+ort_kurzbz).value=value;
-					document.getElementById(name+"img"+ort_kurzbz).src="../../skin/images/"+value+".png";
-				}
-				else 
-					alert("ERROR:"+data)
-			},
-			error: function() { alert("error"); }
-		});
-	}
-
-	</script>
-</head>
-<body>
-<h2>R&auml;ume &Uuml;bersicht</h2>
-
-<?php 
-	echo $htmlstr;
-?>
-
-</body>
-</html>
+
+	<?php 
+	include('../../include/meta/jquery.php');
+	include('../../include/meta/jquery-tablesorter.php');
+	?>
+		
+	<link rel="stylesheet" href="../../skin/tablesort.css" type="text/css"/>
+	<style>
+	table.tablesorter tbody td
+	{
+		margin: 0;
+		padding: 0;
+		vertical-align: middle;
+	}
+	div.table { 
+		display: table; 
+		border-collapse:collapse; 
+	}
+	div.tr { 
+		display:table-row; 
+	}
+	div.table-caption { 
+		display:table-caption; 
+	}
+	div.td { 
+		display:table-cell; 
+		border:thin solid black; 
+		padding:5px; 
+	}
+	 /* Tooltip container */
+	.tooltip 
+	{
+		position: relative;
+		display: inline;
+	}
+	.tooltip .tooltiptext 
+	{
+		visibility: hidden;
+		width: 400px;
+		background-color: #555;
+		color: #fff;
+		text-align: center;
+		border-radius: 6px;
+		padding: 5px 0;
+		
+		/* Position the tooltip */
+		position: absolute;
+		z-index: 1;
+		top: -5px;
+		left: 105%;
+	}
+	/* Show the tooltip text when you mouse over the tooltip container */
+	.tooltip:hover .tooltiptext 
+	{
+		visibility: visible;
+		opacity: 1;
+	}
+	</style>
+	<script language="JavaScript" type="text/javascript">
+	$(document).ready(function() 
+	{ 
+		$("#t1").tablesorter(
+		{
+			sortList: [[3,0]],
+			widgets: ["zebra", "filter", "stickyHeaders"],
+			headers: { 	0: { filter: false,  sorter: false }},
+			widgetOptions : {	filter_functions : {
+									// Add select menu to this column
+									8 : {
+									"True" : function(e, n, f, i, $r, c, data) { return /t/.test(e); },
+									"False" : function(e, n, f, i, $r, c, data) { return /f/.test(e); }
+									},
+									9 : {
+									"True" : function(e, n, f, i, $r, c, data) { return /t/.test(e); },
+									"False" : function(e, n, f, i, $r, c, data) { return /f/.test(e); }
+									},
+									10 : {
+									"True" : function(e, n, f, i, $r, c, data) { return /t/.test(e); },
+									"False" : function(e, n, f, i, $r, c, data) { return /f/.test(e); }
+									}
+				}}
+		});
+	});
+		
+	function changeboolean(ort_kurzbz, name)
+	{
+		value=document.getElementById(name+ort_kurzbz).value;
+	
+		var dataObj = {};
+		dataObj["ort_kurzbz"]=ort_kurzbz;
+		dataObj[name]=value;
+
+		$.ajax({
+			type:"POST",
+			url:"raum_uebersicht.php", 
+			data:dataObj,
+			success: function(data) 
+			{
+				if(data=="true")
+				{
+					//Image und Value aendern
+					if(value=="true")
+						value="false";
+					else
+						value="true";
+					document.getElementById(name+ort_kurzbz).value=value;
+					document.getElementById(name+"img"+ort_kurzbz).src="../../skin/images/"+value+".png";
+				}
+				else 
+					alert("ERROR:"+data)
+			},
+			error: function() { alert("error"); }
+		});
+	}
+
+	</script>
+</head>
+<body>
+<h2>R&auml;ume &Uuml;bersicht</h2>
+
+<?php 
+	echo $htmlstr;
+?>
+
+</body>
+</html>

vilesci/stammdaten/reihungstestverwaltung.php

@@ -954,14 +954,14 @@ if(isset($_GET['excel']))
 				};
 
 				// Wenn die Spalten "Absolvierte Tests" oder "Ergebnis" angezeigt werden, wird die Punkteberechnung aktiviert
-				$('#clm_absolviert, #clm_ergebnis').on('click', function()
+				$('#clm_absolviert').on('click', function()
 				{
-					if (<?php echo json_encode($punkteberechnung);?> == 'false' && (document.getElementById('clm_absolviert').className == 'inactive' || document.getElementById('clm_ergebnis').className == 'inactive'))
+					if (<?php echo json_encode($punkteberechnung);?> == 'false' && ($('#clm_absolviert').attr('class') == 'active'))
 					{
 						$('.wait').html('...loading...');
 						window.location.href = "<?php echo $_SERVER['PHP_SELF'].'?stg_kz='.$stg_kz.'&reihungstest_id='.$reihungstest_id.'&studiensemester_kurzbz='.$studiensemester_kurzbz.'&punkteberechnung=true';?>";
 					}
-					else if (<?php echo json_encode($punkteberechnung);?> == 'true' && document.getElementById('clm_absolviert').className == 'inactive' && document.getElementById('clm_ergebnis').className == 'inactive')
+					else if (<?php echo json_encode($punkteberechnung);?> == 'true' && $('#clm_absolviert').attr('class') == 'inactive')
 						window.location.href = "<?php echo $_SERVER['PHP_SELF'].'?stg_kz='.$stg_kz.'&reihungstest_id='.$reihungstest_id.'&studiensemester_kurzbz='.$studiensemester_kurzbz.'&punkteberechnung=false';?>";
 				});
 
@@ -983,7 +983,8 @@ if(isset($_GET['excel']))
 									"filter_clm_studienplan",
 									"filter_clm_einstiegssemester",
 									"filter_clm_geburtsdatum",
-									"filter_clm_email"]}
+									"filter_clm_email",
+									"filter_clm_absolviert"]}
 						});
 
 					$("#toggle_"+v.id).on('click', function(e) {
@@ -1021,7 +1022,8 @@ if(isset($_GET['excel']))
 							'clm_studienplan',
 							'clm_einstiegssemester',
 							'clm_geburtsdatum',
-							'clm_email'];
+							'clm_email',
+							'clm_absolviert'];
 						for (var i in arr)
 						{
 							i = arr[i];
@@ -1037,6 +1039,13 @@ if(isset($_GET['excel']))
 									else
 										document.getElementById(i).className = 'active';
 								}
+								// Wenn punkteberechnung true, wird spalte clm_absolviert anzezeigt
+								if(<?php echo json_encode($punkteberechnung);?> == 'true' && i == 'clm_absolviert')
+								{
+									$('.'+i).css('display', 'table-cell');
+									$('.filter_'+i).parent().css('display', 'table-cell');
+									document.getElementById(i).className = 'active';
+								}
 							}
 						}
 
@@ -2633,7 +2642,7 @@ if($reihungstest_id!='')
 	echo '<div id="clm_einstiegssemester" class="active" onclick="hideColumn(\'clm_einstiegssemester\')">Einstiegssemester</div>';
 	echo '<div id="clm_geburtsdatum" class="active" onclick="hideColumn(\'clm_geburtsdatum\')">Geburtsdatum</div>';
 	echo '<div id="clm_email" class="active" onclick="hideColumn(\'clm_email\')">EMail</div>';
-	//echo '<div id="clm_absolviert" class="active" onclick="hideColumn(\'clm_absolviert\')">Absolvierte Tests <span class="wait"></span></div>';
+	echo '<div id="clm_absolviert" class="active" onclick="hideColumn(\'clm_absolviert\')">Absolvierte Tests <span class="wait"></span></div>';
 	//echo '<div id="clm_ergebnis" class="active" onclick="hideColumn(\'clm_ergebnis\')">Ergebnis <span class="wait"></span></div>';
 	//echo '<div id="clm_fas" class="active" onclick="hideColumn(\'clm_fas\')">FAS</div>';
 	echo '</td></tr></table>';
@@ -2674,8 +2683,8 @@ if($reihungstest_id!='')
 					<th style="display: table-cell" class="clm_einstiegssemester">Einstiegssemester</th>
 					<th style="display: table-cell" class="clm_geburtsdatum">Geburtsdatum</th>
 					<th style="display: table-cell" class="clm_email">EMail</th>
-					<!--<th style="display: table-cell" class="clm_absolviert">bereits absolvierte Verfahren</th>
-					<th style="display: table-cell" class="clm_ergebnis">Ergebnis</th>
+					<th style="display: table-cell" class="clm_absolviert">bereits absolvierte Verfahren</th>
+					<!--<th style="display: table-cell" class="clm_ergebnis">Ergebnis</th>
 					<th style="display: table-cell" class="clm_fas">FAS</th>-->
 				</tr>
 				</thead>
@@ -2793,6 +2802,7 @@ if($reihungstest_id!='')
 										<td style="display: table-cell" class="clm_einstiegssemester">'.$db->convert_html_chars($row->ausbildungssemester).'</td>
 										<td style="display: table-cell" class="clm_geburtsdatum">'.$db->convert_html_chars($row->gebdatum!=''?$datum_obj->convertISODate($row->gebdatum):' ').'</td>
 										<td style="display: table-cell; text-align: center" class="clm_email"><a href="mailto:'.$db->convert_html_chars($row->email).'"><img src="../../skin/images/button_mail.gif" name="mail"></a></td>
+										<td style="display: table-cell;" class="clm_absolviert">'.$rt_in_anderen_stg.'</td>
 									</tr>';
 
 							$mailto.= ($mailto!=''?',':'').$row->email;
@@ -2855,8 +2865,8 @@ if($reihungstest_id!='')
 							<th style="display: table-cell" class="clm_einstiegssemester">Einstiegssemester</th>
 							<th style="display: table-cell" class="clm_geburtsdatum">Geburtsdatum</th>
 							<th style="display: table-cell" class="clm_email">EMail</th>
-							<!--<th style="display: table-cell" class="clm_absolviert">bereits absolvierte Verfahren</th>
-							<th style="display: table-cell" class="clm_ergebnis">Ergebnis</th>
+							<th style="display: table-cell" class="clm_absolviert">bereits absolvierte Verfahren</th>
+							<!--<th style="display: table-cell" class="clm_ergebnis">Ergebnis</th>
 							<th style="display: table-cell" class="clm_fas">FAS</th>-->
 						</tr>
 					</thead>
@@ -2973,9 +2983,9 @@ if($reihungstest_id!='')
 									<td style="display: table-cell" class="clm_studienplan">'.$db->convert_html_chars($studienplan_bezeichnung).' ('.$row->studienplan_id.')</td>
 									<td style="display: table-cell" class="clm_einstiegssemester">'.$db->convert_html_chars($row->ausbildungssemester).'</td>
 									<td style="display: table-cell" class="clm_geburtsdatum">'.$db->convert_html_chars($row->gebdatum!=''?$datum_obj->convertISODate($row->gebdatum):' ').'</td>
-									<td style="display: table-cell; text-align: center" class="clm_email"><a href="mailto:'.$db->convert_html_chars($row->email).'"><img src="../../skin/images/button_mail.gif" name="mail"></a></td>';
-							/*echo	'<td style="display: table-cell;" class="clm_absolviert">'.$rt_in_anderen_stg.'</td>
-									<td style="display: table-cell; align: right" class="clm_ergebnis">'.($rtergebnis==0?'-':number_format($rtergebnis,2,'.','')).' %</td>
+									<td style="display: table-cell; text-align: center" class="clm_email"><a href="mailto:'.$db->convert_html_chars($row->email).'"><img src="../../skin/images/button_mail.gif" name="mail"></a></td>
+									<td style="display: table-cell;" class="clm_absolviert">'.$rt_in_anderen_stg.'</td>';
+							/*echo	'<td style="display: table-cell; align: right" class="clm_ergebnis">'.($rtergebnis==0?'-':number_format($rtergebnis,2,'.','')).' %</td>
 									<td style="display: table-cell; align: right" class="clm_fas">';
 									if($rtergebnis!==false && $rtergebnis != '' && $row->punkte=='')
 										echo '<a href="'.$_SERVER['PHP_SELF'].'?reihungstest_id='.$reihungstest_id.'&stg_kz='.$stg_kz.'&type=savertpunkte&rt_person_id='.$row->rt_person_id.'&rtpunkte='.$rtergebnis.'" >&uuml;bertragen</a>';

vilesci/stammdaten/studiengang_uebersicht.php

@@ -57,7 +57,6 @@ require_once('../../include/benutzerberechtigung.class.php');
 	//$htmlstr = "<table class='liste sortable'>\n";
 	$htmlstr = '';
 	$htmlstr .= '<input type="button" value="Neu" onClick="parent.detail_studiengang.location=\'studiengang_details.php\'">
-		<br><br><input type="button" value="Reset Filter" class="resetsaved">
 		<form name="formular"><input type="hidden" name="check" value=""></form><table class="tablesorter" id="t1">
 		<thead><tr>
 			<th onmouseup="document.formular.check.value=0">Kz</th>
@@ -117,16 +116,8 @@ $(document).ready(function()
 		$("#t1").tablesorter(
 		{
 			sortList: [[3,0],[1,0]],
-			widgets: ["saveSort", "zebra", "filter", "stickyHeaders"],
-			headers: {6:{sorter:false}},
-			widgetOptions : {filter_saveFilters : true}
-		}); 
-
-		$('.resetsaved').click(function()
-		{
-			$("#t1").trigger("filterReset");
-			location.reload();
-			return false;
+			widgets: ["zebra", "filter", "stickyHeaders"],
+			headers: {6:{sorter:false}}
 		});
 	} 
 );

vilesci/statistik/oehwaehlerverzeichnis.php

@@ -110,7 +110,7 @@ if($result = $db->db_query($qry))
 			$data_row[2]=implode(';',$personenkennzeichen);
 			$data_row[7]=implode(';',$studiengang_kz);
 
-			echo implode('|',$data_row)."|\r\n";
+			echo implode('|',$data_row)."\r\n";
 			$data_row = array();
 			$personenkennzeichen = array();
 			$studiengang_kz = array();
@@ -166,5 +166,5 @@ if($result = $db->db_query($qry))
 	$data_row[2]=implode(';',$personenkennzeichen);
 	$data_row[7]=implode(';',$studiengang_kz);
 
-	echo implode('|',$data_row)."|\r\n";
+	echo implode('|',$data_row)."\r\n";
 }