fix partial events showing up on remove past events

ljmerza · Dec 5, 2019 · 2775700 · 2775700
1 parent d7bacde
commit 2775700
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 17 deletions.
diff --git a/dist/calendar-card.js b/dist/calendar-card.js
diff --git a/dist/calendar-card.js.map b/dist/calendar-card.js.map
diff --git a/src/calendar-event.js b/src/calendar-event.js
@@ -69,20 +69,22 @@ export default class CalendarEvent {
      * @param {boolean} isEndDate
      */
     _processDate(date, isEndDate=false){
-        if (date) {
-            date = moment(date);
-            // add days to a start date for multi day event
-            if (this.addDays !== false) {
-                if (!isEndDate && this.addDays) date = date.add(this.addDays, 'days');
-
-                // if first day and end time then set to end of current event day that day
-                if (this.isFirstDay && isEndDate) {
-                    date = moment(this.startDateTime).endOf('day');
-
-                } else if (this.isLastDay && !isEndDate) {
-                    // if last day and start time then set start as start of day
-                    date = date.startOf('day');
-                }
+        if (!date) return date;
+
+        date = moment(date);
+
+        // add days to a start date for multi day event
+        if (this.addDays !== false) {
+            if (!isEndDate && this.addDays) date = date.add(this.addDays, 'days');
+
+            // if not the last day and we are modifying the endDateTime then 
+            // set end dateTimeDate as end of start day for that partial event
+            if (!this.isLastDay && isEndDate) {
+                date = moment(this.startDateTime).endOf('day');
+
+            } else if (this.isLastDay && !isEndDate) {
+                // if last day and start time then set start as start of day
+                date = date.startOf('day');
             }
         }
 

diff --git a/src/event.tools.js b/src/event.tools.js
@@ -173,7 +173,9 @@ export function processEvents(allEvents, config) {
         return events;
     }, []);
 
-    // now that we have all events filter any events from config settings
+    // remove events before today
+    const today = moment().startOf('day');
+    newEvents = newEvents.filter(event => event.endDateTime.isAfter(today));
 
     // if config to hide passed events then check that now
     if (config.hidePastEvents) {