From 2bcee938936708748a72eda6c4f5e440c911fd59 Mon Sep 17 00:00:00 2001
From: Christian Paminger <pam@technikum-wien.at>
Date: Tue, 24 Apr 2007 12:28:16 +0000
Subject: [PATCH]

---
 admin/mlists/mlists_create.php              |  4 ++--
 cis/private/lehre/anwesenheitsliste.pdf.php |  5 ++---
 cis/private/lehre/notenliste.xls.php        |  2 +-
 cis/private/pers_in_grp.php                 |  4 ++--
 skin/cis.css                                | 12 ++++++++++++
 5 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/admin/mlists/mlists_create.php b/admin/mlists/mlists_create.php
index 03b0ead18..1b4dff59e 100644
--- a/admin/mlists/mlists_create.php
+++ b/admin/mlists/mlists_create.php
@@ -46,7 +46,7 @@
 				       'FROM campus.vw_benutzer, public.tbl_benutzergruppe '.
 				       'WHERE vw_benutzer.uid=tbl_benutzergruppe.uid AND '.
 				       "UPPER(gruppe_kurzbz)=UPPER('$mg_kurzbz') AND tbl_benutzergruppe.uid NOT LIKE '\\\\_%' ".
-					   'ORDER BY nachname';
+					   'AND studiensemester_kurzbz IS NULL ORDER BY nachname';
 			//echo $sql_query;
 			if(!($result_person=pg_query($conn, $sql_query)))
 				die(pg_errormessage($conn));
@@ -106,4 +106,4 @@
   Lists</A>).</P>
 <P><A href="index.html" class="linkblue">&lt;&lt; Zur&uuml;ck</A></P>
 </BODY>
-</HTML>
\ No newline at end of file
+</HTML>
diff --git a/cis/private/lehre/anwesenheitsliste.pdf.php b/cis/private/lehre/anwesenheitsliste.pdf.php
index 7edb2a6d9..e8ce9f0e1 100644
--- a/cis/private/lehre/anwesenheitsliste.pdf.php
+++ b/cis/private/lehre/anwesenheitsliste.pdf.php
@@ -40,7 +40,6 @@
    }
    else 
    		$stg='';
-   
    if(isset($_GET['sem'])) //Semester
    {
    	  if(is_numeric($_GET['sem']))
@@ -276,7 +275,7 @@ $pdf->SetFont('Arial','',8);
 //$result = $stud->getStudents($einheit,$gruppe,$verband,$sem,$stg);
 $qry = 'SELECT distinct vorname, nachname, uid, matrikelnr, verband, gruppe, semester FROM ';
 if($gruppe_kurzbz!='')
-	$qry .= "campus.vw_student JOIN public.tbl_benutzergruppe USING(uid) WHERE gruppe_kurzbz='".addslashes($gruppe_kurzbz)."'";
+	$qry .= "campus.vw_student JOIN public.tbl_benutzergruppe USING(uid) WHERE studiensemester_kurzbz IS NULL AND gruppe_kurzbz='".addslashes($gruppe_kurzbz)."'";
 else 
 {
 	$qry .= "campus.vw_student WHERE studiengang_kz='$stg' AND semester='$sem'";
@@ -395,4 +394,4 @@ $pdf->MultiCell(520,$lineheight,'Fehlt ein Student l
 
 
 $pdf->Output('anwesenheitsliste.pdf','I');
-?>
\ No newline at end of file
+?>
diff --git a/cis/private/lehre/notenliste.xls.php b/cis/private/lehre/notenliste.xls.php
index f0da20dd6..d1ed088d7 100644
--- a/cis/private/lehre/notenliste.xls.php
+++ b/cis/private/lehre/notenliste.xls.php
@@ -125,7 +125,7 @@ if (!$conn = pg_pconnect(CONN_STRING))
 	
 	$qry = 'SELECT distinct vorname, nachname, uid, matrikelnr, verband, gruppe, semester FROM ';
 	if($gruppe_kurzbz!='')
-		$qry .= "campus.vw_student JOIN public.tbl_benutzergruppe USING(uid) WHERE gruppe_kurzbz='".addslashes($gruppe_kurzbz)."'";
+		$qry .= "campus.vw_student JOIN public.tbl_benutzergruppe USING(uid) WHERE studiensemester_kurzbz IS NULL AND gruppe_kurzbz='".addslashes($gruppe_kurzbz)."'";
 	else 
 	{
 		$qry .= "campus.vw_student WHERE studiengang_kz='$stg' AND semester='$sem'";
diff --git a/cis/private/pers_in_grp.php b/cis/private/pers_in_grp.php
index 0ade46698..119a0edae 100644
--- a/cis/private/pers_in_grp.php
+++ b/cis/private/pers_in_grp.php
@@ -29,7 +29,7 @@
 
 <?php
  		  //$sql_query = "SELECT vornamen AS vn,nachname AS nn,a.uid as uid FROM public.tbl_personmailgrp AS a, public.tbl_person AS b WHERE a.uid=b.uid AND a.mailgrp_kurzbz='$grp' ORDER BY nachname";
-	  $qry = "SELECT uid, vorname, nachname FROM campus.vw_benutzer WHERE uid IN(SELECT uid FROM public.tbl_benutzergruppe where gruppe_kurzbz='".addslashes($_GET['grp'])."') ORDER BY nachname, vorname";
+	  $qry = "SELECT uid, vorname, nachname FROM campus.vw_benutzer JOIN tbl_benutzergruppe USING (uid) WHERE gruppe_kurzbz='".addslashes($_GET['grp'])."' AND studiensemester_kurzbz IS NULL ORDER BY nachname, vorname";
 	  if($result=pg_query($conn, $qry))
 	  {
 	  	while($row = pg_fetch_object($result))
@@ -42,4 +42,4 @@
 		}
 	  }
 ?>
-</body></html>
\ No newline at end of file
+</body></html>
diff --git a/skin/cis.css b/skin/cis.css
index f8776a97d..f38ecf490 100644
--- a/skin/cis.css
+++ b/skin/cis.css
@@ -10,6 +10,18 @@ body
 	/*IE hack end*/
 }
 
+#menujfd
+{
+	position:absolute;
+	top:0px;
+	left:100px;
+	width:300px;
+	height:100%;
+	margin:0;
+	padding:0;
+	border-width:0;
+}
+
 a
 {
 	color: #008381; text-decoration: none;