From 525bd30b610db5538dadab96f93c9242c3cedf65 Mon Sep 17 00:00:00 2001 From: oesi Date: Tue, 9 Jun 2015 08:09:35 +0200 Subject: [PATCH] - Fehler behoben bei dem die STPL Details im Tempus nicht korrekt aktualisiert wurden - Fehler behoben bei dem das Anmerkungs Icon im Tempus nicht immer angezeigt wurde --- content/dragboard.js.php | 74 ++++++++++++---------- content/lvplanung/stpl-week-overlay.js.php | 6 +- include/wochenplan.class.php | 3 +- 3 files changed, 45 insertions(+), 38 deletions(-) diff --git a/content/dragboard.js.php b/content/dragboard.js.php index b4fc7da1e..06ac6bd70 100644 --- a/content/dragboard.js.php +++ b/content/dragboard.js.php @@ -458,53 +458,59 @@ var boardObserver= }, onDragEnter: function (evt,flavour,session) { - var styleNow=evt.target.getAttribute("style"); - if (evt.target.tagName=="label") + if(typeof evt.target.getAttribute == 'function') { - evt.target.setAttribute("style","background-color:#AAFFAA;"); - - var tagesinfo = evt.target.parentNode.getElementsByClassName('stplweek_tagesinfo'); - if(typeof tagesinfo[0]!='undefined') + var styleNow=evt.target.getAttribute("style"); + if (evt.target.tagName=="label") { - var Tagesinfostyle = tagesinfo[0].getAttribute("style"); - tagesinfo[0].setAttribute("style",Tagesinfostyle+";visibility:visible;"); + evt.target.setAttribute("style","background-color:#AAFFAA;"); + + var tagesinfo = evt.target.parentNode.getElementsByClassName('stplweek_tagesinfo'); + if(typeof tagesinfo[0]!='undefined') + { + var Tagesinfostyle = tagesinfo[0].getAttribute("style"); + tagesinfo[0].setAttribute("style",Tagesinfostyle+";visibility:visible;"); + } } - } - else - { - evt.target.setAttribute("style",styleNow+";border:1px dashed black;"); - - var tagesinfo = evt.target.getElementsByClassName('stplweek_tagesinfo'); - if(typeof tagesinfo[0]!='undefined') + else { - var Tagesinfostyle = tagesinfo[0].getAttribute("style"); - tagesinfo[0].setAttribute("style",Tagesinfostyle+";visibility:visible;"); + evt.target.setAttribute("style",styleNow+";border:1px dashed black;"); + + var tagesinfo = evt.target.getElementsByClassName('stplweek_tagesinfo'); + if(typeof tagesinfo[0]!='undefined') + { + var Tagesinfostyle = tagesinfo[0].getAttribute("style"); + tagesinfo[0].setAttribute("style",Tagesinfostyle+";visibility:visible;"); + } } } }, onDragExit: function (evt,flavour,session) { - var styleNow=evt.target.getAttribute("style"); - if (evt.target.tagName=="label") + if(typeof evt.target.getAttribute == 'function') { - evt.target.setAttribute("style",""); - - var tagesinfo = evt.target.parentNode.getElementsByClassName('stplweek_tagesinfo'); - if(typeof tagesinfo[0]!='undefined') + var styleNow=evt.target.getAttribute("style"); + if (evt.target.tagName=="label") { - var Tagesinfostyle = tagesinfo[0].getAttribute("style"); - tagesinfo[0].setAttribute("style",Tagesinfostyle+";visibility:hidden;"); + evt.target.setAttribute("style",""); + + var tagesinfo = evt.target.parentNode.getElementsByClassName('stplweek_tagesinfo'); + if(typeof tagesinfo[0]!='undefined') + { + var Tagesinfostyle = tagesinfo[0].getAttribute("style"); + tagesinfo[0].setAttribute("style",Tagesinfostyle+";visibility:hidden;"); + } } - } - else - { - evt.target.setAttribute("style",styleNow+";border:1px solid black;"); - - var tagesinfo = evt.target.getElementsByClassName('stplweek_tagesinfo'); - if(typeof tagesinfo[0]!='undefined') + else { - var Tagesinfostyle = tagesinfo[0].getAttribute("style"); - tagesinfo[0].setAttribute("style",Tagesinfostyle+";visibility:hidden;"); + evt.target.setAttribute("style",styleNow+";border:1px solid black;"); + + var tagesinfo = evt.target.getElementsByClassName('stplweek_tagesinfo'); + if(typeof tagesinfo[0]!='undefined') + { + var Tagesinfostyle = tagesinfo[0].getAttribute("style"); + tagesinfo[0].setAttribute("style",Tagesinfostyle+";visibility:hidden;"); + } } } }, diff --git a/content/lvplanung/stpl-week-overlay.js.php b/content/lvplanung/stpl-week-overlay.js.php index a28720349..1d58e41a6 100644 --- a/content/lvplanung/stpl-week-overlay.js.php +++ b/content/lvplanung/stpl-week-overlay.js.php @@ -494,7 +494,7 @@ function onStplDetail(event) window.parent.STPLlastDetailUrl = url; //alert(url+' - '+window.parent.STPLlastDetailUrl); var treeStplDetails=parent.document.getElementById('treeStplDetails'); - treeStplDetails.setAttribute('datasources',url); + treeStplDetails.setAttribute('datasources',url+"&ts="+gettimestamp()); } @@ -581,7 +581,7 @@ function STPLDetailSave(dialog) var treeStplDetails=parent.document.getElementById('treeStplDetails'); //alert('url'+STPLlastDetailUrl); treeStplDetails.setAttribute('datasources', ''); - treeStplDetails.setAttribute('datasources', STPLlastDetailUrl); + treeStplDetails.setAttribute('datasources', STPLlastDetailUrl+"&ts="+gettimestamp()); return true; } @@ -642,7 +642,7 @@ function STPLDetailDelete() var treeStplDetails=parent.document.getElementById('treeStplDetails'); //alert('url'+STPLlastDetailUrl); treeStplDetails.setAttribute('datasources', ''); - treeStplDetails.setAttribute('datasources', STPLlastDetailUrl); + treeStplDetails.setAttribute('datasources', STPLlastDetailUrl+"&ts="+gettimestamp()); } } } diff --git a/include/wochenplan.class.php b/include/wochenplan.class.php index 6f3b9eba0..ce6c1a82a 100644 --- a/include/wochenplan.class.php +++ b/include/wochenplan.class.php @@ -1356,6 +1356,7 @@ class wochenplan extends basis_db $z=0; $reservierung=false; $stundenplan_ids=array(); + $titel=''; if(isset($raumcheck)) unset($raumcheck); @@ -1401,7 +1402,7 @@ class wochenplan extends basis_db } if(isset($lehrstunde->farbe) && $farbe=='') $farbe=$lehrstunde->farbe; - $titel=htmlspecialchars($lehrstunde->titel); + $titel.=htmlspecialchars($lehrstunde->titel); $anmerkung=htmlspecialchars($lehrstunde->anmerkung); $tooltip_anmerkung[]=$titel.' '.$anmerkung; }