Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/components/racer_row.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ use dioxus::prelude::*;
use crate::components::app::Action;
use crate::components::time_input::TimeInput;
use crate::race::Racer;
use crate::time_utils::{format_time, format_time_delta};
use crate::time_utils::{format_time, format_time_delta_millis};

#[component]
pub fn RacerRow(racer: Racer) -> Element {
Expand All @@ -28,7 +28,7 @@ pub fn RacerRow(racer: Racer) -> Element {
},
}
}
td { "{format_time_delta(racer.time)}" }
td { "{format_time_delta_millis(racer.time)}" }
td { "{racer.track_rank.map(|rank| rank.to_string()).unwrap_or_default() }" }
td {
for category in racer.categories.clone() {
Expand Down
4 changes: 2 additions & 2 deletions src/components/racers.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ use crate::{
th::{Sorter, Th},
},
race::{Category, Race, Racer, RacerField},
time_utils::{format_time, format_time_delta},
time_utils::{format_time, format_time_delta_millis},
};

// Checks whether a racer matches all active filters in the map.
Expand Down Expand Up @@ -82,7 +82,7 @@ fn matches_filters(
}
}
RacerField::Time => {
if !format_time_delta(racer.time)
if !format_time_delta_millis(racer.time)
.to_lowercase()
.contains(&filter_lowercase)
{
Expand Down
24 changes: 23 additions & 1 deletion src/components/track_start.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
use std::time::Duration;

use crate::time_utils::format_time_delta_secs;
use chrono::{DateTime, Utc};
use dioxus::prelude::*;

Expand All @@ -10,14 +13,33 @@ use crate::{
pub fn TrackStart(track: Track, start: Option<DateTime<Utc>>) -> Element {
let mut editing = use_signal(|| false);
let track2 = track.clone();
let time_since_start = use_signal(|| None);

use_hook(move || {
spawn({
to_owned![time_since_start];
async move {
loop {
tokio::time::sleep(Duration::from_secs(1)).await;
time_since_start
.set(start.map(|start| Some(Utc::now().signed_duration_since(start))));
}
}
});
});

rsx! {
div { class: "input-group", style: "width: 400px",
div { class: "input-group", style: "width: 490px",
span {
class: "input-group-text justify-content-end",
style: "width: 150px",
"{track}"
}
span { class: "input-group-text", style: "width: 90px",
if let Some(time_since_start) = time_since_start() {
"{format_time_delta_secs(time_since_start)}"
}
}
TimeInput {
time: start,
editing,
Expand Down
6 changes: 3 additions & 3 deletions src/printer.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use crate::race::{Race, Racer};
use crate::time_utils::format_time_delta;
use crate::time_utils::format_time_delta_millis;
use std::path::PathBuf;
use tracing::{error, info};

Expand Down Expand Up @@ -112,7 +112,7 @@ fn print_tracks(doc: &mut Document, race: &Race) {
.element(elements::Paragraph::new(format!("{}", racer.start_number)).padded(1))
.element(elements::Paragraph::new(&racer.first_name).padded(1))
.element(elements::Paragraph::new(&racer.last_name).padded(1))
.element(elements::Paragraph::new(format_time_delta(racer.time)).padded(1))
.element(elements::Paragraph::new(format_time_delta_millis(racer.time)).padded(1))
.element(
elements::Paragraph::new(format!("{}", racer.track_rank.unwrap_or_default()))
.padded(1),
Expand Down Expand Up @@ -153,7 +153,7 @@ fn print_categories(doc: &mut Document, race: &Race) {
.element(elements::Paragraph::new(format!("{}", racer.start_number)).padded(1))
.element(elements::Paragraph::new(&racer.first_name).padded(1))
.element(elements::Paragraph::new(&racer.last_name).padded(1))
.element(elements::Paragraph::new(format_time_delta(racer.time)).padded(1))
.element(elements::Paragraph::new(format_time_delta_millis(racer.time)).padded(1))
.element(
elements::Paragraph::new(format!("{}", racer.categories_rank[category]))
.padded(1),
Expand Down
16 changes: 14 additions & 2 deletions src/time_utils.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,15 @@ pub fn format_time(datetime: Option<DateTime<Utc>>) -> String {
}
}

pub fn format_time_delta(delta: Option<TimeDelta>) -> String {
pub fn format_time_delta_millis(delta: Option<TimeDelta>) -> String {
format_time_delta(delta, true)
}

pub fn format_time_delta_secs(delta: Option<TimeDelta>) -> String {
format_time_delta(delta, false)
}

fn format_time_delta(delta: Option<TimeDelta>, with_ms: bool) -> String {
let delta = match delta {
Some(delta) => delta,
_ => return "".to_string(),
Expand All @@ -22,5 +30,9 @@ pub fn format_time_delta(delta: Option<TimeDelta>) -> String {
let secs = (total_millis / 1000) % 60;
let millis = total_millis % 1000;

format!("{hours:02}:{mins:02}:{secs:02}.{millis:03}")
if with_ms {
format!("{hours:02}:{mins:02}:{secs:02}.{millis:03}")
} else {
format!("{hours:02}:{mins:02}:{secs:02}")
}
}
Loading