From 27080d4e2c3fa4c3513c24368f939082f6d64a9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Tue, 11 Sep 2007 09:05:52 +0000
Subject: [PATCH]

---
 content/bindings.xml.php                      |  2 +-
 .../lehrveranstaltungnotenoverlay.xul.php     | 15 ++++---
 content/student/studentDBDML.php              | 10 ++---
 content/student/studentnotenoverlay.xul.php   | 15 ++++---
 content/student/studentoverlay.js.php         | 39 +++++++++++++++++++
 include/studiensemester.class.php             |  9 +++--
 6 files changed, 68 insertions(+), 22 deletions(-)

diff --git a/content/bindings.xml.php b/content/bindings.xml.php
index f279f5371..e92fafce3 100644
--- a/content/bindings.xml.php
+++ b/content/bindings.xml.php
@@ -38,7 +38,7 @@
 		<!--<xul:textbox maxlength="10" xbl:inherits="disabled, value" size="10" tooltiptext="Format: DD.MM.JJJJ Beispiel: 31.12.2007"/>-->
 		<xul:hbox>
 			<xul:spacer flex="1"/>
-			<xul:menulist anonid="binding-menulist-field" style="margin: 1px" editable="true" xbl:inherits="disabled, value" label="">
+			<xul:menulist anonid="binding-menulist-field" style="padding: 1px" editable="true" xbl:inherits="disabled, value" label="">
 				<xul:menupopup>
 					<xul:datepicker anonid="binding-datepicker-field" 
 								onselect="parentNode.parentNode.parentNode.parentNode.value=this.selection.currentDay+'.'+(parseInt(this.selection.currentMonth)+1)+'.'+this.selection.currentYear"/>
diff --git a/content/lvplanung/lehrveranstaltungnotenoverlay.xul.php b/content/lvplanung/lehrveranstaltungnotenoverlay.xul.php
index 74182b741..57b7b1861 100644
--- a/content/lvplanung/lehrveranstaltungnotenoverlay.xul.php
+++ b/content/lvplanung/lehrveranstaltungnotenoverlay.xul.php
@@ -42,10 +42,12 @@ echo "<?xml-stylesheet href=\"".APP_ROOT."content/bindings.css\" type=\"text/css
 		<menuitem label="Entfernen" oncommand="LehrveranstaltungNotenDelete();" id="lehrveranstaltung-noten-tree-popup-delete" hidden="false"/>
 	</popup>
 </popupset>
-<hbox flex="1">
+<hbox flex="1" style="margin-top: 10px;">
+	<vbox flex="1">
+	<label value="Zeugnis" />
 	<tree id="lehrveranstaltung-noten-tree" seltype="single" hidecolumnpicker="false" flex="1"
 		datasources="rdf:null" ref="http://www.technikum-wien.at/zeugnisnote/liste"
-		style="margin-left:10px;margin-right:10px;margin-bottom:5px;margin-top: 10px;" height="100%" enableColumnDrag="true"
+		style="margin-bottom:5px;" height="100%" enableColumnDrag="true"
 		onselect="LehrveranstaltungNotenAuswahl()"
 		context="lehrveranstaltung-noten-tree-popup"
 		flags="dont-build-content"
@@ -113,17 +115,18 @@ echo "<?xml-stylesheet href=\"".APP_ROOT."content/bindings.css\" type=\"text/css
 			</treechildren>
 		</template>
 	</tree>
-	
+	</vbox>
 	<vbox>
 		<spacer flex="1"/>
 		<button id="lehrveranstaltung-note-copy" label="&lt;=" style="font-weight: bold;" oncommand="LehrveranstaltungNotenMove();"/>
 		<spacer flex="1"/>
 	</vbox>
 	
-	
+	<vbox flex="1">
+	<label value="Lektor" />
 	<tree id="lehrveranstaltung-lvgesamtnoten-tree" seltype="multi" hidecolumnpicker="false" flex="1"
 		datasources="rdf:null" ref="http://www.technikum-wien.at/lvgesamtnote/liste"
-		style="margin-left:10px;margin-right:10px;margin-bottom:5px;margin-top: 10px;" height="100%" enableColumnDrag="true"
+		style="margin-bottom:5px;" height="100%" enableColumnDrag="true"
 		flags="dont-build-content"
 	>
 	
@@ -194,7 +197,7 @@ echo "<?xml-stylesheet href=\"".APP_ROOT."content/bindings.css\" type=\"text/css
 			</treechildren>
 		</template>
 	</tree>
