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

Unify Dates logic and expand DoneDate format

Browse source
This commit is contained in:
Joscha 2021-12-14 23:32:04 +01:00
parent 2e7ab3c4a1
commit c69af9bcde
8 changed files with 119 additions and 133 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/eval/entry.rs
View file

@ -75,8 +75,9 @@ impl Entries {
fn is_touching(&self, entry: &Entry) -> bool {
if let Some(dates) = entry.dates {
let (start, end) = dates.sorted().dates();
// Inside the range or overlapping it
dates.start() <= self.range.until() && self.range.from() <= dates.end()
start <= self.range.until() && self.range.from() <= end
} else {
false
}
@ -102,7 +103,8 @@ impl Entries {
// Unfinished tasks before or inside the range
if let EntryKind::Task = entry.kind {
if let Some(dates) = entry.dates {
if dates.start() <= self.range.until() {
let (start, _) = dates.sorted().dates();
if start <= self.range.until() {
return true;
}
}