diff --git a/content/statistik/alvsstatistik.php b/content/statistik/alvsstatistik.php
new file mode 100644
index 000000000..b745ef94d
--- /dev/null
+++ b/content/statistik/alvsstatistik.php
@@ -0,0 +1,280 @@
+<?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>.
+ */
+require_once('../../vilesci/config.inc.php');
+require_once('../../include/functions.inc.php');
+require_once('../../include/studiengang.class.php');
+require_once('../../include/fachbereich.class.php');
+require_once('../../include/Excel/excel.php');
+
+if(!$conn = pg_pconnect(CONN_STRING))
+	die('Fehler beim Connecten zur Datenbank');
+
+$user = get_uid();
+loadVariables($conn, $user);
+
+$stsem = (isset($_GET['stsem'])?$_GET['stsem']:$semester_aktuell);
+
+$typ = (isset($_GET['typ'])?$_GET['typ']:'');
+
+$studiengang = new studiengang($conn);
+$studiengang->getAll('typ, kurzbz', false);
+
+$stg_arr = array();
+foreach ($studiengang->result as $row)
+	$stg_arr[$row->studiengang_kz] = $row->kuerzel.' ('.$row->kurzbzlang.')';
+
+$fachbereich = new fachbereich($conn);
+$fachbereich->getAll();
+
+$fb_arr = array();
+foreach ($fachbereich->result as $row) 
+	$fb_arr[$row->fachbereich_kurzbz]=$row->bezeichnung;
+	
+$qry = "
+SELECT * FROM (
+	SELECT 
+		fachbereich_kurzbz, tbl_lehrveranstaltung.studiengang_kz, sum(tbl_lehreinheitmitarbeiter.semesterstunden) as semesterstunden 
+	FROM 
+		lehre.tbl_lehreinheit, 
+		lehre.tbl_lehrveranstaltung, 
+		lehre.tbl_lehrfach, 
+		lehre.tbl_lehreinheitmitarbeiter
+	WHERE 
+		tbl_lehrveranstaltung.lehrveranstaltung_id = tbl_lehreinheit.lehrveranstaltung_id AND 
+		tbl_lehreinheit.studiensemester_kurzbz='$stsem' AND 
+		tbl_lehreinheit.lehrfach_id = tbl_lehrfach.lehrfach_id AND 
+		tbl_lehreinheitmitarbeiter.semesterstunden<>0 AND 
+		faktor<>0 AND 
+		stundensatz<>0 AND 
+		tbl_lehreinheitmitarbeiter.lehreinheit_id=tbl_lehreinheit.lehreinheit_id
+	GROUP BY fachbereich_kurzbz, tbl_lehrveranstaltung.studiengang_kz
+	) as a JOIN public.tbl_studiengang USING(studiengang_kz)
+ORDER BY typ, tbl_studiengang.kurzbz, fachbereich_kurzbz
+";
+
+if(!$result = pg_query($conn, $qry))
+	die('Fehler bei Datenbankabfrage');
+
+$fachbereiche = array();
+
+while($row = pg_fetch_object($result))
+{
+	if(!in_array($row->fachbereich_kurzbz, $fachbereiche))
+		$fachbereiche[] = $row->fachbereich_kurzbz;
+	$data[$row->studiengang_kz][$row->fachbereich_kurzbz]=$row->semesterstunden;
+}
+
+sort($fachbereiche);
+
+$qry = "
+SELECT 
+	studiengang_kz, sum(stunden) as stunden
+FROM 
+	lehre.tbl_projektarbeit, 
+	lehre.tbl_lehrveranstaltung, 
+	lehre.tbl_lehreinheit, 
+	lehre.tbl_projektbetreuer 
+WHERE 
+	tbl_projektarbeit.projektarbeit_id=tbl_projektbetreuer.projektarbeit_id AND 
+	tbl_lehreinheit.lehreinheit_id=tbl_projektarbeit.lehreinheit_id AND 
+	tbl_lehreinheit.lehrveranstaltung_id=tbl_lehrveranstaltung.lehrveranstaltung_id AND 
+	tbl_projektbetreuer.faktor<>0 AND 
+	tbl_projektbetreuer.stunden<>0 AND 
+	tbl_projektbetreuer.stundensatz<>0 AND 
+	tbl_lehreinheit.studiensemester_kurzbz='$stsem'
+GROUP BY studiengang_kz";
+
+if(!$result = pg_query($conn, $qry))
+	die('Fehler bei DB-Abfrage');
+
+while($row = pg_fetch_object($result))
+	$data[$row->studiengang_kz]['betreuungen']=$row->stunden;
+
+if($typ=='xls')
+{
+	// Creating a workbook
+	$workbook = new Spreadsheet_Excel_Writer();
+	
+	// sending HTTP headers
+	$workbook->send("ALVSStatistik_".$stsem.".xls");
+	
+	// Creating a worksheet
+	$worksheet =& $workbook->addWorksheet("ALVSStatistik");
+	
+	//Formate Definieren
+	$format_bold =& $workbook->addFormat();
+	$format_bold->setBold();
+	//$format_bold->setBorder(1);
+	
+	$format_border =& $workbook->addFormat();
+	$format_border->setBorder(1);
+		
+	$format_rotate =& $workbook->addFormat();
+	$format_rotate->setTextRotation(270);
+	$format_rotate->setAlign('center');
+	$format_rotate->setBold();
+	
+	$spalte=0;
+	$zeile=0;
+	
+	
+	$worksheet->write($zeile,$spalte,$stsem, $format_bold);
+	$maxlength[$spalte]=13;
+	$summe_fb = array();
+	foreach ($fachbereiche as $fb)
+	{
+		$worksheet->write($zeile,++$spalte,$fb_arr[$fb], $format_rotate);
+		$fachbereiche[$fb]=$spalte;
+		$maxlength[$spalte]=3;
+		$summe_fb[$fb]=0;
+	}
+	$worksheet->write($zeile,++$spalte,'Betreuerstunden', $format_rotate);
+	$fachbereiche['betreuungen']=$spalte;
+	$maxlength[$spalte]=3;
+	$summe_fb['betreuungen']=0;
+	
+	$worksheet->write($zeile,++$spalte,'Summe', $format_rotate);
+	$maxspalten=$spalte;
+	
+	
+	foreach ($data as $key=>$val)
+	{
+		$zeile++;
+		$spalte=0;
+		$worksheet->write($zeile,$spalte,$stg_arr[$key], $format_bold);
+		$summe=0;
+		foreach ($data[$key] as $fb=>$stunden)
+		{
+			$summe+=$stunden;
+			$summe_fb[$fb]+=$stunden;
+			$worksheet->write($zeile,$fachbereiche[$fb],$stunden);
+			if($maxlength[$fachbereiche[$fb]]<strlen($stunden))
+				$maxlength[$fachbereiche[$fb]]=strlen($stunden);
+		}
+		$worksheet->write($zeile,$maxspalten,$summe, $format_bold);
+	}
+	
+	
+	$zeile++;
+	$worksheet->write($zeile,0,'Summe', $format_bold);
+	foreach ($summe_fb as $fb=>$summe)
+	{
+		if(isset($fachbereiche[$fb]))
+			$worksheet->write($zeile,$fachbereiche[$fb],$summe, $format_bold);
+	}
+	
+	//Die Breite der Spalten setzen
+	foreach($maxlength as $i=>$breite)
+		$worksheet->setColumn($i, $i, $breite);
+		
+	$workbook->close();
+}
+else 
+{
+	echo '
+	<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+	<html>
+	<head>
+	<title>Studenten/Semester</title>
+	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-15">
+	<link rel="stylesheet" href="../../skin/vilesci.css" type="text/css">
+	<style type="text/css">
+	td, th
+	{
+		border: 1px solid black;
+	}
+	</style>
+	</head>
+	<body class="Background_main">';
+	
+	
+	
+	echo "<h2>Studenten / Semester</h2>";
+	
+	echo '<table class="liste" style="border: 1px solid black" cellspacing="0"><tr class="liste"><th>'.$stsem.'</th>';
+	$summe_fb = array();
+	
+	foreach ($fachbereiche as $fb)
+	{
+		echo "<th>".$fb_arr[$fb]."</th>";
+		$summe_fb[$fb]=0;
+	}
+	echo "<th>Betreuungen</th>";
+	$summe_fb['betreuungen']=0;
+	echo "<th>Summe</th>";
+	echo "</tr>";
+	
+	foreach ($data as $key=>$val)
+	{
+		echo "<tr>";
+		echo "<td>".$stg_arr[$key]."</td>";
+		$summe =0;
+		foreach ($fachbereiche as $fb)
+		{
+			echo "<td>";
+			if(isset($data[$key][$fb]))
+			{
+				$summe+=$data[$key][$fb];
+				$summe_fb[$fb]+=$data[$key][$fb];
+				echo $data[$key][$fb];
+			}
+			else 
+				echo "&nbsp;";
+			echo "</td>";
+		}
+		
+		echo "<td>";
+		if(isset($data[$key]['betreuungen']))
+		{
+			echo $data[$key]['betreuungen'];
+			$summe_fb['betreuungen']+=$data[$key]['betreuungen'];
+		}
+		else 
+			echo "&nbsp;";
+		echo "</td>";
+		echo "<td><b>$summe</b></td>";
+		echo "</tr>";
+	}
+		
+	echo "<tr>";
+	echo "<td>Summe</td>";
+	foreach ($fachbereiche as $fb)
+	{
+		echo "<td><b>";
+		if(isset($summe_fb[$fb]))
+			echo $summe_fb[$fb];
+		else 
+			echo "&nbsp;";
+		echo "</b></td>";
+	}	
+	echo "<td><b>";
+		if(isset($summe_fb['betreuungen']))
+			echo $summe_fb['betreuungen'];
+		else 
+			echo "&nbsp;";
+		echo "</b></td>";
+	echo "</tr>";
+	echo '</table>';
+	echo '</body>
+	</html>';
+}
+?>
diff --git a/content/statistik/studentenprosemester.php b/content/statistik/studentenprosemester.php
new file mode 100644
index 000000000..c9c6f8f30
--- /dev/null
+++ b/content/statistik/studentenprosemester.php
@@ -0,0 +1,160 @@
+<?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>.
+ */
+require_once('../../vilesci/config.inc.php');
+require_once('../../include/functions.inc.php');
+require_once('../../include/studiengang.class.php');
+require_once('../../include/Excel/excel.php');
+
+if(!$conn = pg_pconnect(CONN_STRING))
+	die('Fehler beim Connecten zur Datenbank');
+
+$user = get_uid();
+loadVariables($conn, $user);
+
+$stsem = $semester_aktuell;
+
+$typ = (isset($_GET['typ'])?$_GET['typ']:'');
+
+$studiengang = new studiengang($conn);
+$studiengang->getAll('typ, kurzbz', false);
+
+$stg_arr = array();
+foreach ($studiengang->result as $row)
+	$stg_arr[$row->studiengang_kz] = $row->kuerzel.' ('.$row->kurzbzlang.')';
+
+$qry = "
+	SELECT 
+		stdlvb.studiengang_kz, 
+		count(*) AS all,
+		(SELECT count(*) FROM tbl_studentlehrverband WHERE studiensemester_kurzbz='$stsem' AND semester=1 AND studiengang_kz=stdlvb.studiengang_kz ) AS s1, 
+		(SELECT count(*) FROM tbl_studentlehrverband WHERE studiensemester_kurzbz='$stsem' AND semester=2 AND studiengang_kz=stdlvb.studiengang_kz ) AS s2, 
+		(SELECT count(*) FROM tbl_studentlehrverband WHERE studiensemester_kurzbz='$stsem' AND semester=3 AND studiengang_kz=stdlvb.studiengang_kz ) AS s3,
+		(SELECT count(*) FROM tbl_studentlehrverband WHERE studiensemester_kurzbz='$stsem' AND semester=4 AND studiengang_kz=stdlvb.studiengang_kz ) AS s4,
+		(SELECT count(*) FROM tbl_studentlehrverband WHERE studiensemester_kurzbz='$stsem' AND semester=5 AND studiengang_kz=stdlvb.studiengang_kz ) AS s5,
+		(SELECT count(*) FROM tbl_studentlehrverband WHERE studiensemester_kurzbz='$stsem' AND semester=6 AND studiengang_kz=stdlvb.studiengang_kz ) AS s6,
+		(SELECT count(*) FROM tbl_studentlehrverband WHERE studiensemester_kurzbz='$stsem' AND semester=7 AND studiengang_kz=stdlvb.studiengang_kz ) AS s7,
+		(SELECT count(*) FROM tbl_studentlehrverband WHERE studiensemester_kurzbz='$stsem' AND semester=8 AND studiengang_kz=stdlvb.studiengang_kz ) AS s8
+	FROM 
+		tbl_studentlehrverband stdlvb JOIN tbl_studiengang USING(studiengang_kz)
+	WHERE 
+		studiensemester_kurzbz='$stsem' AND semester>0 AND semester<9
+	GROUP BY typ, kurzbz, studiengang_kz 
+";
+if(!$result = pg_query($conn, $qry))
+	die('Fehler bei Datenbankabfrage');
+
+if($typ=='xls')
+{
+	// Creating a workbook
+	$workbook = new Spreadsheet_Excel_Writer();
+	
+	// sending HTTP headers
+	$workbook->send("StudentenSemester_".$stsem.".xls");
+	
+	// Creating a worksheet
+	$worksheet =& $workbook->addWorksheet("StudentenSemester");
+	
+	//Formate Definieren
+	$format_bold =& $workbook->addFormat();
+	$format_bold->setBold();
+	$format_bold->setBorder(1);
+	
+	$format_border =& $workbook->addFormat();
+	$format_border->setBorder(1);
+		
+	$spalte=0;
+	$zeile=0;
+	
+	$worksheet->write($zeile,$spalte,$stsem, $format_bold);
+	$worksheet->write($zeile,++$spalte,'Gesamt', $format_bold);
+	$worksheet->write($zeile,++$spalte,'1', $format_bold);
+	$worksheet->write($zeile,++$spalte,'2', $format_bold);
+	$worksheet->write($zeile,++$spalte,'3', $format_bold);
+	$worksheet->write($zeile,++$spalte,'4', $format_bold);
+	$worksheet->write($zeile,++$spalte,'5', $format_bold);
+	$worksheet->write($zeile,++$spalte,'6', $format_bold);
+	$worksheet->write($zeile,++$spalte,'7', $format_bold);
+	$worksheet->write($zeile,++$spalte,'8', $format_bold);
+	
+	while($row = pg_fetch_object($result))
+	{
+		$zeile++;
+		$spalte=0;
+		$worksheet->write($zeile,$spalte,$stg_arr[$row->studiengang_kz], $format_bold);
+		$worksheet->write($zeile,++$spalte,$row->all, $format_border);
+		$worksheet->write($zeile,++$spalte,($row->s1!=0?$row->s1:''), $format_border);
+		$worksheet->write($zeile,++$spalte,($row->s2!=0?$row->s2:''), $format_border);
+		$worksheet->write($zeile,++$spalte,($row->s3!=0?$row->s3:''), $format_border);
+		$worksheet->write($zeile,++$spalte,($row->s4!=0?$row->s4:''), $format_border);
+		$worksheet->write($zeile,++$spalte,($row->s5!=0?$row->s5:''), $format_border);
+		$worksheet->write($zeile,++$spalte,($row->s6!=0?$row->s6:''), $format_border);
+		$worksheet->write($zeile,++$spalte,($row->s7!=0?$row->s7:''), $format_border);
+		$worksheet->write($zeile,++$spalte,($row->s8!=0?$row->s8:''), $format_border);
+	}
+		
+	$workbook->close();
+}
+else 
+{
+	echo '
+	<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+	<html>
+	<head>
+	<title>Studenten/Semester</title>
+	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-15">
+	<link rel="stylesheet" href="../../skin/vilesci.css" type="text/css">
+	<style type="text/css">
+	td, th
+	{
+		border: 1px solid black;
+	}
+	</style>
+	</head>
+	<body class="Background_main">';
+	
+	
+	
+	echo "<h2>Studenten / Semester</h2>";
+	
+	echo '<table class="liste" style="border: 1px solid black" cellspacing="0"><tr class="liste"><th>'.$stsem.'</th><th>Gesamt</th><th>1</th><th>2</th><th>3</th><th>4</th><th>5</th><th>6</th><th>7</th><th>8</th></tr>';
+
+	while($row = pg_fetch_object($result))
+	{
+		echo "<tr>";
+		echo "<td align='left'>".$stg_arr[$row->studiengang_kz]."</td>";
+		echo "<td align='center'>".$row->all."</td>";
+		echo "<td align='center'>".($row->s1!=0?$row->s1:'&nbsp;')."</td>";
+		echo "<td align='center'>".($row->s2!=0?$row->s2:'&nbsp;')."</td>";
+		echo "<td align='center'>".($row->s3!=0?$row->s3:'&nbsp;')."</td>";
+		echo "<td align='center'>".($row->s4!=0?$row->s4:'&nbsp;')."</td>";
+		echo "<td align='center'>".($row->s5!=0?$row->s5:'&nbsp;')."</td>";
+		echo "<td align='center'>".($row->s6!=0?$row->s6:'&nbsp;')."</td>";
+		echo "<td align='center'>".($row->s7!=0?$row->s7:'&nbsp;')."</td>";
+		echo "<td align='center'>".($row->s8!=0?$row->s8:'&nbsp;')."</td>";
+		echo "</tr>";
+	}
+		
+	echo '</table>';
+	echo '</body>
+	</html>';
+}
+?>
diff --git a/content/student/studentDBDML.php b/content/student/studentDBDML.php
index fa108ebc9..cd9609924 100644
--- a/content/student/studentDBDML.php
+++ b/content/student/studentDBDML.php
@@ -623,6 +623,7 @@ if(!$error)
 						$rolle->studiensemester_kurzbz = $_POST['studiensemester_kurzbz'];
 						$rolle->studiensemester_old = $_POST['studiensemester_old'];
 						$rolle->datum = $_POST['datum'];
