andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2026-06-15 12:26:33 +03:00
Code Issues Packages Projects Releases Wiki Activity

don't show Scheduler items of type immediate in Dashboard

Browse Source
This commit is contained in:
proddy
2026-06-06 15:07:17 +02:00
parent 1acc71a6b9
commit 0b5d643863
3 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/web/WebSchedulerService.cpp
View File

@@ -82,7 +82,7 @@ StateUpdateResult WebScheduler::update(JsonObject root, WebScheduler & webSchedu
EMSESP::webSchedulerService.ha_reset();
// build up the list of schedule items
auto scheduleItems = root["schedule"].as<JsonArray>();
auto scheduleItems = root["schedule"].as<JsonArray>();
for (const JsonObject schedule : scheduleItems) {
// create each schedule item, overwriting any previous settings
// ignore the id (as this is only used in the web for table rendering)
@@ -333,10 +333,12 @@ void WebSchedulerService::publish(const bool force) {
}
// count number of entries, default: only named items
uint8_t WebSchedulerService::count_entities(bool cmd_only) {
// if exclude_immediate is true, include those that are of type SCHEDULEFLAG_SCHEDULE_IMMEDIATE
uint8_t WebSchedulerService::count_entities(bool exclude_immediate) {
uint8_t count = 0;
for (const ScheduleItem & scheduleItem : *scheduleItems_) {
if (scheduleItem.name[0] != '\0' || !cmd_only) {
// count all except SCHEDULE_IMMEDIATE if exclude_immediate is true, else count all
if (!exclude_immediate || scheduleItem.flags != SCHEDULEFLAG_SCHEDULE_IMMEDIATE) {
count++;
}
}