From b6497d499ff28d574fa2efdc8470b9795121bb06 Mon Sep 17 00:00:00 2001 From: Campbell Alden Date: Sat, 22 Jul 2023 00:23:44 +0900 Subject: [PATCH] Add status to project information --- src/things/logbook.js | 2 +- src/things/logbook_cycle.js | 2 +- src/things/task.rs | 1 + src/things/today.js | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/things/logbook.js b/src/things/logbook.js index 6f014eb..52f5967 100644 --- a/src/things/logbook.js +++ b/src/things/logbook.js @@ -27,7 +27,7 @@ logbook.filter(task => { notes: todo.notes() || null, status: todo.status(), completion_date: todo.completionDate(), - project: proj && { id: proj.id(), title: proj.name() }, + project: proj && { id: proj.id(), title: proj.name(), status: proj.status() }, area: area && { id: area.id(), title: area.name() }, tags: [...tags, ...todo.tagNames().split(', ')].filter(t => t), }); diff --git a/src/things/logbook_cycle.js b/src/things/logbook_cycle.js index 320f66b..368a256 100644 --- a/src/things/logbook_cycle.js +++ b/src/things/logbook_cycle.js @@ -27,7 +27,7 @@ logbook.filter(task => { notes: todo.notes() || null, status: todo.status(), completion_date: todo.completionDate(), - project: proj && { id: proj.id(), title: proj.name() }, + project: proj && { id: proj.id(), title: proj.name(), status: proj.status() }, area: area && { id: area.id(), title: area.name() }, tags: [...tags, ...todo.tagNames().split(', ')].filter(t => t), }); diff --git a/src/things/task.rs b/src/things/task.rs index a5a1e05..90e031f 100644 --- a/src/things/task.rs +++ b/src/things/task.rs @@ -19,6 +19,7 @@ pub enum Status { pub struct Project { pub id: String, pub title: String, + pub status: Status, } #[derive(Deserialize, Debug)] diff --git a/src/things/today.js b/src/things/today.js index 129939c..ffcaa8d 100644 --- a/src/things/today.js +++ b/src/things/today.js @@ -15,7 +15,7 @@ today.forEach(todo => { notes: todo.notes() || null, status: todo.status(), completion_date: todo.completionDate(), - project: proj && { id: proj.id(), title: proj.name() }, + project: proj && { id: proj.id(), title: proj.name(), status: proj.status() }, area: area && { id: area.id(), title: area.name() }, tags: [...tags, ...todo.tagNames().split(', ')].filter(t => t), });