content/fasoverlay.js.php

@@ -203,6 +203,9 @@ function onVerbandSelect(event)
 	if(row.value!=tree.currentIndex)
 		return;
 
+	//Export aktivieren
+	document.getElementById('student-toolbar-export').disabled=false;
+	
     // Progressmeter starten. Ab jetzt keine 'return's mehr.
     document.getElementById('statusbar-progressmeter').setAttribute('mode','undetermined');
     //globalProgressmeter.StartPM();

content/statistik/studentenexport.xls.php

@@ -0,0 +1,270 @@
+<?php
+/* Copyright (C) 2006 Technikum-Wien
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Authors: Christian Paminger <christian.paminger@technikum-wien.at>,
+ *          Andreas Oesterreicher <andreas.oesterreicher@technikum-wien.at> and
+ *          Rudolf Hangl <rudolf.hangl@technikum-wien.at>.
+ */
+/**
+ * Exportiert die Studentendaten in ein Excel File.
+ * Die zu exportierenden Spalten werden per GET uebergeben.
+ * Die Adressen werden immer dazugehaengt
+ */
+require_once('../../vilesci/config.inc.php');
+require_once('../../include/functions.inc.php');
+require_once('../../include/person.class.php');
+require_once('../../include/benutzer.class.php');
+require_once('../../include/student.class.php');
+require_once('../../include/prestudent.class.php');
+require_once('../../include/datum.class.php');
+require_once('../../include/Excel/excel.php');
+
+// Datenbank Verbindung
+if (!$conn = pg_pconnect(CONN_STRING))
+   	$error_msg='Es konnte keine Verbindung zum Server aufgebaut werden!';
+
+$user = get_uid();
+$datum_obj = new datum();
+loadVariables($conn, $user);
+	
+	//Parameter holen
+	$studiengang_kz = $_GET['studiengang_kz'];
+	$semester = $_GET['semester'];
+	$verband = $_GET['verband'];
+	$gruppe = $_GET['gruppe'];
+	$gruppe_kurzbz = $_GET['gruppe_kurzbz'];
+	$studiensemester_kurzbz = $_GET['studiensemester_kurzbz'];
+	$typ = $_GET['typ'];
+	
+	$maxlength= array();
+	$zeile=1;
+
+	// Creating a workbook
+	$workbook = new Spreadsheet_Excel_Writer();
+
+	// sending HTTP headers
+	$workbook->send("Studenten". "_" . date("d_m_Y") . ".xls");
+
+	// Creating a worksheet
+	$worksheet =& $workbook->addWorksheet("Studenten");
+
+	$format_bold =& $workbook->addFormat();
+	$format_bold->setBold();
+
+	$format_title =& $workbook->addFormat();
+	$format_title->setBold();
+	// let's merge
+	$format_title->setAlign('merge');
+
+	//Zeilenueberschriften ausgeben
+	$i=0;
+	$worksheet->write(0,$i,"UID", $format_bold);
+	$maxlength[$i]=3;
+	$worksheet->write(0,++$i,"TITELPRE", $format_bold);
+	$maxlength[$i]=8;
+	$worksheet->write(0,++$i,"VORNAME", $format_bold);
+	$maxlength[$i]=7;
+	$worksheet->write(0,++$i,"VORNAMEN", $format_bold);
+	$maxlength[$i]=8;
+	$worksheet->write(0,++$i,"NACHNAME", $format_bold);
+	$maxlength[$i]=8;
+	$worksheet->write(0,++$i,"TITELPOST", $format_bold);
+	$maxlength[$i]=9;
+	$worksheet->write(0,++$i,"SVNR", $format_bold);
+	$maxlength[$i]=4;
+	$worksheet->write(0,++$i,"GEBURTSDATUM", $format_bold);
+	$maxlength[$i]=12;
+	$worksheet->write(0,++$i,"SEMESTER", $format_bold);
+	$maxlength[$i]=8;
+	$worksheet->write(0,++$i,"VERBAND", $format_bold);
+	$maxlength[$i]=7;
+	$worksheet->write(0,++$i,"GRUPPE", $format_bold);
+	$maxlength[$i]=6;
+	$worksheet->write(0,++$i,"MATRIKELNUMMER", $format_bold);
+	$maxlength[$i]=15;
+	$worksheet->write(0,++$i,"STATUS", $format_bold);
+	$maxlength[$i]=6;
+	$worksheet->write(0,++$i,"STRASSE", $format_bold);
+	$maxlength[$i]=7;
+	$worksheet->write(0,++$i,"PLZ", $format_bold);
+	$maxlength[$i]=3;
+	$worksheet->write(0,++$i,"ORT", $format_bold);
+	$maxlength[$i]=3;
+			
+	// Student holen
+	if($typ=='student')
+	{
+		
+		// Studenten holen
+		$student=new student($conn,null,false);
+		$studenten=$student->getStudents($studiengang_kz,$semester,$verband,$gruppe,$gruppe_kurzbz, $studiensemester_kurzbz);
+		
+		foreach ($studenten as $student)
+		{
+		
+			draw_content($student);
+			$zeile++;
+		}
+	}
+	elseif(in_array($typ, array('prestudent', 'interessenten','bewerber','aufgenommen',
+	                      'warteliste','absage','zgv','reihungstestangemeldet',
+	                      'reihungstestnichtangemeldet')))
+	{
+		$prestd = new prestudent($conn, null, false);
+
+		if($studiengang_kz!=null)
+		{
+			if($prestd->loadIntessentenUndBewerber($studiensemester_kurzbz, $studiengang_kz, $semester, $typ))
+			{
+				foreach ($prestd->result as $row)
+				{
+					$student=new student($conn,null,false);
+					if($uid = $student->getUid($row->prestudent_id))
+					{
+						if(!$student->load($uid, $studiensemester_kurzbz))
+							$student->load($uid);
+						draw_content($student);
+					}
+					else
+						draw_content($row);
+					$zeile++;
+				}
+			}
+		}
+	}
+
+	function draw_content($row)
+	{
+		global $maxlength, $datum_obj;
+		global $zeile, $worksheet, $conn;
+		
+		$prestudent = new prestudent($conn, null, null);
+		$prestudent->getLastStatus($row->prestudent_id);
+		$status = $prestudent->rolle_kurzbz;
+			
+		$i=0;
+		if(isset($row->uid))
+		{
+			if(strlen($row->uid)>$maxlength[$i])
+				$maxlength[$i] = strlen($row->uid);
+			$worksheet->write($zeile,$i, $row->uid);
+		}
+		$i++;
+		
+		if(strlen($row->titelpre)>$maxlength[$i])
+			$maxlength[$i] = strlen($row->titelpre);
+		$worksheet->write($zeile,$i, $row->titelpre);
+		$i++;
+		
+		if(strlen($row->vorname)>$maxlength[$i])
+			$maxlength[$i] = strlen($row->vorname);
+		$worksheet->write($zeile,$i, $row->vorname);
+		$i++;
+		
+		if(strlen($row->vornamen)>$maxlength[$i])
+			$maxlength[$i] = strlen($row->vornamen);
+		$worksheet->write($zeile,$i, $row->vornamen);
+		$i++;
+		
+		if(strlen($row->nachname)>$maxlength[$i])
+			$maxlength[$i] = strlen($row->nachname);
+		$worksheet->write($zeile,$i, $row->nachname);
+		$i++;
+		
+		if(strlen($row->titelpost)>$maxlength[$i])
+			$maxlength[$i] = strlen($row->titelpost);
+		$worksheet->write($zeile,$i, $row->titelpost);
+		$i++;
+		
+		if(strlen($row->svnr)>$maxlength[$i])
+			$maxlength[$i] = strlen($row->svnr);
+		$worksheet->write($zeile,$i, $row->svnr);
+		$i++;
+		
+		if(strlen($row->gebdatum)>$maxlength[$i])
+			$maxlength[$i] = strlen($row->gebdatum);
+		$worksheet->write($zeile,$i, $datum_obj->convertISODate($row->gebdatum));
+		$i++;
+		
+		if(isset($row->semester))
+		{
+			if(strlen($row->semester)>$maxlength[$i])
+				$maxlength[$i] = strlen($row->semester);
+			$worksheet->write($zeile,$i, $row->semester);
+		}
+		$i++;
+		
+		if(isset($row->verband))
+		{
+			if(strlen($row->verband)>$maxlength[$i])
+				$maxlength[$i] = strlen($row->verband);
+			$worksheet->write($zeile,$i, $row->verband);
+		}
+		$i++;
+		
+		if(isset($row->gruppe))
+		{
+			if(strlen($row->gruppe)>$maxlength[$i])
+				$maxlength[$i] = strlen($row->gruppe);
+			$worksheet->write($zeile,$i, $row->gruppe);
+		}
+		$i++;
+		
+		if(isset($row->matrikelnr))
+		{
+			if(strlen($row->matrikelnr)>$maxlength[$i])
+				$maxlength[$i] = strlen($row->matrikelnr);
+			$worksheet->write($zeile,$i, $row->matrikelnr);
+		}
+		$i++;
+		
+		if(strlen($status)>$maxlength[$i])
+			$maxlength[$i] = strlen($status);
+		$worksheet->write($zeile,$i, $status);
+		$i++;
+		
+		//Zustelladresse aus der Datenbank holen und dazuhaengen
+		$qry_1 = "SELECT * FROM public.tbl_adresse WHERE person_id='$row->person_id' ORDER BY zustelladresse LIMIT 1";
+		if($result_1 = pg_query($conn, $qry_1))
+		{
+			if($row_1 = pg_fetch_object($result_1))
+			{	
+				if(strlen($row_1->strasse)>$maxlength[$i])
+					$maxlength[$i]=strlen($row_1->strasse);
+				$worksheet->write($zeile,$i, $row_1->strasse);
+				$i++;
+				
+				if(strlen($row_1->plz)>$maxlength[$i])
+					$maxlength[$i]=strlen($row_1->plz);
+				$worksheet->write($zeile,$i, $row_1->plz);
+				$i++;
+				
+				if(strlen($row_1->ort)>$maxlength[$i])
+					$maxlength[$i]=strlen($row_1->ort);
+				$worksheet->write($zeile,$i, $row_1->ort);
+			}
+		}
+	}
+		
+
+	//Die Breite der Spalten setzen
+	foreach($maxlength as $i=>$breite)
+		$worksheet->setColumn($i, $i, $breite+2);
+    
+	$workbook->close();
+
+?>

