diff --git a/include/preoutgoing.class.php b/include/preoutgoing.class.php
index 8e84dc6d8..8b10b4a8e 100755
--- a/include/preoutgoing.class.php
+++ b/include/preoutgoing.class.php
@@ -47,6 +47,9 @@ class preoutgoing extends basis_db
     public $praktikum_bis;          // date
     public $behinderungszuschuss;   // boolean
     public $studienbeihilfe;        // boolean
+    public $anmerkung_student;      // text
+    public $anmerkung_admin;        // text
+    public $studienrichtung_gastuniversitaet; // varchar(64)
     public $insertamum;             // timestamp
     public $insertvon;              // uid
     public $updateamum;             // timestamp
@@ -63,7 +66,7 @@ class preoutgoing extends basis_db
     /* Tabellenspalten tbl_preoutgoing_status */
     public $stati = array();                    // preoutgoing objekte
     public $status_id;                          // serial
-    public $proutgoing_status_kurzbz;           // varchar(32)
+    public $preoutgoing_status_kurzbz;           // varchar(32)
     // public $bezeichnung;                     // varchar(256)
     // public $preoutgoing_id;                  // integer
     public $datum;                              // date
@@ -132,6 +135,9 @@ class preoutgoing extends basis_db
             $this->praktikum_bis = $row->praktikum_bis; 
             $this->behinderungszuschuss = $this->db_parse_bool($row->behinderungszuschuss);
             $this->studienbeihilfe = $this->db_parse_bool($row->studienbeihilfe);
+            $this->anmerkung_student = $row->anmerkung_student; 
+            $this->anmerkung_admin = $row->anmerkung_admin; 
+            $this->studienrichtung_gastuniversitaet = $row->studienrichtung_gastuniversitaet; 
             $this->insertamum = $row->insertamum; 
             $this->insertvon = $row->insertvon; 
             $this->updateamum = $row->updateamum; 
@@ -179,6 +185,9 @@ class preoutgoing extends basis_db
             $preoutgoing->praktikum_bis = $row->praktikum_bis; 
             $preoutgoing->behinderungszuschuss = $this->db_parse_bool($row->behinderungszuschuss);
             $preoutgoing->studienbeihilfe = $this->db_parse_bool($row->studienbeihilfe);
+            $preoutgoing->anmerkung_student = $row->anmerkung_student; 
+            $preoutgoing->anmerkung_admin = $row->anmerkung_admin; 
+            $preoutgoing->studienrichtung_gastuniversitaet = $row->studienrichtung_gastuniversitaet; 
             $preoutgoing->insertamum = $row->insertamum; 
             $preoutgoing->insertvon = $row->insertvon; 
             $preoutgoing->updateamum = $row->updateamum; 
@@ -233,6 +242,9 @@ class preoutgoing extends basis_db
             $this->praktikum_bis = $row->praktikum_bis; 
             $this->behinderungszuschuss = $this->db_parse_bool($row->behinderungszuschuss);
             $this->studienbeihilfe = $this->db_parse_bool($row->studienbeihilfe);
+            $this->anmerkung_student = $row->anmerkung_student; 
+            $this->anmerkung_admin = $row->anmerkung_admin; 
+            $this->studienrichtung_gastuniversitaet = $row->studienrichtung_gastuniversitaet; 
             $this->insertamum = $row->insertamum; 
             $this->insertvon = $row->insertvon; 
             $this->updateamum = $row->updateamum; 
@@ -257,7 +269,7 @@ class preoutgoing extends basis_db
 			//Neuen Datensatz einfuegen
 			$qry='BEGIN;INSERT INTO public.tbl_preoutgoing (uid, dauer_von, dauer_bis, ansprechperson, bachelorarbeit, masterarbeit,
                 betreuer, sprachkurs, intensivsprachkurs, sprachkurs_von, sprachkurs_bis, praktikum, praktikum_von, praktikum_bis, behinderungszuschuss,
-                studienbeihilfe, insertamum, insertvon, updateamum, updatevon)
+                studienbeihilfe, anmerkung_student, anmerkung_admin, studienrichtung_gastuniversitaet, insertamum, insertvon, updateamum, updatevon)
 				  VALUES('.
                 $this->db_add_param($this->uid).', '.
                 $this->db_add_param($this->dauer_von).', '.
@@ -275,6 +287,9 @@ class preoutgoing extends basis_db
                 $this->db_add_param($this->praktikum_bis).', '.
                 $this->db_add_param($this->behinderungszuschuss, FHC_BOOLEAN).', '.
                 $this->db_add_param($this->studienbeihilfe, FHC_BOOLEAN).', '.
+                $this->db_add_param($this->anmerkung_student).', '.
+                $this->db_add_param($this->anmerkung_admin).', '.
+                $this->db_add_param($this->studienrichtung_gastuniversitaet).', '.
                 ' now(), '.
                 $this->db_add_param($this->insertamum).' , '.
                 ' now(), '.
@@ -300,6 +315,9 @@ class preoutgoing extends basis_db
 		      	' praktikum_bis='.$this->db_add_param($this->praktikum_bis).', '.
 				' behinderungszuschuss='.$this->db_add_param($this->behinderungszuschuss, FHC_BOOLEAN).', '.
 				' studienbeihilfe='.$this->db_add_param($this->studienbeihilfe, FHC_BOOLEAN).', '.
+                ' anmerkung_student='.$this->db_add_param($this->anmerkung_student).', '.
+                ' anmerkung_admin='.$this->db_add_param($this->anmerkung_admin).', '.
+                ' studienrichtung_gastuniversitaet='.$this->db_add_param($this->studienrichtung_gastuniversitaet).', '.
 				' updateamum= now(), '.
 				' updatevon='.$this->db_add_param($this->updatevon).' 
                 WHERE preoutgoing_id = '.$this->db_add_param($this->preoutgoing_id, FHC_INTEGER).';';
@@ -591,7 +609,11 @@ class preoutgoing extends basis_db
         
     }
     
