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

---
 content/ToDo_FASo.html                     |  8 ++++++++
 content/student/studentDBDML.php           |  2 ++
 content/student/studentoverlay.js.php      | 23 ++++++++++++++++++++--
 content/student/studentrolledialog.xul.php | 21 +++++++++++++++++---
 vilesci/bis/checkfunktion.php              |  6 ++++--
 5 files changed, 53 insertions(+), 7 deletions(-)

diff --git a/content/ToDo_FASo.html b/content/ToDo_FASo.html
index 08d77b77c..4a7ff159a 100644
--- a/content/ToDo_FASo.html
+++ b/content/ToDo_FASo.html
@@ -309,6 +309,14 @@ Studenten<br>
 <hr>
 <h2>Erledigte Anforderungen</h2>
 <ul>
+	<li>Im Fenster zum ändern des Status wird nun der Name des Studenten angezeigt<br>
+		14.11.2007 oesi<br>
+		<br>
+	</li>
+	<li>Organisationsform wird bei Status&auml;nderung automatisch mit&uuml;bernommen<br>
+		14.11.2007 oesi<br>
+		<br>
+	</li>
 	<li>Beim Anlegen von neuen Benutzerfunktionen soll Studiengang und 'Studententvertreter' vorausgewaehlt sein<br>
 		09.11.2007 oesi<br>
 		<br>
diff --git a/content/student/studentDBDML.php b/content/student/studentDBDML.php
index 4ac49255f..434a2e9f1 100644
--- a/content/student/studentDBDML.php
+++ b/content/student/studentDBDML.php
@@ -498,6 +498,7 @@ if(!$error)
 							$prestd_neu->studiensemester_kurzbz = $studiensemester;
 							$prestd_neu->datum = date('Y-m-d');
 							$prestd_neu->ausbildungssemester = $sem;
+							$prestd_neu->orgform_kurzbz = $prestd->orgform_kurzbz;
 							$prestd_neu->insertamum = date('Y-m-d H:i:s');
 							$prestd_neu->insertvon = $user;
 							$prestd_neu->new = true;
@@ -795,6 +796,7 @@ if(!$error)
 												$rolle->rolle_kurzbz = 'Student';
 												$rolle->studiensemester_kurzbz = $hlp->result[0]->studiensemester_kurzbz;
 												$rolle->ausbildungssemester = $hlp->result[0]->ausbildungssemester;
+												$rolle->orgform_kurzbz = $hlp->result[0]->orgform_kurzbz;
 												$rolle->datum = date('Y-m-d');
 												$rolle->insertamum = date('Y-m-d H:i:s');
 												$rolle->insertvon = $user;
diff --git a/content/student/studentoverlay.js.php b/content/student/studentoverlay.js.php
index f2f0cfbad..6475deb44 100644
--- a/content/student/studentoverlay.js.php
+++ b/content/student/studentoverlay.js.php
@@ -1269,6 +1269,25 @@ function StudentPrestudentDisableFields(val)
 	document.getElementById('student-prestudent-button-save').disabled=val;
 	//document.getElementById('student-prestudent-menulist-studiengang_kz').disabled=val;
 	document.getElementById('student-prestudent-textbox-anmerkung').disabled=val;
+	
+	//Status Tree leeren
+	rollentree = document.getElementById('student-prestudent-tree-rolle');
+
+	try
+	{
+		StudentDetailRolleTreeDatasource.removeXMLSinkObserver(StudentDetailRolleTreeSinkObserver);
+	}
+	catch(e)
+	{}
+	
+	//Alte DS entfernen
+	var oldDatasources = rollentree.database.GetDataSources();
+	while(oldDatasources.hasMoreElements())
+	{
+		rollentree.database.RemoveDataSource(oldDatasources.getNext());
+	}
+	//Refresh damit die entfernten DS auch wirklich entfernt werden
+	rollentree.builder.rebuild();
 }
 
 // ****
@@ -1443,7 +1462,7 @@ function StudentRolleBearbeiten()
 	var col = tree.columns ? tree.columns["student-prestudent-tree-rolle-ausbildungssemester"] : "student-prestudent-tree-rolle-ausbildungssemester";
 	var ausbildungssemester=tree.view.getCellText(tree.currentIndex,col);
 