content/student/studentdetailoverlay.xul.php

@@ -168,50 +168,54 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
 				</rows>
 			</grid>
 			</groupbox>
-			<groupbox id="student-detail-groupbox-student">
-			<caption label="Student" />
-			<grid id="student-detail-grid-student" style="margin:4px;" flex="1">
-				  	<columns  >
-    					<column flex="1"/>
-    					<column flex="5"/>
-    					<column flex="1"/>
-    					<column flex="5"/>
-    					<column flex="1"/>
-    					<column flex="5"/>
-  					</columns>
-  					<rows>
-    					<row>
-    						<label value="UID" control="student-detail-textbox-uid"/>
-      						<hbox><textbox id="student-detail-textbox-uid" disabled="true" maxlength="16" size="16"/></hbox>
-    						<label value="Matrikelnummer" control="student-detail-textbox-matrikelnummer"/>
-      						<hbox><textbox id="student-detail-textbox-matrikelnummer" disabled="true" maxlength="15" size="15"/></hbox>
-      						<label value="Studiengang" control="student-detail-textbox-studiengang_kz"/>
-      						<menulist id="student-detail-menulist-studiengang_kz" disabled="true"
-							          datasources="<?php echo APP_ROOT ?>rdf/studiengang.rdf.php" flex="1"
-						              ref="http://www.technikum-wien.at/studiengang/liste" >
-								<template>
-									<menupopup>
-										<menuitem value="rdf:http://www.technikum-wien.at/studiengang/rdf#studiengang_kz"
-							        		      label="rdf:http://www.technikum-wien.at/studiengang/rdf#kuerzel - rdf:http://www.technikum-wien.at/studiengang/rdf#bezeichnung"
-										  		  uri="rdf:*"/>
-										</menupopup>
-								</template>
-							</menulist>
-    					</row>
-    					<row>
-	    					<label value="Semester" control="student-detail-textbox-semester"/>
-      						<hbox><textbox id="student-detail-textbox-semester" disabled="true" maxlength="2" size="1"/></hbox>
-      						<label value="Verband" control="student-detail-textbox-verband"/>
-      						<hbox><textbox id="student-detail-textbox-verband" disabled="true" maxlength="1" size="1"/></hbox>
-      						<label value="Gruppe" control="student-detail-textbox-gruppe"/>
-      						<hbox><textbox id="student-detail-textbox-gruppe" disabled="true" maxlength="1" size="1"/></hbox>
-    					</row>
-    				</rows>
-    		</grid>
-    		</groupbox>
-    		<hbox>
-    			<spacer flex="1" />
-    			<button id="student-detail-button-save" label="Speichern" oncommand="StudentDetailSave();" disabled="true"/>
+			<hbox>
+				<groupbox id="student-detail-groupbox-student" flex="1">
+				<caption label="Student" />
+				<grid id="student-detail-grid-student" style="margin:4px;" flex="1">
+					  	<columns  >
+	    					<column flex="1"/>
+	    					<column flex="5"/>
+	    					<column flex="1"/>
+	    					<column flex="5"/>
+	    					<column flex="1"/>
+	    					<column flex="5"/>
+	  					</columns>
+	  					<rows>
+	    					<row>
+	    						<label value="UID" control="student-detail-textbox-uid"/>
+	      						<hbox><textbox id="student-detail-textbox-uid" disabled="true" maxlength="16" size="16"/></hbox>
+	    						<label value="Matrikelnummer" control="student-detail-textbox-matrikelnummer"/>
+	      						<hbox><textbox id="student-detail-textbox-matrikelnummer" disabled="true" maxlength="15" size="15"/></hbox>
+	      						<!--<label value="Studiengang" control="student-detail-textbox-studiengang_kz"/>-->
+	      						<textbox id="student-detail-menulist-studiengang_kz" disabled="true" hidden="true" />
+	      						<!--
+	      						<menulist id="student-detail-menulist-studiengang_kz" disabled="true"
+								          datasources="<?php echo APP_ROOT ?>rdf/studiengang.rdf.php" flex="1"
+							              ref="http://www.technikum-wien.at/studiengang/liste" >
+									<template>
+										<menupopup>
+											<menuitem value="rdf:http://www.technikum-wien.at/studiengang/rdf#studiengang_kz"
+								        		      label="rdf:http://www.technikum-wien.at/studiengang/rdf#kuerzel - rdf:http://www.technikum-wien.at/studiengang/rdf#bezeichnung"
+											  		  uri="rdf:*"/>
+											</menupopup>
+									</template>
+								</menulist>-->
+	    					</row>
+	    					<row>
+		    					<label value="Semester" control="student-detail-textbox-semester"/>
+	      						<hbox><textbox id="student-detail-textbox-semester" disabled="true" maxlength="2" size="1"/></hbox>
+	      						<label value="Verband" control="student-detail-textbox-verband"/>
+	      						<hbox><textbox id="student-detail-textbox-verband" disabled="true" maxlength="1" size="1"/></hbox>
+	      						<label value="Gruppe" control="student-detail-textbox-gruppe"/>
+	      						<hbox><textbox id="student-detail-textbox-gruppe" disabled="true" maxlength="1" size="1"/></hbox>
+	    					</row>
+	    				</rows>
+	    		</grid>
+	    		</groupbox>
+    			<vbox>
+    				<spacer flex="1" />-->
+    				<button id="student-detail-button-save" label="Speichern" oncommand="StudentDetailSave();" disabled="true"/>
+    			</vbox>
     		</hbox>
 		</vbox>
 </vbox>

