2026-07-19 07:52:16 +00:00 · 2007-08-23 14:23:38 +00:00
parent b8fff3ea07
commit 503bf70d9b
5 changed files with 503 additions and 233 deletions
@@ -24,73 +24,21 @@ require_once('../include/studiensemester.class.php');
 require_once('../include/prestudent.class.php');
 require_once('../include/studiengang.class.php');

-// Datenbank Verbindung
-if (!$conn = pg_pconnect(CONN_STRING))
-   	$error_msg='Es konnte keine Verbindung zum Server aufgebaut werden!';
-
+// *********** Funktionen *************************++
 function convdate($date)
 {
 	list($d,$m,$y) = explode('.',$date);
 	return $y.'-'.$m.'-'.$d;
 }
-
-if(isset($_SERVER['REMOTE_USER']))
-{
-	$user = get_uid();
-	loadVariables($conn, $user);
-}
-
-$gruppe_kurzbz=(isset($_GET['gruppe_kurzbz'])?$_GET['gruppe_kurzbz']:null);
-$gruppe=(isset($_GET['gruppe'])?$_GET['gruppe']:null);
-$verband=(isset($_GET['verband'])?$_GET['verband']:null);
-$semester=(isset($_GET['semester'])?$_GET['semester']:null);
-$studiengang_kz=(isset($_GET['studiengang_kz'])?$_GET['studiengang_kz']:null);
-$studiensemester_kurzbz = (isset($_GET['studiensemester_kurzbz'])?$_GET['studiensemester_kurzbz']:null);
-$uid = (isset($_GET['uid'])?$_GET['uid']:null);
-$typ = (isset($_GET['typ'])?$_GET['typ']:null);
-$prestudent_id = (isset($_GET['prestudent_id'])?$_GET['prestudent_id']:null);
-$filter = (isset($_GET['filter'])?$_GET['filter']:null);
-$ss = (isset($_GET['ss'])?$_GET['ss']:null);
-$filter2 = (isset($_GET['filter2'])?$_GET['filter2']:null);
-
-if($studiensemester_kurzbz=='aktuelles')
-	$studiensemester_kurzbz = $semester_aktuell;
-
-if(isset($_GET['xmlformat']) && $_GET['xmlformat']=='xml')
-	$xmlformat='xml';
-else
-	$xmlformat='rdf';
-
-$datum_obj = new datum();
-
-if($xmlformat=='rdf')
-{
-	$stg_arr = array();
-	$stg_obj = new studiengang($conn, null, null);
-	$stg_obj->getAll(null, false);
-	foreach ($stg_obj->result as $row)
-		$stg_arr[$row->studiengang_kz]=$row->kuerzel;
-
-	$rdf_url='http://www.technikum-wien.at/student';
-	echo '
-	<RDF:RDF
-		xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-		xmlns:STUDENT="'.$rdf_url.'/rdf#"
-	>
-
-
-	  <RDF:Seq about="'.$rdf_url.'/alle">
-	';
-
 	function checkfilter($row, $filter2)
 	{
 		global $conn;
-		
+
 		if($filter2=='dokumente')
 		{
-			$qry = "SELECT count(*) as anzahl FROM public.tbl_dokumentstudiengang WHERE 
+			$qry = "SELECT count(*) as anzahl FROM public.tbl_dokumentstudiengang WHERE
 					dokument_kurzbz NOT IN(
-						SELECT dokument_kurzbz FROM tbl_dokumentprestudent WHERE prestudent_id='$row->prestudent_id') 
+						SELECT dokument_kurzbz FROM tbl_dokumentprestudent WHERE prestudent_id='$row->prestudent_id')
 					AND studiengang_kz='$row->studiengang_kz'";
 			if($result_filter = pg_query($conn, $qry))
 				if($row_filter = pg_fetch_object($result_filter))
@@ -105,14 +53,14 @@ if($xmlformat=='rdf')
 					if($row_filter->summe=='0.00')
 						return false;
 		}
-		return true;		
+		return true;
 	}
-	
+
 	function draw_content_liste($row)
 	{
 		global $rdf_url, $datum_obj, $conn, $stg_arr;
 		$status='';
-		
+
 		$mail_privat = '';
 		/*$qry_mail = "SELECT kontakt FROM public.tbl_kontakt WHERE kontakttyp='email' AND person_id='$row->person_id' AND zustellung=true ORDER BY kontakt_id DESC LIMIT 1";
 		if($result_mail = pg_query($conn, $qry_mail))
@@ -126,7 +74,7 @@ if($xmlformat=='rdf')
 		$prestudent = new prestudent($conn, null, null);
 		$prestudent->getLastStatus($row->prestudent_id);
 		$status = $prestudent->rolle_kurzbz;
-			
+
 		echo '
 		  <RDF:li>
 	      	<RDF:Description  id="'.$row->prestudent_id.'"  about="'.$rdf_url.'/'.$row->prestudent_id.'" >
@@ -148,19 +96,19 @@ if($xmlformat=='rdf')
 				<STUDENT:matrikelnummer><![CDATA['.(isset($row->matrikelnr)?$row->matrikelnr:'').']]></STUDENT:matrikelnummer>
 	    		<STUDENT:mail_privat><![CDATA['.$mail_privat.']]></STUDENT:mail_privat>
 	    		<STUDENT:mail_intern><![CDATA['.(isset($row->uid)?$row->uid.'@'.DOMAIN:'').']]></STUDENT:mail_intern>
-				<STUDENT:status><![CDATA['.$status.']]></STUDENT:status>    		
+				<STUDENT:status><![CDATA['.$status.']]></STUDENT:status>
 	    		<STUDENT:anmerkungen>'.($row->anmerkungen==''?'&#xA0;':'<![CDATA['.$row->anmerkungen.']]>').'</STUDENT:anmerkungen>
 	    		<STUDENT:studiengang_kz><![CDATA['.$row->studiengang_kz.']]></STUDENT:studiengang_kz>
-				<STUDENT:studiengang><![CDATA['.$stg_arr[$row->studiengang_kz].']]></STUDENT:studiengang>				
+				<STUDENT:studiengang><![CDATA['.$stg_arr[$row->studiengang_kz].']]></STUDENT:studiengang>
 	      	</RDF:Description>
 	      </RDF:li>';
 	}
-	
+
 	function draw_content($row)
 	{
 		global $rdf_url, $datum_obj, $conn;
 		$status='';
-		
+
 		$mail_privat = '';
 		/*$qry_mail = "SELECT kontakt FROM public.tbl_kontakt WHERE kontakttyp='email' AND person_id='$row->person_id' AND zustellung=true ORDER BY kontakt_id DESC LIMIT 1";
 		if($result_mail = pg_query($conn, $qry_mail))
@@ -170,7 +118,7 @@ if($xmlformat=='rdf')
 				$mail_privat = $row_mail->kontakt;
 			}
 		}*/
-		
+
 		if($row->prestudent_id!='')
 		{
 			$prestudent = new prestudent($conn, null, null);
@@ -249,12 +197,68 @@ if($xmlformat=='rdf')
 		}
 	}

