From 22e6400369b0ca1c26e7fa912ba365b5fea0e115 Mon Sep 17 00:00:00 2001 From: Ziver Koc Date: Thu, 26 Sep 2024 00:55:47 +0200 Subject: [PATCH] Removed old event page --- hal-core/resources/web/event_overview.tmpl | 98 ---------------- .../src/se/hal/page/EventOverviewWebPage.java | 108 ------------------ hal-core/src/se/hal/plugin.json | 1 - 3 files changed, 207 deletions(-) delete mode 100644 hal-core/resources/web/event_overview.tmpl delete mode 100644 hal-core/src/se/hal/page/EventOverviewWebPage.java diff --git a/hal-core/resources/web/event_overview.tmpl b/hal-core/resources/web/event_overview.tmpl deleted file mode 100644 index 9fd32adb..00000000 --- a/hal-core/resources/web/event_overview.tmpl +++ /dev/null @@ -1,98 +0,0 @@ -

Event Overview

- -
-
-
Local Events
-
- - - - - - - - - -
NameTypeDataLast UpdateActions
-
-
-
- - \ No newline at end of file diff --git a/hal-core/src/se/hal/page/EventOverviewWebPage.java b/hal-core/src/se/hal/page/EventOverviewWebPage.java deleted file mode 100644 index 105b2e21..00000000 --- a/hal-core/src/se/hal/page/EventOverviewWebPage.java +++ /dev/null @@ -1,108 +0,0 @@ -package se.hal.page; - -import se.hal.EventControllerManager; -import se.hal.HalContext; -import se.hal.intf.HalEventData; -import se.hal.intf.HalWebPage; -import se.hal.struct.Event; -import se.hal.struct.devicedata.ColorEventData; -import se.hal.struct.devicedata.LevelEventData; -import se.hal.struct.devicedata.OnOffEventData; -import se.hal.util.DeviceNameComparator; -import se.hal.util.HistoryDataListSqlResult; -import se.hal.util.HistoryDataListSqlResult.HistoryData; -import zutil.ObjectUtil; -import zutil.db.DBConnection; -import zutil.io.file.FileUtil; -import zutil.log.LogUtil; -import zutil.parser.Templator; - -import java.sql.PreparedStatement; -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.logging.Logger; - -public class EventOverviewWebPage extends HalWebPage { - private static final Logger logger = LogUtil.getLogger(); - private static final int HISTORY_LIMIT = 200; - private static final String OVERVIEW_TEMPLATE = HalContext.RESOURCE_WEB_ROOT + "/event_overview.tmpl"; - private static final String DETAIL_TEMPLATE = HalContext.RESOURCE_WEB_ROOT + "/event_detail.tmpl"; - - - public EventOverviewWebPage() { - super("event_overview"); - super.getRootNav().createSubNav("Events").createSubNav(this.getId(), "Overview"); - } - - @Override - public Templator httpRespond( - Map session, - Map cookie, - Map request) - throws Exception{ - - DBConnection db = HalContext.getDB(); - - if ("modify".equals(request.get("action"))) { - int id = (ObjectUtil.isEmpty(request.get("action-id")) ? -1 : Integer.parseInt(request.get("action-id"))); - - // change event data - HalEventData eventData = null; - - switch (request.get("type")) { - case "level": - eventData = new LevelEventData(Integer.parseInt(request.get("data")) / 100.0, 0); - break; - - case "color": - eventData = new ColorEventData(request.get("data"), 0); - break; - - case "on-off": - eventData = new OnOffEventData("on".equals(request.get("data")), 0); - break; - } - - if (id >= 0 && eventData != null) { - logger.info("Modifying Event(" + id + ") state: " + eventData.toString()); - Event event = Event.getEvent(db, id); - EventControllerManager.getInstance().send(event, eventData); - } else { - logger.warning("Unable to process event change request for event " + id + ", data type most likely not supported: " + request.get("type")); - } - } - - int id = (ObjectUtil.isEmpty(request.get("id")) ? -1 : Integer.parseInt(request.get("id"))); - - // -------------------------------------- - // Detailed page - // -------------------------------------- - if (id >= 0) { - Event event = Event.getEvent(db, id); - - // get history data - PreparedStatement stmt = db.getPreparedStatement( - "SELECT * FROM event_data_raw WHERE event_id == ? ORDER BY timestamp DESC LIMIT ?"); - stmt.setLong(1, event.getId()); - stmt.setLong(2, HISTORY_LIMIT); - List history = DBConnection.exec(stmt, new HistoryDataListSqlResult()); - - Templator tmpl = new Templator(FileUtil.find(DETAIL_TEMPLATE)); - tmpl.set("event", event); - tmpl.set("history", history); - return tmpl; - } - // -------------------------------------- - // Overview page - // -------------------------------------- - else { - List events = Event.getLocalEvents(db); - Collections.sort(events, DeviceNameComparator.getInstance()); - - Templator tmpl = new Templator(FileUtil.find(OVERVIEW_TEMPLATE)); - tmpl.set("events", events); - return tmpl; - } - } -} diff --git a/hal-core/src/se/hal/plugin.json b/hal-core/src/se/hal/plugin.json index 4ecb1528..c3ce564f 100644 --- a/hal-core/src/se/hal/plugin.json +++ b/hal-core/src/se/hal/plugin.json @@ -19,7 +19,6 @@ {"se.hal.intf.HalApiEndpoint": "se.hal.page.api.SensorApiEndpoint"}, {"se.hal.intf.HalJavascriptModule": "se.hal.page.JavascriptModules"}, - {"DISABLEDse.hal.intf.HalWebPage": "se.hal.page.EventOverviewWebPage"}, {"se.hal.intf.HalWebPage": "se.hal.page.EventConfigWebPage"}, {"se.hal.intf.HalWebPage": "se.hal.page.PropertyConfigWebPage"}, {"se.hal.intf.HalWebPage": "se.hal.page.PluginConfigWebPage"},