From 89bce02c3514241c2cf47b70e2201a2ff9992390 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Tue, 29 May 2007 15:42:33 +0000
Subject: [PATCH] Beim Aendern des Studiensemesters werden die trees refresht
 Konto nun auch fuer Interessenten vorhanden Tabs aendern sich automatisch mit
 wenn der Lvb geaendert wird Sem/Verb/Grp wechseln nun auch mit dem
 Studiensemester.

---
 cis/public/location.html                      |   2 +-
 content/fasoverlay.js.php                     |   8 +
 content/lvplanung/lehrauftrag.php             |   6 +-
 .../lvplanung/lehrveranstaltungoverlay.js.php |   6 +-
 content/student/interessentenoverlay.xul.php  |   6 +-
 .../student/interessentkontoneudialog.js.php  |  82 ++++
 .../student/interessentkontoneudialog.xul.php |  99 ++++
 .../student/interessentkontooverlay.xul.php   | 182 ++++++++
 content/student/interessentoverlay.js.php     | 432 +++++++++++++++++-
 content/student/studentDBDML.php              |  18 +-
 content/student/studentdetailoverlay.xul.php  |   2 +-
 content/student/studentoverlay.js.php         |   8 +-
 content/tempus.js.php                         |  11 +
 include/student.class.php                     |  33 +-
 rdf/student.rdf.php                           |   2 +-
 15 files changed, 871 insertions(+), 26 deletions(-)
 create mode 100644 content/student/interessentkontoneudialog.js.php
 create mode 100644 content/student/interessentkontoneudialog.xul.php
 create mode 100644 content/student/interessentkontooverlay.xul.php

diff --git a/cis/public/location.html b/cis/public/location.html
index fda1c819a..ec5d86759 100644
--- a/cis/public/location.html
+++ b/cis/public/location.html
@@ -100,7 +100,7 @@
         			<td colspan="2">Mo-Fr 7:30 - 17:00 Uhr</td>
         		</tr>
         		<tr>
-        			<td>Freischaltung Gant&uuml;ren</td>
+        			<td>Freischaltung Gangt&uuml;ren</td>
         			<td colspan="2">Mo-Fr 7:30 - 20:00 Uhr; Sa 7:30 - 15:30 Uhr</td>
         		</tr>
 		  		<tr>