content/student/studentenoverlay.xul.php

@@ -75,7 +75,8 @@ echo '<?xul-overlay href="'.APP_ROOT.'content/student/interessentdokumenteoverla
 							<toolbarbutton id="interessent-toolbar-aufgenommener" label="-> Aufgenommener" oncommand="InteressentAddRolle('Aufgenommener')" disabled="false" tooltiptext="Interessent zum Aufgenommenen machen" hidden="true"/>
 							<toolbarbutton id="interessent-toolbar-warteliste" label="-> Warteliste" oncommand="InteressentAddRolle('Wartender')" disabled="false" tooltiptext="Interessent zum Wartenden machen" hidden="true"/>
 							<toolbarbutton id="interessent-toolbar-absage" label="-> Absage" oncommand="InteressentAddRolle('Abgewiesener')" disabled="false" tooltiptext="Interessent zum Absager machen" hidden="true"/>
-
+							
+							<toolbarbutton id="student-toolbar-export" label="Export" oncommand="StudentExport()" disabled="false" image="../skin/images/ExcelIcon.png" tooltiptext="Daten ins Excel Exportieren"/>
 							<toolbarbutton id="student-toolbar-refresh" label="Aktualisieren" oncommand="StudentTreeRefresh()" disabled="false" image="../skin/images/refresh.png" tooltiptext="Liste neu laden"/>
 							<textbox id="student-toolbar-textbox-suche" control="student-toolbar-button-search" onkeypress="StudentSearchFieldKeyPress(event)" />
 							<button id="student-toolbar-button-search" oncommand="StudentSuche()" label="Suchen"/>
