RMS/backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Feature/nominatim function adjustment

Browse Source
This commit is contained in:
amirghasempoor
2024-09-29 10:54:35 +00:00
committed by Hamidreza Ranjbarpour
parent 9c4086d186
commit 365b7ec644
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Http/Controllers/CoridorsController.php
View File

@@ -581,7 +581,7 @@ class CoridorsController extends Controller
$data = RoadItemsProject::with('files')->find($request->id);
break;
case "2":
$data = RoadPatrolProject::find($request->id);
$data = RoadPatrol::find($request->id);
break;
case "3":
$collection = \App\Models\ContractSubItems::whereId($request->id)->get();
@@ -725,13 +725,13 @@ class CoridorsController extends Controller
}
if ( in_array(2, $typeArrays) ) {
$roadPatrolProject = RoadPatrolProject::whereIn('start_way_id', $idArrays)
$roadPatrolProject = RoadPatrol::whereIn('start_way_id', $idArrays)
->orWhereIn('end_way_id', $idArrays)
// ->when($date_to , function ($query) use ($date_to, $date_from) {
->whereBetween('created_at', [$date_from . ' 00:00:00', $date_to . ' 23:59:59'])
// })
->whereNotNull('start_lat')
->select('start_lat', 'start_lng', 'id')
->select('start_lat', 'start_lon', 'id')
->get();
}