nickorlow/septastic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix ordering
All checks were successful
Create and publish a Docker image / build-and-push-image (push) Successful in 5m20s
Details

Browse source
This commit is contained in:
Nicholas Orlowsky 2026-01-13 22:26:18 -05:00
parent 8f62ee812e
commit 33f58a7b3a
No known key found for this signature in database
GPG key ID: A9F3BA4C0AA7A70B
3 changed files with 15 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
api/src/controllers/stop.rs
View file

@ -2,7 +2,7 @@ use actix_web::{get, web::{self, Data}, HttpRequest, Responder};
use anyhow::anyhow;
use chrono::Timelike;
use chrono_tz::America::New_York;
use libseptastic::stop_schedule::{self, Trip};
use libseptastic::stop_schedule::{self, LiveTrip, Trip, TripTracking};
use log::info;
use std::{collections::HashSet, sync::Arc, time::Instant};
@ -87,7 +87,7 @@ async fn get_stop_html(req: HttpRequest, state: Data<Arc<AppState>>, path: web::
match &trip.tracking_data {
libseptastic::stop_schedule::TripTracking::Tracked(live) => {
let actual_arrival_time = stop_schedule.arrival_time + (live.delay * 60 as f64) as i64;
let actual_arrival_time = stop_schedule.get_arrival_time(&live);
est_arrival_time = stop_schedule.arrival_time;
is_tracked = true;
return
@ -122,7 +122,11 @@ async fn get_stop_html(req: HttpRequest, state: Data<Arc<AppState>>, path: web::
}
}).collect();
filtered_trips.sort_by_key(|f| f.perspective_stop.arrival_time);
filtered_trips.sort_by_key(|f|
match &f.trip.tracking_data {
TripTracking::Tracked(live) => f.perspective_stop.get_arrival_time(&live),
_ => f.perspective_stop.arrival_time
});
Ok(crate::templates::ContentTemplate {
page_title: Some(stop.name.clone()),

4
api/templates/stop.html
View file

@ -51,8 +51,8 @@
</td>
{% if let Tracked(tracked_trip) = trip.trip.tracking_data %}
<td style="color: #008800">
<p style="font-size: small;">{{ (trip.perspective_stop.arrival_time + (tracked_trip.delay * 60.0) as i64) | format_time }}</p>
<p style="font-size: x-small; font-style: italic;">{{ ( (trip.perspective_stop.arrival_time + (tracked_trip.delay * 60.0) as i64) - current_time) / 60 }} mins</p>
<p style="font-size: small;">{{ &trip.perspective_stop.get_arrival_time(&tracked_trip) | format_time }}</p>
<p style="font-size: x-small; font-style: italic;">{{ ( trip.perspective_stop.get_arrival_time(&tracked_trip) - current_time) / 60 }} mins</p>
</td>
{% else %}
<td>