+// ******* Init **************************
+// Datenbank Verbindung
+if (!$conn = pg_pconnect(CONN_STRING))
+   	$error_msg='Es konnte keine Verbindung zum Server aufgebaut werden!';
+
+
+if(isset($_SERVER['REMOTE_USER']))
+{
+	$user = get_uid();
+	loadVariables($conn, $user);
+}
+
+$gruppe_kurzbz=(isset($_GET['gruppe_kurzbz'])?$_GET['gruppe_kurzbz']:null);
+$gruppe=(isset($_GET['gruppe'])?$_GET['gruppe']:null);
+$verband=(isset($_GET['verband'])?$_GET['verband']:null);
+$semester=(isset($_GET['semester'])?$_GET['semester']:null);
+$studiengang_kz=(isset($_GET['studiengang_kz'])?$_GET['studiengang_kz']:null);
+$studiensemester_kurzbz = (isset($_GET['studiensemester_kurzbz'])?$_GET['studiensemester_kurzbz']:null);
+$uid = (isset($_GET['uid'])?$_GET['uid']:null);
+$typ = (isset($_GET['typ'])?$_GET['typ']:null);
+$prestudent_id = (isset($_GET['prestudent_id'])?$_GET['prestudent_id']:null);
+$filter = (isset($_GET['filter'])?$_GET['filter']:null);
+$ss = (isset($_GET['ss'])?$_GET['ss']:null);
+$filter2 = (isset($_GET['filter2'])?$_GET['filter2']:null);
+
+if($studiensemester_kurzbz=='aktuelles')
+	$studiensemester_kurzbz = $semester_aktuell;
+
+if(isset($_GET['xmlformat']) && $_GET['xmlformat']=='xml')
+	$xmlformat='xml';
+else
+	$xmlformat='rdf';
+
+$datum_obj = new datum();
+
+// ************ Beginn **************************
+
+if($xmlformat=='rdf')
+{
+	$stg_arr = array();
+	$stg_obj = new studiengang($conn, null, null);
+	$stg_obj->getAll(null, false);
+	foreach ($stg_obj->result as $row)
+		$stg_arr[$row->studiengang_kz]=$row->kuerzel;
+
+	$rdf_url='http://www.technikum-wien.at/student';
+	echo '
+	<RDF:RDF
+		xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+		xmlns:STUDENT="'.$rdf_url.'/rdf#"
+	>
+
+
+	  <RDF:Seq about="'.$rdf_url.'/alle">
+	';
+
 	if(isset($uid))
 	{
 		$student=new student($conn,null,true);
 		$student->load($uid, $studiensemester_kurzbz);
 		$prestd = new prestudent($conn, null, true);
-		
+
 		draw_content($student);
 		$prestd->load($student->prestudent_id);
 		draw_prestudent($prestd);
@@ -270,27 +274,28 @@ if($xmlformat=='rdf')
 				$where.=" AND tbl_benutzergruppe.studiensemester_kurzbz='$studiensemester_kurzbz'";
 		}
 		else
-		{		
+		{
 			$where.=" tbl_studentlehrverband.studiengang_kz=$studiengang_kz";
 			if ($semester!=null)
 				$where.=" AND tbl_studentlehrverband.semester=$semester";
 			if ($verband!=null)
 				$where.=" AND tbl_studentlehrverband.verband='".$verband."'";
 			if ($gruppe!=null)
-				$where.=" AND tbl_studentlehrverband.gruppe='".$gruppe."'";	
-		}			
+				$where.=" AND tbl_studentlehrverband.gruppe='".$gruppe."'";
+		}

 		$where.=" AND tbl_studentlehrverband.studiensemester_kurzbz='$studiensemester_kurzbz'";
-		
-		$sql_query = "SET CLIENT_ENCODING TO 'UNICODE'; SELECT tbl_person.person_id, tbl_student.prestudent_id, tbl_benutzer.uid, tbl_person.titelpre, 
+
+		$sql_query = "SET CLIENT_ENCODING TO 'UNICODE'; SELECT tbl_person.person_id, tbl_student.prestudent_id, tbl_benutzer.uid, tbl_person.titelpre,
 		                     tbl_person.titelpost, tbl_person.vorname, tbl_person.vornamen, tbl_person.nachname,
 		                      tbl_person.gebdatum, tbl_person.anmerkungen, tbl_person.ersatzkennzeichen,
-		                     tbl_person.svnr, tbl_student.matrikelnr, tbl_studentlehrverband.semester, 
+		                     tbl_person.svnr, tbl_student.matrikelnr, tbl_studentlehrverband.semester,
 		                     tbl_studentlehrverband.verband, tbl_studentlehrverband.gruppe, tbl_studentlehrverband.studiengang_kz
 					  FROM public.tbl_person, public.tbl_student, public.tbl_benutzer, public.tbl_studentlehrverband";
 		if($gruppe_kurzbz!=null)
 			$sql_query.= ",public.tbl_benutzergruppe";
 		$sql_query.= " WHERE tbl_person.person_id=tbl_benutzer.person_id AND tbl_benutzer.uid = tbl_student.student_uid AND tbl_studentlehrverband.student_uid=tbl_student.student_uid AND $where ORDER BY nachname, vorname";
+		echo $sql_query;
 		if($result = pg_query($conn, $sql_query))
 			while($row = pg_fetch_object($result))
 			{
@@ -498,7 +503,7 @@ else
 					$semester = $row->ausbildungssemester;
 				}
 			}
