gogs
/
tsheet-cli
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

per task gets 1.1 hours, per day gets rounded 1 hours

main
Bel LaPointe 2023-11-29 06:38:24 -07:00
parent 326b79a3b1
commit 0f9711aaa1
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main.rs
View File

@ -49,12 +49,12 @@ fn add(f: &String, x: &Option<String>, tag: &Option<String>) -> Result<(), Strin
#[derive(Debug, Serialize, Clone)] #[derive(Debug, Serialize, Clone)]
struct Log { struct Log {
t: String, t: String,
d: u8, d: f32,
xs: Vec<LogX>, xs: Vec<LogX>,
} }
#[derive(Debug, Serialize, Clone)] #[derive(Debug, Serialize, Clone)]
struct LogX { struct LogX {
d: u8, d: f32,
x: String, x: String,
} }
@ -68,7 +68,7 @@ fn log(f: &String, enabled: &bool, since: &Option<String>) -> Result<(), String>
let tsheet = tsheet.sorted(); let tsheet = tsheet.sorted();
let mut result = vec![]; 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() { for i in 0..tsheet.xs.len() {
let x = &tsheet.xs[i]; let x = &tsheet.xs[i];
if curr.t != x.timestamp() { if curr.t != x.timestamp() {
@ -77,12 +77,12 @@ fn log(f: &String, enabled: &bool, since: &Option<String>) -> Result<(), String>
} }
curr.xs.truncate(0); curr.xs.truncate(0);
curr.t = x.timestamp(); curr.t = x.timestamp();
curr.d = 0; curr.d = 0.0;
} }
let d = match curr.xs.len() { let d = match curr.xs.len() {
0 if x.x.len() == 0 => 0, 0 if x.x.len() == 0 => 0.0,
0 => 1, 0 => 1.0,
_ => ((tsheet.xs[i].t - tsheet.xs[i-1].t + 60*30) / (60*60)) as u8, _ => ((tsheet.xs[i].t - tsheet.xs[i-1].t) as f32 / (60.0*60.0)) as f32,
}; };
curr.t = x.timestamp(); curr.t = x.timestamp();
curr.xs.push(LogX{d: d, x: x.x.clone()}); curr.xs.push(LogX{d: d, x: x.x.clone()});
@ -97,7 +97,7 @@ fn log(f: &String, enabled: &bool, since: &Option<String>) -> Result<(), String>
for log in result { for log in result {
for x in log.xs { for x in log.xs {
if x.x.len() > 0 { 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);
} }
} }
} }