Merge pull request #1278 from UN-OCHA/berliner/HPC-9976

HPC-9976: Use default label 'Measure' for data points of types periodicalMeasure and cumulativeMeasure
UN-OCHA · Dec 23, 2024 · 5aa486c · 5aa486c
2 parents a73dced + 202c13c
commit 5aa486c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/html/modules/custom/ghi_plans/src/ApiObjects/AttachmentPrototype/AttachmentPrototype.php b/html/modules/custom/ghi_plans/src/ApiObjects/AttachmentPrototype/AttachmentPrototype.php
@@ -191,6 +191,8 @@ public function getDefaultFieldLabel($index, $langcode = NULL) {
         case 'cumulative_reach':
           return (string) $this->t('People reached', [], ['langcode' => $langcode]);
 
+        case 'periodical_measure':
+        case 'cumulative_measure':
         case 'measure':
           return (string) $this->t('Measure', [], ['langcode' => $langcode]);
       }

diff --git a/html/modules/custom/ghi_subpages/src/LogframeManager.php b/html/modules/custom/ghi_subpages/src/LogframeManager.php
@@ -478,7 +478,7 @@ private function buildCaseloadColumns(AttachmentPrototype $attachment_prototype,
         'id' => count($columns),
         'item_type' => 'data_point',
         'config' => [
-          'label' => $attachment_prototype->getDefaultFieldLabel($index, $plan->getPlanLanguage()) . ' %',
+          'label' => $attachment_prototype->getDefaultFieldLabel($measure, $plan->getPlanLanguage()) . ' %',
           'data_point' => [
             'processing' => 'calculated',
             'calculation' => 'percentage',