-    
+    /**
+     * Lädt eine firma mit übergebener firma_id vom outgoing
+     * @param type $preoutgoing_firma_id
+     * @return boolean 
+     */
     public function loadFirma($preoutgoing_firma_id)
     {
         $qry='SELECT * FROM public.tbl_preoutgoing_firma WHERE preoutgoing_firma_id = '.$this->db_add_param($preoutgoing_firma_id, FHC_INTEGER).';';
@@ -835,6 +857,182 @@ class preoutgoing extends basis_db
 			return false;
 		}
 	}
+    
+    /**
+     * Liefert Alle Stati eines Outgoings zurück
+     * @param type $preoutgoing_id
+     * @return boolean 
+     */
+    public function getAllStatus($preoutgoing_id)
+    {
+        $qry = "SELECT * FROM public.tbl_preoutgoing_preoutgoing_status 
+				WHERE 
+					preoutgoing_id=".$this->db_add_param($preoutgoing_id, FHC_INTEGER);
+        
+        if($result = $this->db_query($qry))
+        {
+            while($row = $this->db_fetch_object($result))
+            {
+                $out = new preoutgoing(); 
+                $out->status_id = $row->status_id; 
+                $out->preoutgoing_status_kurzbz = $row->preoutgoing_status_kurzbz; 
+                $out->preoutgoing_id = $row->preoutgoing_id; 
+                $out->datum = $row->datum; 
+                $out->insertamum = $row->insertamum; 
+                $out->insertvon = $row->insertvon; 
+                $out->updateamum = $row->updateamum; 
+                $out->updatevon = $row-> updatevon; 
+                
+                $this->stati[]=$out; 
+            }
+            return true; 
+        }
+        else
+        {
+            $this->errormsg = "Fehler bei der Abfrage aufgetreten";
+            return false; 
+        }
+    }
+    
+    /**
+     * Liefert Outgoings anhand bestimmter Kriterien zurück
+     * 
+     * @param $name
+     * @param $von
+     * @param $bis
+     * @param $status
+     * @return boolean 
+     */
+    public function getOutgoingFilter($name ='', $von ='', $bis='', $status='')
+    {
+        $qry ="SELECT distinct(pre.preoutgoing_id), person.vorname, person.nachname, pre.* FROM public.tbl_preoutgoing pre 
+                JOIN public.tbl_preoutgoing_preoutgoing_status status USING(preoutgoing_id) 
+                JOIN public.tbl_benutzer benutzer USING(uid)
+                JOIN public.tbl_person person USING(person_id)
+                WHERE (vorname LIKE '%".$name."%' OR nachname LIKE'%".$name."%')";
+        
+        if($von != '')
+            $qry.=" AND pre.dauer_von >=".$this->db_add_param($von, FHC_STRING);
+        
+        if($bis != '')
+            $qry.= " AND pre.dauer_bis <=".$this->db_add_param ($bis, FHC_STRING);
+        
+        if($status != '')
+            $qry.= "AND status.preoutgoing_status_kurzbz =".$this->db_add_param ($status, FHC_STRING);      
+        
+        if(!$this->db_query($qry))
+		{
+			$this->errormsg = 'Fehler bei einer Datenbankabfrage';
+			return false;
+		}
+
+		while($row = $this->db_fetch_object())
+		{
+            $preoutgoing= new preoutgoing();
+            
+            $preoutgoing->preoutgoing_id = $row->preoutgoing_id;
+            $preoutgoing->uid = $row->uid;
+            $preoutgoing->dauer_von = $row->dauer_von;
+            $preoutgoing->dauer_bis = $row->dauer_bis;
+            $preoutgoing->ansprechperson = $row->ansprechperson; 
+            $preoutgoing->bachelorarbeit = $this->db_parse_bool($row->bachelorarbeit);
+            $preoutgoing->masterarbeit = $this->db_parse_bool($row->masterarbeit);
+            $preoutgoing->betreuer = $row->betreuer; 
+            $preoutgoing->sprachkurs = $this->db_parse_bool($row->sprachkurs); 
+            $preoutgoing->intensivsprachkurs = $this->db_parse_bool($row->intensivsprachkurs); 
+            $preoutgoing->sprachkurs_von = $row->sprachkurs_von; 
+            $preoutgoing->sprachkurs_bis = $row->sprachkurs_bis; 
+            $preoutgoing->praktikum = $this->db_parse_bool($row->praktikum); 
+            $preoutgoing->praktikum_von = $row->praktikum_von; 
+            $preoutgoing->praktikum_bis = $row->praktikum_bis; 
+            $preoutgoing->behinderungszuschuss = $this->db_parse_bool($row->behinderungszuschuss);
+            $preoutgoing->studienbeihilfe = $this->db_parse_bool($row->studienbeihilfe);
+            $preoutgoing->anmerkung_student = $row->anmerkung_student; 
+            $preoutgoing->anmerkung_admin = $row->anmerkung_admin; 
+            $preoutgoing->studienrichtung_gastuniversitaet = $row->studienrichtung_gastuniversitaet; 
+            $preoutgoing->insertamum = $row->insertamum; 
+            $preoutgoing->insertvon = $row->insertvon; 
+            $preoutgoing->updateamum = $row->updateamum; 
+            $preoutgoing->updatevon = $row->updatevon; 
+            
+            $this->result[] = $preoutgoing; 
+		}       
+        return true; 
+    }
+    
+    /**
+     * Liefert alle Status_kurzbz zurück
+     * @return boolean 
+     */
+    public function getAllStatiKurzbz()
+    {
+        $qry = "SELECT * FROM public.tbl_preoutgoing_status";
+        
+        if(!$this->db_query($qry))
+        {
+            $this->errormsg = 'Fehler bei der Abfrage aufgetreten';
+            return false; 
+        }
+        
+        while($row= $this->db_fetch_object())
+        {
+            $preoutgoing = new preoutgoing(); 
+            $preoutgoing->preoutgoing_status_kurzbz = $row->preoutgoing_status_kurzbz; 
+            $preoutgoing->bezeichnung = $row->bezeichnung; 
+            
+            $this->stati[] = $preoutgoing; 
+        }
+        return true; 
+    }
+    
+    
+    /**
+     * Liefert alle Aktuell im Ausland befindlichen Outgoings zurück
+     * @return boolean 
+     */
+    public function getAktuellOutgoing()
+    {
+        $qry = "SELECT * FROM public.tbl_preoutgoing WHERE dauer_von < CURRENT_DATE AND dauer_bis > CURRENT_DATE;";
+        
+        if(!$this->db_query($qry))
+        {
+            $this->errormsg = 'Fehler bei der Abfrage aufgetreten';
+            return false; 
+        }
+        
+        while($row = $this->db_fetch_object())
+        {
+            $preoutgoing= new preoutgoing();
+            
+            $preoutgoing->preoutgoing_id = $row->preoutgoing_id;
+            $preoutgoing->uid = $row->uid;
+            $preoutgoing->dauer_von = $row->dauer_von;
+            $preoutgoing->dauer_bis = $row->dauer_bis;
+            $preoutgoing->ansprechperson = $row->ansprechperson; 
+            $preoutgoing->bachelorarbeit = $this->db_parse_bool($row->bachelorarbeit);
+            $preoutgoing->masterarbeit = $this->db_parse_bool($row->masterarbeit);
+            $preoutgoing->betreuer = $row->betreuer; 
+            $preoutgoing->sprachkurs = $this->db_parse_bool($row->sprachkurs); 
+            $preoutgoing->intensivsprachkurs = $this->db_parse_bool($row->intensivsprachkurs); 
+            $preoutgoing->sprachkurs_von = $row->sprachkurs_von; 
+            $preoutgoing->sprachkurs_bis = $row->sprachkurs_bis; 
+            $preoutgoing->praktikum = $this->db_parse_bool($row->praktikum); 
+            $preoutgoing->praktikum_von = $row->praktikum_von; 
+            $preoutgoing->praktikum_bis = $row->praktikum_bis; 
+            $preoutgoing->behinderungszuschuss = $this->db_parse_bool($row->behinderungszuschuss);
+            $preoutgoing->studienbeihilfe = $this->db_parse_bool($row->studienbeihilfe);
+            $preoutgoing->anmerkung_student = $row->anmerkung_student; 
+            $preoutgoing->anmerkung_admin = $row->anmerkung_admin; 
+            $preoutgoing->studienrichtung_gastuniversitaet = $row->studienrichtung_gastuniversitaet; 
+            $preoutgoing->insertamum = $row->insertamum; 
+            $preoutgoing->insertvon = $row->insertvon; 
+            $preoutgoing->updateamum = $row->updateamum; 
+            $preoutgoing->updatevon = $row->updatevon; 
+            
+            $this->result[] = $preoutgoing; 
+        }       
+        return true; 
+    }
 		
 
 }