Stratawiz
/
Rapport-Laravel
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of http://192.168.1.200:3000/Stratawiz/Rapport-Laravel
Specific Folder FTP Upload / ftp-deploy (push) Successful in 26s Details

This commit is contained in:
zeeshan 2026-11-02 12:27:46 +05:30
parent e183aacea5 a12e3ce183
commit 97edde2a79
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/Http/Controllers/FormController.php
View File

@ -417,16 +417,17 @@ class FormController extends Controller
if (isset($question->type) && $question->type == 'hidden') { if (isset($question->type) && $question->type == 'hidden') {
continue; continue;
} }
$col = is_object($question) && isset($question->code) ? $question->code : $code;
$value = null; $value = null;
if (isset($submission->formdata) && is_object($submission->formdata) && property_exists($submission->formdata, $code)) { if (isset($submission->formdata) && is_object($submission->formdata) && property_exists($submission->formdata, $col)) {
$value = $submission->formdata->{$code}; $value = $submission->formdata->{$col};
} elseif (isset($submission->{$code})) { } elseif (isset($submission->{$col})) {
$value = $submission->{$code}; $value = $submission->{$col};
} }
if (is_array($value)) { if (is_array($value)) {
$value = implode(', ', $value); $value = implode(', ', $value);
} }
$row[$code] = $value ?? ''; $row[$col] = $value ?? '';
} }
if (isset($formdata->workflow) && $formdata->workflow == 'yes') { if (isset($formdata->workflow) && $formdata->workflow == 'yes') {
$row['workflow_next_approver'] = $submission->workflow_next_approver ?? ''; $row['workflow_next_approver'] = $submission->workflow_next_approver ?? '';

1
app/Http/Controllers/FormentityController.php
View File

@ -61,6 +61,7 @@ class FormentityController extends Controller
'status' => ['title' => 'Status', 'type' => 'select', 'required' => true, 'values' => ['active' => 'Active', 'disabled' => 'Disabled'] ], 'status' => ['title' => 'Status', 'type' => 'select', 'required' => true, 'values' => ['active' => 'Active', 'disabled' => 'Disabled'] ],
'metric_submission' => ['title' => 'Metric Submission', 'type' => 'yesno', 'required' => true], 'metric_submission' => ['title' => 'Metric Submission', 'type' => 'yesno', 'required' => true],
'metric_authkey' => ['title' => 'Auth Key', 'type' => 'text', 'required' => true], 'metric_authkey' => ['title' => 'Auth Key', 'type' => 'text', 'required' => true],
'metric_ready_on_submit' => ['title' => 'Metric Ready On Submit', 'type' => 'yesno', 'required' => true, 'default' => 'no'],
'manager_de_roles' => ['title' => 'Manager Data Entry Roles', 'type' => 'multiselect', 'values' => $roles_dd ], 'manager_de_roles' => ['title' => 'Manager Data Entry Roles', 'type' => 'multiselect', 'values' => $roles_dd ],
// 'manager_data_child_role' => ['title' => 'Manager Data Child Entry Roles', 'type' => 'multiselect', 'values' => $roles_dd ], // 'manager_data_child_role' => ['title' => 'Manager Data Child Entry Roles', 'type' => 'multiselect', 'values' => $roles_dd ],

3
resources/views/form/list.blade.php
View File

@ -255,7 +255,8 @@
@if(isset($question->type) && $question->type == 'hidden') @if(isset($question->type) && $question->type == 'hidden')
@continue @continue
@endif @endif
{ "data": "{{$code}}", "defaultContent": "" }, @php $col = is_object($question) && isset($question->code) ? $question->code : $code; @endphp
{ "data": "{{$col}}", "defaultContent": "" },
@endforeach @endforeach
@else @else
{ "data": "date" }, { "data": "date" },