From 12b5b26f98f627d3db34903ea9a4ce37ca1ec49e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Tue, 6 Oct 2009 09:15:00 +0000
Subject: [PATCH] =?UTF-8?q?-=20Prestudent-Filter=20korrigiert=20-=20Organi?=
 =?UTF-8?q?sationseinheiten=20=C3=9Cbersicht=20zeigt=20nur=20noch=20aktive?=
 =?UTF-8?q?=20OEs=20an?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 include/prestudent.class.php                  |  6 +++-
 vilesci/stammdaten/organisationseinheiten.php | 30 +++++++++++--------
 2 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/include/prestudent.class.php b/include/prestudent.class.php
index 1862e6c27..828fc94f7 100644
--- a/include/prestudent.class.php
+++ b/include/prestudent.class.php
@@ -468,13 +468,17 @@ class prestudent extends person
 	 */
 	public function loadIntessentenUndBewerber($studiensemester_kurzbz, $studiengang_kz, $semester=nulll, $typ=null, $orgform=null)
 	{
+		$stsemqry='';
+		if(!is_null($studiensemester_kurzbz) && $studiensemester_kurzbz!='')
+			$stsemqry=" AND studiensemester_kurzbz='".addslashes($studiensemester_kurzbz)."'";
+		
 		$qry = "SELECT 
 					*, a.anmerkung, tbl_person.anmerkung as anmerkungen 
 				FROM 
 					(
 						SELECT 
 							*, (SELECT status_kurzbz FROM tbl_prestudentstatus 
-							    WHERE prestudent_id=prestudent.prestudent_id 
+							    WHERE prestudent_id=prestudent.prestudent_id $stsemqry
 							    ORDER BY datum DESC, insertamum DESC, ext_id DESC LIMIT 1) AS rolle 
 						FROM tbl_prestudent prestudent ORDER BY prestudent_id
 					) a, tbl_prestudentstatus, tbl_person
diff --git a/vilesci/stammdaten/organisationseinheiten.php b/vilesci/stammdaten/organisationseinheiten.php
index 226b9ffec..e8d7b3315 100644
--- a/vilesci/stammdaten/organisationseinheiten.php
+++ b/vilesci/stammdaten/organisationseinheiten.php
@@ -111,24 +111,28 @@ function displayh($arr)
 			$style = 'style="border: 1px solid gray; font-weight:bold; padding-right: 10px;padding-left: 10px; margin:0;"';
 		else 
 			$style = 'style="padding-left: 10px;padding-right: 10px;"';
-			
-		echo '<tr><td valign="center" '.$style.'>';
-	
+		
 		$obj = new organisationseinheit();
 		$obj->load($key);
 		
-		if($obj->organisationseinheittyp_kurzbz=='Institut')
-			echo $obj->oe_kurzbz;
-		else
-			echo $obj->bezeichnung;
-		echo '</td>';	
-		$style = 'style="border: 1px solid gray; font-weight:bold; padding: 0px; margin:0;"';
-		echo '<td valign="center" '.$style.'>';
+		if($obj->aktiv)
+		{	
+			echo '<tr><td valign="center" '.$style.'>';
 		
-		if(is_array($val) && count($val)>0)
-			displayh($val);
+			echo $obj->organisationseinheittyp_kurzbz.' - ';
+			if($obj->organisationseinheittyp_kurzbz=='Institut')
+				echo $obj->oe_kurzbz;
+			else
+				echo $obj->bezeichnung;
+			echo '</td>';	
+			$style = 'style="border: 1px solid gray; font-weight:bold; padding: 0px; margin:0;"';
+			echo '<td valign="center" '.$style.'>';
 			
-		echo '</td></tr>';
+			if(is_array($val) && count($val)>0)
+				displayh($val);
+				
+			echo '</td></tr>';
+		}
 	}
 	echo '</table>';
 }