+						$rolle->orgform_kurzbz = $_POST['orgform_kurzbz'];
 						$rolle->new = false;
 						
 						if($rolle->save_rolle())
diff --git a/content/student/studentdetailoverlay.xul.php b/content/student/studentdetailoverlay.xul.php
index 0d12e294f..655df0b77 100644
--- a/content/student/studentdetailoverlay.xul.php
+++ b/content/student/studentdetailoverlay.xul.php
@@ -472,6 +472,10 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
 								class="sortDirectionIndicator"
 								sort="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#datum" />									
 							<splitter class="tree-splitter"/>
+							<treecol id="student-prestudent-tree-rolle-orgform_kurzbz" label="Organisationsform" flex="2" hidden="true"
+								class="sortDirectionIndicator"
+								sort="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#orgform_kurzbz" />
+							<splitter class="tree-splitter"/>
 							<treecol id="student-prestudent-tree-rolle-prestudent_id" label="PrestudentID" flex="2" hidden="true"
 								class="sortDirectionIndicator"
 								sort="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#prestudent_id" />
@@ -487,6 +491,7 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
 											<treecell label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#studiensemester_kurzbz"/>
 											<treecell label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#ausbildungssemester"/>
 											<treecell label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#datum"/>
+											<treecell label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#orgform_kurzbz"/>
 											<treecell label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#prestudent_id"/>
 										</treerow>
 									</treeitem>