@@ -125,6 +126,10 @@ echo '<?xul-overlay href="'.APP_ROOT.'content/student/interessentdokumenteoverla
 	    					class="sortDirectionIndicator"
 	    					sort="rdf:http://www.technikum-wien.at/student/rdf#titelpost" onclick="StudentTreeSort()"/>
 	    				<splitter class="tree-splitter"/>
+	    				<treecol id="student-treecol-svnr" label="SVNR" flex="1" hidden="false"
+	    					class="sortDirectionIndicator"
+	    					sort="rdf:http://www.technikum-wien.at/student/rdf#svnr" onclick="StudentTreeSort()"/>
+	    				<splitter class="tree-splitter"/>
 	    				<treecol id="student-treecol-geburtsdatum" label="Geburtsdatum" flex="1" hidden="false"
 	    					class="sortDirectionIndicator"
 	    					sort="rdf:http://www.technikum-wien.at/student/rdf#geburtsdatum_iso" onclick="StudentTreeSort()"/>
@@ -178,6 +183,7 @@ echo '<?xul-overlay href="'.APP_ROOT.'content/student/interessentdokumenteoverla
 	           							<treecell label="rdf:http://www.technikum-wien.at/student/rdf#vornamen" />
 	           							<treecell label="rdf:http://www.technikum-wien.at/student/rdf#nachname" />
 	           							<treecell label="rdf:http://www.technikum-wien.at/student/rdf#titelpost" />
