diff --git a/src/se/koc/hal/deamon/DataSynchronizationClient.java b/src/se/koc/hal/deamon/DataSynchronizationClient.java index 0e3315b3..8abeaf6f 100755 --- a/src/se/koc/hal/deamon/DataSynchronizationClient.java +++ b/src/se/koc/hal/deamon/DataSynchronizationClient.java @@ -9,7 +9,6 @@ import java.net.UnknownHostException; import java.sql.PreparedStatement; import java.sql.SQLException; import java.util.List; -import java.util.Locale; import java.util.Timer; import java.util.TimerTask; import java.util.logging.Logger; @@ -39,10 +38,10 @@ public class DataSynchronizationClient extends TimerTask implements HalDaemon{ List users = User.getExternalUsers(db); for(User user : users){ if(user.getHostname() == null){ - logger.fine("Hostname not defined for user: "+ user.getName()); + logger.fine("Hostname not defined for user: "+ user.getUserName()); continue; } - logger.fine("Synchronizing user: "+ user.getName() +" ("+user.getHostname()+":"+user.getPort()+")"); + logger.fine("Synchronizing user: "+ user.getUserName() +" ("+user.getHostname()+":"+user.getPort()+")"); try (Socket s = new Socket(user.getHostname(), user.getPort());){ ObjectOutputStream out = new ObjectOutputStream(s.getOutputStream()); ObjectInputStream in = new ObjectInputStream(s.getInputStream()); @@ -72,7 +71,7 @@ public class DataSynchronizationClient extends TimerTask implements HalDaemon{ stmt.setFloat(6, data.confidence); DBConnection.exec(stmt); } - logger.fine("Stored " + dataList.size() + " entries for sensor " + sensor.getId() + " from " + user.getName()); + logger.fine("Stored " + dataList.size() + " entries for sensor " + sensor.getId() + " from " + user.getUserName()); } out.writeObject(null); out.close(); diff --git a/src/se/koc/hal/page/PCConfigureHttpPage.java b/src/se/koc/hal/page/PCConfigureHttpPage.java index dc9d2ad3..b85305a0 100755 --- a/src/se/koc/hal/page/PCConfigureHttpPage.java +++ b/src/se/koc/hal/page/PCConfigureHttpPage.java @@ -1,7 +1,5 @@ package se.koc.hal.page; -import java.io.IOException; -import java.sql.SQLException; import java.util.Map; import se.koc.hal.HalContext; @@ -9,9 +7,6 @@ import se.koc.hal.struct.Sensor; import se.koc.hal.struct.User; import zutil.db.DBConnection; import zutil.io.file.FileUtil; -import zutil.net.http.HttpHeaderParser; -import zutil.net.http.HttpPage; -import zutil.net.http.HttpPrintStream; import zutil.parser.Templator; public class PCConfigureHttpPage extends HalHttpPage { @@ -21,23 +16,33 @@ public class PCConfigureHttpPage extends HalHttpPage { } @Override - public Templator httpRespond( - Map session, - Map cookie, - Map request) - throws Exception{ + public Templator httpRespond( + Map session, + Map cookie, + Map request) + throws Exception{ + DBConnection db = HalContext.getDB(); + User localUser = User.getLocalUser(db); - DBConnection db = HalContext.getDB(); - - Templator tmpl = new Templator(FileUtil.find("web-resource/configure.tmpl")); - tmpl.set("user", User.getLocalUser(db)); - tmpl.set("localSensor", Sensor.getLocalSensors(db)); - tmpl.set("extUsers", User.getExternalUsers(db)); - tmpl.set("extSensor", Sensor.getExternalSensors(db)); + // Save new input + if(request.containsKey("form")){ + if(request.get("form").equals("user")){ + localUser.setUserName(request.get("username")); + localUser.setAddress(request.get("address")); + localUser.save(db); + } + } - return tmpl; + // Output + Templator tmpl = new Templator(FileUtil.find("web-resource/configure.tmpl")); + tmpl.set("user", localUser); + tmpl.set("localSensor", Sensor.getLocalSensors(db)); + tmpl.set("extUsers", User.getExternalUsers(db)); + tmpl.set("extSensor", Sensor.getExternalSensors(db)); - } + return tmpl; + + } } diff --git a/src/se/koc/hal/struct/User.java b/src/se/koc/hal/struct/User.java index 5c8bfabc..156306d9 100755 --- a/src/se/koc/hal/struct/User.java +++ b/src/se/koc/hal/struct/User.java @@ -7,6 +7,7 @@ import java.util.List; import zutil.db.DBConnection; import zutil.db.bean.DBBean; import zutil.db.bean.DBBeanSQLResultHandler; +import zutil.ui.Configurator; /** * Created by Ziver on 2015-12-03. @@ -37,10 +38,10 @@ public class User extends DBBean{ - public String getName() { + public String getUserName() { return username; } - public void setName(String name) { + public void setUserName(String name) { this.username = name; } public String getAddress() { diff --git a/web-resource/configure.tmpl b/web-resource/configure.tmpl index 2fe428cd..1da95f5c 100755 --- a/web-resource/configure.tmpl +++ b/web-resource/configure.tmpl @@ -3,19 +3,20 @@
Profile Information
-
- -
- - -
-
- - -
-
- -
+ + + +
+ + +
+
+ + +
+
+ +