diff --git a/content/student/studentdetailoverlay.xul.php b/content/student/studentdetailoverlay.xul.php
index ba92808a1..0a014b20a 100644
--- a/content/student/studentdetailoverlay.xul.php
+++ b/content/student/studentdetailoverlay.xul.php
@@ -69,6 +69,10 @@ echo '';
+
+
+
+
@@ -496,105 +500,176 @@ echo '';
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/content/student/studentoverlay.js.php b/content/student/studentoverlay.js.php
index a1e403200..6dbaa55e8 100644
--- a/content/student/studentoverlay.js.php
+++ b/content/student/studentoverlay.js.php
@@ -1055,6 +1055,8 @@ function StudentAuswahl()
status=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#status" ));
alias=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#alias" ));
matr_nr=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#matr_nr" ));
+ zugangscode=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#zugangscode" ));
+ link_bewerbungstool=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#link_bewerbungstool" ));
//Bei Incoming wird das Menue zur Statusaenderung deaktiviert
if(status=='Incoming')
@@ -1099,6 +1101,8 @@ function StudentAuswahl()
document.getElementById('student-detail-textbox-person_id').value = person_id;
document.getElementById('student-detail-textbox-alias').value=alias;
document.getElementById('student-detail-textbox-matr_nr').value=matr_nr;
+ document.getElementById('label-student-detail-zugangscode').value=zugangscode;
+ document.getElementById('label-student-detail-link_bewerbungstool').value=link_bewerbungstool;
//PreStudent Daten holen
@@ -1187,6 +1191,22 @@ function StudentAuswahl()
rollentree.database.AddDataSource(StudentDetailRolleTreeDatasource);
StudentDetailRolleTreeDatasource.addXMLSinkObserver(StudentDetailRolleTreeSinkObserver);
+ var historietree = document.getElementById('historie-tree');
+ url_historie='rdf/prestudenthistorie.rdf.php?prestudent_id='+prestudent_id+"&"+gettimestamp();
+
+ //Alte DS entfernen
+ var oldDatasourcesHistorie = historietree.database.GetDataSources();
+ while(oldDatasourcesHistorie.hasMoreElements())
+ {
+ historietree.database.RemoveDataSource(oldDatasourcesHistorie.getNext());
+ }
+ //Refresh damit die entfernten DS auch wirklich entfernt werden
+ historietree.builder.rebuild();
+
+ var HistorieTreeDatasource = rdfService.GetDataSource(url_historie);
+ HistorieTreeDatasource.QueryInterface(Components.interfaces.nsIRDFRemoteDataSource);
+ historietree.database.AddDataSource(HistorieTreeDatasource);
+
if(uid=='')
{
//PRESTUDENT
diff --git a/rdf/prestudenthistorie.rdf.php b/rdf/prestudenthistorie.rdf.php
new file mode 100644
index 000000000..110e1a4e7
--- /dev/null
+++ b/rdf/prestudenthistorie.rdf.php
@@ -0,0 +1,166 @@
+,
+ * Andreas Oesterreicher and
+ * Rudolf Hangl .
+ */
+// header für no cache
+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");
+// content type setzen
+header("Content-type: application/xhtml+xml");
+// xml
+echo '';
+
+require_once('../config/vilesci.config.inc.php');
+require_once('../include/person.class.php');
+require_once('../include/prestudent.class.php');
+require_once('../include/datum.class.php');
+require_once('../include/statusgrund.class.php');
+require_once('../include/studiengang.class.php');
+
+$rdf_url='http://www.technikum-wien.at/prestudenthistorie';
+$datum = new datum();
+
+echo '
+
+
+
+';
+
+if(isset($_GET['prestudent_id']) && is_numeric($_GET['prestudent_id']))
+ $prestudent_id = $_GET['prestudent_id'];
+else
+ die('Prestudent_id muss angegeben werden');
+
+$studiengang = new studiengang();
+$studiengang->getAll('typ, kurzbz', false);
+
+if (!$db = new basis_db())
+ die('Es konnte keine Verbindung zum Server aufgebaut werden.');
+
+$prestudent = new prestudent($prestudent_id);
+$prestudent->getLastStatus($prestudent_id);
+$prestudentGET_studiengang = $prestudent->studiengang_kz;
+$prestudentGET_orgform_kurzbz = $prestudent->orgform_kurzbz;
+$prestudent->getPrestudenten($prestudent->person_id);
+
+foreach ($prestudent->result as $row)
+{
+ $prestudentLastStatus = new prestudent();
+ $prestudentLastStatus->getLastStatus($row->prestudent_id);
+ $row->studiensemester_kurzbz = $prestudentLastStatus->studiensemester_kurzbz;
+ $row->ausbildungssemester = $prestudentLastStatus->ausbildungssemester;
+ $row->datum = $prestudentLastStatus->datum;
+ $row->orgform_kurzbz = $prestudentLastStatus->orgform_kurzbz;
+ $row->studienplan_bezeichnung = $prestudentLastStatus->studienplan_bezeichnung;
+ $row->status_kurzbz = $prestudentLastStatus->status_kurzbz;
+ if ($prestudentLastStatus->statusgrund_id != '')
+ {
+ $statusgrund = new statusgrund($prestudentLastStatus->statusgrund_id);
+ $row->statusgrund = $statusgrund->bezeichnung_mehrsprachig[DEFAULT_LANGUAGE];
+ }
+ else
+ {
+ $row->statusgrund = '';
+ }
+}
+
+// Sortiert PreStudenten nach Studiensemester
+function sortPrestudents($a, $b)
+{
+ $c = substr($b->studiensemester_kurzbz, 2) - substr($a->studiensemester_kurzbz, 2);
+ $c .= strcmp(substr($b->studiensemester_kurzbz, 0, 2), substr($a->studiensemester_kurzbz, 0, 2));
+ $c .= $a->priorisierung - $b->priorisierung;
+ return $c;
+}
+
+usort($prestudent->result, "sortPrestudents");
+
+$studiensemester_kurzbz = '';
+$stdsem = '';
+
+foreach ($prestudent->result as $row)
+{
+ // Allfällige Studentendaten laden
+ $uid = '';
+ $gruppe = '';
+ $status = '';
+ $aktiv = 'true';
+ $bold = '';
+ if ($row->status_kurzbz == 'Abgewiesener' || $row->status_kurzbz == 'Abbrecher' || $row->status_kurzbz == 'Absolvent' )
+ {
+ $aktiv = 'false';
+ }
+ $qry ="SELECT * FROM public.tbl_student WHERE prestudent_id='$row->prestudent_id'";
+ if($result = $db->db_query($qry))
+ {
+ if($db->db_num_rows($result)>1)
+ {
+ $uid ='ACHTUNG: Mehrere Studenteneinträge vorhanden!';
+ }
+ else
+ {
+ if($row_std = $db->db_fetch_object($result))
+ {
+ $uid = $row_std->student_uid;
+ $gruppe = $row_std->semester.$row_std->verband.$row_std->gruppe;
+ }
+ }
+ }
+
+ $status = $row->status_kurzbz;
+ if ($row->ausbildungssemester != '')
+ {
+ $status .= ' ('.$row->ausbildungssemester.'. Semester)';
+ }
+ if ($row->statusgrund != '')
+ {
+ $status .= ' - '.$row->statusgrund;
+ }
+ if ($row->studiengang_kz == $prestudentGET_studiengang && $row->orgform_kurzbz == $prestudentGET_orgform_kurzbz)
+ {
+ $bold = 'bold';
+ }
+ echo '
+
+
+ prestudent_id.']]>
+ studiensemester_kurzbz.']]>
+ priorisierung.']]>
+ kuerzel_arr[$row->studiengang_kz].']]>
+ orgform_kurzbz.']]>
+ studienplan_bezeichnung.']]>
+
+
+
+
+
+
+
+ ';
+
+}
+?>
+
+
\ No newline at end of file
diff --git a/rdf/student.rdf.php b/rdf/student.rdf.php
index 5d2e3dd0c..3c0492338 100644
--- a/rdf/student.rdf.php
+++ b/rdf/student.rdf.php
@@ -180,6 +180,7 @@ function draw_content_liste($row)
bestaetigtam!=''?$datum_obj->formatDatum($prestudent->bestaetigtam,'d.m.Y'):'-').']]>
formatDatum($prestudent->datum,'Y-m-d').']]>
bestaetigtam!=''?$datum_obj->formatDatum($prestudent->bestaetigtam,'Y-m-d'):'-').']]>
+ zugangscode.']]>
'.($row->anmerkungen==''?' ':'anmerkungen.']]>').'
'.($row->anmerkung==''?' ':'anmerkung.']]>').'
@@ -222,10 +223,10 @@ function draw_content($row)
{
switch($row->bnaktiv)
{
- case "t":
+ case true:
$aktiv = "true";
break;
- case "f":
+ case false:
$aktiv = "false";
break;
default:
@@ -294,6 +295,8 @@ function draw_content($row)
studienplan_id.']]>
uid)?$row->uid.'@'.DOMAIN:'').']]>
+ zugangscode.']]>
+ zugangscode.'&emailAdresse='.$mail_privat.']]>
uid)?$row->uid:'').']]>
@@ -475,7 +478,7 @@ if($xmlformat=='rdf')
AS email_privat,
(SELECT rt_gesamtpunkte as punkte FROM public.tbl_prestudent WHERE prestudent_id=tbl_student.prestudent_id) as punkte,
tbl_prestudent.dual as dual, tbl_prestudent.reihungstest_id, tbl_prestudent.anmeldungreihungstest, p.matr_nr,
- tbl_prestudent.gsstudientyp_kurzbz, tbl_prestudent.aufnahmegruppe_kurzbz, tbl_prestudent.priorisierung
+ tbl_prestudent.gsstudientyp_kurzbz, tbl_prestudent.aufnahmegruppe_kurzbz, tbl_prestudent.priorisierung, p.zugangscode
FROM
public.tbl_student
JOIN public.tbl_benutzer ON (student_uid=uid)
diff --git a/skin/tempus.css b/skin/tempus.css
index f064ccb8c..de025ef27 100644
--- a/skin/tempus.css
+++ b/skin/tempus.css
@@ -205,6 +205,10 @@ treechildren::-moz-tree-cell-text(Aktiv_false)
{
color: grey;
}
+treechildren::-moz-tree-cell-text(bold)
+{
+ font-weight: bold;
+}
treechildren::-moz-tree-cell(Lektor_inaktiv)
{
color: grey;
diff --git a/vilesci/lehre/lehrveranstaltung_details.php b/vilesci/lehre/lehrveranstaltung_details.php
index ae7f4057e..6c99066e3 100644
--- a/vilesci/lehre/lehrveranstaltung_details.php
+++ b/vilesci/lehre/lehrveranstaltung_details.php
@@ -616,18 +616,18 @@
}
$("#farbe").ColorPicker(
+ {
+ onSubmit: function(hsb, hex, rgb, el)
{
- onSubmit: function(hsb, hex, rgb, el)
- {
- $(el).val(hex);
- $(el).ColorPickerHide();
- document.getElementById("farbevorschau").style.backgroundColor=hex;
- },
- onBeforeShow: function ()
- {
- $(this).ColorPickerSetColor(this.value);
- }
- })
+ $(el).val(hex);
+ $(el).ColorPickerHide();
+ document.getElementById("farbevorschau").style.backgroundColor=hex;
+ },
+ onBeforeShow: function ()
+ {
+ $(this).ColorPickerSetColor(this.value);
+ }
+ })
.bind("keyup", function()
{
$(this).ColorPickerSetColor(this.value);