add axis type to safety excel

This commit is contained in:
2025-04-08 11:11:26 +03:30
parent 6734eed822
commit 93d1775379
5 changed files with 65 additions and 9 deletions

View File

@@ -141,6 +141,7 @@ class SafetyAndPrivacyController extends Controller
'step_fa' => 'گام سوم (برخورد)',
'action_picture' => FileFacade::save($request->action_picture, "safety_and_privacy/{$safetyAndPrivacy->id}/action_picture"),
'action_picture_document_upload_date' => now(),
'action_date' => $request->action_date,
]);
$user->addActivityComplete(1136);
@@ -201,4 +202,25 @@ class SafetyAndPrivacyController extends Controller
->select('id', 'item', 'item_str', 'sub_item_str as name', 'sub_item_unit as unit', 'needs_image', 'needs_end_point', 'sub_item')
->get());
}
public function map(Request $request): JsonResponse
{
$province = $request->province_id;
$edare_shahri = $request->edare_shahri_id;
$step = $request->step;
$info_id = $request->info_id;
$fromDate = $request->from_date ? $request->from_date . ' 00:00:00' : now()->startOfDay()->toDateTimeString();
$toDate = $request->date_to ? $request->date_to . ' 23:59:59' : now()->endOfDay()->toDateTimeString();
$activities = SafetyAndPrivacy::query()
->when($province, fn ($query) => $query->where('province_id', '=', $province))
->when($edare_shahri, fn($query) => $query->where('edarate_shahri_id', '=', $edare_shahri))
->when($step, fn($query) => $query->where('step', '=', $step))
->when($info_id, fn($query) => $query->where('info_id', '=', $info_id))
->whereBetween('created_at', [$fromDate, $toDate])
->select('id', 'lat', 'lon', 'step')
->get();
return $this->successResponse($activities);
}
}