matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

Add "done" marker in "list" output

Browse source 
This patch adds a marker in the table when using the "list" command
which marks when the task is already done for the list entry.

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
This commit is contained in:
Matthias Beyer 2019-06-30 11:09:18 +02:00
parent 57039654ca
commit 82c2beafbb
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
bin/domain/imag-habit/src/main.rs
View file

@ -413,16 +413,23 @@ fn list(rt: &Runtime) {
let basedate = h.habit_basedate().map_err_trace_exit_unwrap(); let basedate = h.habit_basedate().map_err_trace_exit_unwrap();
let recur = h.habit_recur_spec().map_err_trace_exit_unwrap(); let recur = h.habit_recur_spec().map_err_trace_exit_unwrap();
let comm = h.habit_comment().map_err_trace_exit_unwrap(); let comm = h.habit_comment().map_err_trace_exit_unwrap();
let due = h.next_instance_date().map_err_trace_exit_unwrap() let (due, done) = if let Some(date) = h.next_instance_date().map_err_trace_exit_unwrap() {
.map(date_to_string_helper) let done = h.instance_exists_for_date(&date)
.unwrap_or_else(|| String::from("<finished>")); .map(|b| if b { "x" } else { "" })
.map(String::from)
.map_err_trace_exit_unwrap();
(date_to_string_helper(date), done)
} else {
// "finished" as in "the habit is closed"
(String::from("<finished>"), String::from(""))
};
let v = vec![name, basedate, recur, comm, due]; let v = vec![name, basedate, recur, comm, due, done];
debug!(" -> {:?}", v); debug!(" -> {:?}", v);
v v
} }
let header = ["#", "Name", "Basedate", "Recurr", "Comment", "Next Due"] let header = ["#", "Name", "Basedate", "Recurr", "Comment", "Next Due", "Done"]
.iter() .iter()
.map(|s| Cell::new(s)) .map(|s| Cell::new(s))
.collect::<Vec<Cell>>(); .collect::<Vec<Cell>>();