From 2b655acb49a1148b22aab9b094b9be3af4862ed2 Mon Sep 17 00:00:00 2001 From: lkadalski Date: Mon, 11 Oct 2021 13:43:15 +0200 Subject: [PATCH] Fix for missing column for project Signed-off-by: lkadalski --- src/app.rs | 2 +- src/pane/project.rs | 17 ++++++++++++----- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/src/app.rs b/src/app.rs index 8f68b79..b302ff3 100644 --- a/src/app.rs +++ b/src/app.rs @@ -1238,10 +1238,10 @@ impl TaskwarriorTui { self.task_details.clear(); self.dirty = false; self.save_history()?; - self.projects.update_data()?; } self.cursor_fix(); self.update_task_table_state(); + self.projects.update_data()?; if self.task_report_show_info { task::block_on(self.update_task_details())?; } diff --git a/src/pane/project.rs b/src/pane/project.rs index fe16ae8..79b3ebb 100644 --- a/src/pane/project.rs +++ b/src/pane/project.rs @@ -129,12 +129,19 @@ impl ProjectsState { .filter(|x| !x.is_empty()) .map(ToString::to_string) .collect(); - + let name = (&row[0]).parse()?; + let remaining = (&row[1]).parse()?; + let mut avg_age = "0s".to_string(); + let mut complete = (&row[2]).parse()?; + if row.len() > 3 { + avg_age = (&row[2]).parse()?; + complete = (&row[3]).parse()?; + } self.rows.push(ProjectDetails { - name: (&row[0]).parse()?, - remaining: (&row[1]).parse()?, - avg_age: (&row[2]).parse()?, - complete: (&row[3]).parse()?, + name, + remaining, + avg_age, + complete, }); } self.list = self.rows.iter().map(|x| x.name.clone()).collect_vec();