-	
+	</vbox>
 </hbox>		
 <hbox>		
 	<label value="Note" control="lehrveranstaltung-noten-menulist-note"/>
diff --git a/content/student/studentDBDML.php b/content/student/studentDBDML.php
index 89243ab12..87ac75d76 100644
--- a/content/student/studentDBDML.php
+++ b/content/student/studentDBDML.php
@@ -183,7 +183,7 @@ if(!$error)
 			if(!$student->load($_POST['uid']))
 			{
 				$return = false;
-				$errormsg = 'Fehler beim laden:'.$student->errormsg;
+				$errormsg = 'Fehler beim Laden:'.$student->errormsg;
 				$error = true;
 			}
 			
@@ -291,7 +291,7 @@ if(!$error)
 			if(!$person->load($_POST['person_id']))
 			{
 				$return = false;
-				$errormsg = 'Fehler beim laden:'.$person->errormsg;
+				$errormsg = 'Fehler beim Laden:'.$person->errormsg;
 				$error = true;
 			}
 			
@@ -352,7 +352,7 @@ if(!$error)
 			if(!$prestudent->load($_POST['prestudent_id']))
 			{
 				$return = false;
-				$errormsg = 'Fehler beim laden:'.$prestudent->errormsg;
+				$errormsg = 'Fehler beim Laden:'.$prestudent->errormsg;
 				$error = true;
 			}
 			
@@ -875,7 +875,7 @@ if(!$error)
 				else 
 				{
 					$return = false;
-					$errormsg = 'Fehler beim Speicher:'.$buchung->errormsg;
+					$errormsg = 'Fehler beim Speichern:'.$buchung->errormsg;
 				}
 			}
 			else 
@@ -1180,7 +1180,7 @@ if(!$error)
 				{
 					$error = true;
 					$return = false;
-					$errormsg = 'Fehler beim laden der Betriebmittelperson Zuordnung';
+					$errormsg = 'Fehler beim Laden der Betriebmittelperson Zuordnung';
 				}
 			}
 			else 
diff --git a/content/student/studentnotenoverlay.xul.php b/content/student/studentnotenoverlay.xul.php
index 4ca208476..7cd686eb3 100644
--- a/content/student/studentnotenoverlay.xul.php
+++ b/content/student/studentnotenoverlay.xul.php
@@ -42,10 +42,12 @@ echo "<?xml-stylesheet href=\"".APP_ROOT."content/bindings.css\" type=\"text/css
 		<menuitem label="Entfernen" oncommand="StudentNotenDelete();" id="student-noten-tree-popup-delete" hidden="false"/>
 	</popup>
 </popupset>
-<hbox flex="1">
+<hbox flex="1" style="margin-top: 10px;">
+	<vbox flex="1">
+	<label value='Zeugnis' />
 	<tree id="student-noten-tree" seltype="single" hidecolumnpicker="false" flex="1"
 		datasources="rdf:null" ref="http://www.technikum-wien.at/zeugnisnote/liste"
-		style="margin-left:10px;margin-right:10px;margin-bottom:5px;margin-top: 10px;" height="100%" enableColumnDrag="true"
+		style="margin-bottom:5px;" height="100%" enableColumnDrag="true"
 		onselect="StudentNotenAuswahl()"
 		context="student-noten-tree-popup"
 		flags="dont-build-content"
@@ -105,17 +107,18 @@ echo "<?xml-stylesheet href=\"".APP_ROOT."content/bindings.css\" type=\"text/css
 			</treechildren>
 		</template>
 	</tree>
-	
+	</vbox>
 	<vbox>
 		<spacer flex="1"/>
 		<button id="student-note-copy" label="&lt;=" style="font-weight: bold;" oncommand="StudentNotenMove();"/>
 		<spacer flex="1"/>
 	</vbox>
 	
-	
+	<vbox flex="1">
+	<label value='Lektor' />
 	<tree id="student-lvgesamtnoten-tree" seltype="multi" hidecolumnpicker="false" flex="1"
 		datasources="rdf:null" ref="http://www.technikum-wien.at/lvgesamtnote/liste"
-		style="margin-left:10px;margin-right:10px;margin-bottom:5px;margin-top: 10px;" height="100%" enableColumnDrag="true"
+		style="margin-bottom:5px;" height="100%" enableColumnDrag="true"
 		flags="dont-build-content"
 	>
 	
@@ -178,7 +181,7 @@ echo "<?xml-stylesheet href=\"".APP_ROOT."content/bindings.css\" type=\"text/css
 			</treechildren>
 		</template>
 	</tree>
