From 0f9711aaa14a43d528d942fa1915063f6546683d Mon Sep 17 00:00:00 2001 From: Bel LaPointe Date: Wed, 29 Nov 2023 06:38:24 -0700 Subject: [PATCH] per task gets 1.1 hours, per day gets rounded 1 hours --- src/main.rs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main.rs b/src/main.rs index 1b5b7c1..ad08607 100644 --- a/src/main.rs +++ b/src/main.rs @@ -49,12 +49,12 @@ fn add(f: &String, x: &Option, tag: &Option) -> Result<(), Strin #[derive(Debug, Serialize, Clone)] struct Log { t: String, - d: u8, + d: f32, xs: Vec, } #[derive(Debug, Serialize, Clone)] struct LogX { - d: u8, + d: f32, x: String, } @@ -68,7 +68,7 @@ fn log(f: &String, enabled: &bool, since: &Option) -> Result<(), String> let tsheet = tsheet.sorted(); let mut result = vec![]; - let mut curr = Log{t: "".to_string(), d: 0, xs: vec![]}; + let mut curr = Log{t: "".to_string(), d: 0.0, xs: vec![]}; for i in 0..tsheet.xs.len() { let x = &tsheet.xs[i]; if curr.t != x.timestamp() { @@ -77,12 +77,12 @@ fn log(f: &String, enabled: &bool, since: &Option) -> Result<(), String> } curr.xs.truncate(0); curr.t = x.timestamp(); - curr.d = 0; + curr.d = 0.0; } let d = match curr.xs.len() { - 0 if x.x.len() == 0 => 0, - 0 => 1, - _ => ((tsheet.xs[i].t - tsheet.xs[i-1].t + 60*30) / (60*60)) as u8, + 0 if x.x.len() == 0 => 0.0, + 0 => 1.0, + _ => ((tsheet.xs[i].t - tsheet.xs[i-1].t) as f32 / (60.0*60.0)) as f32, }; curr.t = x.timestamp(); curr.xs.push(LogX{d: d, x: x.x.clone()}); @@ -97,7 +97,7 @@ fn log(f: &String, enabled: &bool, since: &Option) -> Result<(), String> for log in result { for x in log.xs { if x.x.len() > 0 { - println!("{} ({}) {} ({})", log.t, log.d, x.x, x.d); + println!("{} ({}) {} ({:.1})", log.t, (0.5 + log.d) as i64, x.x, x.d + 0.05); } } }