From d7f34dd05dfb56636e0c58a3be09ff0fdad4acf3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= Date: Fri, 11 Dec 2009 12:28:39 +0000 Subject: [PATCH] =?UTF-8?q?Filter=20f=C3=BCr=20die=20Lehrfachverteilung=20?= =?UTF-8?q?im=20Tempus?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- content/lvplanung/stpl-week-overlay.js.php | 28 +++++++++++++++++++++ content/lvplanung/stpl-week-overlay.xul.php | 1 + content/tempusoverlay.js.php | 2 ++ rdf/lehreinheit-lvplan.rdf.php | 14 +++++++++++ 4 files changed, 45 insertions(+) diff --git a/content/lvplanung/stpl-week-overlay.js.php b/content/lvplanung/stpl-week-overlay.js.php index b44223536..3c64cd88f 100644 --- a/content/lvplanung/stpl-week-overlay.js.php +++ b/content/lvplanung/stpl-week-overlay.js.php @@ -33,6 +33,34 @@ function onLVARefresh() vboxLehrveranstalungPlanung.setAttribute('datasources',datasources+"&bla="); } +// LVA-Panel filtern +function onLVAFilter() +{ + var filter=document.getElementById('tempus-lva-filter').value; + var vorher=''; + var nachher=''; + + // LVAs + var vboxLehrveranstalungPlanung=document.getElementById('vboxLehrveranstalungPlanung'); + var datasources=vboxLehrveranstalungPlanung.getAttribute('datasources'); + + var orig=datasources.substring(0); + var idx = datasources.indexOf("&filter=") + if(idx!=-1) + { + idx2=datasources.indexOf("&",idx+9); + vorher=datasources.slice(0,idx); + if(idx2!=-1) + nachher=datasources.slice(idx2); + datasources=vorher+nachher; + } + + datasources=datasources+"&filter="+encodeURIComponent(filter); + + //alert('Orig:'+orig+' Source: '+datasources+' Vorher:'+vorher+' Nachher:'+nachher); + vboxLehrveranstalungPlanung.setAttribute('datasources',datasources); +} + function onJumpNow() { var contentFrame=document.getElementById('iframeTimeTableWeek'); diff --git a/content/lvplanung/stpl-week-overlay.xul.php b/content/lvplanung/stpl-week-overlay.xul.php index 8a67adcaa..6c4e74210 100644 --- a/content/lvplanung/stpl-week-overlay.xul.php +++ b/content/lvplanung/stpl-week-overlay.xul.php @@ -108,6 +108,7 @@ echo ' + diff --git a/content/tempusoverlay.js.php b/content/tempusoverlay.js.php index 824a9d402..c05ab853a 100644 --- a/content/tempusoverlay.js.php +++ b/content/tempusoverlay.js.php @@ -38,6 +38,7 @@ function auswahlValues() function onVerbandSelect() { + document.getElementById('tempus-lva-filter').value=''; netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect"); var contentFrame=document.getElementById('iframeTimeTableWeek'); var tree=document.getElementById('tree-verband'); @@ -276,6 +277,7 @@ function onOrtSelect() function onLektorSelect(event) { + document.getElementById('tempus-lva-filter').value=''; netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect"); var contentFrame=document.getElementById('iframeTimeTableWeek'); var treeLektor=document.getElementById('tree-lektor'); diff --git a/rdf/lehreinheit-lvplan.rdf.php b/rdf/lehreinheit-lvplan.rdf.php index 120123d4a..5e3b168c9 100644 --- a/rdf/lehreinheit-lvplan.rdf.php +++ b/rdf/lehreinheit-lvplan.rdf.php @@ -74,6 +74,12 @@ if (isset($_GET['gruppe'])) else $gruppe_kurzbz=null; +if (isset($_GET['filter'])) + $filter=$_GET['filter']; +else + $filter=null; + + // LVA holen $lva=array(); $lehreinheit=new lehreinheit(); @@ -197,6 +203,14 @@ if ($anz>0) if (count($l->offenestunden)>1) $offenestunden.=' ?'; + if($filter!='') + { + if(!strstr(strtolower($lektor), strtolower($filter)) && + !strstr(strtolower($lehrfach), strtolower($filter))) + { + continue; + } + } echo' '.$lvnr.'