diff --git a/content/student/studentabschlusspruefung.js.php b/content/student/studentabschlusspruefung.js.php index a92b119ab..541cb3335 100644 --- a/content/student/studentabschlusspruefung.js.php +++ b/content/student/studentabschlusspruefung.js.php @@ -898,8 +898,8 @@ function StudentAbschlusspruefungTypChange() } else { - document.getElementById('student-abschlusspruefung-label-pruefer1').value='Pruefer 1 (nicht technisch)'; - document.getElementById('student-abschlusspruefung-label-pruefer2').value='Pruefer 2 (technisch)'; + document.getElementById('student-abschlusspruefung-label-pruefer1').value='Pruefer 1 (Diplomarbeit)'; + document.getElementById('student-abschlusspruefung-label-pruefer2').value='Pruefer 2'; document.getElementById('student-abschlusspruefung-menulist-pruefer3').hidden=true; document.getElementById('student-abschlusspruefung-label-pruefer3').hidden=true; } diff --git a/content/student/studentenoverlay.xul.php b/content/student/studentenoverlay.xul.php index 82e74aff4..158c09ca8 100644 --- a/content/student/studentenoverlay.xul.php +++ b/content/student/studentenoverlay.xul.php @@ -242,6 +242,14 @@ else class="sortDirectionIndicator" sort="rdf:http://www.technikum-wien.at/student/rdf#punkte" onclick="StudentTreeSort()"/> + + + + @@ -278,6 +286,8 @@ else + + diff --git a/rdf/student.rdf.php b/rdf/student.rdf.php index d70c3ea61..18b68be4c 100644 --- a/rdf/student.rdf.php +++ b/rdf/student.rdf.php @@ -179,6 +179,8 @@ function draw_content_liste($row) aufmerksamdurch_kurzbz.']]> punkte.']]> + rt_punkte1.']]> + rt_punkte2.']]> dual=='t'?'true':'false').']]> dual=='t'?'Ja':'Nein').']]> @@ -341,6 +343,7 @@ if($xmlformat=='rdf') @@ -402,7 +405,9 @@ if($xmlformat=='rdf') LIMIT 1 ) 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 + (SELECT rt_gesamtpunkte as punkte FROM public.tbl_prestudent WHERE prestudent_id=tbl_student.prestudent_id) as punkte, + (SELECT rt_punkte1 as punkte FROM public.tbl_prestudent WHERE prestudent_id=tbl_student.prestudent_id) as rt_punkte1, + (SELECT rt_punkte2 as punkte FROM public.tbl_prestudent WHERE prestudent_id=tbl_student.prestudent_id) as rt_punkte2, tbl_prestudent.dual as dual FROM public.tbl_student JOIN public.tbl_benutzer ON (student_uid=uid) JOIN public.tbl_person p USING (person_id) JOIN public.tbl_prestudent USING(prestudent_id) "; if($gruppe_kurzbz!=null) diff --git a/vilesci/personen/personendetails.php b/vilesci/personen/personendetails.php index 5944b2ceb..3953ecc8f 100644 --- a/vilesci/personen/personendetails.php +++ b/vilesci/personen/personendetails.php @@ -31,6 +31,7 @@ require_once('../../include/datum.class.php'); require_once('../../include/kontakt.class.php'); require_once('../../include/adresse.class.php'); require_once('../../include/nation.class.php'); +require_once('../../include/firma.class.php'); if(!$conn=pg_pconnect(CONN_STRING)) die("Konnte Verbindung zur Datenbank nicht herstellen"); @@ -162,6 +163,7 @@ if(count($preinteressent->result)>0) AufmerksamDurch Kontaktmedium (Woher) Studiengänge + Schule '; @@ -187,6 +189,11 @@ if(count($preinteressent->result)>0) } echo $stgs; echo ''; + echo ''; + $firma = new firma($conn); + $firma->load($row->firma_id); + echo $firma->name; + echo ''; echo ''; } echo '';