ziver/hal
1
1
Fork 0
Code Pull requests Releases Activity

Configuration of Events and Sensors are working with dynamic forms

Browse source 
Former-commit-id: ff81dee3365eee865099badc73ca70bc7cb222c6
This commit is contained in:
Ziver Koc 2016-01-18 13:09:28 +01:00
parent 02e15810ec
commit 42064e5209
7 changed files with 173 additions and 134 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/se/hal/page/EventConfigHttpPage.java
View file

@ -86,7 +86,7 @@ public class EventConfigHttpPage extends HalHttpPage {
// Output
Templator tmpl = new Templator(FileUtil.find(TEMPLATE));
tmpl.set("user", localUser);
tmpl.set("localEvent", Event.getLocalEvents(db));
tmpl.set("localEvents", Event.getLocalEvents(db));
tmpl.set("localEventConf", eventConfigurations);
tmpl.set("detectedEvents", ControllerManager.getInstance().getDetectedEvents());

2
src/se/hal/struct/Event.java
View file

@ -15,7 +15,7 @@ import java.util.logging.Logger;
/**
* Created by Ziver on 2015-12-15.
*/
@DBBean.DBTable("event")
@DBBean.DBTable(value="event", superBean=true)
public class Event extends AbstractDevice<HalEventData>{
private static final Logger logger = LogUtil.getLogger();