add more data to api

This commit is contained in:
2025-01-11 13:30:35 +03:30
parent 7288b7fce6
commit 8fbae148b7
2 changed files with 64 additions and 14 deletions

View File

@@ -5,6 +5,8 @@ namespace App\Http\Controllers\V3\Dashboard\Reports;
use App\Exports\V2\RoadPatrol\RoadPatrolTable\AllSheets as RoadPatrolTable;
use App\Http\Controllers\Controller;
use App\Http\Traits\ApiResponse;
use App\Models\EdarateShahri;
use App\Models\Province;
use App\Models\RoadPatrolProject;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
@@ -19,8 +21,13 @@ class RoadPatrolReportController extends Controller
$fromDate = $request->from_date ? $request->from_date . ' 00:00:00' : now()->startOfDay()->toDateTimeString();
$dateTo = $request->date_to ? $request->date_to . ' 23:59:59' : now()->endOfDay()->toDateTimeString();
$data = RoadPatrolProject::provincePatrolData($fromDate, $dateTo);
return $this->successResponse($data);
$activities = RoadPatrolProject::provincePatrolData($fromDate, $dateTo);
$provinces = Province::all(['id', 'name_fa']);
return $this->successResponse([
'activities' => $activities,
'provinces' => $provinces
]);
}
public function cityPatrolActivity(Request $request): JsonResponse
@@ -29,8 +36,13 @@ class RoadPatrolReportController extends Controller
$fromDate = $request->from_date ? $request->from_date . ' 00:00:00' : now()->startOfDay()->toDateTimeString();
$dateTo = $request->date_to ? $request->date_to . ' 23:59:59' : now()->endOfDay()->toDateTimeString();
$data = RoadPatrolProject::edarehPatrolData($fromDate, $dateTo, $request->province_id);
return $this->successResponse($data);
$activities = RoadPatrolProject::edarehPatrolData($fromDate, $dateTo, $request->province_id);
$edarateShahri = EdarateShahri::query()->where('province_id', '=', $request->province_id)->get(['id', 'name_fa']);
return $this->successResponse([
'activities' => $activities,
'edarateShahri' => $edarateShahri,
]);
}
public function excel(Request $request): BinaryFileResponse