diff --git a/content/fasoverlay.js.php b/content/fasoverlay.js.php
index f411c2b0d..fff1f4e84 100644
--- a/content/fasoverlay.js.php
+++ b/content/fasoverlay.js.php
@@ -203,6 +203,10 @@ function onVerbandSelect(event)
 
 	if(typ=='')
 	{
+		//Wenn der Interessenten Tab markiert ist, dann den Studenten Tab markieren
+		if(document.getElementById('tabbox-main').selectedIndex=="0")
+			document.getElementById('tabbox-main').selectedIndex="1";
+
 		// Studenten
 		try
 		{
@@ -237,6 +241,10 @@ function onVerbandSelect(event)
 	// Interessenten / Bewerber
 	try
 	{
+		//Wenn ein anderer Tab markiert ist, dann den Interessenten Tab markieren
+		if(typ!='')
+			document.getElementById('tabbox-main').selectedIndex="0";
+
 		if(stsem=='' && typ=='')
 			stsem='aktuelles';
 		url = "<?php echo APP_ROOT; ?>rdf/interessentenbewerber.rdf.php?"+"studiengang_kz="+stg_kz+"&semester="+sem+"&typ="+typ+"&studiensemester_kurzbz="+stsem+"&"+gettimestamp();
diff --git a/content/lvplanung/lehrauftrag.php b/content/lvplanung/lehrauftrag.php
index a5c0398a6..921fa86a1 100644
--- a/content/lvplanung/lehrauftrag.php
+++ b/content/lvplanung/lehrauftrag.php
@@ -140,7 +140,7 @@ if($result = pg_query($conn, $qry))
 $xml.='
 	<lehreinheit>
 		<lehreinheit_id>'.$lehreinheit_id.'</lehreinheit_id>
-		<lehrveranstaltung>'.$lehrveranstaltung.'</lehrveranstaltung>
+		<lehrveranstaltung><![CDATA['.$lehrveranstaltung.']]></lehrveranstaltung>
 		<fachbereich>'.$fb_arr[$fachbereich].'</fachbereich>
 		<gruppe>'.trim($grp).'</gruppe>
 		<stunden>'.$stunden.'</stunden>
@@ -184,7 +184,7 @@ $xml.='
 $xml.='
 	<lehreinheit>
 		<lehreinheit_id>'.(isset($lehreinheit_id)?$lehreinheit_id:'').'</lehreinheit_id>
-		<lehrveranstaltung>'.(isset($lehrveranstaltung)?$lehrveranstaltung:'').'</lehrveranstaltung>
+		<lehrveranstaltung><![CDATA['.(isset($lehrveranstaltung)?$lehrveranstaltung:'').']]></lehrveranstaltung>
 		<fachbereich>'.(isset($fachbereich)?$fb_arr[$fachbereich]:'').'</fachbereich>
 		<gruppe>'.trim($grp).'</gruppe>
 		<stunden>'.(isset($stunden)?$stunden:'').'</stunden>
@@ -252,7 +252,7 @@ $proc->importStyleSheet($xsl); // attach the xsl rules
 $buffer = $proc->transformToXml($xml_doc);
 //in $buffer steht nun das xsl-fo file mit den daten
 $buffer = '<?xml version="1.0" encoding="ISO-8859-15" ?>'.substr($buffer, strpos($buffer,"\n"),strlen($buffer));
-$buffer = html_entity_decode($buffer);
+//$buffer = html_entity_decode($buffer);
 //echo "buffer: $buffer";
 
 //Pdf erstellen
diff --git a/content/lvplanung/lehrveranstaltungoverlay.js.php b/content/lvplanung/lehrveranstaltungoverlay.js.php
index 8ab7ce338..d08a3732c 100644
--- a/content/lvplanung/lehrveranstaltungoverlay.js.php
+++ b/content/lvplanung/lehrveranstaltungoverlay.js.php
@@ -197,10 +197,12 @@ function LvTreeRefresh()
 	try
 	{
 		LvSelectLehreinheit_id=tree.view.getCellText(tree.currentIndex,col);
-		LvTreeDatasource.Refresh(false); //non blocking
 	}
 	catch(e)
-	{}
+	{
+		LvSelectLehreinheit_id=null;
+	}
+	LvTreeDatasource.Refresh(false); //non blocking
 }
 
 // ****
diff --git a/content/student/interessentenoverlay.xul.php b/content/student/interessentenoverlay.xul.php
index 3a0f1c839..68ddafeb3 100644
--- a/content/student/interessentenoverlay.xul.php
+++ b/content/student/interessentenoverlay.xul.php
@@ -31,6 +31,7 @@ echo '<?xml version="1.0" encoding="ISO-8859-15" standalone="yes" ?>';
 
 echo '<?xul-overlay href="'.APP_ROOT.'content/student/interessentdetailoverlay.xul.php"?>';
 echo '<?xul-overlay href="'.APP_ROOT.'content/student/interessentdokumenteoverlay.xul.php"?>';
+echo '<?xul-overlay href="'.APP_ROOT.'content/student/interessentkontooverlay.xul.php"?>';
 ?>
 <!DOCTYPE overlay >
 
@@ -51,6 +52,7 @@ echo '<?xul-overlay href="'.APP_ROOT.'content/student/interessentdokumenteoverla
 						<toolbarbutton id="interessent-toolbar-neu" label="Neu" oncommand="InteressentNeu()" disabled="false" image="../skin/images/NeuDokument.png" tooltiptext="Interessent neu anlegen" />
 						<toolbarbutton id="interessent-toolbar-zubewerber" label="-> Bewerber" oncommand="InteressentzuBewerber()" disabled="false" tooltiptext="Interessent zum Bewerber machen" />
 						<toolbarbutton id="interessent-toolbar-zustudent" label="-> Student" oncommand="InteressentzuStudent()" disabled="false" tooltiptext="Bewerber zu Studenten machen" />
+						<toolbarbutton id="interessent-toolbar-buchung" label="Neue Buchung" oncommand="InteressentKontoNeu()" disabled="false" tooltiptext="neue Buchung anlegen"/>
 						<toolbarbutton id="interessent-toolbar-refresh" label="Aktualisieren" oncommand="InteressentTreeRefresh()" disabled="false" image="../skin/images/refresh.png" tooltiptext="Liste neu laden"/>
 						<spacer flex="1"/>
 						<label id="interessent-toolbar-label-anzahl"/>
@@ -61,7 +63,7 @@ echo '<?xul-overlay href="'.APP_ROOT.'content/student/interessentdokumenteoverla
 				<!-- ************* -->
 				<!-- *  Auswahl  * -->
 				<!-- ************* -->
-				<tree id="interessent-tree" seltype="single" hidecolumnpicker="false" flex="1"
+				<tree id="interessent-tree" seltype="multi" hidecolumnpicker="false" flex="1"
 						datasources="rdf:null" ref="http://www.technikum-wien.at/interessent/alle"
 						onselect="InteressentAuswahl();"
 						flags="dont-build-content"
@@ -168,11 +170,13 @@ echo '<?xul-overlay href="'.APP_ROOT.'content/student/interessentdokumenteoverla
 							<tab id="interessent-tab-detail" label="Details" />
 							<tab id="interessent-tab-prestudent" label="PreStudent" />
 							<tab id="interessent-tab-dokumente" label="Dokumente" />
+							<tab id="interessent-tab-konto" label="Konto" />
 						</tabs>
 						<tabpanels id="interessent-tabpanels-main" flex="1">
 							<vbox id="interessent-detail"  style="margin-top:10px;" />
 							<vbox id="interessent-prestudent"  style="margin-top:10px;" />
 							<vbox id="interessent-dokumente"  style="margin-top:10px;" />
+							<vbox id="interessent-konto"  style="margin-top:10px;" />
 						</tabpanels>
 					</tabbox>				
 				</vbox>
diff --git a/content/student/interessentkontoneudialog.js.php b/content/student/interessentkontoneudialog.js.php
new file mode 100644
index 000000000..c6cf36980
--- /dev/null
+++ b/content/student/interessentkontoneudialog.js.php
@@ -0,0 +1,82 @@
+<?php
+/* Copyright (C) 2006 Technikum-Wien
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Authors: Christian Paminger <christian.paminger@technikum-wien.at>,
+ *          Andreas Oesterreicher <andreas.oesterreicher@technikum-wien.at> and
+ *          Rudolf Hangl <rudolf.hangl@technikum-wien.at>.
+ */
+
+require_once('../../vilesci/config.inc.php');
+require_once('../../include/functions.inc.php');
+
+$conn = pg_pconnect(CONN_STRING);
+
+$user = get_uid();
+loadVariables($conn, $user);
+?>
+var studiengang_kz=''; // enthaelt die Studiengangskennzahl
+var person_ids=''; // enthaelt eine durch ';' getrennte Liste an Personen_ids
+
+// ****
+// * Ermittelt die markierten Personen und den aktuellen Studiengang
+// ****
+function InteressentKontoNeuInit()
+{
+	var tree = window.opener.document.getElementById('interessent-tree')
+    
+	var start = new Object();
+	var end = new Object();
+	var numRanges = tree.view.selection.getRangeCount();
+	var paramList= '';
+	var anzahl=0;
+	
+	//alle markierten personen holen
+	for (var t = 0; t < numRanges; t++)
+	{
+  		tree.view.selection.getRangeAt(t,start,end);
+			for (var v = start.value; v <= end.value; v++)
+			{
+			col = tree.columns ? tree.columns["interessent-treecol-person_id"] : "interessent-treecol-person_id";
+			id = tree.view.getCellText(v,col);
+			paramList += ';'+id;
+			anzahl +=1;
+			}
+	}
+
+	//Studiengang holen
+	var tree=window.opener.document.getElementById('tree-verband');
+	
+	col = tree.columns ? tree.columns["stg_kz"] : "stg_kz";
+	studiengang_kz=tree.view.getCellText(tree.currentIndex,col);
+	
+	person_ids = paramList;
+	
+	if(anzahl>1)
+		document.getElementById('interessent-konto-neu-label').value='Anzahl Personen: '+anzahl;
+}
+
+// ****
+// * Speichern der Buchung
+// * Hierzu wird eine Funktion vom Aufrufenden Fenster gestartet weil
+// * es dann nicht zu Problemen mit den Zugriffen auf die anderen Fkt
+// * kommt.
+// ****
+function InteressentKontoNeuSpeichern()
+{
+	if(window.opener.InteressentKontoNeuSpeichern(document, person_ids, studiengang_kz))
+		window.close();
+}
\ No newline at end of file
diff --git a/content/student/interessentkontoneudialog.xul.php b/content/student/interessentkontoneudialog.xul.php
new file mode 100644
index 000000000..316f6bad4
--- /dev/null
+++ b/content/student/interessentkontoneudialog.xul.php
@@ -0,0 +1,99 @@
+<?php
+/* Copyright (C) 2006 Technikum-Wien
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Authors: Christian Paminger <christian.paminger@technikum-wien.at>,
+ *          Andreas Oesterreicher <andreas.oesterreicher@technikum-wien.at> and
+ *          Rudolf Hangl <rudolf.hangl@technikum-wien.at>.
+ */
+
+header("Cache-Control: no-cache");
+header("Cache-Control: post-check=0, pre-check=0",false);
+header("Expires Mon, 26 Jul 1997 05:00:00 GMT");
+header("Pragma: no-cache");
+header("Content-type: application/vnd.mozilla.xul+xml");
+
+include('../../vilesci/config.inc.php');
+echo '<?xml version="1.0" encoding="UTF-8"?>'."\n";
+
+echo '<?xml-stylesheet href="'.APP_ROOT.'skin/tempus.css" type="text/css"?>';
+?>
+
+<window id="interessent-konto-neu-dialog" title="Neu"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        onload="InteressentKontoNeuInit()"
+        >
+
+<script type="application/x-javascript" src="<?php echo APP_ROOT; ?>content/student/interessentkontoneudialog.js.php" />
+
+<vbox>
+<groupbox id="interessent-konto-neu-groupbox" flex="1">
+	<caption label="Details"/>
+		<label id="interessent-konto-neu-label"/>
+		<grid id="interessent-konto-neu-grid-detail" style="overflow:auto;margin:4px;" flex="1">
+		  	<columns  >
+				<column flex="1"/>
+				<column flex="5"/>
+			</columns>
+			<rows>
+				<row>
+					<label value="Betrag" control="interessent-konto-neu-textbox-betrag"/>
+					<hbox>
+      					<textbox id="interessent-konto-neu-textbox-betrag" value="-0.0" maxlength="9" size="9"/>
+      					<spacer flex="1" />			
+      				</hbox>
+				</row>
+				<row>
+					<label value="Buchungsdatum" control="interessent-konto-neu-textbox-buchungsdatum"/>
+					<hbox>
+      					<textbox id="interessent-konto-neu-textbox-buchungsdatum" value="<?php echo date('Y-m-d');?>" maxlength="10" size="10"/>
+      					<spacer flex="1" />			
+      				</hbox>
+      			</row>
+      			<row>
+      				<label value="Buchungstext" control="interessent-konto-neu-textbox-buchungstext"/>
+		      		<textbox id="interessent-konto-neu-textbox-buchungstext"  maxlength="256"/>
+				</row>
+				<row>
+					<label value="Mahnspanne" control="interessent-konto-neu-textbox-mahnspanne"/>
+					<hbox>
+						<textbox id="interessent-konto-neu-textbox-mahnspanne" value="30" maxlength="4" size="4"/>
+						<spacer flex="1" />			
+      				</hbox>
+				</row>
+				<row>
+					<label value="Typ" control="interessent-konto-neu-menulist-buchungstyp"/>
+					<menulist id="interessent-konto-neu-menulist-buchungstyp" 
+					          datasources="<?php echo APP_ROOT ?>rdf/buchungstyp.rdf.php" flex="1"
+					          ref="http://www.technikum-wien.at/buchungstyp/liste" >
+						<template>
+							<menupopup>
+								<menuitem value="rdf:http://www.technikum-wien.at/buchungstyp/rdf#buchungstyp_kurzbz"
+					        		      label="rdf:http://www.technikum-wien.at/buchungstyp/rdf#beschreibung"
+								  		  uri="rdf:*"/>
+								</menupopup>
+						</template>
+					</menulist>
+				</row>
+			</rows>
+	</grid>
+	<hbox>
+		<spacer flex="1" />
+		<button id="interessent-konto-neu-button-speichern" oncommand="InteressentKontoNeuSpeichern()" label="Speichern" />
+	</hbox>
+</groupbox>
+</vbox>
+</window>
\ No newline at end of file
diff --git a/content/student/interessentkontooverlay.xul.php b/content/student/interessentkontooverlay.xul.php
new file mode 100644
index 000000000..fa60764e9
--- /dev/null
+++ b/content/student/interessentkontooverlay.xul.php
@@ -0,0 +1,182 @@
+<?php
+/* Copyright (C) 2006 Technikum-Wien
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Authors: Christian Paminger <christian.paminger@technikum-wien.at>,
+ *          Andreas Oesterreicher <andreas.oesterreicher@technikum-wien.at> and
+ *          Rudolf Hangl <rudolf.hangl@technikum-wien.at>.
+ */
+
+header("Cache-Control: no-cache");
+header("Cache-Control: post-check=0, pre-check=0",false);
+header("Expires Mon, 26 Jul 1997 05:00:00 GMT");
+header("Pragma: no-cache");
+header("Content-type: application/vnd.mozilla.xul+xml");
+require_once('../../vilesci/config.inc.php');
+echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
+
+?>
+
+<overlay id="InteressentKonto"
+	xmlns:html="http://www.w3.org/1999/xhtml"
+	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+	>
+<!-- Zeugnis Overlay -->
+<vbox id="interessent-konto" style="margin:0px;" flex="1">
+<popupset>
+	<popup id="interessent-konto-tree-popup">
+		<menuitem label="Entfernen" oncommand="InteressentKontoDelete();" id="interessent-konto-tree-popup-kontodel" hidden="false"/>
+	</popup>
+</popupset>
+<hbox flex="1">
+<grid id="interessent-konto-grid-detail" style="overflow:auto;margin:4px;" flex="1">
+		  	<columns  >
+				<column flex="1"/>
+				<column flex="1"/>
+			</columns>
+			<rows>
+				<row>	
+					<hbox>
+						<spacer flex="1" />
+						<button id="interessent-konto-button-filter" value="alle" oncommand="InteressentKontoFilter()" label="offene" disabled="true"/>
+					</hbox>
+					<spacer />
+				</row>
+				
+				<row>
+					<tree id="interessent-konto-tree" seltype="single" hidecolumnpicker="false" flex="1"
+						datasources="rdf:null" ref="http://www.technikum-wien.at/konto/liste"
+						style="margin-left:10px;margin-right:10px;margin-bottom:5px;margin-top: 10px;" height="100px" enableColumnDrag="true"
+						onselect="InteressentKontoAuswahl()"
+						context="interessent-konto-tree-popup"
+					>
+					
+						<treecols>
+							<treecol id="interessent-konto-tree-buchungsdatum" label="Buchungsdatum" flex="2" hidden="false" primary="true"
+								class="sortDirectionIndicator"
+								sortActive="true"
+								sortDirection="ascending"
+								sort="rdf:http://www.technikum-wien.at/konto/rdf#buchungsdatum"/>
+							<splitter class="tree-splitter"/>
+							<treecol id="interessent-konto-tree-buchungstext" label="Buchungstext" flex="5" hidden="false"
+							   class="sortDirectionIndicator"
+								sort="rdf:http://www.technikum-wien.at/konto/rdf#buchungstext"/>
+							<splitter class="tree-splitter"/>
+							<treecol id="interessent-konto-tree-betrag" label="Betrag" flex="2" hidden="false"
+								class="sortDirectionIndicator"
+								sort="rdf:http://www.technikum-wien.at/konto/rdf#betrag" />
+							<splitter class="tree-splitter"/>
+							<treecol id="interessent-konto-tree-studiensemester_kurzbz" label="StSem" flex="2" hidden="false"
+								class="sortDirectionIndicator"
+								sort="rdf:http://www.technikum-wien.at/konto/rdf#studiensemester_kurzbz" />
+							<splitter class="tree-splitter"/>
+							<treecol id="interessent-konto-tree-buchungstyp_kurzbz" label="Typ" flex="2" hidden="true"
+								class="sortDirectionIndicator"
+								sort="rdf:http://www.technikum-wien.at/konto/rdf#buchungstyp_kurzbz" />
+							<splitter class="tree-splitter"/>
+							<treecol id="interessent-konto-tree-buchungsnr" label="buchungs_nr" flex="2" hidden="true"
+								class="sortDirectionIndicator"
+								sort="rdf:http://www.technikum-wien.at/konto/rdf#buchungsnr" />
+							<splitter class="tree-splitter"/>
+						</treecols>
+					
+						<template>
+							<treechildren flex="1" >
+									<treeitem uri="rdf:*">
+									<treerow>
+										<treecell label="rdf:http://www.technikum-wien.at/konto/rdf#buchungsdatum"/>
+										<treecell label="rdf:http://www.technikum-wien.at/konto/rdf#buchungstext"/>
+										<treecell label="rdf:http://www.technikum-wien.at/konto/rdf#betrag"/>
+										<treecell label="rdf:http://www.technikum-wien.at/konto/rdf#studiensemester_kurzbz"/>
+										<treecell label="rdf:http://www.technikum-wien.at/konto/rdf#buchungstyp_kurzbz"/>
+										<treecell label="rdf:http://www.technikum-wien.at/konto/rdf#buchungsnr"/>
+									</treerow>
+								</treeitem>
+							</treechildren>
+						</template>
+					</tree>
+					<vbox>
+						<hbox>
+							<button id="interessent-konto-button-neu" label="Neu" oncommand="InteressentKontoNeu();" disabled="true"/>
+							<button id="interessent-konto-button-gegenbuchung" label="Gegenbuchung" oncommand="InteressentKontoGegenbuchung();" disabled="true"/>
+							<button id="interessent-konto-button-loeschen" label="Loeschen" oncommand="InteressentKontoDelete();" disabled="true"/>
+						</hbox>
+						<vbox hidden="true">
+							<label value="Buchungsnr" control="interessent-konto-textbox-buchungsnr"/>
+							<textbox id="interessent-konto-textbox-buchungsnr" disabled="true"/>
+						</vbox>
+						<groupbox id="interessent-konto-groupbox" flex="1">
+						<caption label="Details"/>
+							<grid id="interessent-konto-grid-detail" style="overflow:auto;margin:4px;" flex="1">
+							  	<columns  >
+									<column flex="1"/>
+									<column flex="5"/>
+								</columns>
+								<rows>
+									<row>
+										<label value="Betrag" control="interessent-konto-textbox-betrag"/>
+										<hbox>
+					      					<textbox id="interessent-konto-textbox-betrag" disabled="true" maxlength="9" size="9"/>
+					      					<spacer flex="1" />			
+					      				</hbox>
+									</row>
+									<row>
+										<label value="Buchungsdatum" control="interessent-konto-textbox-buchungsdatum"/>
+										<hbox>
+					      					<textbox id="interessent-konto-textbox-buchungsdatum" disabled="true" maxlength="10" size="10"/>
+					      					<spacer flex="1" />			
+					      				</hbox>
+					      			</row>
+					      			<row>
+					      				<label value="Buchungstext" control="interessent-konto-textbox-buchungstext"/>
+							      		<textbox id="interessent-konto-textbox-buchungstext" disabled="true" maxlength="256"/>
+									</row>
+									<row>
+										<label value="Mahnspanne" control="interessent-konto-textbox-mahnspanne"/>
+										<hbox>
+											<textbox id="interessent-konto-textbox-mahnspanne" disabled="true" maxlength="4" size="4"/>
+											<spacer flex="1" />			
+					      				</hbox>
+									</row>
+									<row>
+										<label value="Typ" control="interessent-konto-menulist-buchungstyp"/>
+										<menulist id="interessent-konto-menulist-buchungstyp" disabled="true"
+										          datasources="<?php echo APP_ROOT ?>rdf/buchungstyp.rdf.php" flex="1"
+										          ref="http://www.technikum-wien.at/buchungstyp/liste" >
+											<template>
+												<menupopup>
+													<menuitem value="rdf:http://www.technikum-wien.at/buchungstyp/rdf#buchungstyp_kurzbz"
+										        		      label="rdf:http://www.technikum-wien.at/buchungstyp/rdf#beschreibung"
+													  		  uri="rdf:*"/>
+													</menupopup>
+											</template>
+										</menulist>
+									</row>
+								</rows>
+							</grid>
+							<hbox>
+								<spacer flex="1" />
+								<button id="interessent-konto-button-speichern" oncommand="InteressentKontoDetailSpeichern()" label="Speichern" disabled="true"/>
+							</hbox>
+						</groupbox>
+					</vbox>
+				</row>
+		</rows>
+</grid>
+</hbox>
+<spacer flex="1" />
+</vbox>
+</overlay>
\ No newline at end of file
diff --git a/content/student/interessentoverlay.js.php b/content/student/interessentoverlay.js.php
index 9d0045f56..3af96754d 100644
--- a/content/student/interessentoverlay.js.php
+++ b/content/student/interessentoverlay.js.php
@@ -35,6 +35,8 @@ var InteressentDokumentTreeAbgegebenDatasource=null; //Datasource fuer Dokumente
 var InteressentDokumentTreeAbgegebenDoubleRefresh=false; // Wenn true, dann wird der rechte Dokumententree das naechste mal 2 mal hintereinander Refresht
 var InteressentDokumentTreeNichtabgegebenDoubleRefresh=false; // Wenn true, dann wird der linke Dokumententree das naechste mal 2 mal hintereinander Refresht
 var InteressentTreeLoadDataOnSelect=true; //Gibt an ob beim naechsten Select des Interessenten Trees die Daten geladen werden sollen
+var InteressentKontoSelectBuchung=null; //Buchung die nach dem Refresh markiert werden soll
+var InteressentKontoTreeDatasource; //Datasource des KontoTrees
 
 // ********** Observer und Listener ************* //
 
@@ -147,6 +149,40 @@ var InteressentDokumentTreeAbgegebenListener =
   }
 };
 
