diff --git a/app/Http/Controllers/TrackerController.php b/app/Http/Controllers/TrackerController.php index cbd59fc..f584af8 100644 --- a/app/Http/Controllers/TrackerController.php +++ b/app/Http/Controllers/TrackerController.php @@ -21,7 +21,23 @@ class TrackerController extends Controller */ public function show_past_trips_list() { - return view('past-trips'); + $trips = []; + + foreach (config('app.past_trip_ids') as $tripId) { + $tripData = $this->get_trip_data($tripId, false); + $trips[$tripId] = [ + 'name' => $tripData->name, + 'start_date' => new DateTime($tripData->date_start), + 'end_date' => new DateTime($tripData->date_end) + ]; + } + + return view( + 'past-trips', + [ + 'trips' => $trips + ] + ); } /** diff --git a/resources/views/past-trips.blade.php b/resources/views/past-trips.blade.php index b246a1a..3db331f 100644 --- a/resources/views/past-trips.blade.php +++ b/resources/views/past-trips.blade.php @@ -14,9 +14,10 @@
    -
  1. Monkey Run Scotland 2022
  2. -
  3. Europespedition III: Leds Free or Die Hard
  4. -
  5. Bentral American Diaries
  6. + @php $DATE_FORMAT = 'M Y' @endphp + @foreach ($trips as $trip_id => $trip) +
  7. {{ $trip['name'] }} ({{ $trip['start_date']->format($DATE_FORMAT) }} to {{ $trip['end_date']->format($DATE_FORMAT) }})
  8. + @endforeach
diff --git a/resources/views/tracker.blade.php b/resources/views/tracker.blade.php index ae17123..750c365 100644 --- a/resources/views/tracker.blade.php +++ b/resources/views/tracker.blade.php @@ -66,18 +66,20 @@ @if(!in_array($location->id, config('app.current_trip_ignore'))) @php - // Privacy zones - $privacyLatLons = config('app.privacy_lat_lons'); - $latLon = explode(',', $privacyLatLons[0]); - if ( - !( - ( $location->latitude - $latLon[0] > 0.01 ) || ( $location->latitude - $latLon[0] < -0.01 ) || - ( $location->longitude - $latLon[1] > 0.01 ) || ( $location->longitude - $latLon[1] < -0.01 ) - ) - ) { - $location->latitude = $location->latitude + ((rand(0,2)-1)/100); - $location->longitude = $location->longitude + ((rand(0,2)-1)/100); - } + // Privacy zones + $privacyLatLons = config('app.privacy_lat_lons'); + foreach ($privacyLatLons as $latLonUnparsed) { + $latLon = explode(',', $latLonUnparsed); + if ( + !( + ( $location->latitude - $latLon[0] > 0.01 ) || ( $location->latitude - $latLon[0] < -0.01 ) || + ( $location->longitude - $latLon[1] > 0.01 ) || ( $location->longitude - $latLon[1] < -0.01 ) + ) + ) { + $location->latitude = $location->latitude + ((rand(0,2)-1)/100); + $location->longitude = $location->longitude + ((rand(0,2)-1)/100); + } + } @endphp [{{ $location->latitude }}, {{ $location->longitude }}],