From 3b296bd2b5e44a5a0e7d23b5577033c25b63d609 Mon Sep 17 00:00:00 2001
From: Christian Paminger <pam@technikum-wien.at>
Date: Sat, 3 Feb 2007 15:10:34 +0000
Subject: [PATCH]

---
 content/stpl-semester-overlay.js.php  | 2 +-
 content/stpl-semester-overlay.xul.php | 4 ++--
 content/tempusoverlay.js.php          | 9 +++++++--
 content/tempusoverlay.xul.php         | 6 +++---
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/content/stpl-semester-overlay.js.php b/content/stpl-semester-overlay.js.php
index 9fe759f7c..94d88ab95 100644
--- a/content/stpl-semester-overlay.js.php
+++ b/content/stpl-semester-overlay.js.php
@@ -22,6 +22,6 @@ function onSTPLSemesterPrint()
 	// Wie ist gerade die Source vom iFrame
 	var iframeTimeTableSemester=document.getElementById('iframeTimeTableSemester');
 	var iframeTimeTableSemesterSource=iframeTimeTableSemester.getAttribute("src");
-	var src=iframeTimeTableSemesterSource.replace("content/timetable-week.xul.php","stdplan/stpl_kalender.php");
+	var src=iframeTimeTableSemesterSource.replace("content/timetable-week.xul.php","cis/private/lvplan/stpl_kalender.php");
 	var newWindow=window.open(src, "subWindowTimeTableSemester","");
 }
diff --git a/content/stpl-semester-overlay.xul.php b/content/stpl-semester-overlay.xul.php
index 16b8c6968..0ce362652 100644
--- a/content/stpl-semester-overlay.xul.php
+++ b/content/stpl-semester-overlay.xul.php
@@ -12,7 +12,7 @@ if (!isset($REMOTE_USER))
 
 $uid=$REMOTE_USER;
 
-if (!$conn = @pg_pconnect(CONN_STRING))
+if (!$conn = pg_pconnect(CONN_STRING))
    	$error_msg='Fehler: Es konnte keine Verbindung zum Server aufgebaut werden!';
 //$error_msg.=loadVariables($conn,$REMOTE_USER);
 // Stundentafel abfragen
@@ -23,7 +23,7 @@ $num_rows_stunde=pg_numrows($result_stunde);
 ?>
 
 <!DOCTYPE overlay [
-	<?php require("../locale/tempus.dtd"); ?>
+	<?php require("../locale/de-AT/tempus.dtd"); ?>
 ]>
 
 <overlay id="TempusOverlay"
diff --git a/content/tempusoverlay.js.php b/content/tempusoverlay.js.php
index 7e72163fc..2cadcf6d4 100644
--- a/content/tempusoverlay.js.php
+++ b/content/tempusoverlay.js.php
@@ -46,6 +46,7 @@ function onVerbandSelect()
 	var panelIndex=semesterplan.getAttribute("selectedIndex");
 	if (panelIndex==1)
 	{
+		alert (url);
 		var contentFrame=document.getElementById('iframeTimeTableSemester');
 		var url = "<?php echo APP_ROOT; ?>content/timetable-week.xul.php";
 		if (einheit!=null && einheit!=0 &einheit!='')
@@ -60,9 +61,10 @@ function onVerbandSelect()
 
 	// LVAs
 	var vboxLehrveranstalungPlanung=document.getElementById('vboxLehrveranstalungPlanung');
-	var attribute='lehrveranstaltung.rdf.php'+type+"&stg_kz="+stg_kz+"&sem="+sem+"&ver="+ver+"&grp="+grp+"&einheit="+einheit;
+	var attribute='../rdf/lehreinheit-lvplan.rdf.php'+type+"&stg_kz="+stg_kz+"&sem="+sem+"&ver="+ver+"&grp="+grp+"&einheit="+einheit;
 	vboxLehrveranstalungPlanung.setAttribute('datasources',attribute);
 
+	/*
 	// Studenten
 	var treeStudenten=document.getElementById('treeStudenten');
 	attribute="<?php echo APP_ROOT; ?>rdf/student.rdf.php?"+"stg_kz="+stg_kz+"&sem="+sem+"&ver="+ver+"&grp="+grp+"&einheit="+einheit;
@@ -107,6 +109,7 @@ function onVerbandSelect()
 
 	//treeLFVT.setAttribute('datasources','lfvt.rdf.php?'+"stg_kz="+stg_kz+"&sem="+sem+"&ver="+ver+"&grp="+grp+"&einheit="+einheit);
 	//alert('lfvt.rdf.php?'+"stg_kz="+stg_kz+"&sem="+sem+"&ver="+ver+"&grp="+grp+"&einheit="+einheit);
+	*/
 }
 
 function onOrtSelect()
