From 943adbe824003a2c646954a3a6eaadecbacf79e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Mon, 3 Sep 2007 10:00:04 +0000
Subject: [PATCH] - Bei Projektarbeiten koennen nun Personen angelegt werden
 (Firmenbetreuer) - Anpassung von Vorlagen

---
 cis/menu.html                                 |  20 +-
 cis/private/profile/index.php                 |   3 +-
 .../verordnungen/Roboter_Laborordnung.doc     | Bin 0 -> 31232 bytes
 content/student/studentprojektarbeit.js.php   |  20 +
 .../studentprojektarbeitoverlay.xul.php       |   6 +-
 include/adresse.class.php                     |   1 +
 include/kontakt.class.php                     |   1 +
 include/projektbetreuer.class.php             |   4 +-
 vilesci/admin/xslvorlagen/prprotokollbakk.xsl |   4 +-
 vilesci/admin/xslvorlagen/prprotokolldipl.xsl |  10 +-
 vilesci/personen/kontaktdaten_edit.php        | 432 ++++++++++++++++++
 vilesci/personen/personen_anlegen.php         | 423 +++++++++++++++++
 12 files changed, 910 insertions(+), 14 deletions(-)
 create mode 100644 cis/public/info/verordnungen/Roboter_Laborordnung.doc
 create mode 100644 vilesci/personen/kontaktdaten_edit.php
 create mode 100644 vilesci/personen/personen_anlegen.php

diff --git a/cis/menu.html b/cis/menu.html
index b4aa802dd..3584c5acd 100644
--- a/cis/menu.html
+++ b/cis/menu.html
@@ -111,6 +111,12 @@
 		  	</td>
   		</tr>
 
+  		<!-- FuE -->
+  		<tr>
+			<td class="tdwrap"><a href="#" class="MenuItem" onClick="alert('Dieser Bereich befindet sich im Aufbau')"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;F &amp; E</a>
+		</tr>
+		
+		<!-- Weiterbildung -->
 		<tr>
 			<td class="tdwrap"><a href="private/info/weiterbildung/info.html" target="content" class="MenuItem" onClick="js_toggle_container('Weiterbildung');"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Weiterbildung</a>
 		  	<table class="tabcontent" id="Weiterbildung" style="display: none">
@@ -328,8 +334,18 @@
 						<td class="tdwrap"><a class="Item" href="public/info/verordnungen/EDV_Richtlinien.doc" target="content"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;EDV Richtlinien</a></td>
 					</tr>
 					<tr>
-					  	<td class="tdwidth10" nowrap>&nbsp;</td>
-						<td class="tdwrap"><a class="Item" href="public/info/verordnungen/laborordnung.doc" target="content"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Laborordnung</a></td>
+					    <td class="tdwidth10" nowrap>&nbsp;</td>
+						<td class="tdwrap"><a href="?Verordnungen" class="MenuItem" onClick="return(js_toggle_container('Laborordnung'));"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Laborordnung</a>
+						  	<table class="tabcontent" id="Laborordnung" style="display: none">
+						  	<tr>
+							  	<td class="tdwidth10" nowrap>&nbsp;</td>
+								<td class="tdwrap"><a class="Item" href="public/info/verordnungen/laborordnung.doc" target="content"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Laborordnung Chemie</a></td>
+							</tr>
+							<tr>
+								<td class="tdwidth10" nowrap>&nbsp;</td>
+								<td class="tdwrap"><a class="Item" href="public/info/verordnungen/Roboter_Laborordnung.doc" target="content"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Laborordnung Roboter</a></td>
+							</tr>
+							</table>
 					</tr>
 					</table>
 				</td>
diff --git a/cis/private/profile/index.php b/cis/private/profile/index.php
index b4a6ae09c..5115e71fe 100644
--- a/cis/private/profile/index.php
+++ b/cis/private/profile/index.php
@@ -1,6 +1,7 @@
 <?php
 	require_once('../../config.inc.php');
 	require_once('../../../include/functions.inc.php');
+	require_once('../../../include/globals.inc.php');
 
 	//if (!isset($REMOTE_USER))
 	//	$REMOTE_USER='pam';
@@ -113,7 +114,7 @@
         		Technikum: <a class='Item' href='mailto:<?php echo $uid; ?>@technikum-wien.at'> <?php echo $uid; ?>@technikum-wien.at</a><br>
 
         		<?php
-        		if($email_alias!='')
+        		if($email_alias!='' && !in_array($stg,$noalias))
         		{
         		?>
         			Alias: <a class='Item' href='mailto:<?php echo $email_alias; ?>@technikum-wien.at'><?php echo $email_alias; ?>@technikum-wien.at</a>
diff --git a/cis/public/info/verordnungen/Roboter_Laborordnung.doc b/cis/public/info/verordnungen/Roboter_Laborordnung.doc
new file mode 100644
index 0000000000000000000000000000000000000000..bf9a0cd3424a153b89b735bf57b0d3228b14134a
GIT binary patch
literal 31232
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

literal 0
HcmV?d00001

diff --git a/content/student/studentprojektarbeit.js.php b/content/student/studentprojektarbeit.js.php
index ca2b5091c..8abebfc6e 100644
--- a/content/student/studentprojektarbeit.js.php
+++ b/content/student/studentprojektarbeit.js.php
@@ -936,4 +936,24 @@ function StudentProjektbetreuerLoadMitarbeiterDaten()
 	}
 	
 	document.getElementById('student-projektbetreuer-textbox-stundensatz').value=stundensatz;