diff --git a/content/student/studentoverlay.js.php b/content/student/studentoverlay.js.php
index 01b1b53f0..fd1c8df84 100644
--- a/content/student/studentoverlay.js.php
+++ b/content/student/studentoverlay.js.php
@@ -1452,6 +1452,7 @@ function StudentRolleSpeichern(dialog, studiensemester_old, ausbildungssemester_
 	studiensemester_kurzbz = dialog.getElementById('student-rolle-menulist-studiensemester').value;
 	ausbildungssemester = dialog.getElementById('student-rolle-menulist-ausbildungssemester').value;
 	datum = dialog.getElementById('student-rolle-datum-datum').value;
+	orgform_kurzbz = dialog.getElementById('student-rolle-menulist-orgform_kurzbz').value;
 	
 	if(!CheckDatum(datum))
 	{
@@ -1471,6 +1472,7 @@ function StudentRolleSpeichern(dialog, studiensemester_old, ausbildungssemester_
 	req.add('ausbildungssemester_old', ausbildungssemester_old);
 	req.add('ausbildungssemester', ausbildungssemester);
 	req.add('datum', datum);
+	req.add('orgform_kurzbz', orgform_kurzbz);
 
 	var response = req.executePOST();
 
diff --git a/content/student/studentrolledialog.js.php b/content/student/studentrolledialog.js.php
index a23e4aa0a..7fb498af8 100644
--- a/content/student/studentrolledialog.js.php
+++ b/content/student/studentrolledialog.js.php
@@ -57,6 +57,7 @@ function StudentRolleInit(prestudent_id, rolle_kurzbz, studiensemester_kurzbz, a
 	
 		//RDF parsen	
 		datum = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#datum" ));
+		orgform_kurzbz = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#orgform_kurzbz" ));
 		neu = false;
 	}
 	else
@@ -69,6 +70,7 @@ function StudentRolleInit(prestudent_id, rolle_kurzbz, studiensemester_kurzbz, a
 	document.getElementById('student-rolle-menulist-studiensemester').value=studiensemester_kurzbz;
 	document.getElementById('student-rolle-menulist-ausbildungssemester').value=ausbildungssemester;
 	document.getElementById('student-rolle-datum-datum').value=datum;
+	document.getElementById('student-rolle-menulist-orgform_kurzbz').value=orgform_kurzbz;
 }
 
 // ****
diff --git a/content/student/studentrolledialog.xul.php b/content/student/studentrolledialog.xul.php
index 8371a8f6e..29d6d1f2c 100644
--- a/content/student/studentrolledialog.xul.php
+++ b/content/student/studentrolledialog.xul.php
@@ -115,6 +115,24 @@ else
 						?>
 						</menupopup>
 					</menulist>
+      			</row>
+      			<?php
+      				$hidden='true';
+      				$qry = "SELECT orgform_kurzbz FROM public.tbl_prestudent JOIN public.tbl_studiengang USING(studiengang_kz) WHERE prestudent_id='$prestudent_id'";
+      				if($result = pg_query($conn, $qry))
+      					if($row = pg_fetch_object($result))
+      						if($row->orgform_kurzbz=='VBB')
+      							$hidden='false';
+      			?>
+      			<row hidden="<?php echo $hidden; ?>">		
+      				<label value="Organisationsform" control="student-rolle-menulist-orgform_kurzbz"/>
+					<menulist id="student-rolle-menulist-orgform_kurzbz" >
+						<menupopup>
+						<menuitem value="" label="-- keine Auswahl --"/>
+						<menuitem value="VZ" label="Vollzeit"/>
+						<menuitem value="BB" label="Berufsbegleitend"/>
+						</menupopup>
+					</menulist>
       			</row>
 				<row>
 					<label value="Datum" control="student-rolle-datum-datum"/>
diff --git a/include/prestudent.class.php b/include/prestudent.class.php
index ddc60dd85..bf18faec6 100644
--- a/include/prestudent.class.php
+++ b/include/prestudent.class.php
@@ -52,6 +52,7 @@ class prestudent extends person
 	var $insertvon;
 	var $updateamum;
 	var $updatevon;
+	var $orgform_kurzbz;
 	
 	// ErgebnisArray
 	var $result=array();
@@ -372,6 +373,7 @@ class prestudent extends person
 				$rolle->insertvon = $row->insertvon;
 				$rolle->updateamum = $row->updateamum;
 				$rolle->updatevon = $row->updatevon;
+				$rolle->orgform_kurzbz = $row->orgform_kurzbz;
 				
 				$this->result[] = $rolle;
 			}
@@ -414,6 +416,7 @@ class prestudent extends person
 				$this->updateamum = $row->updateamum;
 				$this->updatevon = $row->updatevon;
 				$this->ext_id_prestudent = $row->ext_id;
+				$this->orgform_kurzbz = $row->orgform_kurzbz;
 			}
 			return true;
 		}
