mirror of
https://github.com/FH-Complete/FHC-Core.git
synced 2026-06-22 22:49:32 +00:00
This commit is contained in:
@@ -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;
|
||||
}
|
||||
|
||||
@@ -242,6 +242,14 @@ else
|
||||
class="sortDirectionIndicator"
|
||||
sort="rdf:http://www.technikum-wien.at/student/rdf#punkte" onclick="StudentTreeSort()"/>
|
||||
<splitter class="tree-splitter"/>
|
||||
<treecol id="student-treecol-rt_punkte1" label="RT_Punkte1" flex="1" hidden="true" persist="hidden, width, ordinal"
|
||||
class="sortDirectionIndicator"
|
||||
sort="rdf:http://www.technikum-wien.at/student/rdf#punkte1" onclick="StudentTreeSort()"/>
|
||||
<splitter class="tree-splitter"/>
|
||||
<treecol id="student-treecol-rt_punkte2" label="RT_Punkte2" flex="1" hidden="true" persist="hidden, width, ordinal"
|
||||
class="sortDirectionIndicator"
|
||||
sort="rdf:http://www.technikum-wien.at/student/rdf#punkte2" onclick="StudentTreeSort()"/>
|
||||
<splitter class="tree-splitter"/>
|
||||
<treecol id="student-treecol-dual" label="Dual" flex="1" hidden="true" persist="hidden, width, ordinal"
|
||||
class="sortDirectionIndicator"
|
||||
sort="rdf:http://www.technikum-wien.at/student/rdf#dual_bezeichnung" onclick="StudentTreeSort()"/>
|
||||
@@ -278,6 +286,8 @@ else
|
||||
<treecell label="rdf:http://www.technikum-wien.at/student/rdf#orgform" />
|
||||
<treecell label="rdf:http://www.technikum-wien.at/student/rdf#aufmerksamdurch_kurzbz" />
|
||||
<treecell label="rdf:http://www.technikum-wien.at/student/rdf#punkte" />
|
||||
<treecell label="rdf:http://www.technikum-wien.at/student/rdf#punkte1" />
|
||||
<treecell label="rdf:http://www.technikum-wien.at/student/rdf#punkte2" />
|
||||
<treecell label="rdf:http://www.technikum-wien.at/student/rdf#dual_bezeichnung" />
|
||||
</treerow>
|
||||
</treeitem>
|
||||
|
||||
+6
-1
@@ -179,6 +179,8 @@ function draw_content_liste($row)
|
||||
<STUDENT:orgform><![CDATA['.$orgform.']]></STUDENT:orgform>
|
||||
<STUDENT:aufmerksamdurch_kurzbz><![CDATA['.$row->aufmerksamdurch_kurzbz.']]></STUDENT:aufmerksamdurch_kurzbz>
|
||||
<STUDENT:punkte><![CDATA['.$row->punkte.']]></STUDENT:punkte>
|
||||
<STUDENT:punkte1><![CDATA['.$row->rt_punkte1.']]></STUDENT:punkte1>
|
||||
<STUDENT:punkte2><![CDATA['.$row->rt_punkte2.']]></STUDENT:punkte2>
|
||||
<STUDENT:dual><![CDATA['.($row->dual=='t'?'true':'false').']]></STUDENT:dual>
|
||||
<STUDENT:dual_bezeichnung><![CDATA['.($row->dual=='t'?'Ja':'Nein').']]></STUDENT:dual_bezeichnung>
|
||||
</RDF:Description>
|
||||
@@ -341,6 +343,7 @@ if($xmlformat=='rdf')
|
||||
<RDF:RDF
|
||||
xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
||||
xmlns:STUDENT="'.$rdf_url.'/rdf#"
|
||||
xmlns:NC="http://home.netscape.com/NC-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)
|
||||
|
||||
@@ -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)
|
||||
<th>AufmerksamDurch</th>
|
||||
<th>Kontaktmedium (Woher)</th>
|
||||
<th>Studiengänge</th>
|
||||
<th>Schule</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>';
|
||||
@@ -187,6 +189,11 @@ if(count($preinteressent->result)>0)
|
||||
}
|
||||
echo $stgs;
|
||||
echo '</td>';
|
||||
echo '<td>';
|
||||
$firma = new firma($conn);
|
||||
$firma->load($row->firma_id);
|
||||
echo $firma->name;
|
||||
echo '</td>';
|
||||
echo '</tr>';
|
||||
}
|
||||
echo '</tbody></table>';
|
||||
|
||||
Reference in New Issue
Block a user