From 88c6469154889204e318f43edf387ea04b132eba Mon Sep 17 00:00:00 2001 From: Philipp Hofer Date: Mon, 11 Nov 2024 22:45:32 +0100 Subject: [PATCH 1/2] trim ergo entries --- src/tera/ergo.rs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/tera/ergo.rs b/src/tera/ergo.rs index a029a7b..317f008 100644 --- a/src/tera/ergo.rs +++ b/src/tera/ergo.rs @@ -209,10 +209,12 @@ async fn new_thirty( if let Err(e) = data.proof.move_copy_to(file_path).await { eprintln!("Failed to persist file: {:?}", e); } + + let result = data.result.trim_start_matches(|c| c == '0' || c == ' '); sqlx::query!( "UPDATE user SET dirty_thirty = ? where id = ?", - data.result, + result, data.user ) .execute(db.inner()) @@ -253,10 +255,11 @@ async fn new_dozen( if let Err(e) = data.proof.move_copy_to(file_path).await { eprintln!("Failed to persist file: {:?}", e); } + let result = data.result.trim_start_matches(|c| c == '0' || c == ' '); sqlx::query!( "UPDATE user SET dirty_dozen = ? where id = ?", - data.result, + result, data.user ) .execute(db.inner()) From 5c8966f34c4d2c5cb0f8aef8bb87fa64c73f451b Mon Sep 17 00:00:00 2001 From: Philipp Hofer Date: Mon, 11 Nov 2024 22:57:46 +0100 Subject: [PATCH 2/2] always show full time --- src/tera/ergo.rs | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/src/tera/ergo.rs b/src/tera/ergo.rs index 317f008..4e93c4e 100644 --- a/src/tera/ergo.rs +++ b/src/tera/ergo.rs @@ -233,6 +233,32 @@ async fn new_thirty( Flash::success(Redirect::to("/ergo"), "Erfolgreich eingetragen") } +fn format_time(input: &str) -> String { + let mut parts: Vec<&str> = input.split(':').collect(); + + // If there's only seconds (e.g., "24.2"), treat it as "00:00:24.2" + if parts.len() == 1 { + parts.insert(0, "0"); // Add "0" for hours + parts.insert(0, "0"); // Add "0" for minutes + } + + // If there are two parts (e.g., "4:24.2"), treat it as "00:04:24.2" + if parts.len() == 2 { + parts.insert(0, "0"); // Add "0" for hours + } + + // Now parts should have [hours, minutes, seconds] + let hours = if parts[0].len() == 1 { format!("0{}", parts[0]) } else { parts[0].to_string() }; + let minutes = if parts[1].len() == 1 { format!("0{}", parts[1]) } else { parts[1].to_string() }; + let seconds = parts[2]; + + // Split seconds into whole and fractional parts + let (sec_int, sec_frac) = seconds.split_once('.').unwrap_or((seconds, "0")); + + // Format the time as "hh:mm:ss.s" + format!("{}:{}:{}.{:1}", hours, minutes, sec_int, sec_frac.chars().next().unwrap_or('0')) +} + #[post("/dozen", data = "", format = "multipart/form-data")] async fn new_dozen( db: &State, @@ -256,6 +282,7 @@ async fn new_dozen( eprintln!("Failed to persist file: {:?}", e); } let result = data.result.trim_start_matches(|c| c == '0' || c == ' '); + let result = format_time(result); sqlx::query!( "UPDATE user SET dirty_dozen = ? where id = ?",