From 9de2ee1e3c03cc0ca80014b3671b2bbaed227e29 Mon Sep 17 00:00:00 2001
From: Ziver Koc <ziver.koc@ericsson.com>
Date: Mon, 11 Nov 2019 17:56:13 +0100
Subject: [PATCH] Fixed Event config page

---
 resource/web/event_config.tmpl           |  5 +++--
 src/se/hal/page/EventConfigHttpPage.java | 26 +++++++++++++++++-------
 2 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/resource/web/event_config.tmpl b/resource/web/event_config.tmpl
index d9b267b1..4ce353a2 100755
--- a/resource/web/event_config.tmpl
+++ b/resource/web/event_config.tmpl
@@ -13,7 +13,8 @@
                     <th>Configuration</th>
                     <th>
                         <button class="btn btn-default btn-xs pull-right" data-toggle="modal"
-                                data-target="#eventModal">
+                                data-target="#eventModal"
+                                data-action="create_local_event">
                             <span class="glyphicon glyphicon-plus"></span>
                         </button>
                     </th>
@@ -112,7 +113,7 @@
             </div>
             <form method="POST">
                 <div class="modal-body">
-                    <input type="hidden" id="action" name="action" value="">
+                    <input type="hidden" id="action" name="action">
                     <input type="hidden" id="id" name="id">
                     <div class="form-group">
                         <label class="control-label">Name:</label>
diff --git a/src/se/hal/page/EventConfigHttpPage.java b/src/se/hal/page/EventConfigHttpPage.java
index f3bf518d..ff5bb779 100755
--- a/src/se/hal/page/EventConfigHttpPage.java
+++ b/src/se/hal/page/EventConfigHttpPage.java
@@ -12,12 +12,15 @@ import se.hal.struct.User;
 import zutil.ObjectUtil;
 import zutil.db.DBConnection;
 import zutil.io.file.FileUtil;
+import zutil.log.LogUtil;
 import zutil.parser.Templator;
 
 import java.util.ArrayList;
 import java.util.Map;
+import java.util.logging.Logger;
 
 public class EventConfigHttpPage extends HalHttpPage {
+    private static final Logger logger = LogUtil.getLogger();
     private static final String TEMPLATE = "resource/web/event_config.tmpl";
 
     private ArrayList<ClassConfigurationData> eventConfigurations;
@@ -44,7 +47,7 @@ public class EventConfigHttpPage extends HalHttpPage {
 
         // Save new input
         if(request.containsKey("action")){
-            int id = (!ObjectUtil.isEmpty(request.get("id")) ? Integer.parseInt(request.get("id")) : -1);
+            int id = (ObjectUtil.isEmpty(request.get("id")) ? -1 : Integer.parseInt(request.get("id")));
             Event event;
 
             switch(request.get("action")) {
@@ -57,32 +60,42 @@ public class EventConfigHttpPage extends HalHttpPage {
                     event.getDeviceConfigurator().setValues(request).applyConfiguration();
                     event.save(db);
                     ControllerManager.getInstance().register(event);
+
+                    logger.info("Event created: " + event.getName());
                     HalAlertManager.getInstance().addAlert(new HalAlert(
-                            AlertLevel.SUCCESS, "Successfully created new event: "+event.getName(), AlertTTL.ONE_VIEW));
+                            AlertLevel.SUCCESS, "Successfully created new event: " + event.getName(), AlertTTL.ONE_VIEW));
                     break;
+
                 case "modify_local_event":
                     event = Event.getEvent(db, id);
-                    if(event != null){
+                    if (event != null){
                         event.setName(request.get("name"));
                         event.setType(request.get("type"));
                         event.setUser(localUser);
                         event.getDeviceConfigurator().setValues(request).applyConfiguration();
                         event.save(db);
+
+                        logger.info("Event modified: " + event.getName());
                         HalAlertManager.getInstance().addAlert(new HalAlert(
                                 AlertLevel.SUCCESS, "Successfully saved event: "+event.getName(), AlertTTL.ONE_VIEW));
                     } else {
+                        logger.warning("Unknown event id: " + id);
                         HalAlertManager.getInstance().addAlert(new HalAlert(
-                                AlertLevel.ERROR, "Unknown event id: "+id, AlertTTL.ONE_VIEW));
+                                AlertLevel.ERROR, "Unknown event id: " + id, AlertTTL.ONE_VIEW));
                     }
                     break;
+
                 case "remove_local_event":
                     event = Event.getEvent(db, id);
-                    if(event != null) {
+                    if (event != null) {
                         ControllerManager.getInstance().deregister(event);
                         event.delete(db);
+
+                        logger.info("Event deleted: " + event.getName());
                         HalAlertManager.getInstance().addAlert(new HalAlert(
                                 AlertLevel.SUCCESS, "Successfully deleted event: "+event.getName(), AlertTTL.ONE_VIEW));
-                    }else {
+                    } else {
+                        logger.warning("Unknown event id: " + id);
                         HalAlertManager.getInstance().addAlert(new HalAlert(
                                 AlertLevel.ERROR, "Unknown event id: "+id, AlertTTL.ONE_VIEW));
                     }
@@ -100,7 +113,6 @@ public class EventConfigHttpPage extends HalHttpPage {
         tmpl.set("localEvents", Event.getLocalEvents(db));
         tmpl.set("localEventConf", eventConfigurations);
         tmpl.set("detectedEvents", ControllerManager.getInstance().getDetectedEvents());
-
         tmpl.set("availableEvents", ControllerManager.getInstance().getAvailableEvents());
 
         return tmpl;