+}
+
+// ****
+// * Neuen Projektbetreuer anlegen
+// ****
+function StudentProjektbetreuerNeuePerson()
+{
+	window.open('<?php echo APP_ROOT; ?>vilesci/personen/personen_anlegen.php','Person anlegen');
+}
+
+// ****
+// * Kontaktdaten eines Betreuers Bearbeiten
+// ****
+function StudentProjektbetreuerKontaktdaten()
+{
+	person_id = MenulistGetSelectedValue('student-projektbetreuer-menulist-person');
+	if(person_id!='')
+		window.open('<?php echo APP_ROOT; ?>vilesci/personen/kontaktdaten_edit.php?person_id='+person_id,'Kontaktdaten');
+	else
+		alert('Bitte zuerst eine Person auswaehlen');
 }
\ No newline at end of file
diff --git a/content/student/studentprojektarbeitoverlay.xul.php b/content/student/studentprojektarbeitoverlay.xul.php
index 52cc70638..80339292b 100644
--- a/content/student/studentprojektarbeitoverlay.xul.php
+++ b/content/student/studentprojektarbeitoverlay.xul.php
@@ -396,6 +396,8 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
 						<textbox id="student-projektbetreuer-textbox-person_id" />
 						<textbox id="student-projektbetreuer-textbox-betreuerart_kurzbz_old" />
 						<checkbox id="student-projektbetreuer-checkbox-neu" />
+						<label value="Name" control="student-projektbetreuer-textbox-name"/>
+						<textbox id="student-projektbetreuer-textbox-name" disabled="true" maxlength="32"/>
 					</vbox>
 					<grid style="margin:4px;" flex="1">
 					  	<columns  >
@@ -421,8 +423,8 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
 								</menulist>
 							</row>
 							<row>
-								<label value="Name" control="student-projektbetreuer-textbox-name"/>
-								<textbox id="student-projektbetreuer-textbox-name" disabled="true" maxlength="32"/>
+								<button id="student-projektbetreuer-button-neueperson" label="Neue Person anlegen" oncommand="StudentProjektbetreuerNeuePerson()" />
+								<button id="student-projektbetreuer-button-kontaktdaten" label="Kontakttdaten bearbeiten" oncommand="StudentProjektbetreuerKontaktdaten()" />
 							</row>
 							<row>
 								<label value="Art" control="student-projektbetreuer-menulist-betreuerart"/>
diff --git a/include/adresse.class.php b/include/adresse.class.php
index 3a86dd972..c7c456359 100644
--- a/include/adresse.class.php
+++ b/include/adresse.class.php
@@ -171,6 +171,7 @@ class adresse
 			$adr_obj->plz             = $row->plz;
 			$adr_obj->strasse         = $row->strasse;
 			$adr_obj->typ             = $row->typ;
+			$adr_obj->firma_id		  = $row->firma_id;
 			$adr_obj->updateamum      = $row->updateamum;
 			$adr_obj->updatevon       = $row->updatevon;
 			$adr_obj->insertamum      = $row->insertamum;
diff --git a/include/kontakt.class.php b/include/kontakt.class.php
index ced2b59a3..9a755ded6 100644
--- a/include/kontakt.class.php
+++ b/include/kontakt.class.php
@@ -105,6 +105,7 @@ class kontakt
 				$this->insertamum = $row->insertamum;
 				$this->insertvon = $row->insertvon;
 				$this->ext_id = $row->ext_id;
+				return true;
 			}
 			else 
 			{
diff --git a/include/projektbetreuer.class.php b/include/projektbetreuer.class.php
index 04f5ab10a..df314d0e6 100644
--- a/include/projektbetreuer.class.php
+++ b/include/projektbetreuer.class.php
@@ -153,9 +153,9 @@ class projektbetreuer
 			return false;
 		}
 		
-		if(!is_numeric($this->note))
+		if($this->note!='' && !is_numeric($this->note))
 		{
-			$this->errormsg = 'Note muß ein numerischer Wert sein - person_id/projektarbeit: '.$this->person_id.'/'.$this->projektarbeit_id;
+			$this->errormsg = 'Note muss ein numerischer Wert sein - person_id/projektarbeit: '.$this->person_id.'/'.$this->projektarbeit_id;
 			return false;
 		}
 		if(!is_numeric($this->punkte))
diff --git a/vilesci/admin/xslvorlagen/prprotokollbakk.xsl b/vilesci/admin/xslvorlagen/prprotokollbakk.xsl
index c54b44ccc..25c92aa44 100644
--- a/vilesci/admin/xslvorlagen/prprotokollbakk.xsl
+++ b/vilesci/admin/xslvorlagen/prprotokollbakk.xsl
@@ -87,12 +87,12 @@
 									</fo:table-row>
 									<fo:table-row line-height="14pt">
 										<fo:table-cell border-width="0.2mm" border-style="solid">
-											<fo:block font-family="sans-serif" font-size="10pt" content-width="45mm" text-align="left">
+											<fo:block font-family="sans-serif" font-size="10pt" content-width="80mm" text-align="left">
 												<xsl:text> </xsl:text><xsl:value-of select="betreuer" />\n <xsl:value-of select="betreuer_2" />
 											</fo:block>
 										</fo:table-cell>
 										<fo:table-cell border-width="0.2mm" border-style="solid">
-											<fo:block font-family="sans-serif" font-size="10pt" content-width="45mm" text-align="left">
+											<fo:block font-family="sans-serif" font-size="10pt" content-width="181.2mm" text-align="left">
 												<xsl:text> </xsl:text><xsl:value-of select="themenbereich" />\n <xsl:value-of select="themenbereich_2" />
 											</fo:block>
 										</fo:table-cell>
diff --git a/vilesci/admin/xslvorlagen/prprotokolldipl.xsl b/vilesci/admin/xslvorlagen/prprotokolldipl.xsl
index 7da66c9a5..9248a0853 100644
--- a/vilesci/admin/xslvorlagen/prprotokolldipl.xsl
+++ b/vilesci/admin/xslvorlagen/prprotokolldipl.xsl
@@ -98,12 +98,12 @@
 									</fo:table-row>
 									<fo:table-row line-height="14pt">
 										<fo:table-cell border-width="0.2mm" border-style="solid">