+
+// ****
+// * Observer fuer Konto Tree
+// * startet Rebuild nachdem das Refresh
+// * der datasource fertig ist
+// ****
+var InteressentKontoTreeSinkObserver =
+{
+	onBeginLoad : function(pSink) {},
+	onInterrupt : function(pSink) {},
+	onResume : function(pSink) {},
+	onError : function(pSink, pStatus, pError) {},
+	onEndLoad : function(pSink)
+	{
+		netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+		document.getElementById('interessent-konto-tree').builder.rebuild();
+	}
+};
+
+// ****
+// * Nach dem Rebuild wird die Buchung wieder
+// * markiert
+// ****
+var InteressentKontoTreeListener =
+{
+  willRebuild : function(builder) {  },
+  didRebuild : function(builder)
+  {
+  	  //timeout nur bei Mozilla notwendig da sonst die rows
+  	  //noch keine values haben. Ab Seamonkey funktionierts auch
+  	  //ohne dem setTimeout
+      window.setTimeout(InteressentKontoTreeSelectBuchung,10);
+  }
+};
 // ***************** KEY Events ************************* //
 
 // ****
@@ -176,10 +212,12 @@ function InteressentTreeRefresh()
 	try
 	{
 		InteressentSelectId=tree.view.getCellText(tree.currentIndex,col);
-		InteressentTreeDatasource.Refresh(false); //non blocking
 	}
 	catch(e)