-	window.open('<?php echo APP_ROOT?>content/student/studentrolledialog.xul.php?prestudent_id='+prestudent_id+'&rolle_kurzbz='+rolle_kurzbz+'&studiensemester_kurzbz='+studiensemester_kurzbz+'&ausbildungssemester='+ausbildungssemester,"","chrome, status=no, width=500, height=300, centerscreen, resizable");
+	window.open('<?php echo APP_ROOT?>content/student/studentrolledialog.xul.php?prestudent_id='+prestudent_id+'&rolle_kurzbz='+rolle_kurzbz+'&studiensemester_kurzbz='+studiensemester_kurzbz+'&ausbildungssemester='+ausbildungssemester,"Status","chrome, status=no, width=500, height=300, centerscreen, resizable");
 }
 
 // ****
@@ -1547,7 +1566,7 @@ function StudentUnterbrecherZuStudent()
 function StudentRolleAdd()
 {
 	var prestudent_id = document.getElementById('student-prestudent-textbox-prestudent_id').value;
-	window.open('<?php echo APP_ROOT?>content/student/studentrolledialog.xul.php?prestudent_id='+prestudent_id,"","chrome, status=no, width=500, height=300, centerscreen, resizable");
+	window.open('<?php echo APP_ROOT?>content/student/studentrolledialog.xul.php?prestudent_id='+prestudent_id,"Status","chrome, status=no, width=500, height=300, centerscreen, resizable");
 }
 
 // ****
diff --git a/content/student/studentrolledialog.xul.php b/content/student/studentrolledialog.xul.php
index f46436f7b..cb17374d7 100644
--- a/content/student/studentrolledialog.xul.php
+++ b/content/student/studentrolledialog.xul.php
@@ -26,7 +26,10 @@ 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');
+require_once('../../vilesci/config.inc.php');
+require_once('../../include/person.class.php');
+require_once('../../include/prestudent.class.php');
+
 echo '<?xml version="1.0" encoding="UTF-8"?>'."\n";
 
 echo '<?xml-stylesheet href="'.APP_ROOT.'skin/tempus.css" type="text/css"?>';
@@ -55,9 +58,21 @@ if(isset($_GET['ausbildungssemester']))
 	$ausbildungssemester=$_GET['ausbildungssemester'];
 else 
 	$ausbildungssemester='';
+
+$vorname = '';
+$nachname = '';
+if($prestudent_id!='')
+{
+	$prestudent = new prestudent($conn);
+	$prestudent->load($prestudent_id);
+	
+	$vorname = $prestudent->vorname;
+	$nachname = $prestudent->nachname;
+}
+
 ?>
 
-<window id="student-rolle-dialog" title="Neu"
+<window id="student-rolle-dialog" title="Status"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         onload="StudentRolleInit(<?php echo "'$prestudent_id','$rolle_kurzbz','$studiensemester_kurzbz','$ausbildungssemester'";?>)"
         >
@@ -68,7 +83,7 @@ else
 <vbox>
 <textbox id="student-rolle-textbox-prestudent_id" value="" hidden="true" />
 <groupbox id="student-rolle-groupbox" flex="1">
-	<caption label="Details"/>
+	<caption label="Details<?php echo ($nachname!=''?" $nachname $vorname":'');?>"/>
 		<grid id="student-rolle-grid-detail" style="margin:4px;" flex="1">
 		  	<columns  >
 				<column flex="1"/>
diff --git a/vilesci/bis/checkfunktion.php b/vilesci/bis/checkfunktion.php
index d40d53570..4f9a0241c 100644
--- a/vilesci/bis/checkfunktion.php
+++ b/vilesci/bis/checkfunktion.php
@@ -37,7 +37,7 @@ $verwendung_not_found=0;
 $verwendung_multiple=0;
 $funktion_ohne_lehrauftrag=0;
 $user = get_uid();
-$wochen=40;
+$wochen=BIS_SWS_WOCHEN;
 
 $stg_arr = array();
 $stg_obj = new studiengang($conn);
@@ -61,7 +61,9 @@ echo '<html>
 $stsem = new studiensemester($conn);
 $stsemprev = $stsem->getPrevious();
 $stsemprevprev = $stsem->getBeforePrevious();
-echo $stsemprev.' '.$stsemprevprev.'<br>';
+
+echo "Generiere Funktionen für $stsemprevprev/$stsemprev<br>";
+
 $qry =  "SELECT tbl_lehreinheitmitarbeiter.mitarbeiter_uid, tbl_lehrveranstaltung.studiengang_kz, sum(tbl_lehreinheitmitarbeiter.semesterstunden) as semstd 
 		FROM lehre.tbl_lehreinheitmitarbeiter, lehre.tbl_lehreinheit, lehre.tbl_lehrveranstaltung  
 		WHERE