-											<fo:block font-family="sans-serif" font-size="10pt" content-width="45mm" text-align="left">
+											<fo:block font-family="sans-serif" font-size="10pt" content-width="80mm" text-align="left">
 												<xsl:text> </xsl:text><xsl:value-of select="betreuer" />
 											</fo:block>
 										</fo:table-cell>
 										<fo:table-cell border-width="0.2mm" border-style="solid">
-											<fo:block font-family="sans-serif" font-size="10pt" content-width="45mm" text-align="left">
+											<fo:block font-family="sans-serif" font-size="10pt" content-width="120mm" text-align="left">
 												<xsl:text> </xsl:text><xsl:value-of select="themenbereich" />
 											</fo:block>
 										</fo:table-cell>
@@ -113,7 +113,7 @@
 											</fo:block>
 										</fo:table-cell>
 										<fo:table-cell border-width="0.2mm" border-style="solid">
-											<fo:block font-family="sans-serif" font-size="10pt" content-width="45mm" text-align="left">
+											<fo:block font-family="sans-serif" font-size="10pt" content-width="36.4mm" text-align="left">
 												<xsl:text> </xsl:text>
 											</fo:block>
 										</fo:table-cell>
@@ -125,7 +125,7 @@
 								<fo:table-body>
 						            <fo:table-row line-height="14pt">
 										<fo:table-cell border-width="0.2mm" border-style="solid">
-											<fo:block font-family="sans-serif" font-size="10pt" content-width="45mm" text-align="left" font-weight="bold">
+											<fo:block font-family="sans-serif" font-size="10pt" content-width="261.6mm" text-align="left" font-weight="bold">
 												<xsl:text> Technisches Fachgebiet:</xsl:text>
 											</fo:block>
 										</fo:table-cell>
@@ -200,7 +200,7 @@
 								<fo:table-body>
 						            <fo:table-row line-height="14pt">
 										<fo:table-cell border-width="0.2mm" border-style="solid">
-											<fo:block font-family="sans-serif" font-size="10pt" content-width="45mm" text-align="left" font-weight="bold">
+											<fo:block font-family="sans-serif" font-size="10pt" content-width="261.6mm" text-align="left" font-weight="bold">
 												<xsl:text> Nichttechnisches Fachgebiet:</xsl:text>
 											</fo:block>
 										</fo:table-cell>