-	{}
+	{
+		InteressentSelectId=null;
+	}
+	InteressentTreeDatasource.Refresh(false); //non blocking
 }
 
 // ****
@@ -416,6 +454,7 @@ function InteressentAuswahl()
 			//loeschen button aktivieren
 			InteressentDetailDisableFields(false);
 			InteressentPrestudentDisableFields(false);
+			InteressentKontoDisableFields(false);
 			document.getElementById('interessent-detail-button-save').disabled=false;
 		}
 		else
@@ -605,6 +644,29 @@ function InteressentAuswahl()
 	doctree.database.AddDataSource(InteressentDokumentTreeAbgegebenDatasource);
 	InteressentDokumentTreeAbgegebenDatasource.addXMLSinkObserver(InteressentDokumentTreeAbgegebenSinkObserver);
 	doctree.builder.addListener(InteressentDokumentTreeAbgegebenListener);
+	
+	//Konto
+	kontotree = document.getElementById('interessent-konto-tree');
+	filter = document.getElementById('interessent-konto-button-filter').value;
+	url='<?php echo APP_ROOT;?>rdf/konto.rdf.php?person_id='+person_id+"&filter="+filter+"&"+gettimestamp();
+	
+	//Alte DS entfernen
+	var oldDatasources = kontotree.database.GetDataSources();
+	while(oldDatasources.hasMoreElements())
+	{
+		kontotree.database.RemoveDataSource(oldDatasources.getNext());
+	}
+	//Refresh damit die entfernten DS auch wirklich entfernt werden
+	kontotree.builder.rebuild();
+	
+	var rdfService = Components.classes["@mozilla.org/rdf/rdf-service;1"].getService(Components.interfaces.nsIRDFService);
+	InteressentKontoTreeDatasource = rdfService.GetDataSource(url);
+	InteressentKontoTreeDatasource.QueryInterface(Components.interfaces.nsIRDFRemoteDataSource);
+	InteressentKontoTreeDatasource.QueryInterface(Components.interfaces.nsIRDFXMLSink);
+	kontotree.database.AddDataSource(InteressentKontoTreeDatasource);
+	InteressentKontoTreeDatasource.addXMLSinkObserver(InteressentKontoTreeSinkObserver);
+	kontotree.builder.addListener(InteressentKontoTreeListener);	
+	
 }
 
 // ****
