NW/Aknaproff
1
0
Fork 0
Code Issues 2 Pull Requests Packages Projects Releases Wiki Activity

bug fixes and new functionality

Browse Source
This commit is contained in:
NW
2025-01-31 11:07:31 +00:00
parent 4cf46bd449
commit f985bfedd3
3 changed files with 43 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
app/Http/Controllers/FormDataController.php
View File

@@ -470,29 +470,36 @@ class FormDataController extends Controller
public function show($form_id, Request $request)
{
$user_id = $request->user()->id;
$form = Form::findOrFail($form_id);
$data = FormData::query()
->where('form_id', $form_id)
->orderBy('created_at', 'desc')
->get()
->filter(function (FormData $formData) use ($request) {
$date = null;
if (is_array($formData->data)) {
$date = strtotime(
array_values(
array_filter($formData->data, fn($item) => is_string($item) && strtotime($item))
)[0]
);
$dates = array_filter($formData->data, function ($item) {
return is_string($item) && strtotime($item);
});
if (!empty($dates)) {
$firstDate = reset($dates);
$date = strtotime($firstDate);
}
}
$date = Carbon::createFromTimestamp($date)->toDateString();
$isValidStartDate = $request->filled('start_date') ?
$request->get('start_date') <= $date :
Carbon::now()->subDays(7)->toDateString() <= $date;
$isValidEndDate = $request->filled('end_date') ?
$request->get('end_date') >= $date :
Carbon::now()->toDateString() >= $date;
if (!$date) {
return false; // Skip entries without valid dates
}
$dateStr = Carbon::createFromTimestamp($date)->toDateString();
$isValidStartDate = $request->filled('start_date')
? $request->get('start_date') <= $dateStr
: Carbon::now()->subDays(7)->toDateString() <= $dateStr;
$isValidEndDate = $request->filled('end_date')
? $request->get('end_date') >= $dateStr
: Carbon::now()->toDateString() >= $dateStr;
return $isValidStartDate && $isValidEndDate;
});
@@ -532,7 +539,7 @@ class FormDataController extends Controller
}
return view('form_data.show')
->with(compact('form', 'data'));
->with(compact('form', 'data', 'has_permission')); // Добавьте has_permission
}
public function viewData($id)