+	           							<treecell label="rdf:http://www.technikum-wien.at/student/rdf#svnr" />
 	           							<treecell label="rdf:http://www.technikum-wien.at/student/rdf#geburtsdatum" />
 	           							<treecell label="rdf:http://www.technikum-wien.at/student/rdf#semester" />
 	           							<treecell label="rdf:http://www.technikum-wien.at/student/rdf#verband" />

content/student/studentoverlay.js.php

@@ -1521,6 +1521,44 @@ function StudentPrintInskriptionsbestaetigung()
 		alert('Bitte einen Studenten auswaehlen');
 }
 
+// ****
+// * Excel Export der Studentendaten
+// ****
+function StudentExport()
+{
+	var tree=document.getElementById('tree-verband');
+
+	//Wenn nichts markiert wurde -> beenden
+	if(tree.currentIndex==-1)
+		return;
+
+	var col;
+	col = tree.columns ? tree.columns["stg_kz"] : "stg_kz";
+	var stg_kz=tree.view.getCellText(tree.currentIndex,col);
+	col = tree.columns ? tree.columns["sem"] : "sem";
+	var sem=tree.view.getCellText(tree.currentIndex,col);
+	col = tree.columns ? tree.columns["ver"] : "ver";
+	var ver=tree.view.getCellText(tree.currentIndex,col);
+	col = tree.columns ? tree.columns["grp"] : "grp";
+	var grp=tree.view.getCellText(tree.currentIndex,col);
+	col = tree.columns ? tree.columns["gruppe"] : "gruppe";
+	var gruppe=tree.view.getCellText(tree.currentIndex,col);
+	col = tree.columns ? tree.columns["typ"] : "typ";
+	var typ=tree.view.getCellText(tree.currentIndex,col);
+	col = tree.columns ? tree.columns["stsem"] : "stsem";
+	var stsem=tree.view.getCellText(tree.currentIndex,col);
+	if(typ=='')
+		typ='student';
+	
+	if(typ=='student')
+		stsem = getStudiensemester();
+	url = "<?php echo APP_ROOT; ?>content/statistik/studentenexport.xls.php?studiengang_kz="+stg_kz+"&semester="+sem+"&verband="+ver+"&gruppe="+grp+"&gruppe_kurzbz="+gruppe+"&studiensemester_kurzbz="+stsem+"&typ="+typ+"&"+gettimestamp();
+	
+	//alert(url);
+	window.open(url,"","chrome,status=no, modal, width=400, height=250, centerscreen, resizable");
+	//window.location.href=url;	
+}
+
 // **************** KONTO ******************
 
 // ****