@@ -995,4 +1057,370 @@ function InteressentDokumentTreeNichtabgegebenDatasourceRefresh()
 {
 	netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
 	InteressentDokumentTreeNichtabgegebenDatasource.Refresh(false);	
+}
+
+// ***************** KONTO ****************************
+
+// ****
+// * Wenn eine buchung Ausgewaehlt wird, dann werden
+// * die Details geladen und angezeigt
+// ****
+function InteressentKontoAuswahl()
+{
+	netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+	var tree = document.getElementById('interessent-konto-tree');
+
+	if (tree.currentIndex==-1) return;
+
+	InteressentKontoDetailDisableFields(false);
+	
+	//Ausgewaehlte Nr holen
+    var col = tree.columns ? tree.columns["interessent-konto-tree-buchungsnr"] : "interessent-konto-tree-buchungsnr";
+	var buchungsnr=tree.view.getCellText(tree.currentIndex,col);
+	
+	//Daten holen
+	var url = '<?php echo APP_ROOT ?>rdf/konto.rdf.php?buchungsnr='+buchungsnr+'&'+gettimestamp();
+		
+	var rdfService = Components.classes["@mozilla.org/rdf/rdf-service;1"].
+                   getService(Components.interfaces.nsIRDFService);
+    
+    var dsource = rdfService.GetDataSourceBlocking(url);
+    
+	var subject = rdfService.GetResource("http://www.technikum-wien.at/konto/" + buchungsnr);
+
+	var predicateNS = "http://www.technikum-wien.at/konto/rdf";
+
+	//Daten holen
+
+	person_id = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#person_id" ));
+	studiengang_kz = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#studiengang_kz" ));
+	studiensemester_kurzbz = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#studiensemester_kurzbz" ));
+	buchungsnr_verweis = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#buchungsnr_verweis" ));
+	betrag = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#betrag" ));
+	buchungsdatum = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#buchungsdatum" ));
+	buchungstext = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#buchungstext" ));
+	mahnspanne = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#mahnspanne" ));
+	buchungstyp_kurzbz = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#buchungstyp_kurzbz" ));
+		
+	document.getElementById('interessent-konto-textbox-betrag').value=betrag;
+	document.getElementById('interessent-konto-textbox-buchungsdatum').value=buchungsdatum;
+	document.getElementById('interessent-konto-textbox-buchungstext').value=buchungstext;
+	document.getElementById('interessent-konto-textbox-mahnspanne').value=mahnspanne;
+	document.getElementById('interessent-konto-menulist-buchungstyp').value=buchungstyp_kurzbz;
+	document.getElementById('interessent-konto-textbox-buchungsnr').value=buchungsnr;
+}
+
+// ****
+// * Aendert den Filter fuer den Konto Tree und Refresht ihn dann
+// ****
+function InteressentKontoFilter()
+{
+
+	netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+	filter = document.getElementById('interessent-konto-button-filter');
+	
+	if(filter.value=='offene')
+	{
+		filter.value='alle';
+		filter.label='offene';
+	}
+	else
+	{
+		filter.value='offene';
+		filter.label='alle';
+	}
+		
+	//Konto Tree mit neuem Filter laden
+	var kontotree = document.getElementById('interessent-konto-tree');
+	var person_id = document.getElementById('interessent-prestudent-textbox-person_id').value
+	url='<?php echo APP_ROOT;?>rdf/konto.rdf.php?person_id='+person_id+"&filter="+filter.value+"&"+gettimestamp();
+	
+	var buchungsnr=null;
+	try
+	{
+		if(kontotree.currentIndex!='-1')
+		{
+			//Ausgewaehlte Nr holen
+		    var col = kontotree.columns ? kontotree.columns["interessent-konto-tree-buchungsnr"] : "interessent-konto-tree-buchungsnr";
+			buchungsnr=kontotree.view.getCellText(kontotree.currentIndex,col);
+		}
+	}
+	catch(e)
+	{}
+	
+	//Alte DS entfernen
+	var oldDatasources = kontotree.database.GetDataSources();
+	while(oldDatasources.hasMoreElements())
+	{
+		kontotree.database.RemoveDataSource(oldDatasources.getNext());
+	}
+	//Refresh damit die entfernten DS auch wirklich entfernt werden
+	kontotree.builder.rebuild();
+	
+	InteressentKontoSelectBuchung = buchungsnr;
+	
+	var rdfService = Components.classes["@mozilla.org/rdf/rdf-service;1"].getService(Components.interfaces.nsIRDFService);
+	InteressentKontoTreeDatasource = rdfService.GetDataSource(url);
+	InteressentKontoTreeDatasource.QueryInterface(Components.interfaces.nsIRDFRemoteDataSource);
+	InteressentKontoTreeDatasource.QueryInterface(Components.interfaces.nsIRDFXMLSink);
+	kontotree.database.AddDataSource(InteressentKontoTreeDatasource);
+	InteressentKontoTreeDatasource.addXMLSinkObserver(InteressentKontoTreeSinkObserver);
+	kontotree.builder.addListener(InteressentKontoTreeListener);	
+}
+
+// ****
+// * Aktiviert / Deaktiviert die Konto Felder
+// ****
+function InteressentKontoDisableFields(val)
+{
+	document.getElementById('interessent-konto-button-filter').disabled=val;
+	document.getElementById('interessent-konto-button-neu').disabled=val;
+	document.getElementById('interessent-konto-button-gegenbuchung').disabled=val;
+	document.getElementById('interessent-konto-button-loeschen').disabled=val;
+	InteressentKontoDetailDisableFields(true);
+}
+
+// ****
+// * Aktiviert / Deaktiviert die Kontodetail Felder
+// ****
+function InteressentKontoDetailDisableFields(val)
+{
+	document.getElementById('interessent-konto-textbox-betrag').disabled=val;
+	document.getElementById('interessent-konto-textbox-buchungsdatum').disabled=val;
+	document.getElementById('interessent-konto-textbox-buchungstext').disabled=val;
+	document.getElementById('interessent-konto-textbox-mahnspanne').disabled=val;
+	document.getElementById('interessent-konto-menulist-buchungstyp').disabled=val;
+	document.getElementById('interessent-konto-button-speichern').disabled=val;
+}
+
+// ****
+// * Speichert die Buchung
+// ****
+function InteressentKontoDetailSpeichern()
+{
+	netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+	
+	betrag = document.getElementById('interessent-konto-textbox-betrag').value;
+	buchungsdatum = document.getElementById('interessent-konto-textbox-buchungsdatum').value;
+	buchungstext = document.getElementById('interessent-konto-textbox-buchungstext').value;
+	mahnspanne = document.getElementById('interessent-konto-textbox-mahnspanne').value;
+	buchungstyp_kurzbz = document.getElementById('interessent-konto-menulist-buchungstyp').value;
+	buchungsnr = document.getElementById('interessent-konto-textbox-buchungsnr').value;
+	
+	var url = '<?php echo APP_ROOT ?>content/student/studentDBDML.php';
+	var req = new phpRequest(url,'','');
+	
+	req.add('type', 'savebuchung');
+	
+	req.add('betrag', betrag);
+	req.add('buchungsdatum', buchungsdatum);
+	req.add('buchungstext', buchungstext);
+	req.add('mahnspanne', mahnspanne);
+	req.add('buchungstyp_kurzbz', buchungstyp_kurzbz);
+	req.add('buchungsnr', buchungsnr);
+		
+	var response = req.executePOST();
+
+	var val =  new ParseReturnValue(response)
+	
+	if (!val.dbdml_return)
+	{
+		if(val.dbdml_errormsg=='')
+			alert(response)
+		else
+			alert(val.dbdml_errormsg)
+	}
+	else
+	{			
+		InteressentKontoSelectBuchung=buchungsnr;
+		InteressentKontoTreeDatasource.Refresh(false); //non blocking
+		SetStatusBarText('Daten wurden gespeichert');
+	}
+}
+
+// ****
+// * Legt eine Gegenbuchung zu einer Buchung an
+// ****
+function InteressentKontoGegenbuchung()
+{
+	netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+	var tree = document.getElementById('interessent-konto-tree');
+
+	if (tree.currentIndex==-1) return;
+
+	InteressentKontoDetailDisableFields(false);
+	
+	//Ausgewaehlte Nr holen
+    var col = tree.columns ? tree.columns["interessent-konto-tree-buchungsnr"] : "interessent-konto-tree-buchungsnr";
+	var buchungsnr=tree.view.getCellText(tree.currentIndex,col);
+	
+	var url = '<?php echo APP_ROOT ?>content/student/studentDBDML.php';
+	var req = new phpRequest(url,'','');
+	
+	req.add('type', 'savegegenbuchung');
+	
+	req.add('buchungsnr', buchungsnr);
+		
+	var response = req.executePOST();
+
+	var val =  new ParseReturnValue(response)
+	
+	if (!val.dbdml_return)
+	{
+		if(val.dbdml_errormsg=='')
+			alert(response)
+		else
+			alert(val.dbdml_errormsg)
+	}
+	else
+	{			
+		InteressentKontoSelectBuchung=val.dbdml_data;
+		InteressentKontoTreeDatasource.Refresh(false); //non blocking
+		SetStatusBarText('Daten wurden gespeichert');
+	}
+}
+
+// ****
+// * Loescht eine Buchung
+// ****
+function InteressentKontoDelete()
+{
+	netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+	var tree = document.getElementById('interessent-konto-tree');
+
+	if (tree.currentIndex==-1) return;
+
+	InteressentKontoDetailDisableFields(false);
+	
+	//Ausgewaehlte Nr holen
+    var col = tree.columns ? tree.columns["interessent-konto-tree-buchungsnr"] : "interessent-konto-tree-buchungsnr";
+	var buchungsnr=tree.view.getCellText(tree.currentIndex,col);
+	
+	if(confirm('Diese Buchung wirklich loeschen?'))
+	{
+		var url = '<?php echo APP_ROOT ?>content/student/studentDBDML.php';
+		var req = new phpRequest(url,'','');
+		
+		req.add('type', 'deletebuchung');
+		
+		req.add('buchungsnr', buchungsnr);
+			
+		var response = req.executePOST();
+	
+		var val =  new ParseReturnValue(response)
+		
+		if (!val.dbdml_return)
+		{
+			if(val.dbdml_errormsg=='')
+				alert(response)
+			else
+				alert(val.dbdml_errormsg)
+		}
+		else
+		{			
+			InteressentSelectId=document.getElementById('interessent-detail-textbox-prestudent_id').value;
+			InteressentTreeDatasource.Refresh(false); //non blocking
+			SetStatusBarText('Daten wurden gespeichert');
+		}
+	}
+}
+
+// ****
+// * Ruft einen Dialog zum Anlegen von Buchungen auf
+// ****
+function InteressentKontoNeu()
+{
+	window.open("<?php echo APP_ROOT; ?>content/student/interessentkontoneudialog.xul.php","","chrome, status=no, width=500, height=350, centerscreen, resizable");
+}
+
+// ****
+// * Speichert die Daten aus dem BuchungenDialog
+// ****
+function InteressentKontoNeuSpeichern(dialog, person_ids, studiengang_kz)
+{
+	netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+		
+	var url = '<?php echo APP_ROOT ?>content/student/studentDBDML.php';
+	var req = new phpRequest(url,'','');
+	
+	//Daten aus dem Dialog holen
+	betrag = dialog.getElementById('interessent-konto-neu-textbox-betrag').value;
+	buchungsdatum = dialog.getElementById('interessent-konto-neu-textbox-buchungsdatum').value;
+	buchungstext = dialog.getElementById('interessent-konto-neu-textbox-buchungstext').value;
+	mahnspanne = dialog.getElementById('interessent-konto-neu-textbox-mahnspanne').value;
+	buchungstyp_kurzbz = dialog.getElementById('interessent-konto-neu-menulist-buchungstyp').value;
+	
+	req.add('type', 'neuebuchung');
+	
+	req.add('person_ids', person_ids);
+	req.add('studiengang_kz', studiengang_kz);
+	req.add('betrag', betrag);
+	req.add('buchungsdatum', buchungsdatum);
+	req.add('buchungstext', buchungstext);
+	req.add('mahnspanne', mahnspanne);
+	req.add('buchungstyp_kurzbz', buchungstyp_kurzbz);	
+		
+	var response = req.executePOST();
+
+	var val =  new ParseReturnValue(response)
+	
+	if (!val.dbdml_return)
+	{
+		if(val.dbdml_errormsg=='')
+			alert(response)
+		else
+			alert(val.dbdml_errormsg)
+		return false;
+	}
+	else
+	{
+		InteressentKontoTreeDatasource.Refresh(false);
+		return true;
+	}
+}
+
+
+// ****
+// * Selectiert die Buchung nachdem der Tree
+// * rebuildet wurde.
+// ****
+function InteressentKontoTreeSelectBuchung()
+{
+	var tree=document.getElementById('interessent-konto-tree');
+	if(tree.view)
+		var items = tree.view.rowCount; //Anzahl der Zeilen ermitteln
+	else
+		return false;
+
+	//In der globalen Variable ist die zu selektierende Buchung gespeichert
+	if(InteressentKontoSelectBuchung!=null)
+	{
+		//Alle subtrees oeffnen weil rowCount nur die Anzahl der sichtbaren
+		//Zeilen zurueckliefert
+	   	for(var i=items-1;i>=0;i--)
+	   	{
+	   		if(!tree.view.isContainerOpen(i))
+	   			tree.view.toggleOpenState(i);
+	   	}
+
+	   	//Jetzt die wirkliche Anzahl (aller) Zeilen holen
+	   	items = tree.view.rowCount;
+	   	for(var i=0;i<items;i++)
+	   	{
+	   		//buchungsnr der row holen
+			col = tree.columns ? tree.columns["interessent-konto-tree-buchungsnr"] : "interessent-konto-tree-buchungsnr";
+			buchungsnr=tree.view.getCellText(i,col);
+
+			//wenn dies die zu selektierende Zeile
+			if(buchungsnr == InteressentKontoSelectBuchung)
+			{
+				//Zeile markieren
+				tree.view.selection.select(i);
+				//Sicherstellen, dass die Zeile im sichtbaren Bereich liegt
+				tree.treeBoxObject.ensureRowIsVisible(i);
+				InteressentKontoSelectBuchung=null;
+				return true;
+			}
+	   	}
+	}
 }
