Skip to content

Commit 844f98b

Browse files
committed
fix: hidden events text was not showing up
1 parent cdf06f3 commit 844f98b

File tree

2 files changed

+21
-19
lines changed

2 files changed

+21
-19
lines changed

src/index.ts

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -147,17 +147,17 @@ export class AtomicCalendarRevive extends LitElement {
147147
typeof this._config.language != 'undefined'
148148
? this._config.language!
149149
: this.hass.locale
150-
? this.hass.locale.language.toLowerCase()
151-
: this.hass.language.toLowerCase();
150+
? this.hass.locale.language.toLowerCase()
151+
: this.hass.language.toLowerCase();
152152

153153
dayjs.locale(this.language);
154154

155155
const timeFormat =
156156
typeof this._config.hoursFormat != 'undefined'
157157
? this._config.hoursFormat
158158
: this.hass.locale?.time_format == '12' || this.hass.locale?.time_format == '24'
159-
? formatTime(this.hass.locale)
160-
: dayjs().localeData().longDateFormat('LT');
159+
? formatTime(this.hass.locale)
160+
: dayjs().localeData().longDateFormat('LT');
161161
dayjs.updateLocale(this.language, {
162162
weekStart: this._config.firstDayOfWeek!,
163163
formats: {
@@ -194,11 +194,11 @@ export class AtomicCalendarRevive extends LitElement {
194194
${this._config.name
195195
? html`<div class="header-name ${compactMode}" @click="${() => this.handleToggle()}">
196196
${this._config.name}
197-
</div>`
197+
</div>`
198198
: ''}
199199
${this.showLoader && this._config.showLoader ? html`<div class="loader"></div>` : ''}
200200
${this._config.showDate ? html`<div class="header-date ${compactMode}">${getDate(this._config)}</div>` : ''}
201-
</div>`
201+
</div>`
202202
: ''}
203203
<div class="cal-eventContainer" style="padding-top: 4px;">${this.content}</div>
204204
</ha-card>`;
@@ -221,7 +221,8 @@ export class AtomicCalendarRevive extends LitElement {
221221
this.isUpdating = true;
222222
try {
223223
const { events, failedEvents } = await getEventMode(this._config, this.hass);
224-
this.events = events;
224+
this.events = events[0];
225+
this.hiddenEvents = events[1];
225226
this.failedEvents = failedEvents;
226227
// Check no event days and display
227228
if (this._config.showNoEventDays) {
@@ -366,7 +367,7 @@ export class AtomicCalendarRevive extends LitElement {
366367
this._config.showCurrentEventLine && isEventNext
367368
? html`<div class="eventBar">
368369
<hr class="event" style="--event-bar-color: ${this._config.eventBarColor} " />
369-
</div>`
370+
</div>`
370371
: ``;
371372

372373
const calColor =
@@ -377,7 +378,7 @@ export class AtomicCalendarRevive extends LitElement {
377378
event.entityConfig.name && this._config.showCalendarName
378379
? html`<div class="event-cal-name" style="color: ${calColor};">
379380
<ha-icon icon="mdi:calendar" class="event-cal-name-icon"></ha-icon>&nbsp;${event.originName}
380-
</div>`
381+
</div>`
381382
: ``;
382383

383384
//show current event progress bar
@@ -416,10 +417,10 @@ export class AtomicCalendarRevive extends LitElement {
416417
${this._config.showRelativeTime && event.startDateTime.isAfter(now, 'minutes')
417418
? `(${event.startDateTime.fromNow()})`
418419
: this._config.showTimeRemaining &&
419-
event.startDateTime.isBefore(now, 'minutes') &&
420-
event.endDateTime.isAfter(now, 'minutes')
421-
? `${dayjs.duration(event.endDateTime.diff(now)).humanize()}`
422-
: ''}
420+
event.startDateTime.isBefore(now, 'minutes') &&
421+
event.endDateTime.isAfter(now, 'minutes')
422+
? `${dayjs.duration(event.endDateTime.diff(now)).humanize()}`
423+
: ''}
423424
</div>`;
424425
} else {
425426
timeUntilRemaining = html``;
@@ -455,7 +456,7 @@ export class AtomicCalendarRevive extends LitElement {
455456
${showWeekDay}
456457
<!--Show the event date, see eventDateFormat-->
457458
${eventDateFormat}
458-
</div>`
459+
</div>`
459460
: html``;
460461
return html`<div class="single-event-container ${compactMode} ${dayWrap} ${hideDate}" style="${lastEventStyle}">
461462
${eventLeft}

src/lib/event.func.ts

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -165,12 +165,11 @@ export async function getAllEvents(
165165
config.entities.map((entity) => {
166166
const calendarEntity = (entity && entity.entity) || entity;
167167

168+
const daysToShow = entity.maxDaysToShow! == 0 ? entity.maxDaysToShow! : config.maxDaysToShow! - 1;
169+
168170
const endTime =
169171
entity.maxDaysToShow! !== undefined
170-
? dayjs()
171-
.add(entity.maxDaysToShow! - 1 + config.startDaysAhead!, 'day')
172-
.endOf('day')
173-
.format('YYYY-MM-DDTHH:mm:ss')
172+
? start.endOf('day').add(daysToShow, 'day').format('YYYY-MM-DDTHH:mm:ss')
174173
: end.endOf('day').format(dateFormat);
175174

176175
const url: string = `calendars/${entity.entity}?start=${startTime}&end=${endTime}`;
@@ -209,6 +208,7 @@ export async function getAllEvents(
209208
* @return {Promise<Array<EventClass>>}
210209
*/
211210
export function processEvents(allEvents: any[], config: atomicCardConfig, mode: 'Event' | 'Calendar') {
211+
let hiddenEvents: number = 0;
212212
// reduce all the events into the ones we care about
213213
// events = all the events we care about
214214
// calEvent = the current event that is being processed.
@@ -342,7 +342,8 @@ export function processEvents(allEvents: any[], config: atomicCardConfig, mode:
342342
((!config.softLimit && config.maxEventCount < newEvents.length) ||
343343
(config.softLimit && newEvents.length > config.maxEventCount + config.softLimit))
344344
) {
345+
hiddenEvents = newEvents.length - config.maxEventCount;
345346
newEvents.length = config.maxEventCount;
346347
}
347-
return newEvents;
348+
return [newEvents, hiddenEvents];
348349
}

0 commit comments

Comments
 (0)