-			
+
 			echo '
 			<student>
 				<uid><![CDATA['.$student->uid.']]></uid>
@@ -1,6 +1,7 @@
 <?php
-	$dont_sync_php=array('11','91','92','94','145','182','203','204','222','227','254','255','256','257','258','297','298','299','302','327','328','329','476','999');
-																			//'228','300','301','303','308','330','331','332','333','334','335','336'
+	$dont_sync_php=array('11','91','92','94','145','182','203','204','222','227','228','254','255','256','257','258','297','298','299','301','302','327','328','329','332','476','999');
+	//$dont_sync_php=array('11','91','92','94','145','182','203','204','222','227','254','255','256','257','258','297','298','299','301','302','327','328','329','476','999');
+																			//'300','303','308','330','331','333','334','335','336'

 	function dont_sync_sql($dont_sync_php)
 	{
@@ -86,94 +86,22 @@
 	</tr>
 </table>

-<!--____________Menue Stammdaten______________________________________________-->
+<!-- ******************* Haupt-Menue Stammdaten *******************************-->
 <div id="menueStammdaten" style="display:block;">
 	<table class="menue" style="border-right-width:1px;border-right-color:#BCBCBC;">
 		<tr>
 			<td>&nbsp;</td>
 		</tr>
-		<!--______Menue Admin->Personen_______________________________________-->
+		<!--=========== Menue Funktionen ==============-->
 		<tr>
-        	<td nowrap>
-				<a href="?Lehre" class="MenuItem1" onClick="return(js_toggle_container('Personen'));">
-      			<img src="../skin/images/menu_item.gif" width="7" height="9" />
-      			&nbsp;Personen
-        		</a>
-        	</td>
-      </tr>
-		<tr>
-        	<td nowrap>
-				<table width="100%"  border="0" cellspacing="0" cellpadding="0" id="Personen" style="display:block;">
-				<tr>
-					<td width="10" nowrap>&nbsp;</td>
-					<td nowrap><a class="MenuItem2" href="personen/index.html" target="main"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Suche</a></td>
-				</tr>
-				<tr>
-					<td width="10" nowrap>&nbsp;</td>
-					<td nowrap><a class="MenuItem2" href="personen/funktion.php" target="main"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Funtionen</a></td>
-				</tr>
-			  	<!--__Menue Admin->Personen->Studenten___________________________-->
-				<tr>
-					<td width="10" nowrap>&nbsp;</td>
-					<td nowrap>
-					    <a href="?Lehre" class="MenuItem1" onClick="return(js_toggle_container('Studenten'));"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Studenten</a>
-						<table width="100%"  border="0" cellspacing="0" cellpadding="0" id="Studenten" style="display: none">
-						<tr>
-							<td width="10" nowrap>&nbsp;</td>
-					    	<td nowrap><a class="MenuItem2" href="personen/studenten_uebersicht.php" target="main"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;&Uuml;bersicht</a></td>
-						</tr>
-						<tr>
-							<td width="10" nowrap>&nbsp;</td>
-					    	<td nowrap><a class="MenuItem2" href="personen/student_edit.php?new=1" target="main"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Neu</a></td>
-						</tr>
-						</table>
-					</td>
-				</tr>
-				<!--Menu Eintrag Personen - Lektoren -->
-				<tr>
-					<td width="10" nowrap>&nbsp;</td>
-					<td nowrap>
-						<a href="?Lehre" class="MenuItem1" onClick="return(js_toggle_container('Lektoren'));"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Lektoren</a>
-						<table width="100%"  border="0" cellspacing="0" cellpadding="0" id="Lektoren" style="display: none">
-						<tr>
-							<td width="10" nowrap>&nbsp;</td>
-					    	<td nowrap><a class="MenuItem2" href="personen/lektor_uebersicht.php" target="main"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;&Uuml;bersicht</a></td>
-						</tr>
-						<tr>
-							<td width="10" nowrap>&nbsp;</td>
-					    	<td nowrap><a class="MenuItem2" href="personen/lektor_edit.php?new=1" target="main"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Neu</a></td>
-						</tr>
-						</table>
-					</td>
-				</tr>
-				<!--Menu Eintrag Gruppen -->
-
-				<tr>
-					<td width="10" nowrap>&nbsp;</td>
-					<td nowrap>
-						<a href="?Lehre" class="MenuItem1" onClick="return(js_toggle_container('Gruppen'));"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Gruppen</a>
-						<table width="100%"  border="0" cellspacing="0" cellpadding="0" id="Gruppen" style="display: none">
-						<tr>
-							<td width="10" nowrap>&nbsp;</td>
-					    	<td nowrap><a class="MenuItem2" href="lehre/einheit_menu.php" target="main"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;&Uuml;bersicht</a></td>
-						</tr>
-						<tr>
-							<td width="10" nowrap>&nbsp;</td>
-					    	<td nowrap><a class="MenuItem2" href="lehre/einheit_menu.php?newFrm=true" target="main"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Neu</a></td>
-						</tr>
-						</table>
-					</td>
-				</tr>
-				<!--Zusammenlegen von Personen-->
-				<tr>
-					<td width="10" nowrap>&nbsp;</td>
-					<td nowrap><a class="MenuItem2" href="stammdaten/personen_wartung.php" target="main"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Personen zusammenlegen</a></td>
-				</tr>
-			  	</table>
+			<td nowrap>
+				<a class="MenuItem2" href="personen/funktion.php" target="main">
+				<img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Funtionen</a>
 			</td>
+			<td width="10" nowrap>&nbsp;</td>
 		</tr>
-		<tr><td>&nbsp;</td></tr>
-		<!--Menu Eintrag Kommunikation-->
+
+		<!--=========== Menue Kommunikation ==============-->
 		<tr>
          	<td nowrap><a href="?Lehre" class="MenuItem1" onClick="return(js_toggle_container('Kommunikation'));"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Kommunikation</a></td>
        </tr>
@@ -192,76 +120,6 @@
 			  	</table>
 			</td>
 		</tr>
-		<!--Menu Eintrag Stundenplan-->
-		<tr>
-          	<td nowrap><a href="?Lehre" class="MenuItem1" onClick="return(js_toggle_container('Stundenplan'));"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Stundenplan</a></td>
-        </tr>
-		<tr>
-          	<td nowrap>
-		  		<table width="100%"  border="0" cellspacing="0" cellpadding="0" id="Stundenplan" style="display:block;">
-			  	<tr>
-			  		<td width="10" nowrap>&nbsp;</td>
-					<td nowrap><a class="MenuItem2" href="../cis/private/lvplan/index.html" target="main"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Stundenplan</a></td>
-			  	</tr>
-			  	<tr>
-			  		<td width="10" nowrap>&nbsp;</td>
-					<td nowrap><a class="MenuItem2" href="lehre/zeitwuensche.php" target="main"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Zeitw&uuml;nsche</a></td>
-			  	</tr>
-			  	<tr>
-			  		<td width="10" nowrap>&nbsp;</td>
-					<td nowrap><a class="MenuItem2" href="lehre/lv_verteilung/lv_verteilung.php" target="main"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Lehreinheiten</a></td>
-			  	</tr>
-			  	<!--<tr>
-			  		<td width="10" nowrap>&nbsp;</td>
-					<td nowrap><a class="MenuItem2" href="lehre/lehrveranstaltung.php" target="main"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Lehrveranstaltungen</a></td>
-			  	</tr>-->
-			  	<tr>
-			  		<td width="10" nowrap>&nbsp;</td>
-					<td nowrap><a class="MenuItem2" href="lehre/stdplan_insert.php" target="main"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Stundenplan</a></td>
-			  	</tr>
-			  	<tr>
-			  		<td width="10" nowrap>&nbsp;</td>
-					<td nowrap><a class="MenuItem2" href="lehre/stdplan_delete.php" target="main"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Delete</a></td>
-			  	</tr>
-			  	<!--
-			  	<td width="10" nowrap>&nbsp;</td>
-					<td nowrap><a class="MenuItem2" href="lehre/einheit_menu.php" target="main"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Einheiten</a></td>
-			  	</tr> -->
-			  	<!--Menu Eintrag Lehrfach-->
-			  	<tr>
-				  	<td width="10" nowrap>&nbsp;</td>
-				  	<td nowrap>
-				  		<a href="?Lehre" class="MenuItem1" onClick="return(js_toggle_container('Lehrfach'));">
-				  			<img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Lehrfach
-				  		</a>
-				  		<table width="100%"  border="0" cellspacing="0" cellpadding="0" id="Lehrfach" style="display: none;">
-						  	<tr>
-						  		<td width="10" nowrap>&nbsp;</td>
-								<td nowrap><a class="MenuItem2" href="lehre/lehrfach.php" target="main"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Verwaltung</a></td>
-						  	</tr>
-						  	<tr>
-						  		<td width="10" nowrap>&nbsp;</td>
-								<td nowrap><a class="MenuItem2" href="lehre/lehrfach/wartung.php" target="main"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Wartung</a></td>
-						  	</tr>
-					  	</table>
-					</td>
-				</tr>
-				<tr>
-			  		<td width="10" nowrap>&nbsp;</td>
-					<td nowrap><a class="MenuItem2" href="lehre/check/index.html" target="main"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Checken</a></td>
-			  	</tr>
-			  	<tr>
-			  		<td width="10" nowrap>&nbsp;</td>
-					<td nowrap><a class="MenuItem2" href="lehre/import/index.html" target="main"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Import</a></td>
-			  	</tr>
-			  	<tr>
-			  		<td width="10" nowrap>&nbsp;</td>
-					<td nowrap><a class="MenuItem2" href="lehre/export/index.html" target="main"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Export</a></td>
-			  	</tr>
-			  	</table>
-			</td>
-		</tr>
-        <tr><td width="10" nowrap>&nbsp;</td></tr>
        <!--Menu Eintrag Studiengang-->
 		<tr>
          	<td nowrap><a href="?Lehre" class="MenuItem1" onClick="return(js_toggle_container('Studiengang'));"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Studiengang</a></td>
@@ -359,11 +217,194 @@
        <tr><td width="10" nowrap>&nbsp;</td></tr>
 		</table>
 </div>
+<!--****************** Haupt-Menue Personen *****************************-->
 <div id="menuePersonen" style="display: none;">
-bal
+	<table class="menue" style="border-right-width:1px;border-right-color:#BCBCBC;">
+	<tr>
+		<td>&nbsp;</td>
+	</tr>
+	<!--================ Menue Personen->Personen =====================-->
+	<tr>
+       	<td nowrap>
+			<a href="?Lehre" class="MenuItem1" onClick="return(js_toggle_container('Personen'));">
+	   			<img src="../skin/images/menu_item.gif" width="7" height="9" />
+	   			&nbsp;Personen
+       		</a>
+       	</td>
+   	</tr>
+	<tr>
+		<td nowrap>
+			<table width="100%"  border="0" cellspacing="0" cellpadding="0" id="Personen" style="display:block;">
+			<!-- Personen->Personen->Suche -->
+			<tr>
+				<td width="10" nowrap>&nbsp;</td>
+				<td nowrap><a class="MenuItem2" href="personen/index.html" target="main"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Suche</a></td>
+			</tr>
+			<!--Menu Eintrag Gruppen -->
+			<tr>
+				<td width="10" nowrap>&nbsp;</td>
+				<td nowrap>
+					<a href="?Lehre" class="MenuItem1" onClick="return(js_toggle_container('Gruppen'));"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Gruppen</a>
+					<table width="100%"  border="0" cellspacing="0" cellpadding="0" id="Gruppen" style="display: none">
+					<tr>
+						<td width="10" nowrap>&nbsp;</td>
+				    	<td nowrap><a class="MenuItem2" href="lehre/einheit_menu.php" target="main"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;&Uuml;bersicht</a></td>
+					</tr>
+					<tr>
+						<td width="10" nowrap>&nbsp;</td>
+				    	<td nowrap><a class="MenuItem2" href="lehre/einheit_menu.php?newFrm=true" target="main"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Neu</a></td>
+					</tr>
+					</table>
+				</td>
+			</tr>
+			<!--Zusammenlegen von Personen-->
+			<tr>
+				<td width="10" nowrap>&nbsp;</td>
+				<td nowrap><a class="MenuItem2" href="stammdaten/personen_wartung.php" target="main"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Personen zusammenlegen</a></td>
+			</tr>
+			</table>
+		</td>
+	</tr>
+	<tr>
+		<td>&nbsp;</td>
+	</tr>
+	<!--================ Menue Personen->Studenten ===================== -->
+	<tr>
+		<td nowrap>
+		    <a href="?Lehre" class="MenuItem1" onClick="return(js_toggle_container('Studenten'));">
+		    	<img src="../skin/images/menu_item.gif" width="7" height="9">
+		    	&nbsp;Studenten
+		    </a>
+		</td>
+	<tr>
+	<tr>
+		<td nowrap>
+			<table width="100%"  border="0" cellspacing="0" cellpadding="0" id="Studenten" style="display: none">
+			<tr>
+				<td width="10" nowrap>&nbsp;</td>
+			   	<td nowrap><a class="MenuItem2" href="personen/studenten_uebersicht.php" target="main"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;&Uuml;bersicht</a></td>
+			</tr>
+			<tr>
+				<td width="10" nowrap>&nbsp;</td>
+			   	<td nowrap><a class="MenuItem2" href="personen/student_edit.php?new=1" target="main"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Neu</a></td>
+			</tr>
+			<tr>
+				<td width="10" nowrap>&nbsp;</td>
+			   	<td nowrap>
+			   		<a class="MenuItem2" href="personen/student_vorrueckung.php" target="main">
+			   			<img src="../skin/images/menu_item.gif" width="7" height="9">
+			   			&nbsp;Vorr&uuml;ckung
+			   		</a>
+			   	</td>
+			</tr>
+			</table>
+		</td>
+	</tr>
+	<tr>
+		<td>&nbsp;</td>
+	</tr>
+	<!--================ Menue Personen->Lektoren =====================-->
+	<tr>
+		<td nowrap>
+			<a href="?Lehre" class="MenuItem1" onClick="return(js_toggle_container('Lektoren'));">
+				<img src="../skin/images/menu_item.gif" width="7" height="9">
+				&nbsp;Lektoren
+			</a>
+		</td>
+	<tr>
+	<tr>
+		<td nowrap>
+			<table width="100%"  border="0" cellspacing="0" cellpadding="0" id="Lektoren" style="display: none">
+			<tr>
+				<td width="10" nowrap>&nbsp;</td>
+		    	<td nowrap><a class="MenuItem2" href="personen/lektor_uebersicht.php" target="main"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;&Uuml;bersicht</a></td>
+			</tr>
+			<tr>
+				<td width="10" nowrap>&nbsp;</td>
+		    	<td nowrap><a class="MenuItem2" href="personen/lektor_edit.php?new=1" target="main"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Neu</a></td>
+			</tr>
+			</table>
+		</td>
+	</tr>
+	</table>
 </div>
+
 <div id="menueLehre" style="display: none;">
- bla
+	<table class="menue" style="border-right-width:1px;border-right-color:#BCBCBC;">
+		<tr>
+			<td>&nbsp;</td>
+		</tr>
+		<!--Menu Eintrag Stundenplan-->
+		<tr>
+          	<td nowrap><a href="?Lehre" class="MenuItem1" onClick="return(js_toggle_container('Stundenplan'));"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Stundenplan</a></td>
+        </tr>
+		<tr>
+          	<td nowrap>
+		  		<table width="100%"  border="0" cellspacing="0" cellpadding="0" id="Stundenplan" style="display:block;">
+			  	<tr>
+			  		<td width="10" nowrap>&nbsp;</td>
+					<td nowrap><a class="MenuItem2" href="../cis/private/lvplan/index.html" target="main"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Stundenplan</a></td>
+			  	</tr>
+			  	<tr>
+			  		<td width="10" nowrap>&nbsp;</td>
+					<td nowrap><a class="MenuItem2" href="lehre/zeitwuensche.php" target="main"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Zeitw&uuml;nsche</a></td>
+			  	</tr>
+			  	<tr>
+			  		<td width="10" nowrap>&nbsp;</td>
+					<td nowrap><a class="MenuItem2" href="lehre/lv_verteilung/lv_verteilung.php" target="main"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Lehreinheiten</a></td>
+			  	</tr>
+			  	<!--<tr>
+			  		<td width="10" nowrap>&nbsp;</td>
+					<td nowrap><a class="MenuItem2" href="lehre/lehrveranstaltung.php" target="main"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Lehrveranstaltungen</a></td>
+			  	</tr>-->
+			  	<tr>
+			  		<td width="10" nowrap>&nbsp;</td>
+					<td nowrap><a class="MenuItem2" href="lehre/stdplan_insert.php" target="main"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Stundenplan</a></td>
+			  	</tr>
+			  	<tr>
+			  		<td width="10" nowrap>&nbsp;</td>
+					<td nowrap><a class="MenuItem2" href="lehre/stdplan_delete.php" target="main"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Delete</a></td>
+			  	</tr>
+			  	<!--
+			  	<td width="10" nowrap>&nbsp;</td>
+					<td nowrap><a class="MenuItem2" href="lehre/einheit_menu.php" target="main"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Einheiten</a></td>
+			  	</tr> -->
+			  	<!--Menu Eintrag Lehrfach-->
+			  	<tr>
+				  	<td width="10" nowrap>&nbsp;</td>
+				  	<td nowrap>
+				  		<a href="?Lehre" class="MenuItem1" onClick="return(js_toggle_container('Lehrfach'));">
+				  			<img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Lehrfach
+				  		</a>
+				  		<table width="100%"  border="0" cellspacing="0" cellpadding="0" id="Lehrfach" style="display: none;">
+						  	<tr>
+						  		<td width="10" nowrap>&nbsp;</td>
+								<td nowrap><a class="MenuItem2" href="lehre/lehrfach.php" target="main"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Verwaltung</a></td>
+						  	</tr>
+						  	<tr>
+						  		<td width="10" nowrap>&nbsp;</td>
+								<td nowrap><a class="MenuItem2" href="lehre/lehrfach/wartung.php" target="main"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Wartung</a></td>
+						  	</tr>
+					  	</table>
+					</td>
+				</tr>
+				<tr>
+			  		<td width="10" nowrap>&nbsp;</td>
+					<td nowrap><a class="MenuItem2" href="lehre/check/index.html" target="main"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Checken</a></td>
+			  	</tr>
+			  	<tr>
+			  		<td width="10" nowrap>&nbsp;</td>
+					<td nowrap><a class="MenuItem2" href="lehre/import/index.html" target="main"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Import</a></td>
+			  	</tr>
+			  	<tr>
+			  		<td width="10" nowrap>&nbsp;</td>
+					<td nowrap><a class="MenuItem2" href="lehre/export/index.html" target="main"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Export</a></td>
+			  	</tr>
+			  	</table>
+			</td>
+		</tr>
+        <tr><td width="10" nowrap>&nbsp;</td></tr>
+	</table>
  </div>

 </body>
@@ -0,0 +1,223 @@
+<?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>,
+ *          Rudolf Hangl <rudolf.hangl@technikum-wien.at> and
+ *          Gerald Raab <gerald.raab@technikum-wien.at>.
+ */
+require_once('../config.inc.php');
+require_once('../../include/studiengang.class.php');
+require_once('../../include/studiensemester.class.php');
+require_once('../../include/functions.inc.php');
+
+if(!$conn=pg_pconnect(CONN_STRING))
+   die("Konnte Verbindung zur Datenbank nicht herstellen");
+
+$s=new studiengang($conn);
+$s->getAll('typ, kurzbz', true);
+$studiengang=$s->result;
+
+$ss = new studiensemester($conn);
+$ss->getAll();
+foreach($ss->studiensemester as $studiensemester)
+{
+	$ss_arr[] = $studiensemester->studiensemester_kurzbz;
+}
+
+
+$user = get_uid();
+
+if (isset($_GET['stg_kz']) || isset($_POST['stg_kz']))
+	$stg_kz=(isset($_GET['stg_kz'])?$_GET['stg_kz']:$_POST['stg_kz']);
+else
+	$stg_kz=0;
+if (isset($_GET['semester']) || isset($_POST['semester']))
+	$semester=(isset($_GET['semester'])?$_GET['semester']:$_POST['semester']);
+else
+	$semester=0;
+if (isset($_GET['studiensemester_kurzbz']) || isset($_POST['studiensemester_kurzbz']))
+	$studiensemester_kurzbz=(isset($_GET['studiensemester_kurzbz'])?$_GET['studiensemester_kurzbz']:$_POST['studiensemester_kurzbz']);
+else
+	$studiensemester_kurzbz=null;
+if (is_null($studiensemester_kurzbz))
+	$studiensemester_kurzbz=$ss->getaktorNext();
+//echo $studiensemester_kurzbz;
+
+
+if(!is_numeric($stg_kz))
+	$stg_kz=0;
+if(!is_numeric($semester))
+	$semester=0;
+
+
+if(isset($_GET['lvid']) && is_numeric($_GET['lvid']))
+{
+	//Lehre Feld setzen
+	if(isset($_GET['lehre']))
+	{
+		$qry = "UPDATE lehre.tbl_lehrveranstaltung SET lehre=".($_GET['lehre']=='t'?'false':'true')." WHERE lehrveranstaltung_id='".$_GET['lvid']."'";
+		if(!pg_query($conn, $qry))
+			echo "Fehler beim Speichen!";
+		else
+			echo "Erfolgreich gespeichert";
+	}
+
+	//Aktiv Feld setzen
+	if(isset($_GET['aktiv']))
+	{
+		$qry = "UPDATE lehre.tbl_lehrveranstaltung SET aktiv=".($_GET['aktiv']=='t'?'false':'true')." WHERE lehrveranstaltung_id='".$_GET['lvid']."'";
+		if(!pg_query($conn, $qry))
+			echo "Fehler beim Speichen!";
+		else
+			echo "Erfolgreich gespeichert";
+	}
+
+	//Zeugnis Feld setzen
+	if(isset($_GET['zeugnis']))
+	{
+		$qry = "UPDATE lehre.tbl_lehrveranstaltung SET zeugnis=".($_GET['zeugnis']=='t'?'false':'true')." WHERE lehrveranstaltung_id='".$_GET['lvid']."'";
+		if(!pg_query($conn, $qry))
+			echo "Fehler beim Speichen!";
+		else
+			echo "Erfolgreich gespeichert";
+	}
+
+	//Lehrevz Speichern
+	if(isset($_POST['lehrevz']))
+	{
+		$qry = "UPDATE lehre.tbl_lehrveranstaltung SET lehreverzeichnis='".addslashes($_POST['lehrevz'])."' WHERE lehrveranstaltung_id='".$_GET['lvid']."'";
+		if(!pg_query($conn, $qry))
+			echo "Fehler beim Speichern!";
+		else
+			echo "Erfolgreich gespeichert";
+	}
+}
+
+$sql_query="SELECT tbl_student.*,tbl_person.* FROM tbl_studentlehrverband JOIN tbl_student USING (student_uid)
+				JOIN tbl_benutzer ON (student_uid=uid)
+				JOIN tbl_person USING (person_id)
+			WHERE tbl_studentlehrverband.studiengang_kz='$stg_kz' AND tbl_studentlehrverband.semester='$semester' AND studiensemester_kurzbz='$studiensemester_kurzbz'
+			ORDER BY nachname";
+//echo $sql_query;
+if (!$result_std=pg_query($conn, $sql_query))
+	error("Studenten not found!");
+$outp='';
+
+// ****************************** Vorruecken ******************************
+if (isset($_POST['vorr']))
+{
+	$next_ss='WS2007';
+	while($row=pg_fetch_object($result_std))
+	{
+		$s=$row->semester+1;
+		$sql="INSERT INTO tbl_studentlehrverband
+			VALUES ('$row->student_uid','$next_ss','$row->studiengang_kz',
+			'$s','$row->verband','$row->gruppe',NULL,NULL,now(),'$user',NULL);
+			INSERT INTO tbl_prestudentrolle
+			VALUES ($row->prestudent_id,'Student','$next_ss',$s,now(),now(),'$user',NULL,NULL,NULL);
+			UPDATE tbl_student SET semester=$s WHERE student_uid='$row->student_uid'";
+		if (!$r=pg_query($conn, $sql))
+			die(pg_last_error($conn));
+	}
+
+}
+
+// **************** Ausgabe vorbereiten ******************************
+$s=array();
+$outp.="<SELECT name='stg_kz'>";
+foreach ($studiengang as $stg)
+{
+	$outp.="<OPTION onclick=\"window.location.href = '".$_SERVER['PHP_SELF']."?stg_kz=$stg->studiengang_kz&semester=$semester&studiensemester_kurzbz=$studiensemester_kurzbz'\" ".($stg->studiengang_kz==$stg_kz?'selected':'').">$stg->kurzbzlang ($stg->kuerzel) - $stg->bezeichnung</OPTION>";
+	//$outp.= '<A href="'.$_SERVER['PHP_SELF'].'?stg_kz='.$stg->studiengang_kz.'&semester='.$semester.'">'.$stg->kuerzel.'</A> - ';
+	$s[$stg->studiengang_kz]->max_sem=$stg->max_semester;
+	$s[$stg->studiengang_kz]->kurzbz=$stg->kurzbzlang;
+}
+$outp.='</SELECT>';
+
+$outp.="<select name='studiensemester_kurzbz'>\n";
+foreach ($ss_arr AS $sts)
+{
+	if ($studiensemester_kurzbz == $sts)
+		$sel = " selected ";
+	else
+		$sel = '';
+	$outp.="				<option value='".$sts."' ".$sel."onclick=\"window.location.href = '".$_SERVER['PHP_SELF']."?stg_kz=$stg_kz&semester=$semester&studiensemester_kurzbz=$sts'\">".$sts."</option>";
+}
+$outp.="		</select>\n";
+
+$outp.= '<BR> -- ';
+for ($i=0;$i<=$s[$stg_kz]->max_sem;$i++)
+	$outp.= '<A href="'.$_SERVER['PHP_SELF'].'?stg_kz='.$stg_kz.'&semester='.$i.'&studiensemester_kurzbz='.$studiensemester_kurzbz.'">'.$i.'</A> -- ';
+?>
+
+<html>
+<head>
+<title>Studenten Vorrueckung</title>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<link rel="stylesheet" href="../../skin/vilesci.css" type="text/css">
+<link rel="stylesheet" href="../../include/js/tablesort/table.css" type="text/css">
+<script src="../../include/js/tablesort/table.js" type="text/javascript"></script>
+</head>
+<body class="Background_main">
+<?php
+
+echo "<H2>Studenten Vorrueckung (".$s[$stg_kz]->kurzbz." - ".$semester." - ".$studiensemester_kurzbz.")</H2>";
+
+echo '<form action="" method="POST">';
+echo '<table width="70%"><tr><td>';
+echo $outp;
+echo '</td><td>';
+echo '<input type="submit" name="vorr" value="Vorruecken" />';
+echo '</td><td>&nbsp;</td></tr></table>';
+echo '</form>';
+
+echo "<h3>&Uuml;bersicht</h3>
+	<table class='liste table-autosort:2 table-stripeclass:alternate table-autostripe'>
+	<thead>
+	<tr class='liste'>";
+
+if ($result_std!=0)
+{
+	$num_rows=pg_num_rows($result_std);
+	echo 'Anzahl: '.$num_rows;
+	echo "<th class='table-sortable:default'>Nachname</th><th class='table-sortable:default'>Vorname</th><th class='table-sortable:default'>STG</th><th class='table-sortable:default'>Sem</th><th class='table-sortable:default'>Ver</th><th class='table-sortable:default'>Grp</th>\n";
+	echo "</tr></thead>";
+	echo "<tbody>";
+	for($i=0;$i<$num_rows;$i++)
+	{
+	   $row=pg_fetch_object($result_std,$i);
+	   echo "<tr>";
+	   echo "<td>$row->nachname</td><td>$row->vorname</td><td>$row->studiengang_kz</td><td>$row->semester</td><td>$row->verband</td><td>$row->gruppe</td>";
+	   //echo "<td><a href='".$_SERVER['PHP_SELF']."?lvid=$row->lehrveranstaltung_id&stg_kz=$stg_kz&semester=$semester&lehre=$row->lehre'><img src='../../skin/images/".($row->lehre=='t'?'true.gif':'false.gif')."'></a></td>";
+	   //echo "<td><form action='?lvid=$row->lehrveranstaltung_id&stg_kz=$stg_kz&semester=$semester' method='POST'><input type='text' value='$row->lehreverzeichnis' size='4' name='lehrevz'><input type='submit' value='ok'></form></td>";
+	   //echo "<td><a href='".$_SERVER['PHP_SELF']."?lvid=$row->lehrveranstaltung_id&stg_kz=$stg_kz&semester=$semester&aktiv=$row->aktiv'><img src='../../skin/images/".($row->aktiv=='t'?'true.gif':'false.gif')."'></a></td>";
+	   //echo "<td>$row->sort</td>";
+	   //echo "<td><a href='".$_SERVER['PHP_SELF']."?lvid=$row->lehrveranstaltung_id&stg_kz=$stg_kz&semester=$semester&zeugnis=$row->zeugnis'><img src='../../skin/images/".($row->zeugnis=='t'?'true.gif':'false.gif')."'></a></td>";
+	   echo "</tr>\n";
+	}
+
+}
+else
+	echo "Kein Eintrag gefunden!";
+?>
+</tbody>
+</table>
+
+<br>
+</body>
+</html>
@@ -47,7 +47,7 @@ if(!$result_neu=pg_exec($conn, $sql_query))
 // Updates von Zutrittskarten
 $sql_query="SELECT svnr,vorname,nachname,nummerintern,nummer,firstname,name,key,
 				max(tbl_benutzer.uid) AS uid, max(matrikelnr) AS matrikelnr, max(kurzbzlang) AS stg_kurzbzlang,
-				upper(max(typ) || max(kurzbz)) AS stg_kurzbz,
+				upper(max(typ) || max(kurzbz)) AS stg_kurzbz, text1,
 				EXTRACT(DAY FROM vw_betriebsmittelperson.insertamum) AS tag,
 				EXTRACT(MONTH FROM vw_betriebsmittelperson.insertamum) AS monat,
 				EXTRACT(YEAR FROM vw_betriebsmittelperson.insertamum) AS jahr
@@ -57,8 +57,8 @@ $sql_query="SELECT svnr,vorname,nachname,nummerintern,nummer,firstname,name,key,
 				USING (person_id) JOIN sync.tbl_zutrittskarte ON (physaswnumber=nummer)
 			WHERE trim(vw_betriebsmittelperson.nachname)!=trim(tbl_zutrittskarte.name)
 				OR trim(vw_betriebsmittelperson.vorname)!=trim(tbl_zutrittskarte.firstname)
-				OR trim(vw_betriebsmittelperson.nummerintern)!=trim(tbl_zutrittskarte.key)
-			GROUP BY svnr,vorname,nachname,nummerintern,nummer,firstname,name,key,vw_betriebsmittelperson.insertamum;";
+				OR trim(vw_betriebsmittelperson.uid)!=trim(tbl_zutrittskarte.text1)
+			GROUP BY svnr,vorname,nachname,nummerintern,nummer,firstname,name,key,vw_betriebsmittelperson.insertamum,text1;";
 //echo $sql_query;
 if(!$result_upd=pg_exec($conn, $sql_query))
 	die(pg_errormessage().'<BR>'.$sql_query);
@@ -143,11 +143,11 @@ while ($row=pg_fetch_object($result_upd))
 	if ($gruppe=='')
 		$gruppe='Verwaltung';
 	$worksheet->write($z,0, $command);
-	$worksheet->write($z,1, $row->nummerintern);
+	$worksheet->write($z,1, $row->key);
 	$worksheet->write($z,2, $row->nachname);
 	$worksheet->write($z,3, $row->vorname);
 	$worksheet->write($z,4, $gruppe);
-	$worksheet->write($z,5, $row->nummerintern);
+	$worksheet->write($z,5, $row->key);
 	$worksheet->write($z,6, $row->nummer);
 	$worksheet->write($z,7, $row->tag.'.'.$row->monat.'.'.$row->jahr);
 	$worksheet->write($z,8, $row->tag.'.'.$row->monat.'.'.($row->jahr+5));
@@ -155,7 +155,7 @@ while ($row=pg_fetch_object($result_upd))
 	$worksheet->write($z,10,$row->matrikelnr);
 	$worksheet->write($z,11,'');
 	$worksheet->write($z,12,'');
-	$worksheet->write($z,13,$row->key);
+	$worksheet->write($z,13,$row->text1);
 	$worksheet->write($z,14,$row->name);
 	$worksheet->write($z,15,$row->firstname);
 	$worksheet->write($z,16,'0');