janek
/
mostr
1
0
Fork 1
Code Issues Pull Requests Releases Activity

feat(tasks): display tracking since for current task

This commit is contained in:
xeruf 2024-08-14 22:12:43 +03:00
parent 957422f767
commit 0253b00c61
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/tasks.rs
View File

@ -384,13 +384,23 @@ impl Tasks {
let mut lock = stdout().lock(); let mut lock = stdout().lock();
if let Some(t) = self.get_current_task() { if let Some(t) = self.get_current_task() {
let state = t.state_or_default(); let state = t.state_or_default();
let now = &Timestamp::now();
let mut tracking_stamp: Option<Timestamp> = None;
for elem in
timestamps(self.history.get(&self.sender.pubkey()).into_iter().flatten(), &vec![t.get_id()])
.map(|(e, o)| e) {
if tracking_stamp.is_some() && elem > now {
break;
}
tracking_stamp = Some(elem.clone())
}
writeln!( writeln!(
lock, lock,
"{} since {} (total tracked time {}m)", "Tracking since {} (total tracked time {}m) - {} since {}",
// TODO tracking since, scheduled/planned for tracking_stamp.map_or("?".to_string(), |t| relative_datetimestamp(&t)),
self.time_tracked(*t.get_id()) / 60,
state.get_label(), state.get_label(),
relative_datetimestamp(&state.time), relative_datetimestamp(&state.time)
self.time_tracked(*t.get_id()) / 60
)?; )?;
writeln!(lock, "{}", t.descriptions().join("\n"))?; writeln!(lock, "{}", t.descriptions().join("\n"))?;
} }
@ -915,6 +925,7 @@ fn matching_tag_id<'a>(event: &'a Event, ids: &'a Vec<&'a EventId>) -> Option<&'
}) })
} }
/// Filters out event timestamps to those that start or stop one of the given events
fn timestamps<'a>(events: impl Iterator<Item=&'a Event>, ids: &'a Vec<&'a EventId>) -> impl Iterator<Item=(&Timestamp, Option<&EventId>)> { fn timestamps<'a>(events: impl Iterator<Item=&'a Event>, ids: &'a Vec<&'a EventId>) -> impl Iterator<Item=(&Timestamp, Option<&EventId>)> {
events.map(|event| (&event.created_at, matching_tag_id(event, ids))) events.map(|event| (&event.created_at, matching_tag_id(event, ids)))
.dedup_by(|(_, e1), (_, e2)| e1 == e2) .dedup_by(|(_, e1), (_, e2)| e1 == e2)