\ No newline at end of file
diff --git a/content/student/studentDBDML.php b/content/student/studentDBDML.php
index 976165493..81091475e 100644
--- a/content/student/studentDBDML.php
+++ b/content/student/studentDBDML.php
@@ -42,6 +42,7 @@ require_once('../../include/studiengang.class.php');
 require_once('../../include/akte.class.php');
 require_once('../../include/konto.class.php');
 require_once('../../include/dokument.class.php');
+require_once('../../include/studiensemester.class.php');
 
 $user = get_uid();
 
@@ -178,10 +179,19 @@ if(!$error)
 				$student->geburtsnation = $_POST['geburtsnation'];
 				$student->sprache = $_POST['sprache'];
 				$student->matrikelnr = $_POST['matrikelnummer'];
-				$student->studiengang_kz = $_POST['studiengang_kz'];
-				$student->semester = $_POST['semester'];
-				$student->verband = ($_POST['verband']==''?' ':$_POST['verband']);
-				$student->gruppe = ($_POST['gruppe']==''?' ':$_POST['gruppe']);
+				
+				$stsem = new studiensemester($conn);
+				$stsem_kurzbz = $stsem->getaktorNext();
+				//Wenn das ausgewaehlte Semester das aktuelle ist, dann wird auch in der
+				//Tabelle Student der Stg/Semester/Verband/Gruppe geaendert.
+				//Sonst nur in der Tabelle Studentlehrverband
+				if($semester_aktuell == $stsem_kurzbz)
+				{
+					$student->studiengang_kz = $_POST['studiengang_kz'];
+					$student->semester = $_POST['semester'];
+					$student->verband = ($_POST['verband']==''?' ':$_POST['verband']);
+					$student->gruppe = ($_POST['gruppe']==''?' ':$_POST['gruppe']);
+				}
 				
 				$student->new=false;				
 
