change the report/map routes into v2
This commit is contained in:
@@ -13,7 +13,7 @@ use App\Facades\Sms\Sms;
|
||||
use Illuminate\Support\Facades\Gate;
|
||||
use App\Facades\Otp\Otp;
|
||||
use Carbon\Carbon;
|
||||
|
||||
use App\Models\RoadObserved;
|
||||
use App\Models\RoadPatrol;
|
||||
use App\Models\RoadItemsProject;
|
||||
use App\Models\EdarateShahri;
|
||||
@@ -501,6 +501,49 @@ class RoadPatrolProjectController extends Controller
|
||||
], 200);
|
||||
}
|
||||
|
||||
public function map(Request $request)
|
||||
{
|
||||
$province = $request->province_id;
|
||||
$edare_shahri = $request->edare_shahri_id;
|
||||
$status = $request->status;
|
||||
$rms_status = $request->rms_status;
|
||||
|
||||
if ($request->date_from && $request->date_to) {
|
||||
$date_from = $request->date_from.' 00:00:00';
|
||||
$date_to = $request->date_to.' 23:59:59';
|
||||
} else {
|
||||
$date_from = Date('Y-m-d');
|
||||
$date_to = new \DateTime('tomorrow');
|
||||
$date_to = $date_to->format('Y-m-d');
|
||||
}
|
||||
|
||||
$projects = RoadObserved::select('id', 'lng', 'lat','status')
|
||||
->whereBetween('created_at', [$date_from, $date_to])
|
||||
->when($province, function ($query) use ($province) {
|
||||
return $query->where('province_id', $province);
|
||||
})
|
||||
->when($rms_status, function ($query) use ($rms_status) {
|
||||
if ($rms_status == 2) {
|
||||
return $query->where('rms_status', '<>',0);
|
||||
} else {
|
||||
return $query->where('rms_status', 0);
|
||||
}
|
||||
})
|
||||
->when($edare_shahri, function ($query) use ($edare_shahri) {
|
||||
return $query->where('edarate_shahri_id', $edare_shahri);
|
||||
})
|
||||
->when($status, function ($query) use ($status) {
|
||||
return $query->where('status', $status);
|
||||
})
|
||||
// ->toSql();
|
||||
->get();
|
||||
return response()->json([
|
||||
'status' => 'succeed',
|
||||
'message' => '',
|
||||
'data' => $projects
|
||||
], 200);
|
||||
}
|
||||
|
||||
public function detail(RoadPatrol $road_patrol)
|
||||
{
|
||||
return response()->json($road_patrol, 200);
|
||||
|
||||
Reference in New Issue
Block a user