diff --git a/include/person.class.php b/include/person.class.php
index e8edc0629..0b0eab4f5 100644
--- a/include/person.class.php
+++ b/include/person.class.php
@@ -87,7 +87,7 @@ class person extends basis_db
 			$qry = "SELECT person_id, sprache, anrede, titelpost, titelpre, nachname, vorname, vornamen,
 				gebdatum, gebort, gebzeit, foto, anmerkung, homepage, svnr, ersatzkennzeichen,
 				familienstand, anzahlkinder, aktiv, insertamum, insertvon, updateamum, updatevon, ext_id,
-				geschlecht, staatsbuergerschaft, geburtsnation, kurzbeschreibung
+				geschlecht, staatsbuergerschaft, geburtsnation, kurzbeschreibung, zugangscode
 				FROM public.tbl_person WHERE person_id='$person_id'";
 
 			if(!$this->db_query($qry))
@@ -126,6 +126,7 @@ class person extends basis_db
 				$this->staatsbuergerschaft = $row->staatsbuergerschaft;
 				$this->geburtsnation = $row->geburtsnation;
 				$this->kurzbeschreibung = $row->kurzbeschreibung;
+				$this->zugangscode = $row->zugangscode;
 			}
 			else
 			{
diff --git a/include/preincoming.class.php b/include/preincoming.class.php
index d1e055d82..5b17c2784 100644
--- a/include/preincoming.class.php
+++ b/include/preincoming.class.php
@@ -426,5 +426,82 @@ class preincoming extends basis_db
 			return false;
 		}
 	}
+	
+	/**
+	 * Laedt die PreIncoming anhand von Suchkriterien
+	 * 
+	 * @param $filter
+	 * @param $aktiv
+	 * @param $von
+	 * @param $bis
+	 * @param $uebernommen
+	 * @return boolean
+	 */
+	public function getPreincoming($filter, $aktiv=true, $von=null, $bis=null, $uebernommen=false)
+	{
+		$qry = "SELECT 
+					titelpre, titelpost, vorname, nachname, tbl_preincoming.*
+				FROM 
+					public.tbl_person 
+					JOIN public.tbl_preincoming USING(person_id)
+				WHERE
+					1=1";
+		
+		if($filter!='')
+		{
+			$qry.=" AND (lower(nachname) like lower('%".addslashes($filter)."%') 
+						OR lower(vorname) like lower('%".addslashes($filter)."%')
+						OR lower(nachname || ' ' || vorname) like lower('%".addslashes($filter)."%')
+						OR lower(vorname || ' ' || nachname) like lower('%".addslashes($filter)."%'))";
+		}
+		
+		if(!is_null($aktiv))
+			$qry.=" AND tbl_preincoming.aktiv=".($aktiv?'true':'false');
+		if(!is_null($uebernommen))
+			$qry.=" AND tbl_preincoming.uebernommen=".($uebernommen?'true':'false');
+		if($von!='')
+			$qry.=" AND tbl_preincoming.von>='".addslashes($von)."'";
+		if($bis!='')
+			$qry.=" AND tbl_preincoming.bis<='".addslashes($bis)."'";
+			
+		if($result = $this->db_query($qry))
+		{
+			while($row = $this->db_fetch_object($result))
+			{
+				$obj = new preincoming();
+				
+				$obj->preincoming_id = $row->preincoming_id;
+				$obj->person_id = $row->person_id;
+				$obj->mobilitaetsprogramm_code = $row->mobilitaetsprogramm_code;
+				$obj->zweck_code = $row->zweck_code;
+				$obj->firma_id = $row->firma_id;
+				$obj->anmerkung = $row->anmerkung;
+				$obj->universitaet = $row->universitaet;
+				$obj->aktiv = ($row->aktiv=='t'?true:false);
+				$obj->bachelorthesis = ($row->bachelorthesis=='t'?true:false);
+				$obj->masterthesis = ($row->masterthesis=='t'?true:false);
+				$obj->von = $row->von;
+				$obj->bis = $row->bis;
+				$obj->uebernommen = ($row->uebernommen=='t'?true:false);
+				$obj->updateamum = $row->updateamum;
+				$obj->updatevon = $row->updatevon;
+				$obj->insertamum = $row->insertamum;
+				$obj->insertvon = $row->insertvon;
+				
+				$obj->vorname = $row->vorname;
+				$obj->nachname = $row->nachname;
+				$obj->titelpre = $row->titelpre;
+				$obj->titelpost = $row->titelpost;
+				
+				$this->result[] = $obj;
+			}
+			return true;
+		}
+		else
+		{
+			$this->errormsg = 'Fehler beim Laden der Daten';
+			return false;
+		}
+	}
 }
 ?>
