diff --git a/content/termine.xul.php b/content/termine.xul.php index b4e33af9a..1e51ddaad 100644 --- a/content/termine.xul.php +++ b/content/termine.xul.php @@ -109,7 +109,7 @@ $student_uid = filter_input(INPUT_GET,'student_uid'); - + diff --git a/rdf/termine.rdf.php b/rdf/termine.rdf.php index 3c4be4875..4fefaa6d3 100644 --- a/rdf/termine.rdf.php +++ b/rdf/termine.rdf.php @@ -49,6 +49,7 @@ foreach($stunde->stunden as $row) $stunden_arr[$row->stunde]['ende']=$row->ende->format('H:i'); } $datum_obj = new datum(); +$verplanteStunden = array(); $oRdf = new rdf('TERMINE','http://www.technikum-wien.at/termine'); @@ -106,7 +107,27 @@ if(isset($lehrstunde->result) && is_array($lehrstunde->result)) $anwesend='Nein'; $oRdf->obj[$i]->setAttribut('anwesend',$anwesend,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); $i++;