diff --git a/vilesci/personen/kontaktdaten_edit.php b/vilesci/personen/kontaktdaten_edit.php
new file mode 100644
index 000000000..d033bb3a6
--- /dev/null
+++ b/vilesci/personen/kontaktdaten_edit.php
@@ -0,0 +1,432 @@
+<?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('../config.inc.php');
+require_once('../../include/functions.inc.php');
+require_once('../../include/benutzerberechtigung.class.php');
+require_once('../../include/person.class.php');
+require_once('../../include/datum.class.php');
+require_once('../../include/adresse.class.php');
+require_once('../../include/nation.class.php');
+require_once('../../include/firma.class.php');
+require_once('../../include/kontakt.class.php');
+
+if(!$conn=pg_pconnect(CONN_STRING))
+	die('Fehler beim Herstellen der DB Connection');
+
+$user=get_uid();
+$datum_obj = new datum();
+
+loadVariables($conn, $user);
+
+?>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-15">
+<link href="../../skin/vilesci.css" rel="stylesheet" type="text/css">
+<script language="Javascript">
+function confdel()
+{
+	return confirm('Wollen Sie diesen Datensatz wirklich loeschen?');
+}
+</script>
+<style>
+td
+{
+	font-size: small;
+}
+</style>
+</head>
+<body>
+<?php
+//Berechtigung pruefen
+$rechte = new benutzerberechtigung($conn);
+$rechte->getBerechtigungen($user);
+
+if(!$rechte->isBerechtigt('admin') && !$rechte->isBerechtigt('mitarbeiter'))
+	die('Sie haben keine Berechtigung fuer diese Seite');
+
+$person_id = (isset($_GET['person_id'])?$_GET['person_id']:'');
+$adresse_id = (isset($_REQUEST['adresse_id'])?$_REQUEST['adresse_id']:'');
+$kontakt_id = (isset($_REQUEST['kontakt_id'])?$_REQUEST['kontakt_id']:'');
+$errormsg = '';
+$error = false;
+
+$adresstyp = (isset($_POST['adresstyp'])?$_POST['adresstyp']:'');
+$strasse = (isset($_POST['strasse'])?$_POST['strasse']:'');
+$plz = (isset($_POST['plz'])?$_POST['plz']:'');
+$ort = (isset($_POST['ort'])?$_POST['ort']:'');
+$gemeinde = (isset($_POST['gemeinde'])?$_POST['gemeinde']:'');
+$nation = (isset($_POST['nation'])?$_POST['nation']:'');
+$heimatadresse = (isset($_POST['heimatadresse'])?true:false);
+$zustelladresse = (isset($_POST['zustelladresse'])?true:false);
+$firma_id = (isset($_POST['firma'])?$_POST['firma']:'');
+$zustellung = (isset($_POST['zustellung'])?true:false);
+$anmerkung = (isset($_POST['anmerkung'])?$_POST['anmerkung']:false);
+$kontakt = (isset($_POST['kontakt'])?$_POST['kontakt']:false);
+
+if($person_id=='')
+	die('Person_id muss uebergeben werden');
+
+//Loeschen einer Adresse
+if(isset($_GET['deleteadresse']))
+{
+	if(is_numeric($adresse_id))
+	{
+		$adresse_obj = new adresse($conn);
+		if(!$adresse_obj->delete($adresse_id))
+		{
+			$errormsg = 'Fehler beim Loeschen der Adresse:'.$adresse_obj->errormsg;
+		}
+	}
+}
+
+//Loeschen einen Kontakt
+if(isset($_GET['deletekontakt']))
+{
+	if(is_numeric($kontakt_id))
+	{
+		$kontakt_obj = new kontakt($conn);
+		if(!$kontakt_obj->delete($kontakt_id))
+		{
+			$errormsg = 'Fehler beim Loeschen des Kontakts:'.$kontakt_obj->errormsg;
+		}
+	}
+}
+
+//Speichern einer Adresse
+if(isset($_POST['saveadresse']))
+{
+	$adresse_obj = new adresse($conn);
+	
+	if(is_numeric($adresse_id))
+	{
+		if($adresse_obj->load($adresse_id))
+		{
+			$adresse_obj->new = false;
+		}
+		else 
+		{
+			$errormsg = 'Adresse wurde nicht gefunden:'.$adresse_id;
+			$error=true;
+		}
+	}
+	else 
+	{
+		$adresse_obj->new = true;
+		$adresse_obj->insertamum = date('Y-m-d H:i:s');
+		$adresse_obj->insertvon = $user;
+	}
+	
+	if(!$error)
+	{
+		$adresse_obj->person_id=$person_id;
+		$adresse_obj->strasse = $strasse;
+		$adresse_obj->plz = $plz;
+		$adresse_obj->ort = $ort;
+		$adresse_obj->gemeinde = $gemeinde;
+		$adresse_obj->nation = $nation;
+		$adresse_obj->typ = $adresstyp;
+		$adresse_obj->heimatadresse = $heimatadresse;
+		$adresse_obj->zustelladresse = $zustelladresse;
+		$adresse_obj->firma_id = $firma_id;
+		$adresse_obj->updateamum = date('Y-m-d H:i:s');
+		$adresse_obj->updatvon = $user;
+		
+		//var_dump($adresse_obj);
+		
+		if(!$adresse_obj->save())
+		{
+			$errormsg = 'Fehler beim Speichern der Adresse:'.$adresse_obj->errormsg;
+		}
+		else 
+		{
+			$errormsg = 'Daten wurden gespeichert';
+		}
+	}
+}
+
+//Speichern eines Kontaktes
+if(isset($_POST['savekontakt']))
+{
+	$kontakt_obj = new kontakt($conn);
+	
+	if(is_numeric($kontakt_id))
+	{
+		if($kontakt_obj->load($kontakt_id))
+		{
+			$kontakt_obj->new = false;
+		}
+		else 
+		{
+			$errormsg = 'Kontakt wurde nicht gefunden:'.$kontakt_id;
+			$error=true;
+		}
+	}
+	else 
+	{
+		$kontakt_obj->new = true;
+		$kontakt_obj->insertamum = date('Y-m-d H:i:s');
+		$kontakt_obj->insertvon = $user;
+	}
+	
+	if(!$error)
+	{
+		$kontakt_obj->person_id=$person_id;
+		$kontakt_obj->firma_id = $firma_id;
+		$kontakt_obj->kontakttyp = $kontakttyp;
+		$kontakt_obj->kontakt = $kontakt;
+		$kontakt_obj->anmerkung = $anmerkung;
+		$kontakt_obj->zustellung = $zustellung;
+		$kontakt_obj->updateamum = date('Y-m-d H:i:s');
+		$kontakt_obj->updatvon = $user;
+						
+		if(!$kontakt_obj->save())
+		{
+			$errormsg = 'Fehler beim Speichern des Kontaktes:'.$kontakt_obj->errormsg;
+		}
+		else 
+		{
+			$errormsg = 'Daten wurden gespeichert';
+		}
+	}
+}
+
+//Person laden	
+$person = new person($conn);
+if(!$person->load($person_id))
+	die('Person wurde nicht gefunden');
+	
+//Nationen laden
+$nation_arr = array();
+$nation = new nation($conn);
+$nation->getAll();
+
+foreach($nation->nation as $row)
+	$nation_arr[$row->code]=$row->kurztext;
+	
+//Firmen laden
+
+$firma_arr = array();
+$firma = new firma($conn);
+$firma->getAll();
+
+foreach($firma->result as $row)
+	$firma_arr[$row->firma_id]=$row->name;
+	
+$adresstyp_arr = array('h'=>'Hauptwohnsitz','n'=>'Nebenwohnsitz','f'=>'Firma');
+
+//Kontakttypen laden
+$kontakttyp_arr = array();
+$kontakt_obj = new kontakt($conn);
+$kontakt_obj->getKontakttyp();
+foreach ($kontakt_obj->result as $row)
+	$kontakttyp_arr[]=$row->kontakttyp;
+
+echo "<h2>Kontaktdaten von $person->vorname $person->nachname</h2>";
+echo $errormsg.'<br>';
+
+// *** ADRESSEN *** 
+echo "<h3>Adressen:</h3>";
+echo "<form action='".$_SERVER['PHP_SELF']."?person_id=$person_id' method='POST' />";
+echo "<table class='liste'><tr><th>STRASSE</th><th>PLZ</th><th>ORT</th><th>GEMEINDE</th><th>NATION</th><th>TYP</th><th>HEIMAT</th><th>ZUSTELLUNG</th><th>FIRMA</th></tr>";
+$adresse_obj = new adresse($conn);
+$adresse_obj->load_pers($person_id);
+
+foreach ($adresse_obj->result as $row)
+{
+	echo '<tr class="liste1">';
+	echo "<td>$row->strasse</td>";
+	echo "<td>$row->plz</td>";
+	echo "<td>$row->ort</td>";
+	echo "<td>$row->gemeinde</td>";
+	echo "<td>".$nation_arr[$row->nation]."</td>";
+	echo "<td>".$adresstyp_arr[$row->typ]."</td>";
+	echo "<td>".($row->heimatadresse?'Ja':'Nein')."</td>";
+	echo "<td>".($row->zustelladresse?'Ja':'Nein')."</td>";
+	echo "<td>".($row->firma_id!=''?$firma_arr[$row->firma_id]:'')."</td>";
+	echo "<td><a href='".$_SERVER['PHP_SELF']."?editadresse=true&adresse_id=$row->adresse_id&person_id=$person_id'>bearbeiten</a></td>";
+	echo "<td><a href='".$_SERVER['PHP_SELF']."?deleteadresse=true&adresse_id=$row->adresse_id&person_id=$person_id' onclick='return confdel()'>loeschen</a></td>";
+}
+
+$savebuttonvalue='Neu';
+if(isset($_GET['editadresse']))
+{
+	$adresse_obj = new adresse($conn);
+	if($adresse_obj->load($adresse_id))
+	{
+		$strasse = $adresse_obj->strasse;
+		$plz = $adresse_obj->plz;
+		$ort = $adresse_obj->ort;
+		$gemeinde = $adresse_obj->gemeinde;
+		$nation = $adresse_obj->nation;
+		$typ = $adresse_obj->typ;
+		$heimatadresse = $adresse_obj->heimatadresse;
+		$zustelladresse = $adresse_obj->zustelladresse;
+		$firma_id = $adresse_obj->firma_id;
+		$savebuttonvalue='Speichern';
+	}
+}
+else 
+{
+	$strasse='';
+	$plz='';
+	$ort='';
+	$gemeinde='';
+	$nation = 'A';
+	$typ='';
+	$heimatadresse='';
+	$zustelladresse='';
+	$firma_id='';
+	$adresse_id='';
+}
+	echo "<input type='hidden' name='adresse_id' value='".$adresse_id."' />";
+	echo '<tr class="liste1">';
+	echo "<td><input type='text' name='strasse' value='".htmlentities($strasse)."' /></td>";
+	echo "<td><input type='text' name='plz' size='4' value='".htmlentities($plz)."' /></td>";
+	echo "<td><input type='text' name='ort' value='".htmlentities($ort)."' /></td>";
+	echo "<td><input type='text' name='gemeinde' value='".htmlentities($gemeinde)."' /></td>";
+	echo "<td><SELECT name='nation'>";
+	foreach ($nation_arr as $code=>$kurzbz)
+	{
+		if($code==$nation)
+			$selected='selected';
+		else 
+			$selected='';
+			
+		echo "<OPTION value='$code' $selected>$kurzbz</OPTION>";
+	}
+	
+	echo "</SELECT></td>";
+	echo "<td><SELECT name='adresstyp'>";
+	foreach($adresstyp_arr as $code=>$kurzbz)
+	{
+		if($code==$typ)
+			$selected='selected';
+		else 
+			$selected='';
+			
+		echo "<OPTION value='$code' $selected>$kurzbz</OPTION>";
+	}
+	echo "</SELECT></td>";
+	echo "<td><input type='checkbox' name='heimatadresse' ".($heimatadresse?'checked':'')." /></td>";
+	echo "<td><input type='checkbox' name='zustelladresse' ".($zustelladresse?'checked':'')." /></td>";
+	echo "<td><SELECT name='firma'>";
+	echo "<OPTION value=''>-- keine Auswahl --</OPTION>";
+	foreach ($firma_arr as $id=>$kurzbz)
+	{
+		if($id==$firma_id)
+			$selected='selected';
+		else 
+			$selected='';
+		
+		echo "<OPTION value='$id' $selected>$kurzbz</OPTION>";
+	}
+	echo "</SELECT></td>";
+	echo "<td><input type='submit' name='saveadresse' value='$savebuttonvalue' /></td>";
+	
+	echo "</table>";
+	echo "</form>";
+	
+// *** Kontakte ***
+echo "<h3>Kontakte:</h3>";
+echo "<form action='".$_SERVER['PHP_SELF']."?person_id=$person_id' method='POST' />";
+echo "<table class='liste'><tr><th>TYP</th><th>KONTAKT</th><th>ZUSTELLUNG</th><th>ANMERKUNG</th><th>FIRMA</th></tr>";
+$kontakt_obj = new kontakt($conn);
+$kontakt_obj->load_pers($person_id);
+
+foreach ($kontakt_obj->result as $row)
+{
+	echo '<tr class="liste1">';
+	echo "<td>$row->kontakttyp</td>";
+	echo "<td>$row->kontakt</td>";
+	echo "<td>".($row->zustellung?'Ja':'Nein')."</td>";
+	echo "<td>$row->anmerkung</td>";
+	echo "<td>".($row->firma_id!=''?$firma_arr[$row->firma_id]:'')."</td>";
+	echo "<td><a href='".$_SERVER['PHP_SELF']."?editkontakt=true&kontakt_id=$row->kontakt_id&person_id=$person_id'>bearbeiten</a></td>";
+	echo "<td><a href='".$_SERVER['PHP_SELF']."?deletekontakt=true&kontakt_id=$row->kontakt_id&person_id=$person_id' onclick='return confdel()'>loeschen</a></td>";
+}
+
+$savebuttonvalue='Neu';
+if(isset($_GET['editkontakt']))
+{
+	$kontakt_obj = new kontakt($conn);
+	if($kontakt_obj->load($kontakt_id))
+	{
+		$kontakttyp = $kontakt_obj->kontakttyp;
+		$zustellung = $kontakt_obj->zustellung;
+		$anmerkung = $kontakt_obj->anmerkung;
+		$kontakt = $kontakt_obj->kontakt;
+		$firma_id = $kontakt_obj->firma_id;
+		$savebuttonvalue='Speichern';
+	}
+	else 	
+		echo 'Fehler beim Laden'.$kontakt_id;
+}
+else 
+{
+	$kontakt_id='';
+	$kontakttyp='';
+	$kontakt='';
+	$zustellung=true;
+	$anmerkung='';
+	$firma_id='';
+}
+	echo "<input type='hidden' name='kontakt_id' value='".$kontakt_id."' />";
+	echo '<tr class="liste1">';
+	echo "<td><SELECT name='kontakttyp'>";
+	
+	foreach ($kontakttyp_arr as $kurzbz)
+	{
+		if($kurzbz==$kontakttyp)
+			$selected='selected';
+		else 
+			$selected='';
+		
+		echo "<OPTION value='$kurzbz' $selected>$kurzbz</OPTION>";
+	}
+	echo "</SELECT></td>";
+	
+	echo "<td><input type='text' name='kontakt' value='".htmlentities($kontakt)."' /></td>";
+	echo "<td><input type='checkbox' name='zustellung' ".($zustellung?'checked':'')." /></td>";
+	echo "<td><input type='text' name='anmerkung' value='".htmlentities($anmerkung)."' /></td>";
+	echo "<td><SELECT name='firma'>";
+	echo "<OPTION value=''>-- keine Auswahl --</OPTION>";
+	foreach ($firma_arr as $id=>$kurzbz)
+	{
+		if($id==$firma_id)
+			$selected='selected';
+		else 
+			$selected='';
+		
+		echo "<OPTION value='$id' $selected>$kurzbz</OPTION>";
+	}
+	echo "</SELECT></td>";
+	echo "<td><input type='submit' name='savekontakt' value='$savebuttonvalue' /></td>";
+	
+	echo "</table>";
+	echo "</form>";
+
+?>
+</body>
+</html>
\ No newline at end of file
diff --git a/vilesci/personen/personen_anlegen.php b/vilesci/personen/personen_anlegen.php
new file mode 100644
index 000000000..7150a6e7a
--- /dev/null
+++ b/vilesci/personen/personen_anlegen.php
@@ -0,0 +1,423 @@
+<?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('../config.inc.php');
+require_once('../../include/functions.inc.php');
+require_once('../../include/benutzerberechtigung.class.php');
+require_once('../../include/person.class.php');
+require_once('../../include/datum.class.php');
+
+if(!$conn=pg_pconnect(CONN_STRING))
+	die('Fehler beim Herstellen der DB Connection');
+
+$user=get_uid();
+$datum_obj = new datum();
+
+loadVariables($conn, $user);
+
+?>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-15">
+<link href="../../skin/cis.css" rel="stylesheet" type="text/css">
+<script language="Javascript">
+function disablefields(obj)
+{
+	if(obj.value==0)
+		val=false;
+	else
+		val=true;
+
+	document.getElementById('titel').disabled=val;
+	document.getElementById('nachname').disabled=val;
+	document.getElementById('vorname').disabled=val;
+	document.getElementById('geschlecht').disabled=val;
+	document.getElementById('geburtsdatum').disabled=val;
+	document.getElementById('svnr').disabled=val;
+	document.getElementById('ersatzkennzeichen').disabled=val;
+	//document.getElementById('adresse').disabled=val;
+	//document.getElementById('plz').disabled=val;
+	//document.getElementById('ort').disabled=val;
+	if(val)
+	{
+		document.getElementById('ueb1').style.display = 'block';
+		document.getElementById('ueb2').style.display = 'block';
+		document.getElementById('ueb3').style.display = 'block';
+	}
+	else
+	{
+		document.getElementById('ueb1').style.display = 'none';
+		document.getElementById('ueb2').style.display = 'none';
+		document.getElementById('ueb3').style.display = 'none';
+	}
+}
+
+function GeburtsdatumEintragen()
+{
+	svnr = document.getElementById('svnr').value;
+	gebdat = document.getElementById('geburtsdatum');
+	
+	if(svnr.length==10 && gebdat.value=='')
+	{
+		var tag = svnr.substr(4,2);
+		var monat = svnr.substr(6,2);
+		var jahr = svnr.substr(8,2);
+		
+		gebdat.value='19'+jahr+'-'+monat+'-'+tag;
+	}
+}
+
+function disablefields2(val)
+{
+	document.getElementById('adresse').disabled=val;
+	document.getElementById('plz').disabled=val;
+	document.getElementById('ort').disabled=val;
+}
+</script>
+</head>
+<body>
+<h1>Person Anlegen</h1>
+<?php
+//Berechtigung pruefen
+$rechte = new benutzerberechtigung($conn);
+$rechte->getBerechtigungen($user);
+
+if(!$rechte->isBerechtigt('admin') && !$rechte->isBerechtigt('mitarbeiter'))
+	die('Sie haben keine Berechtigung fuer diese Seite');
+
+$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']:'');
+$person_id = (isset($_POST['person_id'])?$_POST['person_id']:'');
+$svnr = (isset($_POST['svnr'])?$_POST['svnr']:'');
+$ersatzkennzeichen = (isset($_POST['ersatzkennzeichen'])?$_POST['ersatzkennzeichen']:'');
+$ueberschreiben = (isset($_REQUEST['ueberschreiben'])?$_REQUEST['ueberschreiben']:'');
+//end Parameter
+$geburtsdatum_error=false;
+
+// *** Speichern der Daten ***
+if(isset($_POST['save']))
+{
+	//echo "Saving Data: Geburtsdatum: $geburtsdatum | Titel: $titel | Nachname: $nachname | Vorname: $vorname |
+	//		Geschlecht: $geschlecht | Adresse: $adresse | Plz: $plz | Ort: $ort |
+	//		Email: $email | Telefon: $telefon | Mobil: $mobil | Letzteausbildung: $letzteausbildung | ausbildungsart: $ausbildungsart |
+	//		anmerkungen: $anmerkungen | studiengang_kz: $studiengang_kz | person_id: $person_id<br><br>";
+	$person = new person($conn);
+	pg_query($conn, 'BEGIN');
+	//Wenn die person_id=0 dann wird eine neue Person angelegt
+	//Sonst nicht
+	if($person_id=='0')
+	{
+		$person->new = true;
+		$person->titelpre = $titel;
+		$person->nachname = $nachname;
+		$person->vorname = $vorname;
+		$person->geschlecht = $geschlecht;
+		$person->gebdatum = $geburtsdatum;
+		$person->svnr = $svnr;
+		$person->ersatzkennzeichen = $ersatzkennzeichen;
+		$person->aktiv = true;
+		if($person->save())
+		{
+			$error=false;
+		}
+		else
+		{
+			$error=true;
+			$errormsg = "Person konnte nicht gespeichert werden: $person->errormsg";
+		}
+	}
+	
+	//Adresse anlegen
+	if($ueberschreiben!='' && !($plz=='' && $adresse=='' && $ort==''))
+	{
+		if($person_id=='0')
+			$ueberschreiben='Nein';
+
+		$adr = new adresse($conn);
+		//Adresse neu anlegen
+		if($ueberschreiben=='Nein')
+		{
+			$adr->new = true;
+			$adr->insertamum = date('Y-m-d H:i:s');
+			$adr->insertvon = $user;
+		}
+		else
+		{
+			//Bestehende Adresse Ueberschreiben
+
+			//Adressen der Peron laden
+			$adr->load_pers($person->person_id);
+			if(isset($adr->result[0]))
+			{
+				//Erste Adresse laden
+				if($adr->load($adr->result[0]->adresse_id))
+				{
+					$adr->new = false;
+					$adr->updateamum = date('Y-m-d H:i:s');
+					$adr->updatevon = $user;
+				}
+				else
+				{
+					$error = true;
+					$errormsg = 'Fehler beim Laden der Adresse';
+				}
+			}
+			else
+			{
+				//Wenn keine Adrese vorhanden ist dann eine neue Anlegen
+				$adr->new = true;
+				$adr->insertamum = date('Y-m-d H:i:s');
+				$adr->insertvon = $user;
+			}
+		}
+
+		if(!$error)
+		{
+			//Adressdaten zuweisen und speichern
+			$adr->person_id = $person->person_id;
+			$adr->strasse = $adresse;
+			$adr->plz = $plz;
+			$adr->ort = $ort;
+			$adr->typ = 'h';
+			$adr->heimatadresse = true;
+			$adr->zustelladresse = true;
+			if(!$adr->save())
+			{
+				$error = true;
+				$errormsg = $adr->errormsg;
+			}
+		}
+	}
+
+	//Kontaktdaten anlegen
+	if(!$error)
+	{
+		//EMail Adresse speichern
+		if($email!='')
+		{
+			$kontakt = new kontakt($conn);
+			$kontakt->person_id = $person->person_id;
+			$kontakt->kontakttyp = 'email';
+			$kontakt->kontakt = $email;
+			$kontakt->zustellung = true;
+			$kontakt->insertamum = date('Y-m-d H:i:s');
+			$kontakt->insertvon = $user;
+			$kontakt->new = true;
+
+			if(!$kontakt->save())
+			{
+				$error = true;
+				$errormsg = 'Fehler beim Speichern der Email Adresse';
+			}
+		}
+		//Telefonnummer speichern
+		if($telefon!='')
+		{
+			$kontakt = new kontakt($conn);
+			$kontakt->person_id = $person->person_id;
+			$kontakt->kontakttyp = 'telefon';
+			$kontakt->kontakt = $telefon;
+			$kontakt->zustellung = true;
+			$kontakt->insertamum = date('Y-m-d H:i:s');
+			$kontakt->insertvon = $user;
+			$kontakt->new = true;
+
+			if(!$kontakt->save())
+			{
+				$error = true;
+				$errormsg = 'Fehler beim Speichern der Telefonnummer';
+			}
+		}
+		//Mobiltelefonnummer speichern
+		if($mobil!='')
+		{
+			$kontakt = new kontakt($conn);
+			$kontakt->person_id = $person->person_id;
+			$kontakt->kontakttyp = 'mobil';
+			$kontakt->kontakt = $mobil;
+			$kontakt->zustellung = true;
+			$kontakt->insertamum = date('Y-m-d H:i:s');
+			$kontakt->insertvon = $user;
+			$kontakt->new = true;
+
+			if(!$kontakt->save())
+			{
+				$error = true;
+				$errormsg = 'Fehler beim Speichern der Mobiltelefonnummer';
+			}
+		}
+	}
+
+	if(!$error)
+	{
+		pg_query($conn, 'COMMIT');
+		die("<script language='Javascript'>
+				window.opener.StudentProjektbetreuerMenulistPersonLoad(window.opener.document.getElementById('student-projektbetreuer-menulist-person'), '$nachname');
+				window.opener.MenulistSelectItemOnValue('student-projektbetreuer-menulist-person', $person->person_id);
+			</script>
+			<b>Person $vorname $nachname wurde erfolgreich angelegt</b><br>");
+	}
+	else
+	{
+		pg_query($conn, 'ROLLBACK');
+		echo '<span class="error">'.$errormsg.'</span>';
+	}
+}
+// *** SAVE ENDE ***
+if($geburtsdatum!='')
+{
+	//Wenn das Datum im Format d.m.Y ist dann in Y-m-d umwandeln
+	if(strpos($geburtsdatum,'.'))
+	{
+		if($datum_obj->mktime_datum($geburtsdatum))
+		{
+			$geburtsdatum = date('Y-m-d',$datum_obj->mktime_datum($geburtsdatum));
+		}
+		else
+		{
+			$geburtsdatum_error=true;
+		}
+	}
+	else 
+	{
+		if(!ereg("([0-9]{4})-([0-9]{2})-([0-9]{2})",$geburtsdatum))
+			$geburtsdatum_error=true;
+	}
+	
+	if($geburtsdatum_error)
+		echo "Format des Geburtsdatums ist ungueltig!";
+}
+?>
+<form method='POST'>
+<table width="100%">
+
+<tr>
+<td>
+<!--Formularfelder-->
+<table>
+<?php
+echo '<tr><td>Titel</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>Nachname</td><td><input type="text" maxlength="64" id="nachname" name="nachname" value="'.$nachname.'" /></td></tr>';
+echo '<tr><td>Geschlecht</td><td><SELECT id="geschlecht" name="geschlecht">';
+echo '<OPTION value="m" '.($geschlecht=='m'?'selected':'').'>m&auml;nnlich</OPTION>';
+echo '<OPTION value="w" '.($geschlecht=='w'?'selected':'').'>weiblich</OPTION>';
+echo '</SELECT>';
+echo '</td></tr>';
+echo '<tr><td>SVNR</td><td><input type="text" id="svnr" size="10" maxlength="10" name="svnr" value="'.$svnr.'" onblur="GeburtsdatumEintragen()" /></td></tr>';
+echo '<tr><td>Ersatzkennzeichen</td><td><input type="text" id="ersatzkennzeichen" size="10" maxlength="10" name="ersatzkennzeichen" value="'.$ersatzkennzeichen.'" /></td></tr>';
+echo '<tr><td>Geburtsdatum</td><td><input type="text" id="geburtsdatum" size="10" maxlength="10" name="geburtsdatum" value="'.$geburtsdatum.'" /></td></tr>';
+echo '<tr><td colspan="2"><fieldset><legend>Adresse</legend><table>';
+echo '<tr><td>Adresse</td><td><input type="text" id="adresse" maxlength="256" name="adresse" value="'.$adresse.'" /></td></tr>';
+echo '<tr><td>Postleitzahl</td><td><input type="text" maxlength="16" id="plz" name="plz" value="'.$plz.'" /></td></tr>';
+echo '<tr><td>Ort</td><td><input type="text" id="ort" maxlength="256" name="ort" value="'.$ort.'" /></td></tr>';
+echo '</table>';
+echo '<div style="display: none;" id="ueb1"><input type="radio" id="ueberschreiben1" name="ueberschreiben" value="Ja" onclick="disablefields2(false)">Bestehende Adresse überschreiben</div>';
+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>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>';
+echo '<tr><td></td><td>';
+
+if(($geburtsdatum=='' && $vorname=='' && $nachname=='') || $geburtsdatum_error)
+	echo '<input type="submit" name="showagain" value="Vorschlag laden">';
+else
+	echo '<input type="submit" name="save" value="Speichern">';
+
+echo '</td></tr>';
+echo '</table>';
+echo '</td>';
+echo '<td valign="top">';
+
+//Vorschlaege
+
+//Vorschlaege laden
+if($geburtsdatum!='')
+{		
+	if(ereg("([0-9]{4})-([0-9]{2})-([0-9]{2})",$geburtsdatum))
+	{
+		$where = " gebdatum='".$geburtsdatum."'";
+	}
+}
+
+if($vorname!='' && $nachname!='')
+{
+	if($where!='')
+		$where.=' OR';
+	$where.=" (LOWER(vorname)=LOWER('".$vorname."') AND LOWER(nachname)=LOWER('".$nachname."'))";
+}
+
+if($where!='')
+{
+	$qry = "SELECT * FROM public.tbl_person WHERE $where ORDER BY nachname, vorname, gebdatum";
+	
+	if($result = pg_query($conn, $qry))
+	{
+		echo '<table><tr><th></th><th>Nachname</th><th>Vorname</th><th>GebDatum</th><th>SVNR</th><th>Geschlecht</th><th>Adresse</th><th>Status</th></tr>';
+		while($row = pg_fetch_object($result))
+		{
+			$status = '';
+			$qry_ma = "SELECT * FROM campus.vw_mitarbeiter WHERE person_id='$row->person_id'";
+			if($result_ma = pg_query($conn, $qry_ma))
+				if($row_ma=pg_fetch_object($result_ma))
+					$status.=' Mitarbeiter';
+			$qry_ma = "SELECT * FROM campus.vw_student WHERE person_id='$row->person_id'";
+			if($result_ma = pg_query($conn, $qry_ma))
+				if($row_ma=pg_fetch_object($result_ma))
+					$status.=' Student';
+			echo '<tr valign="top"><td><input type="radio" name="person_id" value="'.$row->person_id.'" onclick="disablefields(this)"></td><td>'."$row->nachname</td><td>$row->vorname</td><td>$row->gebdatum</td><td>$row->svnr</td><td>".($row->geschlecht=='m'?'männlich':'weiblich')."</td><td>";
+			$qry_adr = "SELECT * FROM public.tbl_adresse WHERE person_id='$row->person_id'";
+			if($result_adr = pg_query($conn, $qry_adr))
+				while($row_adr=pg_fetch_object($result_adr))
+					echo "$row_adr->plz $row_adr->ort, $row_adr->strasse<br>";
+			echo "<td>$status</td>";
+			echo "</td></tr>";
+		}
+		echo '<tr><td><input type="radio" name="person_id" value="0" checked onclick="disablefields(this)"></td><td>Neue Person anlegen</td></tr>';
+		echo '</table>';
+	}
+}
+//else
+//	echo 'Zum Erstellen des Vorschlags bitte Geburtsdatum oder Vorname und Nachname eingeben';
+
+?>
+</td>
+</tr>
+</table>
+</form>
+</body>
+</html>
\ No newline at end of file