\ No newline at end of file
diff --git a/include/zweck.class.php b/include/zweck.class.php
new file mode 100644
index 000000000..e07fe9925
--- /dev/null
+++ b/include/zweck.class.php
@@ -0,0 +1,65 @@
+<?php
+/* Copyright (C) 2011 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
+ *          Karl Burkhart <burkhart@technikum-wien.at>.
+ */
+ 
+/**
+ * Klasse Zweck
+ */
+ 
+require_once(dirname(__FILE__).'/basis_db.class.php');
+
+class zweck extends basis_db 
+{
+	public $new;
+	public $result = array();
+	
+	//Tabellenspalten
+	public $zweck_code;
+	public $kurzbz;
+	public $bezeichnung;
+
+
+	public function getAll()
+	{
+		$qry ="SELECT * FROM bis.tbl_zweck ORDER BY kurzbz;";
+		
+		if($this->db_query($qry))
+		{
+			while($row = $this->db_fetch_object())
+			{
+				$obj = new zweck(); 
+				
+				$obj->zweck_code = $row->zweck_code; 
+				$obj->kurzbz = $row->kurzbz; 
+				$obj->bezeichnung = $row->bezeichnung; 
+				
+				$this->result[]=$obj; 
+			}
+			return true; 
+		}
+		else
+		{
+			$this->errormsg = "Fehler bei der Abfrage aufgetreten"; 
+			return false; 
+		}
+	}
+
+}
diff --git a/vilesci/personen/incoming_detail.php b/vilesci/personen/incoming_detail.php
new file mode 100644
index 000000000..ac83aeae2
--- /dev/null
+++ b/vilesci/personen/incoming_detail.php
@@ -0,0 +1,451 @@
+<?php
+/* Copyright (C) 2011 FH 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 >
+ *          Karl Burkhart 			< burkhart@technikum-wien.at >
+ */
+require_once('../../config/vilesci.config.inc.php');
+require_once('../../include/functions.inc.php');
+require_once('../../include/benutzerberechtigung.class.php');
+require_once('../../include/preincoming.class.php');
+require_once('../../include/person.class.php');
+require_once('../../include/adresse.class.php');
+require_once('../../include/kontakt.class.php');
+require_once('../../include/nation.class.php');
+require_once('../../include/studiengang.class.php');
+require_once('../../include/mobilitaetsprogramm.class.php');
+require_once('../../include/zweck.class.php');
+
+$user = get_uid();
+
+$rechte = new benutzerberechtigung();
+$rechte->getBerechtigungen($user);
+
+$datum_obj = new datum();
+$message='';
+echo '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+        "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+	<head>
+		<title>Incoming</title>
+		<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+		<link rel="stylesheet" href="../../skin/tablesort.css" type="text/css"/>
+		<link rel="stylesheet" href="../../skin/jquery.css" type="text/css"/>
+		<link rel="stylesheet" href="../../skin/fhcomplete.css" type="text/css">
+		<link rel="stylesheet" href="../../skin/vilesci.css" type="text/css">		
+		<script type="text/javascript" src="../../include/js/jquery.js"></script>
+				
+		<script type="text/javascript">
+	
+		$(document).ready(function() 
+			{ 
+			    $("#myTable").tablesorter(
+				{
+					sortList: [[2,0]],
+					widgets: ["zebra"]
+				}); 
+			} 
+		); 
+			
+	</script> 
+	</head>
+	<body>
+	';
+
+if(!$rechte->isBerechtigt('inout/incoming', null, 'suid'))
+	die('Sie haben keine Berechtigung fuer diese Seite');
+
+$preincoming_id = isset($_GET['preincoming_id'])?$_GET['preincoming_id']:null;
+$action = isset($_GET['action'])?$_GET['action']:'personendetails';
+$method = isset($_GET['method'])?$_GET['method']:null;
+
+if($preincoming_id=='')
+	exit;
+	
+if($method!='')
+{
+	switch($method)
+	{
+		case 'saveperson':
+			//Speichern der Personendetails
+			if(isset($_POST['person_id']) && isset($_POST['adresse_id']) && isset($_POST['kontakt_id']) &&
+			   isset($_POST['titelpre']) && isset($_POST['titelpost']) && isset($_POST['vorname']) &&
+			   isset($_POST['nachname']) && isset($_POST['anmerkung']) && isset($_POST['strasse']) &&
+			   isset($_POST['plz']) && isset($_POST['ort']) && isset($_POST['nation']) &&
+			   isset($_POST['email']) && isset($_POST['universitaet']) && isset($_POST['mobilitaetsprogramm']) &&
+			   isset($_POST['zweck']) && isset($_POST['von']) && isset($_POST['bis']))
+			{
+				$person_id = $_POST['person_id'];
+				$adresse_id = $_POST['adresse_id'];
+				$kontakt_id = $_POST['kontakt_id'];
+				$titelpre = $_POST['titelpre'];
+				$titelpost = $_POST['titelpost'];
+				$vorname = $_POST['vorname'];
+				$nachname = $_POST['nachname'];
+				$anmerkung = $_POST['anmerkung'];
+				$strasse = $_POST['strasse'];
+				$plz = $_POST['plz'];
+				$ort = $_POST['ort'];
+				$nation = $_POST['nation'];
+				$email = $_POST['email'];
+				$universitaet = $_POST['universitaet'];
+				$mobilitaetsprogramm = $_POST['mobilitaetsprogramm'];
+				$zweck = $_POST['zweck'];
+				$von = $_POST['von'];
+				$bis = $_POST['bis'];
+				$aktiv = isset($_POST['aktiv']);
+				
+				//Person
+				$person = new person();
+				if($person->load($person_id))
+				{
+					$person->titelpre = $titelpre;
+					$person->titelpost = $titelpost;
+					$person->nachname = $nachname;
+					$person->vorname = $vorname;
+					if(!$person->save(false))
+						$message.='<span class="error">'.$person->errormsg.'</span>';
+				}
+				//Adresse
+				$adresse = new adresse();
+				if($adresse_id=='')
+				{
+					$adresse->new = true;
+					$adresse->insertamum = date('Y-m-d H:i:s');
+					$adresse->insertvon = $user;
+					$adresse->heimatadresse = true;
+					$adresse->zustelladresse = true;
+				}
+				else
+				{
+					$adresse->load($adresse_id);
+					$adresse->new = false;
+				}
+					
+				$adresse->strasse = $strasse;
+				$adresse->plz = $plz;
+				$adresse->ort = $ort;
+				$adresse->nation = $nation;
+				$adresse->updateamum = date('Y-m-d H:i:s');
+				$adresse->updatevon = $user;
+				
+				if(!$adresse->save())
+					$message.='<span class="error">'.$adresse->errormsg.'</span>';
+				
+				//E-Mail
+				$kontakt = new kontakt();
+				
+				if($kontakt_id=='')
+				{
+					$kontakt->new = true;
+					$kontakt->insertamum = date('Y-m-d H:i:s');
+					$kontakt->insertvon = $user;
+					$kontakt->zustellung = true;
+				}
+				else
+				{
+					$kontakt->load($kontakt_id);
+					$kontakt->new = false;
+				}
+				
+				$kontakt->kontakt = $email;
+				$kontakt->kontakttyp = 'email';
+				$kontakt->updateamum = date('Y-m-d H:i:s');
+				$kontakt->updatevon = $user;
+				
+				if(!$kontakt->save())
+					$message.='<span class="error">'.$kontakt->errormsg.'</span>';
+				
+				//PreIncoming
+				$inc = new preincoming();
+				
+				if($inc->load($preincoming_id))
+				{
+					$inc->mobilitaetsprogramm_code = $mobilitaetsprogramm;
+					$inc->zweck_code = $zweck;
+					$inc->universitaet = $universitaet;
+					$inc->anmerkung = $anmerkung;
+					$inc->aktiv = $aktiv;
+					$inc->von = $datum_obj->formatDatum($von);
+					$inc->bis = $datum_obj->formatDatum($bis);
+					$inc->updateamum = date('Y-m-d H:i:s');
+					$inc->updatevon = $user;
+					$inc->new = false;
+					
+					if(!$inc->save())
+						$message.='<span class="error">'.$inc->errormsg.'</span>';
+				}
+				else
+					$message.='<span class="error">'.$inc->errormsg.'</span>';
+			}
+			if($message=='')
+				$message.='<span class="ok">Daten wurden gespeichert</span>';
+			break;
+		case 'fasuebernahme':
+			//Uebernahme eines PreIncoming ins FAS
+			$message.= 'Diese Funktion ist noch nicht implemenetiert';
+			break;
+		default:
+			break;
+	}
+}
+$inc = new preincoming();
+if(!$inc->load($preincoming_id))
+	$message.= '<span class="error">'.$inc->errormsg.'</span>';
+$person = new person();
+if(!$person->load($inc->person_id))
+	$message.='<span class="error">'.$person->errormsg.'</span>';
+
+echo '<h2>Details - '.$person->vorname.' '.$person->nachname.'</h2>';
+
+print_menu('Personendetails', 'personendetails');
+echo ' | ';
+print_menu('Dokumente', 'dokumente');
+echo ' | ';
+print_menu('Lehrveranstaltungen', 'lehrveranstaltungen');
+echo '<div style="float:right">'.$message.'</div>';
+echo '<br />';
+switch($action)
+{
+	case 'personendetails':
+		print_personendetails();
+		break;
+	case 'dokumente':
+		print_dokumente();
+		break;
+	case 'lehrveranstaltungen':
+		print_lehrveranstaltungen();
+		break;
+	default:
+		break;
+}
+echo '</body>';
+echo '</html>';
+
+/*********** FUNKTIONEN *********************/
+/**
+ * Erstellt einen MenuLink
+ * @param $name Name des Links
+ * @param $value Action
+ */
+function print_menu($name, $value)
+{
+	global $action, $preincoming_id;
+	if($value==$action)
+		$name = '<b>'.$name.'</b>';
+	echo '<a href="'.$_SERVER['PHP_SELF'].'?action='.$value.'&amp;preincoming_id='.$preincoming_id.'">'.$name.'</a>';
+}
+
+/**
+ * Erstellt den Tab zur Anzeige der Personendetails
+ */
+function print_personendetails()
+{
+	global $person, $inc, $preincoming_id, $datum_obj;
+	
+	$adresse = new adresse();
+	$adresse->load_pers($person->person_id);
+	if(isset($adresse->result[0]))
+		$adresse = $adresse->result[0];
+		
+	$kontakt = new kontakt();
+	$kontakt->load_pers($person->person_id);
+	if(isset($kontakt->result[0]))
+		$kontakt = $kontakt->result[0];
+	
+	echo '<fieldset>';
+	echo '<form action="'.$_SERVER['PHP_SELF'].'?action=personendetails&method=saveperson&preincoming_id='.$preincoming_id.'" method="POST">';
+	echo '<input type="hidden" name="person_id" value="'.$person->person_id.'">';
+	echo '<input type="hidden" name="adresse_id" value="'.$adresse->adresse_id.'">';
+	echo '<input type="hidden" name="kontakt_id" value="'.$kontakt->kontakt_id.'">';
+	echo '<table>
+			<tr>
+				<td>TitelPre</td>
+				<td><input type="text" name="titelpre" size="10" value="'.$person->titelpre.'"></td>
+				<td></td>
+				<td>Strasse</td>
+				<td colspan="3"><input type="text" name="strasse" size="50" value="'.$adresse->strasse.'"></td>
+			</tr>
+			<tr>
+				<td>Vorname</td>
+				<td><input type="text" name="vorname" size="30" value="'.$person->vorname.'"></td>
+				<td></td>
+				<td>Plz / Ort</td>
+				<td colspan="3">
+					<input type="text" size="5" name="plz" value="'.$adresse->plz.'">
+					<input type="text" name="ort" size="40" value="'.$adresse->ort.'">
+				</td>
+			</tr>
+			<tr>
+				<td>Nachname</td>
+				<td><input type="text" name="nachname" size="30" value="'.$person->nachname.'"></td>
+				<td></td>
+				<td>Nation</td>
+				<td colspan="3">
+					<SELECT name="nation">
+					<OPTION value="">-- keine Auswahl --</OPTION>
+					';
+	$nation = new nation();
+	$nation->getAll();
+	foreach($nation->nation as $row)
+	{
+		if($adresse->nation==$row->code)
+			$selected='selected';
+		else
+			$selected='';
+		
+		echo '<OPTION value="'.$row->code.'" '.$selected.'>'.$row->kurztext.'</OPTION>';
+	}
+	echo '
+					</SELECT>
+				</td>
+			</tr>
+			<tr>
+				<td>TitelPost</td>
+				<td><input type="text" name="titelpost" size="10" value="'.$person->titelpost.'"></td>
+				<td></td>
+				<td>E-Mail</td>
+				<td colspan="3"><input type="text" name="email" size="50" value="'.$kontakt->kontakt.'"></td>
+			</tr>
+			<tr>
+				<td>Anmerkungen</td>
+				<td colspan="6"><textarea name="anmerkung" rows="4" cols="65">'.$inc->anmerkung.'</textarea></td>
+			</tr>
+			<tr>
+				<td>&nbsp;</td>
+				<td></td>
+				<td></td>
+				<td></td>
+				<td></td>
+			</tr>
+			<tr>
+				<td>Universität</td>
+				<td colspan="4"><input type="text" name="universitaet" size="50" value="'.$inc->universitaet.'"></td>
+								
+				<td>Aktiv</td>
+				<td><input type="checkbox" name="aktiv" '.($inc->aktiv?'checked':'').'></td>
+			</tr>
+			<tr>
+				<td>Mobilitätsprogramm</td>
+				<td><SELECT name="mobilitaetsprogramm">
+						<OPTION value="">-- keine Auswahl --</OPTION>';
+
+	$mob = new mobilitaetsprogramm();
+	$mob->getAll();
+	
+	foreach($mob->result as $row)
+	{
+		if($row->mobilitaetsprogramm_code==$inc->mobilitaetsprogramm_code)
+			$selected='selected';
+		else
+			$selected='';
+		
+		echo '<OPTION value="'.$row->mobilitaetsprogramm_code.'" '.$selected.'>'.$row->kurzbz.'</OPTION>';
+	}
+	echo '</SELECT>
+				</td>
+				<td></td>
+				<td>Von</td>
+				<td>
+					<input type="text" id="von" size="10" name="von" value="'.$datum_obj->formatDatum($inc->von,'d.m.Y').'">
+					<script type="text/javascript">
+					$(document).ready(function() 
+					{ 
+					    $( "#von" ).datepicker($.datepicker.regional["de"]);
+					});
+					</script>								
+				</td>
+				<td>Zugangscode:</td>
+				<td><b>'.$person->zugangscode.'</b></td>
+			</tr>
+			<tr>
+				<td>Zweck</td>
+				<td><SELECT name="zweck">
+						<OPTION value="">-- keine Auswahl --</OPTION>';
+	
+	$zweck = new zweck();
+	$zweck->getAll();
+	
+	foreach($zweck->result as $row)
+	{
+		if($row->zweck_code==$inc->zweck_code)
+			$selected='selected';
+		else
+			$selected='';
+		
+		echo '<OPTION value="'.$row->zweck_code.'" '.$selected.'>'.$row->bezeichnung.'</OPTION>';
+	}
+	
+	echo '</SELECT>
+				</td>
+				<td></td>
+				<td>Bis</td>
+				<td>
+					<input type="text" name="bis" id="bis" size="10" value="'.$datum_obj->formatDatum($inc->bis,'d.m.Y').'">
+					<script type="text/javascript">
+					$(document).ready(function() 
+					{ 
+					    $( "#bis" ).datepicker($.datepicker.regional["de"]);
+					});
+					</script>		
+				</td>
+				
+				<td></td>
+				<td><input type="submit" name="save" value="Speichern"></td>
+			</tr>
+		</table>
+			';
+	echo '</form>';
+	echo '</fieldset>';
+	echo '
+	<fieldset>
+		<legend>Übernahme ins FAS</legend>';
+	if($inc->uebernommen)
+	{
+		echo 'Diese Person wurde bereits ins FAS übernommen';
+	}
+	else
+	{
+		echo '<form action="'.$_SERVER['PHP_SELF'].'?action=personendetails&amp;method=fasuebernahme&amp;preincoming_id='.$preincoming_id.'" method="POST">';
+		echo '<SELECT name="studiengang_kz">';
+		$stg = new studiengang();
+		$stg->getAll('typ, kurzbz');
+		
+		foreach($stg->result as $row)
+		{
+			echo '<OPTION value="'.$row->studiengang_kz.'">'.$row->kuerzel.' ('.$row->kurzbzlang.') '.$row->bezeichnung.'</OPTION>';
+		}
+		echo '</SELECT>';
+		echo ' <input type="submit" name="uebernahme" value="Übernehmen">';
+		echo '</form>';
+	}		
+	echo '</fieldset>';
+	
+}
+
+function print_dokumente()
+{
+	echo 'Dokumente';
+}
+
+function print_lehrveranstaltungen()
+{
+	echo 'Lehrveranstaltungen';
+}
+
+?>
\ No newline at end of file
diff --git a/vilesci/personen/incoming_frameset.php b/vilesci/personen/incoming_frameset.php
new file mode 100644
index 000000000..5930677e9
--- /dev/null
+++ b/vilesci/personen/incoming_frameset.php
@@ -0,0 +1,21 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Frameset//EN">
+<html lang="de_AT">
+
+<head>
+	<title>Incoming</title>
+	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+	<link rel="stylesheet" href="../../skin/fhcomplete.css" type="text/css" />
+	<link rel="stylesheet" href="../../skin/vilesci.css" type="text/css" />
+</head>
+
+<frameset rows="250,*">
+  	<frame src="incoming_uebersicht.php" name="incoming_uebersicht" frameborder="0" />
+  	<frame src="incoming_detail.php" name="incoming_detail" frameborder="0" />
+	<noframes>
+		<body bgcolor="#FFFFFF">
+			This application works only with a frames-enabled browser.<br />
+		</body>
+	</noframes>
+</frameset>
+
+</html>
\ No newline at end of file
diff --git a/vilesci/personen/incoming_uebersicht.php b/vilesci/personen/incoming_uebersicht.php
new file mode 100644
index 000000000..fc2221813
--- /dev/null
+++ b/vilesci/personen/incoming_uebersicht.php
@@ -0,0 +1,196 @@
+<?php
+/* Copyright (C) 2011 FH 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 >
+ *          Karl Burkhart 			< burkhart@technikum-wien.at >
+ */
+require_once('../../config/vilesci.config.inc.php');
+require_once('../../include/functions.inc.php');
+require_once('../../include/benutzerberechtigung.class.php');
+require_once('../../include/preincoming.class.php');
+
+$user = get_uid();
+
+$rechte = new benutzerberechtigung();
+$rechte->getBerechtigungen($user);
+
+$datum_obj = new datum();
+$message='';
+echo '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+        "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+	<head>
+		<title>Incoming</title>
+		<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+		<link rel="stylesheet" href="../../skin/tablesort.css" type="text/css"/>
+		<link rel="stylesheet" href="../../skin/jquery.css" type="text/css"/>
+		<link rel="stylesheet" href="../../skin/fhcomplete.css" type="text/css">
+		<link rel="stylesheet" href="../../skin/vilesci.css" type="text/css">
+		<script type="text/javascript" src="../../include/js/jquery.js"></script>
+		<script type="text/javascript">
+	
+		$(document).ready(function() 
+			{ 
+			    $("#myTable").tablesorter(
+				{
+					sortList: [[2,0]],
+					widgets: ["zebra"]
+				}); 
+			} 
+		); 
+			
+	</script> 
+	</head>
+	<body>
+	<h2>Incoming Verwaltung</h2>
+	';
+
+if(!$rechte->isBerechtigt('inout/incoming', null, 'suid'))
+	die('Sie haben keine Berechtigung fuer diese Seite');
+
+$filter = isset($_POST['filter'])?$_POST['filter']:null;
+$von = isset($_POST['von'])?$_POST['von']:null;
+$bis = isset($_POST['bis'])?$_POST['bis']:null;
+
+if(isset($_POST['aktiv']))
+{
+	switch($_POST['aktiv'])
+	{
+		case 'true': 
+			$aktiv=true; 
+			break;
+		case 'false': 
+			$aktiv=false; 
+			break;
+		default: 
+			$aktiv=null; 
+			break;
+	}
+}
+else
+	$aktiv=true;
+
+if(isset($_POST['uebernommen']))
+{
+	switch($_POST['uebernommen'])
+	{
+		case 'true': 
+			$uebernommen=true; 
+			break;
+		case 'false': 
+			$uebernommen=false; 
+			break;
+		default: 
+			$uebernommen=null; 
+			break;
+	}
+}
+else
+	$uebernommen=false;
+	
+//Suchfilter
+echo '
+<form action="'.$_SERVER['PHP_SELF'].'" method="POST">
+	<input type="hidden" name="action" value="search">
+	<table>
+		<tr>
+			<td>Aktiv</td>
+			<td>
+				<SELECT name="aktiv">
+					<OPTION value="">-</OPTION>
+					<OPTION value="true" '.($aktiv===true?'selected':'').'>Ja</OPTION>
+					<OPTION value="false" '.($aktiv===false?'selected':'').'>Nein</OPTION>
+				</SELECT>
+			</td>
+			<td>Übernommen</td>
+			<td>
+				<SELECT name="uebernommen">
+					<OPTION value="">-</OPTION>
+					<OPTION value="true" '.($uebernommen===true?'selected':'').'>Ja</OPTION>
+					<OPTION value="false" '.($uebernommen===false?'selected':'').'>Nein</OPTION>
+				</SELECT>
+			</td>
+			<td>Von</td>
+			<td>
+				<input type="text" size="10" id="von" name="von" value="'.$von.'">
+				<script type="text/javascript">
+					$(document).ready(function() 
+					{ 
+					    $( "#von" ).datepicker($.datepicker.regional["de"]);
+					});
+				</script>
+			</td>
+			<td>Bis</td>
+			<td>
+				<input type="text" size="10" name="bis" id="bis" value="'.$bis.'">
+				<script type="text/javascript">
+					$(document).ready(function() 
+					{ 
+					    $( "#bis" ).datepicker($.datepicker.regional["de"]);
+					});
+				</script>
+			</td>
+			<td>Name</td>
+			<td><input type="text" name="filter" value="'.$filter.'"></td>
+			<td><input type="submit" value="Anzeigen"/></td>
+		</tr>
+	</table>
+</form>
+';
+if($von!='')
+	$von = $datum_obj->formatDatum($von);
+if($bis!='')
+	$bis = $datum_obj->formatDatum($bis);
+
+$inc = new preincoming();
+if(!$inc->getPreincoming($filter, $aktiv, $von, $bis, $uebernommen))
+	$message = '<span class="error">'.$inc->errormsg.'</span>';
+	
+echo $message;
+echo '
+<table id="myTable" class="tablesorter">
+	<thead>
+		<tr>
+			<th>ID</th>
+			<th>Vorname</th>
+			<th>Nachname</th>
+			<th>Von</th>
+			<th>Bis</th>
+			<th></th>
+		</tr>
+	</thead>
+	<tbody>';
+foreach($inc->result as $row)
+{
+	echo "\n";
+	echo '<tr>';
+	echo '<td>'.$row->preincoming_id.'</td>';
+	echo '<td>'.$row->vorname.'</td>';
+	echo '<td>'.$row->nachname.'</td>';
+	echo '<td>'.$row->von.'</td>';
+	echo '<td>'.$row->bis.'</td>';
+	echo '<td><a href="incoming_detail.php?preincoming_id='.$row->preincoming_id.'" target="incoming_detail">Details</a></td>';
+	echo '</tr>';
+}
+echo '
+	</tbody>
+</table>';
+
+echo '</body>';
+echo '</html>';
+?>
\ No newline at end of file