matt/opnform-host-nginx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[ESC-389]form-requires-to-answer

Browse Source
This commit is contained in:
Julien Nahum
2024-11-28 10:22:33 +01:00
parent a41563a183
commit e2c6af69e6
2 changed files with 245 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
api/app/Http/Requests/AnswerFormRequest.php
View File

@@ -66,12 +66,20 @@ class AnswerFormRequest extends FormRequest
foreach ($selectionFields as $field) {
if (isset($data[$field['id']]) && is_array($data[$field['id']])) {
$data[$field['id']] = array_map(function ($val) use ($field) {
// Find the option by exact ID match first
$tmpop = collect($field[$field['type']]['options'])->first(function ($op) use ($val) {
return $op['id'] ?? $op['value'] === $val;
return $op['id'] === $val || $op['name'] === $val;
});
return isset($tmpop['name']) ? $tmpop['name'] : '';
// Return the original value if no match found
return isset($tmpop['name']) ? $tmpop['name'] : $val;
}, $data[$field['id']]);
} elseif (isset($data[$field['id']])) {
// Handle single select values
$tmpop = collect($field[$field['type']]['options'])->first(function ($op) use ($field, $data) {
return $op['id'] === $data[$field['id']] || $op['name'] === $data[$field['id']];
});
$data[$field['id']] = isset($tmpop['name']) ? $tmpop['name'] : $data[$field['id']];
}
}
if (FormLogicPropertyResolver::isRequired($property, $data)) {