decouple the planner's states; need three separate sets: upcoming-now (for alarms in the current time), upcoming-calendar (to show events coming from the selected calendar date), and calendar-month (all the appointments in the month displayed in the menu).

1 files changed, 10 insertions, 4 deletions

diff --git a/include/datetime/state.h b/include/datetime/state.h
index 414be32..0e1043c 100644
--- a/include/datetime/state.h
+++ b/include/datetime/state.h
@@ -22,7 +22,8 @@
 
 #include <datetime/clock.h>
 #include <datetime/locations.h>
-#include <datetime/planner.h>
+#include <datetime/planner-month.h>
+#include <datetime/planner-upcoming.h>
 #include <datetime/settings.h>
 #include <datetime/timezones.h>
    
@@ -60,9 +61,14 @@ struct State
                section of the #Menu */
     std::shared_ptr<Locations> locations;
 
-    /** \brief The appointments to be displayed in the Calendar and
-               Appointments sections of the #Menu */
-    std::shared_ptr<Planner> planner;
+    /** \brief Appointments in the month that's being displayed
+               in the calendar section of the #Menu */
+    std::shared_ptr<MonthPlanner> calendar_month;
+
+    /** \brief The next appointments that follow highlighed date
+               highlighted in the calendar section of the #Menu
+               (default date = today) */
+    std::shared_ptr<UpcomingPlanner> calendar_upcoming;
 
     /** \brief Configuration options that modify the view */
     std::shared_ptr<Settings> settings;