Terminkollisionen werden farblich hervorgehoben

This commit is contained in:
Nikolaus Krondraf
2015-08-25 15:03:13 +02:00
parent a7579debd0
commit 9d4b444aed
2 changed files with 22 additions and 1 deletions
+1 -1
View File
@@ -109,7 +109,7 @@ $student_uid = filter_input(INPUT_GET,'student_uid');
<rule> <rule>
<treechildren> <treechildren>
<treeitem uri="rdf:*"> <treeitem uri="rdf:*">
<treerow> <treerow properties="rdf:http://www.technikum-wien.at/termine/rdf#kollision">
<treecell label="rdf:http://www.technikum-wien.at/termine/rdf#datum" /> <treecell label="rdf:http://www.technikum-wien.at/termine/rdf#datum" />
<treecell label="rdf:http://www.technikum-wien.at/termine/rdf#stundevon" /> <treecell label="rdf:http://www.technikum-wien.at/termine/rdf#stundevon" />
<treecell label="rdf:http://www.technikum-wien.at/termine/rdf#stundebis" /> <treecell label="rdf:http://www.technikum-wien.at/termine/rdf#stundebis" />
+21
View File
@@ -49,6 +49,7 @@ foreach($stunde->stunden as $row)
$stunden_arr[$row->stunde]['ende']=$row->ende->format('H:i'); $stunden_arr[$row->stunde]['ende']=$row->ende->format('H:i');
} }
$datum_obj = new datum(); $datum_obj = new datum();
$verplanteStunden = array();
$oRdf = new rdf('TERMINE','http://www.technikum-wien.at/termine'); $oRdf = new rdf('TERMINE','http://www.technikum-wien.at/termine');
@@ -106,7 +107,27 @@ if(isset($lehrstunde->result) && is_array($lehrstunde->result))
$anwesend='Nein'; $anwesend='Nein';
$oRdf->obj[$i]->setAttribut('anwesend',$anwesend,true); $oRdf->obj[$i]->setAttribut('anwesend',$anwesend,true);
$oRdf->obj[$i]->setAttribut('datum_iso',$row->datum,true); $oRdf->obj[$i]->setAttribut('datum_iso',$row->datum,true);
// Terminkollisionen prüfen
$kollision = "";
if($lehrveranstaltung_id == '')
{
for($x = $row->stundevon; $x <= $row->stundebis; $x++)
{
if(isset($verplanteStunden[$row->datum]) && in_array($x, $verplanteStunden[$row->datum]))
{
if(!isset($verplanteStunden[implode(',',$row->orte)]) || !in_array($x, $verplanteStunden[implode(',',$row->orte)]))
{
$kollision = "makeItred";
break;
}
}
$verplanteStunden[$row->datum][] = $x;
$verplanteStunden[implode(',',$row->orte)][] = $x;
}
}
$oRdf->obj[$i]->setAttribut('kollision',$kollision,true);
$oRdf->addSequence($i); $oRdf->addSequence($i);
$i++; $i++;