@@ -158,6 +165,8 @@
const d = res.body.data.drop_off_point || res.body.data;
createForm.querySelector('[name="name"]').value = d.name;
createForm.querySelector('[name="code"]').value = d.code;
+ createForm.querySelector('[name="barangay_id"]').value = d.barangay_id || '';
+ barangaySelect.dispatchEvent(new Event('change'));
createForm.querySelector('[name="address_line"]').value = d.address_line;
createForm.querySelector('[name="capacity_kg"]').value = d.capacity_kg ?? '';
createForm.querySelector('[name="contact_person"]').value = d.contact_person ?? '';
@@ -226,9 +235,51 @@
let map = null;
let marker = null;
let geofenceLayer = null;
+ let currentLguBoundaryLayer = null;
+ let currentLguPolygon = null;
+ let allBarangays = [];
const latInput = document.getElementById('dop-lat');
const lngInput = document.getElementById('dop-lng');
const geofenceInput = document.getElementById('geofence_wkt');
+ const barangaySelect = document.getElementById('form-barangay');
+
+ async function loadBarangays() {
+ const res = await window.Verde.apiFetch('/api/v1/geo/barangays');
+ if (res.ok) {
+ allBarangays = res.body.data || [];
+ barangaySelect.innerHTML = '
' +
+ allBarangays.map(b => `
`).join('');
+ }
+ }
+ loadBarangays();
+
+ barangaySelect.addEventListener('change', () => {
+ const id = barangaySelect.value;
+ const b = allBarangays.find(x => x.id == id);
+
+ if (currentLguBoundaryLayer && map) {
+ map.removeLayer(currentLguBoundaryLayer);
+ currentLguBoundaryLayer = null;
+ }
+ currentLguPolygon = null;
+
+ if (b && b.boundary && b.boundary.length > 2 && map) {
+ const coords = b.boundary.map(p => [p.lat, p.lng]);
+ currentLguBoundaryLayer = L.polygon(coords, { color: '#3b82f6', fillOpacity: 0.1, weight: 2 }).addTo(map);
+ map.fitBounds(currentLguBoundaryLayer.getBounds());
+
+ // Close the loop for turf
+ const turfCoords = b.boundary.map(p => [p.lng, p.lat]);
+ turfCoords.push([b.boundary[0].lng, b.boundary[0].lat]);
+ currentLguPolygon = turf.polygon([turfCoords]);
+ }
+ });
+
+ function validatePoint(latlng) {
+ if (!currentLguPolygon) return true;
+ const pt = turf.point([latlng.lng, latlng.lat]);
+ return turf.booleanPointInPolygon(pt, currentLguPolygon);
+ }
function updateGeofenceInput(layer) {
if (!layer) {
@@ -276,13 +327,26 @@
marker = L.marker([initialLat, initialLng], { draggable: true }).addTo(map);
+ marker.on('dragstart', function () {
+ marker._lastPos = marker.getLatLng();
+ });
+
marker.on('dragend', function () {
const pos = marker.getLatLng();
+ if (!validatePoint(pos)) {
+ marker.setLatLng(marker._lastPos);
+ window.Verde.toast('Drop-off point must be within the selected LGU boundary.', 'error');
+ return;
+ }
latInput.value = pos.lat.toFixed(6);
lngInput.value = pos.lng.toFixed(6);
});
map.on('click', function (e) {
+ if (!validatePoint(e.latlng)) {
+ window.Verde.toast('Drop-off point must be within the selected LGU boundary.', 'error');
+ return;
+ }
marker.setLatLng(e.latlng);
latInput.value = e.latlng.lat.toFixed(6);
lngInput.value = e.latlng.lng.toFixed(6);
@@ -375,6 +439,12 @@
li.addEventListener('click', () => {
const lat = parseFloat(li.dataset.lat);
const lng = parseFloat(li.dataset.lng);
+
+ if (!validatePoint({lat, lng})) {
+ window.Verde.toast('Searched location is outside the selected LGU boundary.', 'error');
+ return;
+ }
+
latInput.value = lat.toFixed(6);
lngInput.value = lng.toFixed(6);
marker.setLatLng([lat, lng]);
@@ -426,6 +496,8 @@
latInput.value = '14.653900';
lngInput.value = '121.068500';
geofenceInput.value = '';
+ createForm.querySelector('[name="barangay_id"]').value = '';
+ barangaySelect.dispatchEvent(new Event('change'));
modal.classList.remove('hidden');
initMap(14.6539, 121.0685, null);
});
@@ -440,6 +512,8 @@
const payload = Object.fromEntries(fd.entries());
payload.lat = parseFloat(payload.lat);
payload.lng = parseFloat(payload.lng);
+ if (payload.barangay_id) payload.barangay_id = parseInt(payload.barangay_id, 10);
+ else delete payload.barangay_id;
if (payload.capacity_kg) payload.capacity_kg = parseInt(payload.capacity_kg, 10);
else delete payload.capacity_kg;
if (!payload.contact_person) payload.contact_person = null;
diff --git a/resources/views/admin/incidents.blade.php b/resources/views/admin/incidents.blade.php
new file mode 100644
index 0000000..bf70008
--- /dev/null
+++ b/resources/views/admin/incidents.blade.php
@@ -0,0 +1,258 @@
+@extends('admin.layouts.app', ['pageTitle' => 'Incidents'])
+
+@section('page')
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ | Reported At |
+ Trip |
+ Route |
+ Team / Driver |
+ Type |
+ Driver Notes |
+ Actions |
+
+
+
+ | Loading… |
+
+
+
+
+
+
+
+
+{{-- Detail modal --}}
+
+
+
+
+
Incident Details
+
+
+
+
+
+
+
+@endsection
diff --git a/resources/views/admin/partials/sidebar.blade.php b/resources/views/admin/partials/sidebar.blade.php
index 0f045ad..328c447 100644
--- a/resources/views/admin/partials/sidebar.blade.php
+++ b/resources/views/admin/partials/sidebar.blade.php
@@ -6,7 +6,7 @@
['href' => '/admin/trips', 'label' => 'Trips', 'icon' => 'truck'],
['href' => '/admin/operations/live', 'label' => 'Live Tracking', 'icon' => 'map'],
['href' => '/admin/operations/calendar', 'label' => 'Trip Calendar', 'icon' => 'calendar'],
- ['href' => '/admin/operations/incidents', 'label' => 'Incidents', 'disabled' => true, 'icon' => 'alert'],
+ ['href' => '/admin/operations/incidents', 'label' => 'Incidents', 'icon' => 'alert'],
],
'Planning' => [
['href' => '/admin/routes', 'label' => 'Routes', 'icon' => 'route'],
diff --git a/routes/api.php b/routes/api.php
index 4849e7b..c10d0bf 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -378,6 +378,7 @@ Route::prefix('admin/trips')
Route::get('/', [AdminTripController::class, 'index'])->name('index');
Route::post('/', [AdminTripController::class, 'store'])->name('store');
Route::get('/suggest-assignment', [AdminTripController::class, 'suggestAssignment'])->name('suggest-assignment');
+ Route::get('/incidents', [AdminTripController::class, 'incidents'])->name('incidents');
Route::get('/{trip}', [AdminTripController::class, 'show'])->name('show');
Route::patch('/{trip}', [AdminTripController::class, 'update'])->name('update');
Route::delete('/{trip}', [AdminTripController::class, 'destroy'])->name('destroy');
diff --git a/routes/web.php b/routes/web.php
index 0fdf1cc..88ab8fd 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -38,10 +38,7 @@ Route::prefix('admin')->group(function () {
Route::view('/barangays', 'admin.barangays')->name('admin.barangays');
Route::view('/operations/calendar', 'admin.calendar')->name('admin.calendar');
- Route::view('/operations/incidents', 'admin.coming-soon', [
- 'title' => 'Incidents',
- 'description' => 'Filtered view of trip incident events — UI work pending. Visible inline in each Trip detail.',
- ]);
+ Route::view('/operations/incidents', 'admin.incidents')->name('admin.incidents');
});
Route::prefix('store')->name('store.')->group(function () {
diff --git a/tests/Feature/Api/V1/Trip/TripIncidentDashboardTest.php b/tests/Feature/Api/V1/Trip/TripIncidentDashboardTest.php
new file mode 100644
index 0000000..ef29892
--- /dev/null
+++ b/tests/Feature/Api/V1/Trip/TripIncidentDashboardTest.php
@@ -0,0 +1,118 @@
+seed([RoleSeeder::class, SamplePsgcSeeder::class, SampleDropOffPointsSeeder::class, SampleDumpsitesSeeder::class]);
+ $this->admin = User::factory()->create(['role' => User::ROLE_ADMIN, 'status' => 'active']);
+
+ $driver = User::factory()->create(['role' => User::ROLE_DRIVER, 'status' => 'active']);
+ $truck = Truck::create(['plate_number' => 'TRK-INC', 'status' => 'active']);
+ $team = CollectionTeam::create([
+ 'name' => 'Inc-Team', 'driver_id' => $driver->id, 'truck_id' => $truck->id, 'status' => 'active',
+ ]);
+
+ $dumpsite = Dumpsite::first();
+ $route = Route::create([
+ 'name' => 'Inc-Route', 'code' => 'RT-INC', 'default_dumpsite_id' => $dumpsite->id, 'status' => 'active',
+ ]);
+ RouteStop::create([
+ 'route_id' => $route->id,
+ 'drop_off_point_id' => DropOffPoint::first()->id,
+ 'sequence' => 1,
+ ]);
+
+ $this->trip = Trip::create([
+ 'route_id' => $route->id,
+ 'team_id' => $team->id,
+ 'truck_id' => $truck->id,
+ 'scheduled_date' => now()->toDateString(),
+ 'status' => Trip::STATUS_IN_PROGRESS,
+ ]);
+ }
+
+ public function test_admin_can_view_incidents_list(): void
+ {
+ Sanctum::actingAs($this->admin);
+
+ // 1. Create a breakdown event
+ TripTimelineEvent::create([
+ 'trip_id' => $this->trip->id,
+ 'event_type' => TripTimelineEvent::TYPE_BREAKDOWN,
+ 'event_at' => now(),
+ 'notes' => 'Engine overheated',
+ 'recorded_by_user_id' => $this->trip->team->driver_id,
+ ]);
+
+ // 2. Create a generic incident event
+ TripTimelineEvent::create([
+ 'trip_id' => $this->trip->id,
+ 'event_type' => TripTimelineEvent::TYPE_INCIDENT_REPORTED,
+ 'event_at' => now()->addMinutes(5),
+ 'notes' => 'Blocked road due to parade',
+ 'recorded_by_user_id' => $this->trip->team->driver_id,
+ ]);
+
+ // 3. Create a non-incident event (should not return in list)
+ TripTimelineEvent::create([
+ 'trip_id' => $this->trip->id,
+ 'event_type' => TripTimelineEvent::TYPE_TRIP_STARTED,
+ 'event_at' => now()->subMinutes(10),
+ 'notes' => 'Started trip',
+ 'recorded_by_user_id' => $this->trip->team->driver_id,
+ ]);
+
+ // 4. Query endpoint
+ $response = $this->getJson('/api/v1/admin/trips/incidents');
+ $response->assertOk();
+ $this->assertCount(2, $response->json('data'));
+
+ // Assert serialization of trip relationships is present
+ $this->assertEquals($this->trip->trip_number, $response->json('data.0.trip.trip_number'));
+ $this->assertEquals('Inc-Team', $response->json('data.0.trip.team_name'));
+
+ // 5. Query with type filter: breakdown
+ $responseFiltered = $this->getJson('/api/v1/admin/trips/incidents?event_type=breakdown');
+ $responseFiltered->assertOk();
+ $this->assertCount(1, $responseFiltered->json('data'));
+ $this->assertEquals('Engine overheated', $responseFiltered->json('data.0.notes'));
+ }
+
+ public function test_unauthorized_users_are_blocked(): void
+ {
+ // Unauthenticated
+ $this->getJson('/api/v1/admin/trips/incidents')->assertUnauthorized();
+
+ // Driver
+ $driver = User::factory()->create(['role' => User::ROLE_DRIVER]);
+ Sanctum::actingAs($driver);
+ $this->getJson('/api/v1/admin/trips/incidents')->assertForbidden();
+ }
+}