@@ -3292,6 +3330,8 @@ function StudentSuche()
 		//Bei der Suche wird die Markierung vom Verband Tree entfernt da
 		//es sonst zu Problemen kommen kann
 		document.getElementById('tree-verband').view.selection.clearSelection();
+		//Export deaktivieren
+		document.getElementById('student-toolbar-export').disabled=true;
 
 		//Datasource setzten und Felder deaktivieren
 		url = "<?php echo APP_ROOT; ?>rdf/student.rdf.php?filter="+encodeURIComponent(filter)+"&"+gettimestamp();

include/student.class.php

@@ -281,6 +281,7 @@ class student extends benutzer
 			}
 			if($stsem!=null)
 				$where.=" AND tbl_studentlehrverband.studiensemester_kurzbz='$stsem'";
+
 		}			
 
 		//$sql_query="SELECT * FROM campus.vw_student WHERE $where ORDER by nachname,vorname";
@@ -312,6 +313,7 @@ class student extends benutzer
 			$l->gebdatum=$row->gebdatum;
 			$l->gebort=$row->gebort;
 			$l->gebzeit=$row->gebzeit;
+			$l->svnr=$row->svnr;
 			$l->foto=$row->foto;
 			$l->anmerkungen=$row->anmerkungen;
 			$l->aktiv=$row->aktiv=='t'?true:false;
@@ -328,6 +330,7 @@ class student extends benutzer
 			//$l->stg_bezeichnung=$row->bezeichnung;
 			// student in Array speichern
 			$result[]=$l;
+	
 		}
 		return $result;
 	}

rdf/abschlusspruefung.rdf.php

