create road observed filter datatable
This commit is contained in:
@@ -23,37 +23,20 @@ class ObservedItemController extends Controller
|
|||||||
public function filter(FilterRequest $request): JsonResponse
|
public function filter(FilterRequest $request): JsonResponse
|
||||||
{
|
{
|
||||||
$columns = array(
|
$columns = array(
|
||||||
'id', 'item_id', 'sub_item_id'
|
'id', 'item_id', 'road_patrol_id', 'roadPatrol.start_time', 'roadPatrol.end_time',
|
||||||
);
|
);
|
||||||
|
|
||||||
$allowedFilters = $columns;
|
$allowedFilters = $columns;
|
||||||
$allowedSortings = $columns;
|
$allowedSortings = $columns;
|
||||||
|
|
||||||
$data = ObservedItem::query()->whereNull('road_item_id')
|
$data = ObservedItem::query()->whereNull('road_item_id');
|
||||||
->when($request->start_date, function (Builder $query) use ($request) {
|
|
||||||
return $query->whereHas('roadPatrol', function (Builder $query) use ($request) {
|
|
||||||
$query->WhereBetween('start_time', [$request->start_date.' 00:00:00', $request->end_date.' 23:59:59'])
|
|
||||||
->orWhereBetween('end_time', [$request->start_date.' 00:00:00', $request->end_date.' 23:59:59']);
|
|
||||||
});
|
|
||||||
})
|
|
||||||
->when($request->road_patrol_id, function (Builder $query) use ($request) {
|
|
||||||
return $query->where('road_patrol_id', $request->road_patrol_id);
|
|
||||||
})
|
|
||||||
->when($request->item_id, function (Builder $query) use ($request) {
|
|
||||||
return $query->where('item_id', $request->item_id);
|
|
||||||
})
|
|
||||||
->selectRaw('id as item, item_id, item_name, sub_item_id, sub_item_name, local_name');
|
|
||||||
|
|
||||||
if($data->get()->isEmpty()) {
|
|
||||||
return $this->errorResponse('موردی یافت نشد');
|
|
||||||
}
|
|
||||||
|
|
||||||
$dataTable = DataTableFacade::run(
|
$dataTable = DataTableFacade::run(
|
||||||
$data,
|
$data,
|
||||||
$request,
|
$request,
|
||||||
allowedFilters: $allowedFilters,
|
allowedFilters: $allowedFilters,
|
||||||
allowedSortings: $allowedSortings);
|
allowedSortings: $allowedSortings
|
||||||
|
);
|
||||||
|
|
||||||
return response()->json($dataTable);
|
return response()->json($dataTable);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -184,6 +184,6 @@ Route::prefix('observed_items')
|
|||||||
->name('observedItem.')
|
->name('observedItem.')
|
||||||
->controller(ObservedItemController::class)
|
->controller(ObservedItemController::class)
|
||||||
->group(function () {
|
->group(function () {
|
||||||
Route::post('/filter', 'filter')->name('filter');
|
Route::get('/filter', 'filter')->name('filter');
|
||||||
Route::get('/{observedItem}', 'show')->name('show');
|
Route::get('/{observedItem}', 'show')->name('show');
|
||||||
});
|
});
|
||||||
|
|||||||
Reference in New Issue
Block a user