Merge pull request #698 from totaldebug/607-events_not_always_shown_in_correct_order

fix: events not in correct order with maxEventCount set

Author: marksie1988

README.rst

@@ -88,11 +88,14 @@ Compatibility
 ================== ====================== =======================================================================================
  Card Version       HA Version             Notes
 ================== ====================== =======================================================================================
+ v7.0.0 (beta)      2022.6 Upwards
  v6.0.0             2021.11 Upwards        Progress bar will not work on older HA Versions
  v5.0.0 - v5.2.2    2021.6 to 2021.10.x    May work on older HA Versions but `hoursFormat` option will need to be manually set.
  v4.1.1             0.117 Upwards
 ================== ====================== =======================================================================================
 
+Home Assistant 2022.5 will not work with the card you must upgrade to 2022.6
+
 ************
 Contributing
 ************

dist/atomic-calendar-revive.js

@@ -1,6 +1,6 @@
 {
 	"name": "atomic-calendar-revive",
-	"version": "7.0.0-b3",
+	"version": "7.0.0-b4",
 	"editor_version": "2.0.0",
 	"description": "Calendar Card for Home Assistant",
 	"main": "atomic-calendar-revive.js",
@@ -46,7 +46,6 @@
 		"prettier": "^2.6.2",
 		"rollup": "^2.74.1",
 		"rollup-plugin-serve": "^1.1.0",
-		"rollup-plugin-sourcemaps": "^0.6.3",
 		"rollup-plugin-terser": "^7.0.2",
 		"rollup-plugin-typescript2": "^0.31.2"
 	},

package.json

@@ -235,7 +235,7 @@ export default class EventClass {
             // the current date
             const endDate = dayjs().startOf('day').add(this._globalConfig.maxDaysToShow, 'days');
 
-            if (endDate.isAfter(partialEvent.startDateTime) && dayjs().startOf('day').subtract(1, 'min').isBefore(partialEvent.startDateTime)) {
+            if (endDate.isAfter(partialEvent.startDateTime) && dayjs().startOf('day').subtract(1, 'minute').isBefore(partialEvent.startDateTime)) {
                 partialEvents.push(partialEvent);
             }
         }

src/lib/event.class.ts

@@ -208,6 +208,7 @@ export async function getAllEvents(start: dayjs.Dayjs, end: dayjs.Dayjs, config:
 export function processEvents(allEvents: any[], config: atomicCardConfig) {
     let newEvents = allEvents.reduce((events, calEvent) => {
         calEvent.originCalendar = config.entities.find(entity => entity.entity === calEvent.entity.entity);
+        console.log(events);
 
         const newEvent: EventClass = new EventClass(calEvent, config);
 
@@ -251,28 +252,15 @@ export function processEvents(allEvents: any[], config: atomicCardConfig) {
             events.push(newEvent);
         }
 
-        // Check if the hideFinishedEvents is set, if it is, remove any events
-        // that are already finished
-        if (config.hideFinishedEvents) {
-            events = events.filter(function (e: EventClass) { return e.isFinished == false })
-        }
-
-        // check if the maxEventCount is set, if it is we will remove any events
-        // that go over this limit, unless softLimit is set, in which case we
-        // will remove any events over the soft limit
-        if (config.maxEventCount) {
-            if ((!config.softLimit && config.maxEventCount < events.length) ||
-                (config.softLimit && events.length > config.maxEventCount + config.softLimit)
-            ) {
-                //TODO: hidden events?
-                events.length = config.maxEventCount
-            }
-
-        }
-
         return events;
     }, []);
 
+    // Check if the hideFinishedEvents is set, if it is, remove any events
+    // that are already finished
+    if (config.hideFinishedEvents) {
+        newEvents = newEvents.filter(function (e: EventClass) { return e.isFinished == false })
+    }
+
     // if hideDuplicates remove any duplicate events where
     // title, startDateTime and endDateTime match
     if (config.hideDuplicates) {
@@ -287,5 +275,18 @@ export function processEvents(allEvents: any[], config: atomicCardConfig) {
         newEvents.sort((a: EventClass, b: EventClass) => a.startDateTime.isBefore(b.startDateTime) ? -1 : 1);
     }
 
+     // check if the maxEventCount is set, if it is we will remove any events
+    // that go over this limit, unless softLimit is set, in which case we
+    // will remove any events over the soft limit
+    if (config.maxEventCount) {
+        if ((!config.softLimit && config.maxEventCount < newEvents.length) ||
+            (config.softLimit && newEvents.length > config.maxEventCount + config.softLimit)
+        ) {
+            //TODO: hidden events?
+            newEvents.length = config.maxEventCount
+        }
+
+    }
+
     return newEvents;
 }