mirror of
https://github.com/FH-Complete/FHC-Core.git
synced 2026-07-20 00:12:15 +00:00
- Firmenname wird bei den Adressen jetzt angezeigt
- Encodingproblem beim Anzeigen der StudentenStati behoben
This commit is contained in:
@@ -114,6 +114,10 @@ else
|
||||
class="sortDirectionIndicator"
|
||||
sort="rdf:http://www.technikum-wien.at/adresse/rdf#updateamum" onclick="KontaktAdresseTreeSort()"/>
|
||||
<splitter class="tree-splitter"/>
|
||||
<treecol id="kontakt-adressen-treecol-firma_name" label="Firma" flex="1" hidden="false"
|
||||
class="sortDirectionIndicator"
|
||||
sort="rdf:http://www.technikum-wien.at/adresse/rdf#firma_name" onclick="KontaktAdresseTreeSort()"/>
|
||||
<splitter class="tree-splitter"/>
|
||||
</treecols>
|
||||
|
||||
<template>
|
||||
@@ -134,6 +138,7 @@ else
|
||||
<treecell label="rdf:http://www.technikum-wien.at/adresse/rdf#person_id" />
|
||||
<treecell label="rdf:http://www.technikum-wien.at/adresse/rdf#name" />
|
||||
<treecell label="rdf:http://www.technikum-wien.at/adresse/rdf#updateamum" />
|
||||
<treecell label="rdf:http://www.technikum-wien.at/adresse/rdf#firma_name" />
|
||||
</treerow>
|
||||
</treeitem>
|
||||
</treechildren>
|
||||
|
||||
@@ -63,7 +63,7 @@ $vorname = '';
|
||||
$nachname = '';
|
||||
if($prestudent_id!='')
|
||||
{
|
||||
$prestudent = new prestudent($conn);
|
||||
$prestudent = new prestudent($conn, null, true);
|
||||
$prestudent->load($prestudent_id);
|
||||
|
||||
$vorname = $prestudent->vorname;
|
||||
|
||||
@@ -0,0 +1,12 @@
|
||||
<html>
|
||||
<head>
|
||||
<title>Koordinatorstunden</title>
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
|
||||
<script language="Javascript">
|
||||
window.location.href='../cis/index.html';
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
Sollten Sie nicht automatisch weitergeleitet werden, druecken sie bitte <a href="../cis/index.html">hier</a>
|
||||
</body>
|
||||
</html>
|
||||
+15
-1
@@ -76,7 +76,7 @@ else
|
||||
|
||||
function draw_rdf($row)
|
||||
{
|
||||
global $rdf_url;
|
||||
global $rdf_url, $conn;
|
||||
|
||||
$typ='';
|
||||
switch ($row->typ)
|
||||
@@ -85,6 +85,19 @@ function draw_rdf($row)
|
||||
case 'n': $typ='Nebenwohnsitz'; break;
|
||||
case 'f': $typ='Firma'; break;
|
||||
}
|
||||
|
||||
$firma_name='';
|
||||
if($row->firma_id!='')
|
||||
{
|
||||
$qry="SELECT * FROM public.tbl_firma WHERE firma_id='".addslashes($row->firma_id)."'";
|
||||
if($result_firma=pg_query($conn, $qry))
|
||||
{
|
||||
if($row_firma = pg_fetch_object($result_firma))
|
||||
{
|
||||
$firma_name = $row_firma->name;
|
||||
}
|
||||
}
|
||||
}
|
||||
echo '
|
||||
<RDF:li>
|
||||
<RDF:Description id="'.$row->adresse_id.'" about="'.$rdf_url.'/'.$row->adresse_id.'" >
|
||||
@@ -101,6 +114,7 @@ function draw_rdf($row)
|
||||
<ADRESSE:heimatadresse><![CDATA['.($row->heimatadresse?'Ja':'Nein').']]></ADRESSE:heimatadresse>
|
||||
<ADRESSE:zustelladresse><![CDATA['.($row->zustelladresse?'Ja':'Nein').']]></ADRESSE:zustelladresse>
|
||||
<ADRESSE:firma_id><![CDATA['.$row->firma_id.']]></ADRESSE:firma_id>
|
||||
<ADRESSE:firma_name><![CDATA['.$firma_name.']]></ADRESSE:firma_name>
|
||||
<ADRESSE:updateamum><![CDATA['.date('d.m.Y H:i:s',strtotime($row->updateamum)).']]></ADRESSE:updateamum>
|
||||
</RDF:Description>
|
||||
</RDF:li>
|
||||
|
||||
Reference in New Issue
Block a user