Fixed config page bugs

Former-commit-id: cd32facd6e679eb9a66b294d4011da8eb801fd00

src/se/hal/ControllerManager.java

@@ -117,11 +117,12 @@ public class ControllerManager implements HalSensorReportListener,
             }
             else { // unknown sensor
                 logger.finest("Received report from unregistered sensor: "+ sensorData);
-                if(!detectedSensors.contains(sensorData)) {
+                Sensor detectedSensor = findSensor(sensorData, detectedSensors);
-                    Sensor detectedSensor = new Sensor();
+                if(detectedSensor == null) {
-                    detectedSensor.setDeviceData(sensorData);
+                    detectedSensor = new Sensor();
                     detectedSensors.add(detectedSensor);
                 }
+                detectedSensor.setDeviceData(sensorData);
             }
         }catch (SQLException e){
             logger.log(Level.WARNING, "Unable to store sensor report", e);
@@ -202,11 +203,12 @@ public class ControllerManager implements HalSensorReportListener,
             }
             else { // unknown sensor
                 logger.info("Received report from unregistered event: "+ eventData);
-                if(!detectedEvents.contains(eventData)) {
+                Event detectedEvent = findEvent(eventData, detectedEvents);
-                    Event detectedEvent = new Event();
+                if(detectedEvent == null) {
-                    detectedEvent.setDeviceData(eventData);
+                    detectedEvent = new Event();
                     detectedEvents.add(detectedEvent);
                 }
+                detectedEvent.setDeviceData(eventData);
             }
         }catch (SQLException e){
             logger.log(Level.WARNING, "Unable to store event report", e);

src/se/hal/struct/AbstractDevice.java

@@ -60,6 +60,8 @@ public abstract class AbstractDevice<T> extends DBBean {
     }
     public void setDeviceData(T data) {
         this.deviceData = data;
+        if(data != null)
+            type = data.getClass().getName();
         updateConfigString();
     }
     public void save(DBConnection db) throws SQLException {

web-resource/event_config.tmpl

@@ -63,7 +63,7 @@
                 <tr>
                     <td>{{.getType()}}</td>
                     <td>{{.getDeviceData().getTimestamp()}}</td>
-                    <td>{{.}}</td>
+                    <td>{{.getDeviceData()}}</td>
                     <td>
                         <div class="btn-toolbar pull-right">
                             <button type="button" class="btn btn-default btn-xs" data-toggle="modal"
@@ -104,6 +104,13 @@
             var modal = $(this);
             modal.find("input[type=text]").val(""); // Reset all inputs
             if(button.data("id") >= 0){ // edit
+                modal.find("input[name=action]").val("modify_local_event");
+            }
+            else{ // create
+                modal.find("input[name=action]").val("create_local_event");
+                modal.find("input[name=id]").val(-1);
+            }
+            // Set dynamic data
             modal.find("select[name=type]").val(button.data("type"));
             modal.find("select[name=type]").change(); // Update dynamic inputs
             $.each(button.attr(), function(name, value) {
@@ -113,13 +120,6 @@
                     modal.find("input[name="+name+"]").val(value);
                 }
             });
-                modal.find("input[name=action]").val("modify_local_event");
-            }
-            else{ // create
-                modal.find("input[name=action]").val("create_local_event");
-                modal.find("input[name=id]").val(-1);
-                modal.find("select[name=type]").change(); // Update dynamic inputs
-            }
         });
     });
 </script>

web-resource/sensor_config.tmpl

@@ -66,7 +66,7 @@
                 <tr>
                     <td>{{.getType()}}</td>
                     <td>{{.getDeviceData().getTimestamp()}}</td>
-                    <td>{{.}}</td>
+                    <td>{{.getDeviceData()}}</td>
                     <td>
                         <div class="btn-toolbar pull-right">
                             <button type="button" class="btn btn-default btn-xs" data-toggle="modal"
@@ -204,6 +204,15 @@
             var modal = $(this);
             modal.find("input[type=text]").val(""); // Reset all inputs
             if(button.data("id") >= 0){ // edit
+                modal.find("input[name=action]").val("modify_local_sensor");
+                modal.find("input[name=sync]").prop("checked", button.data("sync"));
+            }
+            else{ // create
+                modal.find("input[name=action]").val("create_local_sensor");
+                modal.find("input[name=id]").val(-1);
+                modal.find("input[name=sync]").prop("checked", "false");
+            }
+            // set dynamic form data
             modal.find("select[name=type]").val(button.data("type"));
             modal.find("select[name=type]").change(); // Update dynamic inputs
             $.each(button.attr(), function(name, value) {
@@ -213,15 +222,6 @@
                     modal.find("input[name="+name+"]").val(value);
                 }
             });
-                modal.find("input[name=action]").val("modify_local_sensor");
-                modal.find("input[name=sync]").prop("checked", button.data("sync"));
-            }
-            else{ // create
-                modal.find("input[name=action]").val("create_local_sensor");
-                modal.find("input[name=id]").val(-1);
-                modal.find("input[name=sync]").prop("checked", "false");
-                modal.find("select[name=type]").change(); // Update dynamic inputs
-            }
         });