Garmelon/today
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix range calculation for done tasks

Browse source
This commit is contained in:
Joscha 2021-12-14 23:38:45 +01:00
parent c69af9bcde
commit 6d0acf8db7
4 changed files with 35 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/eval/command/date.rs
View file

@ -69,11 +69,14 @@ impl DateSpec {
fn start_and_range(&self, s: &CommandState<'_>) -> Option<(NaiveDate, DateRange)> {
let (start, range) = match s.command.command {
Command::Task(_) => {
let last_done = s.last_done();
let start = last_done
let start = s
.last_done_completion()
.filter(|_| self.start_at_done)
.unwrap_or(self.start);
let range_from = last_done.map(|date| date.succ()).unwrap_or(self.start);
let range_from = s
.last_done_root()
.map(|date| date.succ())
.unwrap_or(self.start);
let range = s
.range
.expand_by(&self.end_delta)

4
src/eval/command/formula.rs
View file

@ -326,8 +326,8 @@ impl FormulaSpec {
.move_by(&self.start_delta);
if let Command::Task(_) = s.command.command {
if let Some(last_done) = s.last_done() {
range = range.with_from(last_done.succ())?;
if let Some(last_done_root) = s.last_done_root() {
range = range.with_from(last_done_root.succ())?;
}
// TODO Otherwise, go back one year or so if no FROM is specified
}