From c40cf6e785c97c5377039bce4b91a10bf891fac9 Mon Sep 17 00:00:00 2001 From: Nikolaus Krondraf Date: Mon, 14 Sep 2015 13:40:33 +0200 Subject: [PATCH] Fehlerbehebung bei der Anzeige von Terminkollisionen --- rdf/termine.rdf.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/rdf/termine.rdf.php b/rdf/termine.rdf.php index 4fefaa6d3..eb369448b 100644 --- a/rdf/termine.rdf.php +++ b/rdf/termine.rdf.php @@ -114,9 +114,11 @@ if(isset($lehrstunde->result) && is_array($lehrstunde->result)) { for($x = $row->stundevon; $x <= $row->stundebis; $x++) { + $orte = implode(',',$row->orte); + if(isset($verplanteStunden[$row->datum]) && in_array($x, $verplanteStunden[$row->datum])) { - if(!isset($verplanteStunden[implode(',',$row->orte)]) || !in_array($x, $verplanteStunden[implode(',',$row->orte)])) + if(!isset($verplanteStunden[$row->datum][$orte]) || !in_array($x, $verplanteStunden[$row->datum][$orte])) { $kollision = "makeItred"; break; @@ -124,7 +126,7 @@ if(isset($lehrstunde->result) && is_array($lehrstunde->result)) } $verplanteStunden[$row->datum][] = $x; - $verplanteStunden[implode(',',$row->orte)][] = $x; + $verplanteStunden[$row->datum][$orte][] = $x; } } $oRdf->obj[$i]->setAttribut('kollision',$kollision,true);