fix report
This commit is contained in:
@@ -4,62 +4,25 @@ namespace App\Http\Controllers\V3\RoadPatrole;
|
||||
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Http\Traits\ApiResponse;
|
||||
use App\Models\RoadPatrol;
|
||||
use App\Models\Province;
|
||||
use App\Services\Cartables\RoadPatrolTableService;
|
||||
use Illuminate\Http\JsonResponse;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Support\Facades\Gate;
|
||||
|
||||
class SupervisorController extends Controller
|
||||
{
|
||||
use ApiResponse;
|
||||
|
||||
public function supervisorIndex(Request $request, RoadPatrolTableService $roadPatrolTableService): JsonResponse
|
||||
public function countryPatrolActivity(Request $request, RoadPatrolTableService $roadPatrolTableService): JsonResponse
|
||||
{
|
||||
$data = $roadPatrolTableService->supervisorCartableReport($request);
|
||||
$activities = $roadPatrolTableService->countryActivity($request);
|
||||
|
||||
foreach ($data['data'] as $road_patrol) {
|
||||
if (Gate::allows('gate-supervise-road-item', $road_patrol)) {
|
||||
$road_patrol['can_supervise'] = 1;
|
||||
} else {
|
||||
$road_patrol['can_supervise'] = 0;
|
||||
}
|
||||
}
|
||||
$provinces = Province::all(['id', 'name_fa']);
|
||||
|
||||
return response()->json($data);
|
||||
return $this->successResponse([
|
||||
'activities' => $activities['data'],
|
||||
'provinces' => $provinces
|
||||
]);
|
||||
}
|
||||
public function getReport(RoadPatrol $roadPatrol): JsonResponse
|
||||
{
|
||||
$data = [
|
||||
'serial_no' => $roadPatrol->id,
|
||||
'province_fa' => $roadPatrol->province_fa,
|
||||
'edare_name' => $roadPatrol->edare_name,
|
||||
'start_time' => $roadPatrol->start_time,
|
||||
'end_time' => $roadPatrol->end_time,
|
||||
'officer_name' => $roadPatrol->officer_name,
|
||||
'officer_plaque' => $roadPatrol->officer_plaque,
|
||||
'officer_phone_number' => $roadPatrol->officer_phone_number,
|
||||
'created_at' => $roadPatrol->created_at
|
||||
];
|
||||
|
||||
$observed_items = array();
|
||||
if($roadPatrol->observedItems) {
|
||||
foreach ($roadPatrol->observedItems as $index => $observed_item) {
|
||||
$observed_items[] = [
|
||||
'item' => $observed_item->item_name,
|
||||
'sub_item' => $observed_item->sub_item_name,
|
||||
'local_name' => $observed_item->local_name,
|
||||
'description' => $observed_item->description,
|
||||
'priority_fa' => $observed_item->priority_fa,
|
||||
];
|
||||
}
|
||||
}
|
||||
|
||||
$data['observed_items'] = $observed_items;
|
||||
return $this->successResponse($data);
|
||||
}
|
||||
public function show(RoadPatrol $roadPatrol): JsonResponse
|
||||
{
|
||||
return $this->successResponse($roadPatrol);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user