-	
+	</vbox>
 </hbox>		
 <hbox>		
 	<label value="Note" control="student-noten-menulist-note"/>
diff --git a/content/student/studentoverlay.js.php b/content/student/studentoverlay.js.php
index 19ee8edb6..9cc80a5b5 100644
--- a/content/student/studentoverlay.js.php
+++ b/content/student/studentoverlay.js.php
@@ -2922,6 +2922,40 @@ function StudentPruefungNeu()
 	var rdfService = Components.classes["@mozilla.org/rdf/rdf-service;1"].getService(Components.interfaces.nsIRDFService);
 	var datasource = rdfService.GetDataSource(url);
 	LVDropDown.database.AddDataSource(datasource);
+	LVDropDown.value='';
+	LVDropDown.selectedItem='';
+	
+	var LEDropDown = document.getElementById('student-pruefung-menulist-lehreinheit');
+	
+	//Alte DS entfernen
+	var oldDatasources = LEDropDown.database.GetDataSources();
+	while(oldDatasources.hasMoreElements())
+	{
+		LEDropDown.database.RemoveDataSource(oldDatasources.getNext());
+	}
+	//Refresh damit die entfernten DS auch wirklich entfernt werden
+	LEDropDown.builder.rebuild();
+	
+	LEDropDown.value='';
+	LEDropDown.selectedItem='';
+		
+	var MADropDown = document.getElementById('student-pruefung-menulist-mitarbeiter');
+	
+	//Alte DS entfernen
+	var oldDatasources = MADropDown.database.GetDataSources();
+	while(oldDatasources.hasMoreElements())
+	{
+		MADropDown.database.RemoveDataSource(oldDatasources.getNext());
+	}
+	//Refresh damit die entfernten DS auch wirklich entfernt werden
+	MADropDown.builder.rebuild();
+	
+	MADropDown.value='';
+	MADropDown.selectedItem='';
+	
+	document.getElementById('student-pruefung-menulist-note').value='9';
+	document.getElementById('student-pruefung-textbox-datum').value='<?php echo date('d.m.Y');?>';
+	document.getElementById('student-pruefung-textbox-anmerkung').value='';
 }
 
 // ****
@@ -2985,6 +3019,11 @@ function StudentPruefungDetailSpeichern()
 	neu = document.getElementById('student-pruefung-checkbox-neu').checked;
 	pruefung_id = document.getElementById('student-pruefung-textbox-pruefung_id').value;
 
+	if(lehreinheit_id=='')
+	{
+		alert('Es muss eine Lehreinheit ausgewaehlt werden');
+		return false;
+	}
 	var tree = document.getElementById('student-tree');
 
 	if (tree.currentIndex==-1)
diff --git a/include/studiensemester.class.php b/include/studiensemester.class.php
index b21f4c913..f1d26fd57 100644
--- a/include/studiensemester.class.php
+++ b/include/studiensemester.class.php
@@ -164,7 +164,8 @@ class studiensemester
 	function getakt()
 	{
 		$qry = "SELECT studiensemester_kurzbz FROM public.tbl_studiensemester WHERE start <= now() AND ende >= now()";
-		if(!$res=pg_exec($this->conn,$qry))
+		
+		if(!$res=pg_query($this->conn,$qry))
 		{
 			$this->errormsg = pg_errormessage($this->conn);
 			return false;
@@ -189,7 +190,7 @@ class studiensemester
 	function getAktTillNext()
 	{
 		$qry = "SELECT * FROM public.vw_studiensemester ORDER BY delta LIMIT 2";
-		if(!$res=pg_exec($this->conn,$qry))
+		if(!$res=pg_query($this->conn,$qry))
 		{
 			$this->errormsg = pg_errormessage($this->conn);
 			return false;
@@ -229,7 +230,7 @@ class studiensemester
 	 */
 	function getaktorNext($semester='')
 	{
-		if($stsem=$this->getakt() && $semester=='')
+		if(($stsem=$this->getakt()) && $semester=='')
 		   return $stsem;
 		else
 		{
@@ -246,7 +247,7 @@ class studiensemester
 			}
 			$qry.= " AND ende >= now() ORDER BY ende LIMIT 1";
 			
-			if(!$res=pg_exec($this->conn,$qry))
+			if(!$res=pg_query($this->conn,$qry))
 		    {
 				$this->errormsg = pg_errormessage($this->conn);
 				return false;