@@ -537,6 +540,7 @@ class prestudent extends person
 				$ps->studiensemester_kurzbz = $row->studiensemester_kurzbz;
 				$ps->ausbildungssemester = $row->ausbildungssemester;
 				$ps->datum = $row->datum;
+				$ps->orgform_kurzbz = $row->orgform_kurzbz;
 				
 				$this->result[] = $ps;
 			}
@@ -609,7 +613,7 @@ class prestudent extends person
 	{
 		if($this->new)
 		{
-			$qry = 'INSERT INTO public.tbl_prestudentrolle (prestudent_id, rolle_kurzbz, studiensemester_kurzbz, ausbildungssemester, datum, insertamum, insertvon, updateamum, updatevon, ext_id) VALUES('.
+			$qry = 'INSERT INTO public.tbl_prestudentrolle (prestudent_id, rolle_kurzbz, studiensemester_kurzbz, ausbildungssemester, datum, insertamum, insertvon, updateamum, updatevon, ext_id, orgform_kurzbz) VALUES('.
 			       $this->addslashes($this->prestudent_id).",".
 			       $this->addslashes($this->rolle_kurzbz).",".
 			       $this->addslashes($this->studiensemester_kurzbz).",".
@@ -619,7 +623,8 @@ class prestudent extends person
 			       $this->addslashes($this->insertvon).",".
 			       $this->addslashes($this->updateamum).",".
 			       $this->addslashes($this->updatevon).",".
-			       $this->addslashes($this->ext_id_prestudent).");";
+			       $this->addslashes($this->ext_id_prestudent).",".
+			       $this->addslashes($this->orgform_kurzbz).");";
 		}
 		else
 		{			
@@ -631,7 +636,8 @@ class prestudent extends person
 			$qry = 'UPDATE public.tbl_prestudentrolle SET'.
 			       ' ausbildungssemester='.$this->addslashes($this->ausbildungssemester).",".
 			       ' studiensemester_kurzbz='.$this->addslashes($this->studiensemester_kurzbz).",".
-			       ' datum='.$this->addslashes($this->datum).
+			       ' datum='.$this->addslashes($this->datum).",".
+			       ' orgform_kurzbz='.$this->addslashes($this->orgform_kurzbz).
 			       " WHERE prestudent_id='".addslashes($this->prestudent_id)."' AND rolle_kurzbz='".addslashes($this->rolle_kurzbz)."' AND studiensemester_kurzbz='".addslashes($this->studiensemester_old)."' AND ausbildungssemester='".addslashes($this->ausbildungssemester_old)."';";
 		}
 		
@@ -674,7 +680,7 @@ class prestudent extends person
 			$log->mitarbeiter_uid = get_uid();
 			$log->sql = $qry;
 			$log->sqlundo = 'INSERT INTO public.tbl_prestudentrolle(prestudent_id, rolle_kurzbz, studiensemester_kurzbz,'.
-							' ausbildungssemester, datum, insertamum, insertvon, updateamum, updatevon, ext_id) VALUES('.
+							' ausbildungssemester, datum, insertamum, insertvon, updateamum, updatevon, ext_id, orgform_kurzbz) VALUES('.
 							$this->addslashes($this->prestudent_id).','.
 							$this->addslashes($this->rolle_kurzbz).','.
 							$this->addslashes($this->studiensemester_kurzbz).','.
@@ -684,7 +690,8 @@ class prestudent extends person
 							$this->addslashes($this->insertvon).','.
 							$this->addslashes($this->updateamum).','.
 							$this->addslashes($this->updatevon).','.
-							$this->addslashes($this->ext_id_prestudent).');';
+							$this->addslashes($this->ext_id_prestudent).','.
+							$this->addslashes($this->orgform_kurzbz).');';
 			if($log->save(true))
 			{
 						
@@ -729,6 +736,7 @@ class prestudent extends person
 				$this->insertvon = $row->insertvon;
 				$this->updateamum = $row->updateamum;
 				$this->updatevon = $row->updatevon;
+				$this->orgform_kurzbz = $row->orgform_kurzbz;
 				return true;	
 			}
 			else 
diff --git a/rdf/lehrauftrag.xml.php b/rdf/lehrauftrag.xml.php
index 827f24b06..03b8f4f7c 100644
--- a/rdf/lehrauftrag.xml.php
+++ b/rdf/lehrauftrag.xml.php
@@ -130,7 +130,8 @@ if($uid==null)
 						tbl_lehreinheit.lehreinheit_id=tbl_projektarbeit.lehreinheit_id AND
 						tbl_lehreinheit.studiensemester_kurzbz='".addslashes($ss)."' AND
 						tbl_lehreinheit.lehrveranstaltung_id = tbl_lehrveranstaltung.lehrveranstaltung_id AND
-						tbl_lehrveranstaltung.studiengang_kz=".addslashes($studiengang_kz)."
+						tbl_lehrveranstaltung.studiengang_kz=".addslashes($studiengang_kz)." AND
+						tbl_projektbetreuer.stunden!='0' AND tbl_projektbetreuer.faktor!='0' AND tbl_projektbetreuer.stundensatz!='0'
 					) as mitarbeiter";
 	
 	if($result = pg_query($conn, $qry))
diff --git a/rdf/prestudentrolle.rdf.php b/rdf/prestudentrolle.rdf.php
index ca27c09f2..3958dffc1 100644
--- a/rdf/prestudentrolle.rdf.php
+++ b/rdf/prestudentrolle.rdf.php
@@ -66,6 +66,7 @@ foreach($ps->result as $row)
         	<ROLLE:ausbildungssemester><![CDATA['.$row->ausbildungssemester.']]></ROLLE:ausbildungssemester>
         	<ROLLE:datum><![CDATA['.$datum->convertISODate($row->datum).']]></ROLLE:datum>
         	<ROLLE:datum_iso><![CDATA['.$row->datum.']]></ROLLE:datum_iso>
+        	<ROLLE:orgform_kurzbz><![CDATA['.$row->orgform_kurzbz.']]></ROLLE:orgform_kurzbz>
       	</RDF:Description>
       </RDF:li>
 	';