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
10 changes: 9 additions & 1 deletion src/components/app.rs
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ const LOADING: Asset = asset!("/assets/loading.webp");
#[derive(Debug)]
pub enum Action {
Start(Track, DateTime<Utc>),
FinishByStartNumber(StartNumber, Option<DateTime<Utc>>),
FinishByStartNumber(StartNumber, DateTime<Utc>),
FinishEdit(StartNumber, Option<DateTime<Utc>>),
}

struct RFIDDevices {
Expand Down Expand Up @@ -95,6 +96,13 @@ fn handle_action(selected_race: &mut Signal<SelectedRace>, action: Action) {
}
});
}
Action::FinishEdit(starting_number, time) => {
selected_race.with_mut(|maybe_race| {
if let Some(Ok(race)) = maybe_race {
race.edit_finish_start_number(starting_number, time);
}
});
}
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/components/manual_start_number_input.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ pub fn ManualStartNumberInput() -> Element {
event.prevent_default();
if let Ok(start_number) = start_number().parse() {
use_coroutine_handle::<Action>()
.send(Action::FinishByStartNumber(start_number, Some(Utc::now())));
.send(Action::FinishByStartNumber(start_number, Utc::now()));
}
start_number.set(String::from(""));
},
Expand Down
2 changes: 1 addition & 1 deletion src/components/racer_row.rs
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ pub fn RacerRow(racer: Racer) -> Element {
remove_button: true,
onsave: move |time| {
use_coroutine_handle::<Action>()
.send(Action::FinishByStartNumber(start_number.clone(), time));
.send(Action::FinishEdit(start_number.clone(), time));
},
}
}
Expand Down
25 changes: 16 additions & 9 deletions src/race.rs
Original file line number Diff line number Diff line change
Expand Up @@ -255,14 +255,6 @@ impl Race {
{
let racer = self.racers.iter_mut().find(|r| predicate(r)).ok_or(())?;

if racer.finish.is_some() && time.is_some() {
error!(
"Racer with starting number {} already has a finish time.",
racer.start_number
);
return Err(());
}

racer.finish = time;
racer.time = calculate_time(racer.start, racer.finish);

Expand All @@ -280,7 +272,11 @@ impl Race {
Ok(())
}

pub fn finish_start_number(&mut self, start_number: StartNumber, time: Option<DateTime<Utc>>) {
pub fn edit_finish_start_number(
&mut self,
start_number: StartNumber,
time: Option<DateTime<Utc>>,
) {
if self
.finish(
|r| r.start_number == start_number && r.start.is_some(),
Expand All @@ -291,6 +287,17 @@ impl Race {
error!("Racer with starting number {start_number:?} not found.");
}
}
pub fn finish_start_number(&mut self, start_number: StartNumber, time: DateTime<Utc>) {
if self
.finish(
|r| r.start_number == start_number && r.start.is_some() && r.finish.is_none(),
Some(time),
)
.is_err()
{
error!("Racer with starting number {start_number:?} not found.");
}
}

pub fn tag_finished(&mut self, tag: &str, time: Option<DateTime<Utc>>) {
if self
Expand Down
Loading