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

- Stundenplandb und Ignore-Kollision Status wird jetzt auch direkt nach dem Tempus start farblich korrekt markiert

Browse Source 
- Fehlermeldung beim Eintragen von max-kollision behoben wenn die Variable vorher nicht gesetzt war
- alten Link auf ToDo Liste aus Tempus-Menü entfernt
This commit is contained in:
oesi
2015-04-15 18:55:38 +02:00
parent bda227b9c5
commit 0292f00409
3 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
content/fasDBDML.php
+10 -2
View File
@@ -582,8 +582,16 @@ if(!$error)
}
else
{
$return = false;
$errormsg = 'Fehler: '.$variable->errormsg;
if($variable->errormsg=='')
{
$return = true;
$data = '';
}
else
{
$return = false;
$errormsg = 'Fehler: '.$variable->errormsg;
}
}
}
else
content/tempus.js.php
+11 -12
View File
@@ -90,10 +90,17 @@ function onLoad()
//wenn zb ein IFrame geladen wird
onLoad=function() {return false};
if(document.getElementById('statusbarpanel-ignore_kollision'))
{
// Anzeige von DBTable und Ignorekoll. aktualisieren
updateignorekollision();
updatedbstpltable();
}
//Notizen des Users laden
notiz = document.getElementById('box-notizen');
notiz.LoadNotizTree('','','','','','','', getUsername(),'');
if(notiz)
notiz.LoadNotizTree('','','','','','','', getUsername(),'');
}
catch(e)
{
@@ -294,7 +301,7 @@ function updateignorekollision()
if(getvariable('ignore_kollision')=='true')
{
panel.label='Kollisionscheck AUS';
panel.style.backgroundColor='red';
panel.style.backgroundColor='#FF0000';
panel.style.MozAppearance = "none"
document.getElementById('menu-prefs-ignore_kollision').setAttribute('checked','true');
}
@@ -322,7 +329,7 @@ function updatedbstpltable()
}
else
{
panel.style.backgroundColor='transparent';
panel.style.backgroundColor='';
panel.style.MozAppearance = "none"
}
}
@@ -463,14 +470,6 @@ function UnDo(log_id, bezeichnung)
}
}
// ****
// * Oeffnet die ToDoListe fuers Tempus
// ****
function HelpOpenToDo()
{
window.open('ToDo_Tempus.html','ToDo');
}
// ****
// * Zeigt das Fenster zur Kollisionspruefung auf Studentenebene an
// ****
content/tempus.xul.php
+1 -8
View File
@@ -79,7 +79,6 @@ echo '<?xml-stylesheet href="datepicker/datepicker.css" type="text/css"?>';
<command id="menu-extras-rescheck:command" oncommand="ResCheckShow();"/>
<command id="menu-extras-synclvplan:command" oncommand="SyncLVPlan();"/>
<command id="menu-help-about:command" oncommand="OpenAboutDialog()"/>
<command id="menu-help-todo:command" oncommand="HelpOpenToDo();"/>
<command id="menu-help-manual:command" oncommand="OpenManualTempus();"/>
</commandset>
@@ -264,12 +263,6 @@ echo '<?xml-stylesheet href="datepicker/datepicker.css" type="text/css"?>';
label = "&menu-help-manual.label;"
command = "menu-help-manual:command"
accesskey = "&menu-help-manual.accesskey;"/>
<menuitem
id = "menu-help-todo"
key = "&menu-help-todo.key;"
label = "&menu-help-todo.label;"
command = "menu-help-todo:command"
accesskey = "&menu-help-todo.accesskey;"/>
</menupopup>
</menu>
</menubar>
@@ -316,7 +309,7 @@ echo '<?xml-stylesheet href="datepicker/datepicker.css" type="text/css"?>';
?>
<statusbarpanel id="statusbarpanel-db_table" label="<?php echo $db_stpl_table; ?>"/>
<statusbarpanel>
<toolbarbutton id="statusbarpanel-ignore_kollision" label="Kollisionscheck <?php echo ($ignore_kollision=='true'?'AUS':'AN'); ?>" <?php echo ($ignore_kollision=='true'?'style="background-color: RED;"':'');?> oncommand="updateignorekollision()"/>
<toolbarbutton id="statusbarpanel-ignore_kollision" label="Kollisionscheck <?php echo ($ignore_kollision=='true'?'AUS':'AN'); ?>" <?php echo ($ignore_kollision=='true'?'style="background-color: red;"':'');?> oncommand="updateignorekollision()"/>
</statusbarpanel>
<statusbarpanel id="statusbarpanel-text" label="<?php echo htmlspecialchars($error_msg); ?>" flex="4" crop="right" />
<statusbarpanel id="progress-panel" class="statusbarpanel-progress">