diff --git a/content/lvplanung/lehrveranstaltungoverlay.js.php b/content/lvplanung/lehrveranstaltungoverlay.js.php
index 596f7422c..db5edfd65 100644
--- a/content/lvplanung/lehrveranstaltungoverlay.js.php
+++ b/content/lvplanung/lehrveranstaltungoverlay.js.php
@@ -219,7 +219,7 @@ function LeNeu()
LeDetailReset();
//Detail Tab als aktiv setzen
- document.getElementById('lehrveranstaltung-tabs').selectedItem = document.getElementById('lehrveranstaltung-tab-detail');
+ document.getElementById('lehrveranstaltung-tabbox').selectedIndex=0;
//Lektor-Tab und GruppenTree ausblenden
document.getElementById('lehrveranstaltung-detail-tree-lehreinheitgruppe').hidden=true;
diff --git a/content/student/interessentdetailoverlay.xul.php b/content/student/interessentdetailoverlay.xul.php
index 7b116f89f..91ddbfa1a 100644
--- a/content/student/interessentdetailoverlay.xul.php
+++ b/content/student/interessentdetailoverlay.xul.php
@@ -264,10 +264,21 @@ echo '';
+
+
+
+
+
-
+
+
+
+
-
+
+
+
+
diff --git a/content/student/interessentenoverlay.xul.php b/content/student/interessentenoverlay.xul.php
index f82cf56f6..0d764723e 100644
--- a/content/student/interessentenoverlay.xul.php
+++ b/content/student/interessentenoverlay.xul.php
@@ -111,6 +111,10 @@ echo '
+
+
@@ -118,6 +122,7 @@ echo '
+
@@ -138,6 +143,7 @@ echo '
+
diff --git a/content/student/interessentoverlay.js.php b/content/student/interessentoverlay.js.php
index c12c5e483..8b6530183 100644
--- a/content/student/interessentoverlay.js.php
+++ b/content/student/interessentoverlay.js.php
@@ -416,6 +416,7 @@ function InteressentAuswahl()
reihungstestangetreten = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#reihungstestangetreten" ));
punkte = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#punkte" ));
bismelden = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#bismelden" ));
+ anmerkung = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#anmerkung" ));
document.getElementById('interessent-prestudent-menulist-aufmerksamdurch').value=aufmerksamdurch_kurzbz;
document.getElementById('interessent-prestudent-menulist-berufstaetigkeit').value=berufstaetigkeit_code;
@@ -448,6 +449,7 @@ function InteressentAuswahl()
document.getElementById('interessent-prestudent-textbox-prestudent_id').value=prestudent_id;
document.getElementById('interessent-prestudent-checkbox-new').checked=false;
document.getElementById('interessent-prestudent-menulist-studiengang_kz').value=studiengang_kz;
+ document.getElementById('interessent-prestudent-textbox-anmerkung').value=anmerkung;
rollentree = document.getElementById('interessent-prestudent-tree-rolle');
url='rdf/prestudentrolle.rdf.php?prestudent_id='+prestudent_id+"&"+gettimestamp();
@@ -490,6 +492,7 @@ function InteressentPrestudentDisableFields(val)
document.getElementById('interessent-prestudent-checkbox-bismelden').disabled=val;
document.getElementById('interessent-prestudent-button-anmeldungreihungstest-heute').disabled=val;
document.getElementById('interessent-prestudent-button-save').disabled=val;
+ document.getElementById('interessent-prestudent-textbox-anmerkung').disabled=val;
}
// ****
@@ -517,6 +520,7 @@ function InteressentPrestudentSave()
prestudent_id = document.getElementById('interessent-prestudent-textbox-prestudent_id').value;
neu = document.getElementById('interessent-prestudent-checkbox-new').checked;
studiengang_kz = document.getElementById('interessent-prestudent-menulist-studiengang_kz').value;
+ anmerkung = document.getElementById('interessent-prestudent-textbox-anmerkung').value;
var url = 'content/student/studentDBDML.php';
var req = new phpRequest(url,'','');
@@ -548,6 +552,7 @@ function InteressentPrestudentSave()
req.add('person_id', person_id);
req.add('prestudent_id', prestudent_id);
req.add('studiengang_kz', studiengang_kz);
+ req.add('anmerkung', anmerkung);
var response = req.executePOST();
diff --git a/content/student/studentDBDML.php b/content/student/studentDBDML.php
index e1ed0fc25..9a184d1f7 100644
--- a/content/student/studentDBDML.php
+++ b/content/student/studentDBDML.php
@@ -209,8 +209,8 @@ if(!$error)
$prestudent->studiengang_kz = $_POST['studiengang_kz'];
$prestudent->berufstaetigkeit_code = $_POST['berufstaetigkeit_code'];
$prestudent->ausbildungcode = $_POST['ausbildungcode'];
- $presutdent->zgv_code = $_POST['zgv_code'];
- $presutdent->zgvort = $_POST['zgvort'];
+ $prestudent->zgv_code = $_POST['zgv_code'];
+ $prestudent->zgvort = $_POST['zgvort'];
$prestudent->zgvdatum = $_POST['zgvdatum'];
$prestudent->zgvmas_code = $_POST['zgvmas_code'];
$prestudent->zgvmaort = $_POST['zgvmaort'];
@@ -222,6 +222,7 @@ if(!$error)
$prestudent->reihungstestangetreten = ($_POST['reihungstestangetreten']=='true'?true:false);
$prestudent->punkte = $_POST['punkte'];
$prestudent->bismelden = ($_POST['bismelden']=='true'?true:false);
+ $prestudent->anmerkung = $_POST['anmerkung'];
//$prestudent->insertamum = date('Y-m-d H:i:s');
//$prestudent->insertvon = $user;
$prestudent->updateamum = date('Y-m-d H:i:s');
diff --git a/content/student/studentdetailoverlay.xul.php b/content/student/studentdetailoverlay.xul.php
index e201504d9..234a56e2a 100644
--- a/content/student/studentdetailoverlay.xul.php
+++ b/content/student/studentdetailoverlay.xul.php
@@ -293,10 +293,35 @@ echo '';
+
+
+
+
+
+
+
+
+
-
+
+
+
+
-
+
+
+
+
diff --git a/content/student/studentoverlay.js.php b/content/student/studentoverlay.js.php
index 519f5ed58..db0cf6436 100644
--- a/content/student/studentoverlay.js.php
+++ b/content/student/studentoverlay.js.php
@@ -517,6 +517,7 @@ function StudentAuswahl()
reihungstestangetreten = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#reihungstestangetreten" ));
punkte = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#punkte" ));
bismelden = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#bismelden" ));
+ anmerkung = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#anmerkung" ));
document.getElementById('student-prestudent-menulist-aufmerksamdurch').value=aufmerksamdurch_kurzbz;
document.getElementById('student-prestudent-menulist-berufstaetigkeit').value=berufstaetigkeit_code;
@@ -548,7 +549,8 @@ function StudentAuswahl()
document.getElementById('student-prestudent-textbox-person_id').value=person_id;
document.getElementById('student-prestudent-textbox-prestudent_id').value=prestudent_id;
document.getElementById('student-prestudent-checkbox-new').checked=false;
- document.getElementById('student-prestudent-textbox-studiengang_kz').value=studiengang_kz;
+ document.getElementById('student-prestudent-menulist-studiengang_kz').value=studiengang_kz;
+ document.getElementById('student-prestudent-textbox-anmerkung').value=anmerkung;
rollentree = document.getElementById('student-prestudent-tree-rolle');
@@ -591,6 +593,8 @@ 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-textbox-anmerkung').disabled=val;
}
// ****
@@ -617,7 +621,8 @@ function StudentPrestudentSave()
person_id = document.getElementById('student-prestudent-textbox-person_id').value;
prestudent_id = document.getElementById('student-prestudent-textbox-prestudent_id').value;
neu = document.getElementById('student-prestudent-checkbox-new').checked;
- studiengang_kz = document.getElementById('student-prestudent-textbox-studiengang_kz').value;
+ studiengang_kz = document.getElementById('student-prestudent-menulist-studiengang_kz').value;
+ anmerkung = document.getElementById('student-prestudent-textbox-anmerkung').value;
var url = 'content/student/studentDBDML.php';
var req = new phpRequest(url,'','');
@@ -649,6 +654,7 @@ function StudentPrestudentSave()
req.add('person_id', person_id);
req.add('prestudent_id', prestudent_id);
req.add('studiengang_kz', studiengang_kz);
+ req.add('anmerkung', anmerkung);
var response = req.executePOST();
@@ -665,7 +671,7 @@ function StudentPrestudentSave()
{
netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
- StudentSelectUid=val.dbdml_data;
+ StudentSelectUid=document.getElementById('student-detail-textbox-uid').value;
StudentTreeDatasource.Refresh(false); //non blocking
SetStatusBarText('Daten wurden gespeichert');
}
diff --git a/content/tempus.js.php b/content/tempus.js.php
index 2feef3d38..f6980c666 100644
--- a/content/tempus.js.php
+++ b/content/tempus.js.php
@@ -10,7 +10,15 @@ function closeWindow()
function onLoad()
{
- initLektorTree();
+ try
+ {
+ initLektorTree();
+ //Studenten Tab beim starten markieren
+ document.getElementById('tabbox-main').selectedIndex="1";
+ }
+ catch(e)
+ {
+ }
}
function loadRightFrame()
diff --git a/include/prestudent.class.php b/include/prestudent.class.php
index bf210fb3c..4b5e8039c 100644
--- a/include/prestudent.class.php
+++ b/include/prestudent.class.php
@@ -444,6 +444,7 @@ class prestudent extends person
$ps->reihungstest_id = $row->reihungstest_id;
$ps->punkte = $row->punkte;
$ps->bismelden = ($row->bismelden=='t'?true:false);
+ $ps->anmerkung = $row->anmerkung;
$ps->rolle_kurzbz = $row->rolle_kurzbz;
$ps->studiensemester_kurzbz = $row->studiensemester_kurzbz;
@@ -552,5 +553,36 @@ class prestudent extends person
return false;
}
}
+
+ function getLastStatus($prestudent_id)
+ {
+ $qry = "SELECT * FROM tbl_prestudentrolle WHERE prestudent_id='$prestudent_id' ORDER BY datum DESC LIMIT 1";
+ if($result = pg_query($this->conn, $qry))
+ {
+ if($row = pg_fetch_object($result))
+ {
+ $this->prestudent_id = $row->prestudent_id;
+ $this->rolle_kurzbz = $row->rolle_kurzbz;
+ $this->studiensemester_kurzbz = $row->studiensemester_kurzbz;
+ $this->ausbildungssemester = $row->ausbildungssemester;
+ $this->datum = $row->datum;
+ $this->insertamum = $row->insertamum;
+ $this->insertvon = $row->insertvon;
+ $this->updateamum = $row->updateamum;
+ $this->updatevon = $row->updatevon;
+ return true;
+ }
+ else
+ {
+ $this->errormsg = 'Keine Rolle vorhanden';
+ return false;
+ }
+ }
+ else
+ {
+ $this->errormsg = 'Fehler beim laden der PrestudentDaten';
+ return false;
+ }
+ }
}
?>
\ No newline at end of file
diff --git a/rdf/interessentenbewerber.rdf.php b/rdf/interessentenbewerber.rdf.php
index e5354cfc2..62fa4ff8e 100644
--- a/rdf/interessentenbewerber.rdf.php
+++ b/rdf/interessentenbewerber.rdf.php
@@ -102,7 +102,9 @@ else
function DrawInteressent($row)
{
- global $rdf_url;
+ global $rdf_url, $conn;
+ $ps = new prestudent($conn);
+ $ps->getLastStatus($row->prestudent_id);
?>
@@ -150,6 +152,8 @@ function DrawInteressent($row)
reihungstestangetreten?'true':'false'); ?>]]>
punkte; ?>]]>
bismelden?'true':'false'); ?>]]>
+ anmerkung; ?>]]>
+ rolle_kurzbz; ?>]]>
lehrveranstaltungen as $row_lva)
while($row_lva = pg_fetch_object($result))
- {
+ {
+ //Fachbereichskoordinatoren laden
+ $qry_fbk = "SELECT distinct tbl_mitarbeiter.kurzbz as kurzbz FROM lehre.tbl_lehreinheit, lehre.tbl_lehrfach, public.tbl_mitarbeiter, public.tbl_benutzerfunktion
+ WHERE tbl_lehreinheit.lehrveranstaltung_id='$row_lva->lehrveranstaltung_id' AND
+ tbl_lehreinheit.lehrfach_id = tbl_lehrfach.lehrfach_id AND
+ tbl_lehrfach.fachbereich_kurzbz = tbl_benutzerfunktion.fachbereich_kurzbz AND
+ tbl_mitarbeiter.mitarbeiter_uid = tbl_benutzerfunktion.uid AND
+ tbl_benutzerfunktion.funktion_kurzbz='fbk' AND
+ tbl_benutzerfunktion.studiengang_kz='$row_lva->studiengang_kz'";
+ $result_fbk = pg_query($conn, $qry_fbk);
+ $fbk='';
+ while($row_fbk = pg_fetch_object($result_fbk))
+ {
+ $fbk.=$row_fbk->kurzbz.' ';
+ }
+
+ if($fbk!='')
+ $fbk='FBK: '.$fbk;
+
//Lehrveranstaltung
echo "
lehrveranstaltung_id."\" about=\"".$rdf_url.'/'.$row_lva->lehrveranstaltung_id."\" >
@@ -138,7 +156,7 @@ if(!$result = pg_query($conn, $qry))
-
+ $fbk
";
diff --git a/rdf/prestudent.rdf.php b/rdf/prestudent.rdf.php
index d41b884c2..923241e37 100644
--- a/rdf/prestudent.rdf.php
+++ b/rdf/prestudent.rdf.php
@@ -79,6 +79,7 @@ if(isset($_GET['prestudent_id']) && is_numeric($_GET['prestudent_id']))
reihungstestangetreten?'true':'false'); ?>]]>
punkte; ?>]]>
bismelden?'true':'false'); ?>]]>
+ anmerkung; ?>]]>