diff --git a/content/student/studentdetailoverlay.xul.php b/content/student/studentdetailoverlay.xul.php
index ace3fafb1..94bb279b7 100644
--- a/content/student/studentdetailoverlay.xul.php
+++ b/content/student/studentdetailoverlay.xul.php
@@ -201,7 +201,7 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
     					</row>
     					<row>
 	    					<label value="Semester" control="student-detail-textbox-semester"/>
-      						<hbox><textbox id="student-detail-textbox-semester" disabled="true" maxlength="1" size="1"/></hbox>
+      						<hbox><textbox id="student-detail-textbox-semester" disabled="true" maxlength="2" size="1"/></hbox>
       						<label value="Verband" control="student-detail-textbox-verband"/>
       						<hbox><textbox id="student-detail-textbox-verband" disabled="true" maxlength="1" size="1"/></hbox>
       						<label value="Gruppe" control="student-detail-textbox-gruppe"/>
diff --git a/content/student/studentoverlay.js.php b/content/student/studentoverlay.js.php
index 273382557..700183669 100644
--- a/content/student/studentoverlay.js.php
+++ b/content/student/studentoverlay.js.php
@@ -135,10 +135,12 @@ function StudentTreeRefresh()
 	try
 	{
 		StudentSelectUid=tree.view.getCellText(tree.currentIndex,col);
-		StudentTreeDatasource.Refresh(false); //non blocking
 	}
 	catch(e)
