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

Browse Source
This commit is contained in:
Christian Paminger
2008-02-14 14:06:11 +00:00
parent 203c5fa98a
commit 203e3d4c74
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/wochenplan.class.php
+5 -3
View File
@@ -305,7 +305,7 @@ class wochenplan
{
$this->std_plan[$tag][$stunde][$idx]->lehrfach=$this->wochenplan->lehrstunden[$i]->lehrfach;
$this->std_plan[$tag][$stunde][$idx]->lehrform=$this->wochenplan->lehrstunden[$i]->lehrform;
$this->std_plan[$tag][$stunde][$idx]->lehrfach_nr=$this->wochenplan->lehrstunden[$i]->lehrfach_nr;
$this->std_plan[$tag][$stunde][$idx]->lehrfach_id=$this->wochenplan->lehrstunden[$i]->lehrfach_id;
$this->std_plan[$tag][$stunde][$idx]->farbe=$this->wochenplan->lehrstunden[$i]->farbe;
//$this->std_plan[$tag][$stunde][$idx]->titel=$this->wochenplan->lehrstunden[$i]->titel;
}
@@ -657,7 +657,7 @@ class wochenplan
* @return true oder false
*
*/
function draw_week_xul($semesterplan,$uid, $wunsch=null)
function draw_week_xul($semesterplan, $uid, $wunsch=null, $ignore_kollision=false)
{
//echo $wunsch;
global $cfgStdBgcolor;
@@ -800,7 +800,9 @@ class wochenplan
$kollision++;
}
}
// Kollision anzeigen?
if ($ignore_kollision)
$kollision=0;
//Daten aufbereiten
foreach ($a_unr as $unr)
{