@@ -91,17 +91,35 @@ $pruefung = new abschlusspruefung($conn, null, true);
 		if($result_rek = pg_query($conn, $qry))
 			if($row_rek = pg_fetch_object($result_rek))
 				$rektor = $row_rek->titelpre.' '.$row_rek->vorname.' '.$row_rek->nachname.' '.$row_rek->titelpost;
-		$qry = "SELECT themenbereich, ende FROM lehre.tbl_projektarbeit WHERE student_uid='$student->uid' AND (projekttyp_kurzbz='Bachelor' OR projekttyp_kurzbz='Diplom') ORDER BY beginn LIMIT 1";
+		$qry = "SELECT themenbereich, ende, projektarbeit_id FROM lehre.tbl_projektarbeit a WHERE student_uid='$student->uid' AND (projekttyp_kurzbz='Bachelor' OR projekttyp_kurzbz='Diplom') ORDER BY beginn LIMIT 2";
 		$themenbereich='';
 		$datum_projekt='';
+		$betreuer = '';
+		$betreuer_2 = '';
+		$themenbereich_2 = '';
 		
 		if($result_proj = pg_query($conn, $qry))
 		{
 			if($row_proj = pg_fetch_object($result_proj))
 			{
+				$qry_bet = "SELECT titelpre, vorname, nachname, titelpost FROM lehre.tbl_projektbetreuer JOIN public.tbl_person USING(person_id) WHERE projektarbeit_id='$row_proj->projektarbeit_id' LIMIT 1";
+				if($result_bet = pg_query($conn, $qry_bet))
+					if($row_bet = pg_fetch_object($result_bet))
+						$betreuer = $row_bet->titelpre.' '.$row_bet->vorname.' '.$row_bet->nachname.' '.$row_bet->titelpost;
+
 				$themenbereich = $row_proj->themenbereich;
 				$datum_projekt = $datum_obj->convertISODate($row_proj->ende);
 			}
+			
+			if($row_proj = pg_fetch_object($result_proj))
+			{
+				$qry_bet = "SELECT titelpre, vorname, nachname, titelpost FROM lehre.tbl_projektbetreuer JOIN public.tbl_person USING(person_id) WHERE projektarbeit_id='$row_proj->projektarbeit_id' LIMIT 1";
+					if($result_bet = pg_query($conn, $qry_bet))
+						if($row_bet = pg_fetch_object($result_bet))
+							$betreuer_2 = $row_bet->titelpre.' '.$row_bet->vorname.' '.$row_bet->nachname.' '.$row_bet->titelpost;
+
+				$themenbereich_2 = $row_proj->themenbereich;
+			}
 		}
 		
 		echo "\t<pruefung>".'
@@ -144,6 +162,9 @@ $pruefung = new abschlusspruefung($conn, null, true);
 		<titelbescheidvom><![CDATA['.$datum_obj->convertISODate($studiengang->titelbescheidvom).']]></titelbescheidvom>
 		<rektor><![CDATA['.$rektor.']]></rektor>
 		<themenbereich><![CDATA['.$themenbereich.']]></themenbereich>
+		<themenbereich_2><![CDATA['.$themenbereich_2.']]></themenbereich_2>
+		<betreuer><![CDATA['.$betreuer.']]></betreuer>
+		<betreuer_2><![CDATA['.$betreuer_2.']]></betreuer_2>
 		<datum_projekt><![CDATA['.$datum_projekt.']]></datum_projekt>';
 		
 	 	echo "\n\t</pruefung>";

vilesci/personen/import/interessentenimport.php

@@ -21,7 +21,7 @@
  */
 
 require_once('../../config.inc.php');
-require_once('../../../admin/sync/sync_config.inc.php');
+require_once('../../../system/sync/sync_config.inc.php');
 require_once('../../../include/functions.inc.php');
 require_once('../../../include/benutzerberechtigung.class.php');
 require_once('../../../include/studiengang.class.php');
@@ -88,26 +88,26 @@ if(!$rechte->isBerechtigt('admin'))
 $where = '';
 $error = false;
 //Parameter