@@ -141,8 +144,9 @@ function onLektorSelect()
 		contentFrame.setAttribute('src', url);
 	// LVAs
 	var vboxLehrveranstalungPlanung=document.getElementById('vboxLehrveranstalungPlanung');
-	vboxLehrveranstalungPlanung.setAttribute('datasources','lehrveranstaltung.rdf.php?'+"type=lektor&lektor="+uid);
+	vboxLehrveranstalungPlanung.setAttribute('datasources','../rdf/lehreinheit-lvplan.rdf.php?'+"type=lektor&lektor="+uid);
 
+/*
 	// LFVT
 	var req = new phpRequest('lfvt.rdf.php','pam','pam');
 	req.add('lektor',uid);
@@ -175,6 +179,7 @@ function onLektorSelect()
 	// neue Datenquelle setzen
 	treeLFVT.database.AddDataSource(dsource);
 	treeLFVT.builder.rebuild();
+*/
 }
 
 function loadURL(event)
diff --git a/content/tempusoverlay.xul.php b/content/tempusoverlay.xul.php
index 1aa298389..dceedcff6 100644
--- a/content/tempusoverlay.xul.php
+++ b/content/tempusoverlay.xul.php
@@ -28,7 +28,7 @@ echo '<?xul-overlay href="'.APP_ROOT.'content/stpl-semester-overlay.xul.php"?>';
 
 <tree id="tree-verband" onselect="onVerbandSelect();"
 	seltype="single" hidecolumnpicker="false" flex="1"
-	datasources="../rdf/student-verband.rdf.php" ref="http://www.technikum-wien.at/student-verband/alle-verbaende"
+	datasources="../rdf/lehrverbandsgruppe.rdf.php" ref="http://www.technikum-wien.at/lehrverbandsgruppe/alle-verbaende"
 	>
 	<treecols>
 	    <treecol id="bez" label="Bezeichnung" flex="15" primary="true" />
@@ -43,7 +43,7 @@ echo '<?xul-overlay href="'.APP_ROOT.'content/stpl-semester-overlay.xul.php"?>';
 	    <splitter class="tree-splitter"/>
 	    <treecol id="grp" label="Grp" flex="1" hidden="true"/>
 	    <splitter class="tree-splitter"/>
-	    <treecol id="einheit" label="Einheit" flex="1" hidden="true"/>
+	    <treecol id="einheit" label="SpzGruppe" flex="1" hidden="true"/>
 	</treecols>
 
 	<template>
@@ -57,7 +57,7 @@ echo '<?xul-overlay href="'.APP_ROOT.'content/stpl-semester-overlay.xul.php"?>';
 	           <treecell label="rdf:http://www.technikum-wien.at/student-verband/rdf#sem"/>
 	           <treecell label="rdf:http://www.technikum-wien.at/student-verband/rdf#ver"/>
 	           <treecell label="rdf:http://www.technikum-wien.at/student-verband/rdf#grp"/>
-	           <treecell label="rdf:http://www.technikum-wien.at/student-verband/rdf#einheit"/>
+	           <treecell label="rdf:http://www.technikum-wien.at/student-verband/rdf#gruppe"/>
 	         </treerow>
 	       </treeitem>
 	      </treechildren>