From 05a4582f13dd6e5a54a333251e59c3b2597506c3 Mon Sep 17 00:00:00 2001
From: Joscha <joscha@plugh.de>
Date: Tue, 21 Dec 2021 00:14:28 +0100
Subject: [PATCH] Display reminders correctly

---
 CHANGELOG.md          |  5 +++++
 src/cli/layout/day.rs | 11 +++++++----
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a494d90..c0b9fae 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,11 @@
 
 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
 
 ### Added
diff --git a/src/cli/layout/day.rs b/src/cli/layout/day.rs
index 0cb4c0b..71b2016 100644
--- a/src/cli/layout/day.rs
+++ b/src/cli/layout/day.rs
@@ -81,10 +81,13 @@ impl DayLayout {
     fn layout_task(&mut self, index: usize, entry: &Entry) {
         if let Some(dates) = entry.dates {
             let (start, end) = dates.sorted().dates();
-            if self.today < start && (start - self.today).num_days() < 7 {
-                // TODO Make this adjustable, maybe even per-command
-                let days = (start - self.today).num_days();
-                self.insert(self.today, DayEntry::ReminderUntil(index, days));
+            if self.today < start {
+                if let Some(remind) = entry.remind {
+                    if remind <= self.today {
+                        let days = (start - self.today).num_days();
+                        self.insert(self.today, DayEntry::ReminderUntil(index, days));
+                    }
+                }
             } else if start < self.today && self.today < end {
                 let days = (end - self.today).num_days();
                 self.insert(self.today, DayEntry::ReminderWhile(index, days));