v2.2.4 (#223)

Author: bfren

VERSION

@@ -1 +1 @@
-2.2.3
+2.2.4

cli.Dockerfile

@@ -1,4 +1,4 @@
-FROM bfren/php:php8.3
+FROM bfren/php:php8.4
 
 ENV BF_PHP_EXT="curl session sodium pecl-yaml"
 

src/app.class.php

@@ -31,8 +31,8 @@ class App
      */
     public static function init(bool $is_http = true): void
     {
-        // ensure we are running on PHP 8.3
-        version_compare(PHP_VERSION, "8.3.0", ">=") || self::die("This application requires at least PHP 8.3.");
+        // ensure we are running on PHP 8.4
+        version_compare(PHP_VERSION, "8.4.0", ">=") || self::die("This application requires at least PHP 8.4.");
 
         // get current working directory
         $cwd = __DIR__;

src/classes/rota/rota.class.php

@@ -149,11 +149,8 @@ public function apply_filters(array $filters, Lectionary $lectionary): array
         $series_filter = new Series_Filter();
 
         foreach ($this->services as $service) {
-            // only include services that have ministries with assigned people
-            $include = count($service->ministries) > 0;
-
             // apply person filter
-            $include = $include && $person_filter->apply($lectionary, $service, Arr::get($filters, "person", ""));
+            $include = $person_filter->apply($lectionary, $service, Arr::get($filters, "person", ""));
 
             // apply date filters
             $include = $include && $after_filter->apply($lectionary, $service, Arr::get($filters, "start", ""));

src/pages/rota/services-part.php

@@ -29,7 +29,9 @@
 
                     <!-- Date -->
                     <h5 class="card-title"><?php _e($day->date->format(C::$formats->display_date)); ?></h5>
+                    <?php if($day->name): ?>
                     <h6 class="card-subtitle mb-2 text-muted"><?php _e($day->name); ?> &ndash; <?php _e($day->colour) ?></h6>
+                    <?php endif; ?>
 
                     <!-- Services -->
                     <?php foreach ($day->services as $combined_service) : ?>

src/pages/upload/rota-period.class.php

@@ -42,7 +42,8 @@ public static function create(DateTimeImmutable $first_day, DateTimeImmutable $l
             "order_by" => "name",
             "group_by" => "time",
             "date_start" => $first_day->format("Y-m-d"),
-            "date_end" => $last_day->format("Y-m-d")
+            "date_end" => $last_day->format("Y-m-d"),
+            "show_empty_dates" => "1"
         );
         $href = sprintf(self::ROTA_HREF, C::$churchsuite->org, http_build_query($query_values));