-$titel = (isset($_POST['titel'])?$_POST['titel']:'');
-$nachname = (isset($_POST['nachname'])?$_POST['nachname']:'');
-$vorname = (isset($_POST['vorname'])?$_POST['vorname']:'');
-$geschlecht = (isset($_POST['geschlecht'])?$_POST['geschlecht']:'');
-$geburtsdatum = (isset($_POST['geburtsdatum'])?$_POST['geburtsdatum']:'');
-$adresse = (isset($_POST['adresse'])?$_POST['adresse']:'');
-$plz = (isset($_POST['plz'])?$_POST['plz']:'');
-$ort = (isset($_POST['ort'])?$_POST['ort']:'');
-$email = (isset($_POST['email'])?$_POST['email']:'');
-$telefon = (isset($_POST['telefon'])?$_POST['telefon']:'');
-$mobil = (isset($_POST['mobil'])?$_POST['mobil']:'');
-$letzteausbildung = (isset($_POST['letzteausbildung'])?$_POST['letzteausbildung']:'');
-$ausbildungsart = (isset($_POST['ausbildungsart'])?$_POST['ausbildungsart']:'');
-$anmerkungen = (isset($_POST['anmerkungen'])?$_POST['anmerkungen']:'');
-$studiengang_kz = (isset($_POST['studiengang_kz'])?$_POST['studiengang_kz']:'');
+$titel = (isset($_REQUEST['titel'])?$_REQUEST['titel']:'');
+$nachname = (isset($_REQUEST['nachname'])?$_REQUEST['nachname']:'');
+$vorname = (isset($_REQUEST['vorname'])?$_REQUEST['vorname']:'');
+$geschlecht = (isset($_REQUEST['geschlecht'])?$_REQUEST['geschlecht']:'');
+$geburtsdatum = (isset($_REQUEST['geburtsdatum'])?$_REQUEST['geburtsdatum']:'');
+$adresse = (isset($_REQUEST['adresse'])?$_REQUEST['adresse']:'');
+$plz = (isset($_REQUEST['plz'])?$_REQUEST['plz']:'');
+$ort = (isset($_REQUEST['ort'])?$_REQUEST['ort']:'');
+$email = (isset($_REQUEST['email'])?$_REQUEST['email']:'');
+$telefon = (isset($_REQUEST['telefon'])?$_REQUEST['telefon']:'');
+$mobil = (isset($_REQUEST['mobil'])?$_REQUEST['mobil']:'');
+$letzteausbildung = (isset($_REQUEST['letzteausbildung'])?$_REQUEST['letzteausbildung']:'');
+$ausbildungsart = (isset($_REQUEST['ausbildungsart'])?$_REQUEST['ausbildungsart']:'');
+$anmerkungen = (isset($_REQUEST['anmerkungen'])?$_REQUEST['anmerkungen']:'');
+$studiengang_kz = (isset($_REQUEST['studiengang_kz'])?$_REQUEST['studiengang_kz']:'');
 if($studiengang_kz=='' && isset($_GET['studiengang_kz']))
 	$studiengang_kz = $_GET['studiengang_kz'];
-$person_id = (isset($_POST['person_id'])?$_POST['person_id']:'');
-$ueberschreiben = (isset($_POST['ueberschreiben'])?$_POST['ueberschreiben']:'');
-$studiensemester_kurzbz = (isset($_POST['studiensemester_kurzbz'])?$_POST['studiensemester_kurzbz']:'');
+$person_id = (isset($_REQUEST['person_id'])?$_REQUEST['person_id']:'');
+$ueberschreiben = (isset($_REQUEST['ueberschreiben'])?$_REQUEST['ueberschreiben']:'');
+$studiensemester_kurzbz = (isset($_REQUEST['studiensemester_kurzbz'])?$_REQUEST['studiensemester_kurzbz']:'');
 //end Parameter
 
 if($studiensemester_kurzbz == '')