add map report to safety
This commit is contained in:
@@ -150,6 +150,7 @@ class BiController extends Controller
|
||||
|
||||
public function getDiagram(Request $request)
|
||||
{
|
||||
ini_set('memory_limit', '-1');
|
||||
$subjectID = $request->subject_id;
|
||||
$provinceID = $request->province_id;
|
||||
$dateFrom = $request->from_date;
|
||||
@@ -1021,6 +1022,7 @@ class BiController extends Controller
|
||||
|
||||
public function separationActivityTypeRahdariActivities(Request $request)
|
||||
{
|
||||
ini_set('memory_limit', '-1');
|
||||
$dateFrom = $request->from_date;
|
||||
$dateTo = $request->to_date;
|
||||
$provinceID = $request->province_id ?? null;
|
||||
@@ -1198,4 +1200,4 @@ class BiController extends Controller
|
||||
'data' => round($camps, 2)
|
||||
]);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4,6 +4,7 @@ namespace App\Http\Controllers\V3\Dashboard;
|
||||
|
||||
use App\Enums\AxisTypes;
|
||||
use App\Exports\V3\SafetyAndPrivacy\CartableReport;
|
||||
use App\Facades\DataTable\DataTableFacade;
|
||||
use App\Facades\File\FileFacade;
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Http\Requests\V3\SafetyAndPrivacy\FirstStepStoreRequest;
|
||||
@@ -205,22 +206,12 @@ class SafetyAndPrivacyController extends Controller
|
||||
|
||||
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);
|
||||
return DataTableFacade::run(
|
||||
SafetyAndPrivacy::query(),
|
||||
$request,
|
||||
allowedFilters: ['*'],
|
||||
allowedSortings: ['*'],
|
||||
allowedSelects: ['id', 'lat', 'lon', 'step']
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user