From 81b605d9beeab1d2ed376e7ab600641048f5986f Mon Sep 17 00:00:00 2001
From: Ziver Koc <ziver@koc.se>
Date: Sat, 12 Dec 2015 01:34:55 +0100
Subject: [PATCH] create modify delete external users are working on the web

Former-commit-id: dd1ac3cd8b3f54b1be1aab9f452b12dce006b7cd
---
 src/se/koc/hal/page/PCConfigureHttpPage.java | 28 +++++++++--
 src/se/koc/hal/struct/User.java              |  4 +-
 web-resource/configure.tmpl                  | 52 +++++++++++---------
 3 files changed, 55 insertions(+), 29 deletions(-)

diff --git a/src/se/koc/hal/page/PCConfigureHttpPage.java b/src/se/koc/hal/page/PCConfigureHttpPage.java
index ad806949..9726267b 100755
--- a/src/se/koc/hal/page/PCConfigureHttpPage.java
+++ b/src/se/koc/hal/page/PCConfigureHttpPage.java
@@ -28,6 +28,8 @@ public class PCConfigureHttpPage extends HalHttpPage {
         // Save new input
         if(request.containsKey("action")){
             String action = request.get("action");
+            Sensor sensor;
+            User user;
             switch(action) {
                 case "modify_local_user":
                     localUser.setUserName(request.get("username"));
@@ -39,12 +41,30 @@ public class PCConfigureHttpPage extends HalHttpPage {
                 case "modify_local_sensor": break;
                 case "remove_local_sensor": break;
 
-                case "create_external_user": break;
-                case "modify_external_user": break;
-                case "remove_external_user": break;
+                case "create_external_user":
+                    user = new User();
+                    user.setHostname(request.get("hostname"));
+                    user.setPort(Integer.parseInt(request.get("port")));
+                    user.setExternal(true);
+                    user.save(db);
+                    break;
+                case "modify_external_user":
+                    user = User.getUser(db, Integer.parseInt(request.get("id")));
+                    if(user != null){
+                        user.setHostname(request.get("hostname"));
+                        user.setPort(Integer.parseInt(request.get("port")));
+                        user.save(db);
+                    }
+                    break;
+                case "remove_external_user":
+                    user = User.getUser(db, Integer.parseInt(request.get("id")));
+                    if(user != null){
+                        user.delete(db);
+                    }
+                    break;
 
                 case "modify_external_sensor":
-                    Sensor sensor = Sensor.getSensor(db, Integer.parseInt(request.get("id")));
+                    sensor = Sensor.getSensor(db, Integer.parseInt(request.get("id")));
                     if(sensor != null){
                         sensor.setSynced(Boolean.parseBoolean(request.get("sync")));
                         sensor.save(db);
diff --git a/src/se/koc/hal/struct/User.java b/src/se/koc/hal/struct/User.java
index 156306d9..c9f120cc 100755
--- a/src/se/koc/hal/struct/User.java
+++ b/src/se/koc/hal/struct/User.java
@@ -34,7 +34,9 @@ public class User extends DBBean{
 		return DBConnection.exec(stmt, DBBeanSQLResultHandler.create(User.class, db) );
 	}
 
-	
+	public static User getUser(DBConnection db, int id) throws SQLException {
+		return DBBean.load(db, User.class, id);
+	}
 	
 	
 	
diff --git a/web-resource/configure.tmpl b/web-resource/configure.tmpl
index 28dcbc3a..8b6b3d07 100755
--- a/web-resource/configure.tmpl
+++ b/web-resource/configure.tmpl
@@ -88,20 +88,24 @@
                     <td>{{.hostname}}</td>
                     <td>{{.port}}</td>
                     <td>
-                        <div class="btn-toolbar pull-right">
-                            <button class="btn btn-default btn-xs" data-toggle="modal"
-                                    data-target="#extUserModal"
-                                    data-id="{{.getId()}}"
-                                    data-hostname="{{.hostname}}"
-                                    data-port="{{.port}}">
-                                <span class="glyphicon glyphicon-pencil"></span>
-                            </button>
-                            <button class="btn btn-danger btn-xs" data-toggle="modal"
-                                    data-target="#deleteModal"
-                                    data-name="{{.hostname}}">
-                                <span class="glyphicon glyphicon-trash"></span>
-                            </button>
-                        </div>
+                        <form method="POST">
+                            <input type="hidden" name="action" value="remove_external_user">
+                            <input type="hidden" name="id" value="{{.getId()}}">
+
+                            <div class="btn-toolbar pull-right">
+                                <button type="button" class="btn btn-default btn-xs" data-toggle="modal"
+                                        data-target="#extUserModal"
+                                        data-id="{{.getId()}}"
+                                        data-hostname="{{.hostname}}"
+                                        data-port="{{.port}}">
+                                    <span class="glyphicon glyphicon-pencil"></span>
+                                </button>
+
+                                <button type="submit" class="btn btn-danger btn-xs">
+                                    <span class="glyphicon glyphicon-trash"></span>
+                                </button>
+                            </div>
+                        </form>
                     </td>
                 </tr>
                 {{/extUsers}}
@@ -129,8 +133,8 @@
                     <td>{{.type}}</td>
                     <td>{{.config}}</td>
                     <td>
-                        <div class="btn-toolbar pull-right">
-                            <form method="POST">
+                        <form method="POST">
+                            <div class="btn-toolbar pull-right">
                                 <input type="hidden" name="action" value="modify_external_sensor">
                                 <input type="hidden" name="id" value="{{.getId()}}">
                                 {{^.sync}}
@@ -145,8 +149,8 @@
                                     <span class="glyphicon glyphicon-remove"></span>
                                 </button>
                                 {{/.sync}}
-                            </form>
-                        </div>
+                            </div>
+                        </form>
                     </td>
                 </tr>
                 {{/extSensor}}
@@ -163,7 +167,7 @@
             var button = $(event.relatedTarget);
             var modal = $(this);
             if(button.data("id") >= 0){ // edit
-                modal.find("#action").val(button.data("edit_external_user"));
+                modal.find("#action").val("modify_external_user");
                 modal.find("#id").val(button.data("id"));
                 modal.find("#hostname").val(button.data("hostname"));
                 modal.find("#port").val(button.data("port"));
@@ -182,26 +186,26 @@
     <div class="modal-dialog" role="document">
         <div class="modal-content">
             <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                <button type="button" class="close" data-dismiss="modal">
                     <span aria-hidden="true">&times;</span>
                 </button>
                 <h4 class="modal-title" id="exampleModalLabel">External User</h4>
             </div>
             <form method="POST">
                 <div class="modal-body">
-                    <input type="hidden" id="action" name="action">
+                    <input type="hidden" id="action" name="action" value="">
                     <input type="hidden" id="id" name="id">
                     <div class="form-group">
                         <label for="hostname" class="control-label">Hostname/IP:</label>
-                        <input type="text" class="form-control" id="hostname">
+                        <input type="text" class="form-control" id="hostname" name="hostname">
                     </div>
                     <div class="form-group">
                         <label for="port" class="control-label">Port:</label>
-                        <input type="number" class="form-control" id="port" min="1">
+                        <input type="number" class="form-control" id="port" name="port" min="1">
                     </div>
                 </div>
                 <div class="modal-footer">
-                    <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
+                    <button type="reset" class="btn btn-default" data-dismiss="modal">Cancel</button>
                     <button type="submit" class="btn btn-primary">Save</button>
                 </div>
             </form>