copenhagentruckwash/api
1
0
Fork 0
Code Issues Pull Requests 1 Actions 2 Packages Projects Releases Wiki Activity

Refactor progress_alert_format parsing in goals_criteria to support object structures and update enum mapping in goals_criteria_progress_alert_style

Browse Source
This commit is contained in:
Jeppe Bundgaard
2026-01-27 09:20:27 +01:00
parent 7fd4ac888a
commit 1a5084891d
2 changed files with 30 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/nginx/app/modules/goals/classes/goals_criteria.php
+27 -5
View File
@@ -186,11 +186,33 @@ class goals_criteria implements goals_criteria_i
}
}
// Parse progress alert format (string)
if (isset($data['progress_alert_format']) && is_string($data['progress_alert_format'])) {
$criteria->progress_alert_format = trim((string)$data['progress_alert_format']);
} elseif (isset($data['progressAlertFormat']) && is_string($data['progressAlertFormat'])) {
$criteria->progress_alert_format = trim((string)$data['progressAlertFormat']);
// Parse progress alert format (string or object with render)
if (isset($data['progress_alert_format'])) {
$fmt = $data['progress_alert_format'];
if (is_string($fmt)) {
$criteria->progress_alert_format = trim($fmt);
} elseif (is_array($fmt) || is_object($fmt)) {
// Support structures coming from classes implementing goals_criteria_progress_alert_format_t
// Expected keys: 'render' or 'format'
$arr = (array)$fmt;
if (isset($arr['render']) && is_string($arr['render'])) {
$criteria->progress_alert_format = trim($arr['render']);
} elseif (isset($arr['format']) && is_string($arr['format'])) {
$criteria->progress_alert_format = trim($arr['format']);
}
}
} elseif (isset($data['progressAlertFormat'])) {
$fmt = $data['progressAlertFormat'];
if (is_string($fmt)) {
$criteria->progress_alert_format = trim($fmt);
} elseif (is_array($fmt) || is_object($fmt)) {
$arr = (array)$fmt;
if (isset($arr['render']) && is_string($arr['render'])) {
$criteria->progress_alert_format = trim($arr['render']);
} elseif (isset($arr['format']) && is_string($arr['format'])) {
$criteria->progress_alert_format = trim($arr['format']);
}
}
}
// Parse progress alert weekdays (array of strings)