From b673de63986d3131137881871d304889941360e8 Mon Sep 17 00:00:00 2001
From: berliner <berliner@dev030.com>
Date: Sun, 22 Dec 2024 12:06:21 +0100
Subject: [PATCH] HPC-9976: Change logframe autobuild logic for indicators to
 comply with more diverse attachment prototypes

---
 .../ghi_subpages/src/LogframeManager.php      | 27 +++++++++++++------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/html/modules/custom/ghi_subpages/src/LogframeManager.php b/html/modules/custom/ghi_subpages/src/LogframeManager.php
index 6d1064dd8..942738a9d 100644
--- a/html/modules/custom/ghi_subpages/src/LogframeManager.php
+++ b/html/modules/custom/ghi_subpages/src/LogframeManager.php
@@ -514,8 +514,8 @@ private function buildCaseloadColumns(AttachmentPrototype $attachment_prototype,
    *   container items.
    */
   private function buildIndicatorColumns(AttachmentPrototype $attachment_prototype, Plan $plan) {
-    $columns = [];
     // Setup the columns.
+    $columns = [];
     $columns[] = [
       'item_type' => 'attachment_label',
       'config' => [
@@ -530,16 +530,27 @@ private function buildIndicatorColumns(AttachmentPrototype $attachment_prototype
       ],
       'id' => count($columns),
     ];
-    // Take the first metric of type target and the last measurement.
+
+    // Take the first metric of type target.
     $field_types = $attachment_prototype->getFieldTypes();
     $target = array_search('target', $field_types);
-    $measure = array_search('measure', array_reverse($field_types, TRUE));
-    $available_fields = [
-      $target,
-      $measure,
+
+    // Take the last measurement from a pool of valid candidates.
+    $field_types_reversed = array_reverse($field_types, TRUE);
+    $measure_candidates = [
+      'periodical_measure',
+      'measure',
+      'cumulative_measure',
     ];
-    $available_fields = array_filter($available_fields, function ($field) {
-      return $field !== NULL;
+    foreach ($measure_candidates as $measure_candidate) {
+      if ($measure = array_search($measure_candidate, $field_types_reversed)) {
+        break;
+      }
+    }
+
+    // Collect the available fields.
+    $available_fields = array_filter([$target, $measure], function ($field) {
+      return is_int($field);
     });
     foreach ($available_fields as $index) {
       $columns[] = [