Merge pull request #573 from totaldebug/571-events_missing_single_day

fix: when set to single day, events are not shown

Author: marksie1988

dist/atomic-calendar-revive.js

@@ -1,6 +1,6 @@
 {
 	"name": "atomic-calendar-revive",
-	"version": "7.0.0-b1",
+	"version": "7.0.0-b2",
 	"editor_version": "2.0.0",
 	"description": "Calendar Card for Home Assistant",
 	"main": "atomic-calendar-revive.js",

package.json

@@ -114,10 +114,12 @@ function buildCalendar(config: atomicCardConfig, selectedMonth) {
 export async function getEventMode(config: atomicCardConfig, hass) {
 
     const daysToShow = config.maxDaysToShow! == 0 ? config.maxDaysToShow! : config.maxDaysToShow! - 1;
-    const today = dayjs().startOf('day');
+    const today = dayjs();
     const start = today
+        .startOf('day')
         .add(config.startDaysAhead!, 'day');
     const end = today
+        .endOf('day')
         .add(daysToShow + config.startDaysAhead!, 'day');
     const getEvents = await getAllEvents(start, end, config, hass);
     return getEvents;
@@ -154,14 +156,16 @@ export async function getCalendarMode(config: atomicCardConfig, hass, selectedMo
 export async function getAllEvents(start: dayjs.Dayjs, end: dayjs.Dayjs, config: atomicCardConfig, hass) {
 
     // format times correctly
-    const today = dayjs().startOf('day');
+    const today = dayjs();
     const dateFormat = 'YYYY-MM-DDTHH:mm:ss';
     const timeOffset = -dayjs().utcOffset();
 
     const startTime = start
+        .startOf('day')
         .add(timeOffset, 'minutes')
         .format(dateFormat);
     const endTime = end
+        .endOf('day')
         .add(timeOffset, 'minutes')
         .format(dateFormat);
 
@@ -176,7 +180,7 @@ export async function getAllEvents(start: dayjs.Dayjs, end: dayjs.Dayjs, config:
         const calendarEntity = (entity && entity.entity) || entity;
 
         // get correct end date if maxDaysToShow is set
-        const entityEnd = typeof entity.maxDaysToShow != 'undefined' ? today
+        const entityEnd = typeof entity.maxDaysToShow != 'undefined' ? today.endOf('day')
             .add(entity.maxDaysToShow! - 1 + config.startDaysAhead!, 'day')
             .add(timeOffset, 'minutes').format(dateFormat) : endTime;