fix: AU-2213: Allow budget explantion to be saved without a value

City-of-Helsinki · Mar 8, 2024 · 21ea0ce · 21ea0ce
1 parent fd572eb
commit 21ea0ce
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 7 deletions.
diff --git a/public/modules/custom/grants_budget_components/src/GrantsBudgetComponentService.php b/public/modules/custom/grants_budget_components/src/GrantsBudgetComponentService.php
@@ -88,15 +88,22 @@ public static function processBudgetOtherValues(ListInterface $property): array
       }
 
       $value = $values['value'];
+      $isEmptyValue = (is_null($value) || $value === "");
 
-      if (is_null($value) || $value === "") {
+      if ($isEmptyValue && empty(trim($values['label']))) {
         continue;
       }
+      elseif ($isEmptyValue && $values['label']) {
+        $valueToSave = NULL;
+      }
+      else {
+        $valueToSave = (string) GrantsHandler::convertToFloat($value);
+      }
 
       $itemValues = [
         'ID' => $property->getName() . '_' . $index,
         'label' => $values['label'] ?? NULL,
-        'value' => (string) GrantsHandler::convertToFloat($value),
+        'value' => $valueToSave,
         'valueType' => 'double',
       ];
 
@@ -137,14 +144,19 @@ public static function getBudgetOtherValues(array $documentData, array $jsonPath
       if (!empty($parent) && isset($parent[$pathLast])) {
         $retVal[$groupName] = array_map(function ($e) {
           $value = GrantsHandler::convertToFloat($e['value']);
-          return [
-            'label' => $e['label'] ?? NULL,
-            'value' => number_format(
+
+          if ($value !== NULL) {
+            $value = number_format(
               $value,
               2,
               ',',
               ' ',
-            ) ?? NULL,
+            );
+          }
+
+          return [
+            'label' => $e['label'] ?? NULL,
+            'value' => $value,
           ];
         }, $parent[$pathLast]);
       }

diff --git a/public/modules/custom/grants_metadata/src/TypedData/Definition/NuorisoLomaDefinition.php b/public/modules/custom/grants_metadata/src/TypedData/Definition/NuorisoLomaDefinition.php
@@ -47,7 +47,9 @@ public function getPropertyDefinitions(): array {
         ->setPropertyDefinition(
           'meno',
           GrantsBudgetInfoDefinition::getOtherCostDefinition()
-        );
+        )
+        ->setPropertyDefinition('budget_other_income')
+        ->setPropertyDefinition('budget_other_cost');
 
       $info['lisakysymys_1'] = DataDefinition::create('string')
         ->setSetting('jsonPath', [