From bc4ed2358a28f1b8adfbf4849a377a49ba27a0f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= Date: Wed, 22 Feb 2012 09:39:44 +0000 Subject: [PATCH] =?UTF-8?q?=C3=9Cbergabe=20des=20aktuellen=20Studiensemest?= =?UTF-8?q?ers=20beim=20Drucken=20des=20Semesterplanes=20aus=20dem=20Tempu?= =?UTF-8?q?s,=20damit=20der=20richtige=20Semesterplan=20angezeigt=20wird.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cis/private/lvplan/stpl_kalender.php | 6 +++++- content/lvplanung/stpl-semester-overlay.js.php | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/cis/private/lvplan/stpl_kalender.php b/cis/private/lvplan/stpl_kalender.php index e78627086..77c49c599 100644 --- a/cis/private/lvplan/stpl_kalender.php +++ b/cis/private/lvplan/stpl_kalender.php @@ -73,6 +73,7 @@ else $version=(isset($_GET['version'])?$_GET['version']:2); $target=(isset($_GET['target'])?$_GET['target']:null); +$stsem=(isset($_GET['stsem'])?$_GET['stsem']:''); // UID bestimmen $uid = get_uid(); @@ -80,7 +81,10 @@ $uid = get_uid(); if(!isset($begin)) { $objSS=new studiensemester(); - $ss = $objSS->getaktorNext(); + if($stsem=='') + $ss = $objSS->getaktorNext(); + else + $ss = $stsem; $objSS->load($ss); $begin = datum::mktime_fromdate($objSS->start); $ende = datum::mktime_fromdate($objSS->ende); diff --git a/content/lvplanung/stpl-semester-overlay.js.php b/content/lvplanung/stpl-semester-overlay.js.php index c0b4b4465..1d469c6d9 100644 --- a/content/lvplanung/stpl-semester-overlay.js.php +++ b/content/lvplanung/stpl-semester-overlay.js.php @@ -43,5 +43,6 @@ function onSTPLSemesterPrint() var iframeTimeTableSemesterSource=iframeTimeTableSemester.getAttribute("src"); var src=iframeTimeTableSemesterSource.replace("content/lvplanung/timetable-week.xul.php","cis/private/lvplan/stpl_kalender.php"); src=src+'&db_stpl_table='+document.getElementById('statusbarpanel-db_table').label; + src=src+'&stsem='+getStudiensemester(); var newWindow=window.open(src, "subWindowTimeTableSemester",""); }