-	{}
+	{
+		StudentSelectUid=null;
+	}
+	StudentTreeDatasource.Refresh(false); //non blocking
 }
 
 // ****
@@ -564,7 +566,7 @@ function StudentAuswahl()
 		return false;
 	}
 
-	var url = '<?php echo APP_ROOT ?>rdf/student.rdf.php?uid='+uid+'&'+gettimestamp();
+	var url = '<?php echo APP_ROOT ?>rdf/student.rdf.php?uid='+uid+'&stsem=true&'+gettimestamp();
 	
 	//hier wird GetDataSourceBlocking verwendet da sich
 	//bei der Methode mit phpRequest der Mozilla aufhaengt
diff --git a/content/tempus.js.php b/content/tempus.js.php
index f6980c666..a06f65bda 100644
--- a/content/tempus.js.php
+++ b/content/tempus.js.php
@@ -99,6 +99,17 @@ function studiensemesterChange()
    		document.getElementById("statusbarpanel-text").label = "Studiensemester erfolgreich geändert";
    		document.getElementById("statusbarpanel-semester").label = stsem;
    		//MitarbeiterDetailStudiensemester_id = dbdml_errormsg;
+   		//Ansichten Refreshen
+   		try
+   		{
+   			StudentTreeRefresh();
+   			InteressentTreeRefresh();
+   			LvTreeRefresh();
+   		}
+   		catch(e)
+   		{
+   			debug('catch: '+e);
+   		}
    	}
    	else
    	{
diff --git a/include/student.class.php b/include/student.class.php
index 75fc7cfdb..1e231200b 100644
--- a/include/student.class.php
+++ b/include/student.class.php
@@ -59,13 +59,28 @@ class student extends benutzer
 			$this->load($uid);
 	}
 
-	function load($uid)
+	// **************************************************
+	// * Laedt die Daten eines Studenten
+	// * Wenn Studiensemester_kurzbz angegeben wird, dann werden
+	// * Studiengang, Semester, Verband und Gruppe aus der Tabelle 
+	// * Studentlehrverband geholt.
+	// * @param uid
+	// * 		studiensemester_kurzbz
+	// * @return true wenn ok, false im Fehlerfall
+	// **************************************************
+	function load($uid, $studiensemester_kurzbz=null)
 	{
 		if(!benutzer::load($uid))
 			return false;
 
-		$qry = "SELECT * FROM public.tbl_student WHERE student_uid='".addslashes($uid)."'";
-
+		if(is_null($studiensemester_kurzbz))
+			$qry = "SELECT * FROM public.tbl_student WHERE student_uid='".addslashes($uid)."'";
+		else
+			$qry = "SELECT *, tbl_studentlehrverband.studiengang_kz as studiengang_kz, tbl_studentlehrverband.semester as semester,
+					tbl_studentlehrverband.verband as verband, tbl_studentlehrverband.gruppe as gruppe  
+					FROM public.tbl_student JOIN public.tbl_studentlehrverband USING(student_uid) 
+					WHERE studiensemester_kurzbz='".addslashes($studiensemester_kurzbz)."' AND student_uid='".addslashes($uid)."'";
+		
 		if($result = pg_query($this->conn, $qry))
 		{
 			if($row = pg_fetch_object($result))
@@ -268,7 +283,9 @@ class student extends benutzer
 		}			
 
 		//$sql_query="SELECT * FROM campus.vw_student WHERE $where ORDER by nachname,vorname";
-		$sql_query = "SELECT *, tbl_student.semester as std_semester, tbl_student.verband as std_verband, tbl_student.gruppe as std_gruppe, tbl_student.studiengang_kz as std_studiengang_kz FROM public.tbl_person, public.tbl_student, ((public.tbl_benutzer LEFT JOIN public.tbl_benutzergruppe USING(uid)) LEFT JOIN public.tbl_studentlehrverband ON(uid = student_uid))
+		$sql_query = "SELECT *, tbl_student.semester as std_semester, tbl_student.verband as std_verband, tbl_student.gruppe as std_gruppe, tbl_student.studiengang_kz as std_studiengang_kz,
+					  tbl_studentlehrverband.studiengang_kz as lvb_studiengang_kz, tbl_studentlehrverband.semester as lvb_semester, tbl_studentlehrverband.verband as lvb_verband, tbl_studentlehrverband.gruppe as lvb_gruppe 
+					  FROM public.tbl_person, public.tbl_student, ((public.tbl_benutzer LEFT JOIN public.tbl_benutzergruppe USING(uid)) LEFT JOIN public.tbl_studentlehrverband ON(uid = student_uid))
 					  WHERE tbl_person.person_id=tbl_benutzer.person_id AND tbl_benutzer.uid = tbl_student.student_uid AND $where ORDER BY nachname, vorname";
 	    //echo $sql_query;
 		if(!($erg=pg_query($this->conn, $sql_query)))
@@ -303,10 +320,10 @@ class student extends benutzer
 			$l->updatevon=(isset($row->updatevon)?$row->updatevon:'');
 			// Studentendaten
 			$l->matrikelnr=$row->matrikelnr;
-			$l->gruppe=$row->std_gruppe;
-			$l->verband=$row->std_verband;
-			$l->semester=$row->std_semester;
-			$l->studiengang_kz=$row->std_studiengang_kz;
+			$l->gruppe=$row->lvb_gruppe;
+			$l->verband=$row->lvb_verband;
+			$l->semester=$row->lvb_semester;
+			$l->studiengang_kz=$row->lvb_studiengang_kz;
 			//$l->stg_bezeichnung=$row->bezeichnung;
 			// student in Array speichern
 			$result[]=$l;
diff --git a/rdf/student.rdf.php b/rdf/student.rdf.php
index ef565deb7..cad717c4b 100644
--- a/rdf/student.rdf.php
+++ b/rdf/student.rdf.php
@@ -53,7 +53,7 @@ else
 // Studenten holen
 $student=new student($conn,null,true);
 if (isset($uid))
-	$student->load($uid);
+	$student->load($uid, $stsem);
 else
 	$studenten=$student->getStudents($stg_kz,$sem,$ver,$grp,$gruppe, $stsem);