Adding events to refresh loader - #220

Author: bfren

src/classes/refresh/day.class.php

@@ -6,6 +6,7 @@
 use Obadiah\App;
 use Obadiah\Bible\Day as Readings;
 use Obadiah\Cache\Cache;
+use Obadiah\Calendar\Event;
 use Obadiah\Config\Config as C;
 use Obadiah\Helpers\Arr;
 use Obadiah\Helpers\Psalms;
@@ -18,21 +19,23 @@ class Day
     /**
      * Create Day object.
      *
-     * @param DateTimeImmutable $date   The date.
-     * @param Person[]|string[] $people Array of people.
-     * @param Readings|null $readings   Bible readings.
+     * @param DateTimeImmutable $date       The date.
+     * @param Person[]|string[] $people     Array of people.
+     * @param Event[] $events               Array of people.
+     * @param Readings|null $readings       Bible readings.
      * @return void
      */
     public function __construct(
         public readonly DateTimeImmutable $date,
         public readonly array $people,
+        public readonly array $events,
         public readonly ?Readings $readings
     ) {}
 
     /**
      * Build event summary.
      *
-     * @return string                   Event summary.
+     * @return string                       Event summary.
      */
     public function get_summary(): string
     {
@@ -42,8 +45,8 @@ public function get_summary(): string
     /**
      * Build event description.
      *
-     * @param string $separator         Line separator.
-     * @return string                   Event description.
+     * @param string $separator             Line separator.
+     * @return string                       Event description.
      */
     public function get_description(string $separator = "\\n"): string
     {
@@ -68,6 +71,14 @@ public function get_description(string $separator = "\\n"): string
             $description[] = "";
         }
 
+        // add events
+        if (!empty($this->events)) {
+            $description[] = "= Events & Groups =";
+            $events = Arr::map($this->events, fn($e) => sprintf("%s - %s", $e->start->format(C::$formats->display_time), $e->title));
+            $description[] = join($separator, $events);
+            $description[] = "";
+        }
+
         // add Collects
         if (($collect = Cache::get_lectionary()->get_collect($this->date)) !== null) {
             $lines = preg_split("/\n/", $collect);

src/classes/refresh/refresh.class.php

@@ -8,6 +8,8 @@
 use Obadiah\App;
 use Obadiah\Cache\Cache;
 use Obadiah\Config\Config as C;
+use Obadiah\Helpers\Arr;
+use Obadiah\Pages\Events\Events;
 use Obadiah\Prayer\Prayer_Calendar;
 
 App::check();
@@ -46,6 +48,10 @@ public function __construct()
 
         // get data from caches
         $bible = Cache::get_bible_plan();
+        $events = Events::get_events(array(
+            "start" => $period->start->format(C::$formats->sortable_date),
+            "end" => $period->end->format(C::$formats->sortable_date)
+        ));
 
         // get readings and people for each day
         $days = [];
@@ -58,9 +64,12 @@ public function __construct()
 
             // create day object
             $immutable = DateTimeImmutable::createFromInterface($value);
+            $date = $immutable->format(C::$formats->sortable_date);
+            $date_events = Arr::match($events, fn ($e) => $e->start->format(C::$formats->sortable_date) == $date);
             $day = new Day(
                 date: $immutable,
                 people: Prayer_Calendar::get_day($immutable, Prayer_Calendar::RETURN_OBJECT),
+                events: $date_events,
                 readings: $bible->get_day($immutable)
             );
 
@@ -77,6 +86,6 @@ public function __construct()
         $this->days = $days;
 
         // if today has not been set, create an empty one for today
-        $this->today = $today_value ?: new Day($today, people: [], readings: null);
+        $this->today = $today_value ?: new Day($today, people: [], events: [], readings: null);
     }
 }