From 4468685aaf9f168f710419fa4518855ead405699 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Mon, 10 Nov 2008 14:37:16 +0000
Subject: [PATCH] - Firmenname wird bei den Adressen jetzt angezeigt -
 Encodingproblem beim Anzeigen der StudentenStati behoben

---
 content/kontakt.xul.php                    |  5 +++++
 content/student/studentrolledialog.xul.php |  2 +-
 include/index.html                         | 12 ++++++++++++
 rdf/adresse.rdf.php                        | 16 +++++++++++++++-
 4 files changed, 33 insertions(+), 2 deletions(-)
 create mode 100644 include/index.html
diff --git a/content/kontakt.xul.php b/content/kontakt.xul.php
index a19a3a6d5..155ad5c09 100644
--- a/content/kontakt.xul.php
+++ b/content/kontakt.xul.php
@@ -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>
diff --git a/content/student/studentrolledialog.xul.php b/content/student/studentrolledialog.xul.php
index 298de75e4..79165aa3c 100644
--- a/content/student/studentrolledialog.xul.php
+++ b/content/student/studentrolledialog.xul.php
@@ -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;
diff --git a/include/index.html b/include/index.html
new file mode 100644
index 000000000..0c0829695
--- /dev/null
+++ b/include/index.html
@@ -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>
\ No newline at end of file
diff --git a/rdf/adresse.rdf.php b/rdf/adresse.rdf.php
index 08921fb05..41e35b372 100644
--- a/rdf/adresse.rdf.php
+++ b/rdf/adresse.rdf.php
@@ -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>
