From fe86e091a683974fe898a12d7343a98f1558481e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Mon, 5 Nov 2007 10:59:41 +0000
Subject: [PATCH]

---
 content/ToDo_FASo.html                     | 12 ++++++++++++
 content/student/studentDBDML.php           |  7 ++++---
 content/student/studentoverlay.js.php      |  2 +-
 content/student/studentrolledialog.xul.php |  2 +-
 rdf/student.rdf.php                        |  3 ++-
 5 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/content/ToDo_FASo.html b/content/ToDo_FASo.html
index a6180c2f7..602da8723 100644
--- a/content/ToDo_FASo.html
+++ b/content/ToDo_FASo.html
@@ -313,6 +313,18 @@ Studenten<br>
 <hr>
 <h2>Erledigte Anforderungen</h2>
 <ul>
+	<li>Das Feld Studiengang im PrestudentTab ist nun nicht mehr &auml;nderbar<br>
+		05.11.2007 oesi<br>
+		<br>
+	</li>
+	<li>Bei Personensuche kann nun auch nach Personenkennzeichen (Matrikelnummer) gesucht werden<br>
+		05.11.2007 oesi<br>
+		<br>
+	</li>
+	<li>Bei Status&auml;nderung Abbrecher/Unterbrecher wird nun das richtige Semester im Status eingetragen und nicht mehr 0<br>
+		05.11.2007 oesi<br>
+		<br>
+	</li>
 	<li>Beim Starten kommt manchmal folgende Fehlermeldung in der Errorconsole: Error: can't decode principals (failure code 8007000e)<br>
 		31.10.2007 oesi - Neuinstallation des Seamonkey-Profils beseitigt die Fehlermeldung<br>
 		<br>
diff --git a/content/student/studentDBDML.php b/content/student/studentDBDML.php
index d5b457799..029538da6 100644
--- a/content/student/studentDBDML.php
+++ b/content/student/studentDBDML.php
@@ -457,9 +457,10 @@ if(!$error)
 							$studiensemester = $prestd->studiensemester_kurzbz;
 						$hlp = new prestudent($conn);
 						
-						if($_POST['rolle_kurzbz']=='Unterbrecher' || $_POST['rolle_kurzbz']=='Abbrecher')
-							$sem='0';
-						elseif($_POST['rolle_kurzbz']=='Student')
+						//if($_POST['rolle_kurzbz']=='Unterbrecher' || $_POST['rolle_kurzbz']=='Abbrecher')
+						//	$sem='0';
+						//else
+						if($_POST['rolle_kurzbz']=='Student')
 							$sem=$_POST['semester'];
 						else 
 							$sem=$prestd->ausbildungssemester;
diff --git a/content/student/studentoverlay.js.php b/content/student/studentoverlay.js.php
index f48331ea0..247645d20 100644
--- a/content/student/studentoverlay.js.php
+++ b/content/student/studentoverlay.js.php
@@ -1262,7 +1262,7 @@ function StudentPrestudentDisableFields(val)
 	document.getElementById('student-prestudent-checkbox-bismelden').disabled=val;
 	document.getElementById('student-prestudent-button-anmeldungreihungstest-heute').disabled=val;
 	document.getElementById('student-prestudent-button-save').disabled=val;
-	document.getElementById('student-prestudent-menulist-studiengang_kz').disabled=val;
+	//document.getElementById('student-prestudent-menulist-studiengang_kz').disabled=val;
 	document.getElementById('student-prestudent-textbox-anmerkung').disabled=val;
 }
 
diff --git a/content/student/studentrolledialog.xul.php b/content/student/studentrolledialog.xul.php
index 4e5025d29..f46436f7b 100644
--- a/content/student/studentrolledialog.xul.php
+++ b/content/student/studentrolledialog.xul.php
@@ -118,7 +118,7 @@ else
 								}
 							}
 														
-							for($i=1;$i<=$maxsem;$i++)
+							for($i=0;$i<=$maxsem;$i++)
 							{
 								echo '<menuitem value="'.$i.'" label="'.$i.'"/>';
 							}
diff --git a/rdf/student.rdf.php b/rdf/student.rdf.php
index bbe508099..dfe76641f 100644
--- a/rdf/student.rdf.php
+++ b/rdf/student.rdf.php
@@ -455,7 +455,8 @@ if($xmlformat=='rdf')
 					WHERE 
 						nachname ~* '".addslashes($filter)."' OR 
 						vorname ~* '".addslashes($filter)."' OR
-						student_uid ~* '".addslashes($filter)."';";
+						student_uid ~* '".addslashes($filter)."' OR
+						matrikelnr = '".addslashes($filter)."';";
 			if($result = pg_query($conn, $qry))
 			{
 				while($row = pg_fetch_object($result))