Kerkdienstpagina nog een beetje aangepast

api/app/Http/Controllers/KerkdienstController.php

@@ -8,7 +8,7 @@ use Symfony\Component\HttpFoundation\StreamedResponse;
 class KerkdienstController extends Controller
 {
     private static $BASE_SQL = <<<QUERY
-      SELECT `zondagdienst`.`datum` AS `date`, `zondagdienst`.`tijd` AS `time`, `contacten`.`naam` AS `name` 
+      SELECT ADDTIME(`zondagdienst`.`datum`, `zondagdienst`.`tijd`) AS `start`, `contacten`.`naam` AS `name` 
      FROM `zondagdienst` LEFT JOIN `contacten` ON `zondagdienst`.`kerk` = `contacten`.`contacten_id`
      WHERE `zondagdienst`.`datum` > DATE_SUB("2017-09-02", INTERVAL 7 DAY)
      ORDER BY `zondagdienst`.`datum` ASC
@@ -32,9 +32,14 @@ QUERY;
 
         $isAvailable = ((date('N') % 7) != 0) || (time() > strtotime('today noon'));
         $lastNext = app('db')->select(self::$BASE_SQL);
+        foreach($lastNext as $r) {
+          $r->start = new \DateTimeImmutable($r->start);
+        }
+
         return response()->json([
-          'available' => $isAvailable, 
-          'lastNext' => $lastNext]);
+          'isRunning' => !$isAvailable,
+          'previous' => $lastNext[0],
+          'next' => $lastNext[1]]);
     }
 
     /**

common/classes/Kerkdienst.php

@@ -0,0 +1,26 @@
+<?php 
+
+namespace Model;
+
+class KerkdienstInstance extends Model {
+  public $name;
+  public $start;
+
+  public function __construct($data) {
+    parent::__construct($data);
+    parent::ConvertToDateTime($this->start);
+  }
+}
+
+class Kerkdienst extends Model {
+  public $isRunning;
+  public $previous;
+  public $next;
+
+  public function __construct($data) {
+    // parent::__construct($data);
+    $this->isRunning = $data->isRunning;
+    $this->previous = new KerkdienstInstance($data->previous);
+    $this->next = new KerkdienstInstance($data->next);
+  }
+}