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

Display reminders correctly

Browse source
This commit is contained in:
Joscha 2021-12-21 00:14:28 +01:00
parent 66da16f4e3
commit 05a4582f13
2 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
CHANGELOG.md
View file

@ -2,6 +2,11 @@
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
## Unreleased
### Added
- `REMIND` statement
## 0.1.0 - 2021-12-20 ## 0.1.0 - 2021-12-20
### Added ### Added

7
src/cli/layout/day.rs
View file

@ -81,10 +81,13 @@ impl DayLayout {
fn layout_task(&mut self, index: usize, entry: &Entry) { fn layout_task(&mut self, index: usize, entry: &Entry) {
if let Some(dates) = entry.dates { if let Some(dates) = entry.dates {
let (start, end) = dates.sorted().dates(); let (start, end) = dates.sorted().dates();
if self.today < start && (start - self.today).num_days() < 7 { if self.today < start {
// TODO Make this adjustable, maybe even per-command if let Some(remind) = entry.remind {
if remind <= self.today {
let days = (start - self.today).num_days(); let days = (start - self.today).num_days();
self.insert(self.today, DayEntry::ReminderUntil(index, days)); self.insert(self.today, DayEntry::ReminderUntil(index, days));
}
}
} else if start < self.today && self.today < end { } else if start < self.today && self.today < end {
let days = (end - self.today).num_days(); let days = (end - self.today).num_days();
self.insert(self.today, DayEntry::ReminderWhile(index, days)); self.insert(self.today, DayEntry::ReminderWhile(index, days));