blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-22 01:12:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Fehler behoben bei dem die STPL Details im Tempus nicht korrekt aktualisiert wurden

Browse Source 
- Fehler behoben bei dem das Anmerkungs Icon im Tempus nicht immer angezeigt wurde
This commit is contained in:
oesi
2015-06-09 08:09:35 +02:00
parent 4a58d4fe4c
commit 525bd30b61
3 changed files with 45 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
content/dragboard.js.php
+40 -34
View File
@@ -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;");
}
}
}
},
content/lvplanung/stpl-week-overlay.js.php
+3 -3
View File
@@ -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());
}
}
}
include/wochenplan.class.php
+2 -1
View File
@@ -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;
}