From f0083e4736a682f1e6ef6af4971ac81bb4646bb0 Mon Sep 17 00:00:00 2001
From: Mischa Spelt <mischa.spelt@nhgooi.nl>
Date: Mon, 7 May 2018 20:02:41 +0200
Subject: [PATCH] Nog een bugje uit programmaschema

---
 api/app/Http/Controllers/ProgramController.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/api/app/Http/Controllers/ProgramController.php b/api/app/Http/Controllers/ProgramController.php
index 6ab7f21..bf37ea3 100644
--- a/api/app/Http/Controllers/ProgramController.php
+++ b/api/app/Http/Controllers/ProgramController.php
@@ -63,6 +63,7 @@ QUERY;
           ['enddate' => $end->format('Y-m-d'), 'startdate' => $start->format('Y-m-d')]);
       $scheduleChanges = new \SplPriorityQueue();
       $active = [];
+
       foreach($scheduleItems as $item) {
         if($item->startdate) { $item->startdate = new \DateTimeImmutable($item->startdate); }
         if($item->enddate) { $item->enddate = (new \DateTimeImmutable($item->enddate))->add($DAY); }
@@ -81,7 +82,8 @@ QUERY;
           $itemEnd = $itemEnd->add($WEEK);
         }
 
-        while($itemEnd <= $end) {
+        if($DEBUG) print "<b>Have a schedule item for {$item->name} {$item->suffix} from {$itemStart->format('Y-m-d H:i')} to {$itemEnd->format('Y-m-d H:i')}</b><br/>\n";
+        while($itemStart <= $end) {
             if($DEBUG) { 
               print "Considering {$item->name} {$item->suffix} (#$item->scheduleid) at {$itemStart->format('Y-m-d H:i')} to {$itemEnd->format('Y-m-d H:i')}.<br/>\n";
               if($item->startdate) print "-- (Item start is {$item->startdate->format('Y-m-d H:i')}, end is ". ($item->enddate ? $item->enddate->format('Y-m-d H:i') : "never") . ")<br/>\n";
@@ -103,7 +105,8 @@ QUERY;
  
             $itemStart = $itemStart->add($WEEK);
             $itemEnd = $itemEnd->add($WEEK);
-          }
+        }
+
       }
 
       if($DEBUG) {