implemented multi button build for devices. more testing needed. fixed

tab display on first view.

pom.xml

@@ -5,7 +5,7 @@
 
 	<groupId>com.bwssystems.HABridge</groupId>
 	<artifactId>ha-bridge</artifactId>
-	<version>1.3.1</version>
+	<version>1.3.1a</version>
 	<packaging>jar</packaging>
 
 	<name>HA Bridge</name>

src/main/java/com/bwssystems/HABridge/hue/HueMulator.java

@@ -334,16 +334,25 @@ public class HueMulator {
 	        }
 	        else if(device.getDeviceType().toLowerCase().contains("button") || (device.getMapType() != null && device.getMapType().equalsIgnoreCase("harmonyButton")))
 	        {
-	        	log.debug("executing HUE api request to button press to Harmony: " + url);
+	        	log.debug("executing HUE api request to button press(es) to Harmony: " + url);
-	        	ButtonPress aDeviceButton = new Gson().fromJson(url, ButtonPress.class);
+	        	if(url.substring(0, 1).equalsIgnoreCase("{")) {
+	        		url = "[" + url +"]";
+	        	}
+	        	ButtonPress[] deviceButtons = new Gson().fromJson(url, ButtonPress[].class);
 	        	HarmonyHandler myHarmony = myHarmonyHome.getHarmonyHandler(device.getTargetDevice());
 	        	if(myHarmony == null)
 	        	{
 	        		log.warn("Should not get here, no harmony hub available");
 	        		responseString = "[{\"error\":{\"type\": 6, \"address\": \"/lights/" + lightId + ",\"description\": \"Should not get here, no harmony hub available\", \"parameter\": \"/lights/" + lightId + "state\"}}]";
 	        	}
-	        	else
+	        	else {
-	        		myHarmony.pressButton(aDeviceButton);
+	        		for(int i = 0; i < deviceButtons.length; i++) {
+	        			if( i > 0)
+	        				Thread.sleep(500);
+	    	        	log.debug("pressing button: " + deviceButtons[i].getDevice() + " - " + deviceButtons[i].getButton() + " - iteration: " + String.valueOf(i));
+	        			myHarmony.pressButton(deviceButtons[i]);
+	        		}
+	        	}
 	        }
 	        else if(device.getDeviceType().toLowerCase().contains("home") || (device.getMapType() != null && device.getMapType().equalsIgnoreCase("nestHomeAway")))
 	        {

src/main/resources/public/scripts/app.js

@@ -35,9 +35,6 @@ app.config(function ($routeProvider) {
 
 app.run( function (bridgeService) {
 	bridgeService.loadBridgeSettings();
-	bridgeService.updateShowVera();
-	bridgeService.updateShowHarmony();
-	bridgeService.updateShowNest();
 	bridgeService.getHABridgeVersion();	
 });
 
@@ -180,6 +177,9 @@ app.service('bridgeService', function ($http, $window, BridgeSettings) {
                 	self.BridgeSettings.setupnpstrict(response.data.upnpstrict);
                 	self.BridgeSettings.setdevmode(response.data.devmode);
                 	self.BridgeSettings.setnestconfigured(response.data.nestconfigured);                		
+                	self.updateShowVera();
+                	self.updateShowHarmony();
+                	self.updateShowNest();
                 },
                 function (error) {
                     if (error.data) {
@@ -418,9 +418,6 @@ app.controller('ViewingController', function ($scope, $location, $http, $window,
 		$scope.BridgeSettings = bridgeService.BridgeSettings;
         bridgeService.viewDevices();
         $scope.bridge = bridgeService.state;
-        bridgeService.updateShowVera();
-        bridgeService.updateShowHarmony();
-    	bridgeService.updateShowNest();
         $scope.visible = false;
         $scope.imgUrl = "glyphicon glyphicon-plus";
         $scope.predicate = '';
@@ -456,29 +453,36 @@ app.controller('ViewingController', function ($scope, $location, $http, $window,
     });
 
 app.controller('AddingController', function ($scope, $location, $http, bridgeService, BridgeSettings) {
+	$scope.device = {id: "", name: "", deviceType: "custom", onUrl: "", offUrl: ""};
+	$scope.clearDevice = function () {
+        $scope.device.id = "";
+        $scope.device.mapType = null;
+        $scope.device.mapId = null;
+        $scope.device.name = "";
+        $scope.device.onUrl = "";
+        $scope.device.deviceType = "custom";
+        $scope.device.targetDevice = null;
+        $scope.device.offUrl = "";
+        $scope.device.httpVerb = null;
+        $scope.device.contentType = null;
+        $scope.device.contentBody = null;
+        $scope.device.contentBodyOff = null;
+    };
 
-        $scope.device = {id: "", name: "", deviceType: "custom", onUrl: "", offUrl: ""};
+
+        $scope.clearDevice();
+        bridgeService.device = $scope.device;
         $scope.vera = {base: "", port: "3480", id: ""};
         $scope.vera.base = "http://" + BridgeSettings.veraaddress;
-        bridgeService.device = $scope.device;
         bridgeService.viewVeraDevices();
         bridgeService.viewVeraScenes();
         bridgeService.viewHarmonyActivities();
         bridgeService.viewHarmonyDevices();
         bridgeService.viewNestItems();
         $scope.bridge = bridgeService.state;
-        bridgeService.updateShowVera();
-        bridgeService.updateShowHarmony();
-    	bridgeService.updateShowNest();
         $scope.device = bridgeService.state.device;
-        $scope.activitiesVisible = false;
         $scope.imgButtonsUrl = "glyphicon glyphicon-plus";
         $scope.buttonsVisible = false;
-        $scope.imgActivitiesUrl = "glyphicon glyphicon-plus";
-        $scope.devicesVisible = false;
-        $scope.imgDevicesUrl = "glyphicon glyphicon-plus";
-        $scope.scenesVisible = false;
-        $scope.imgScenesUrl = "glyphicon glyphicon-plus";
         $scope.predicate = '';
         $scope.reverse = true;
         $scope.device_dim_control = "";
@@ -574,13 +578,21 @@ app.controller('AddingController', function ($scope, $location, $http, bridgeSer
         };
 
         $scope.buildButtonUrls = function (harmonydevice, onbutton, offbutton) {
-            $scope.device.deviceType = "button";
+        	var currentOn = $scope.device.onUrl;
-            $scope.device.targetDevice = harmonydevice.hub;
+        	var currentOff = $scope.device.offUrl;
-            $scope.device.name = harmonydevice.device.label;
+        	if( $scope.device.mapType == "harmonyButton") {
-            $scope.device.mapType = "harmonyButton";
+	            $scope.device.onUrl = currentOn.substr(0, currentOn.indexOf("]")) + ",{\"device\":\"" + harmonydevice.device.id + "\",\"button\":\"" + onbutton + "\"}]";
-            $scope.device.mapId = harmonydevice.device.id + "-" + onbutton + "-" + offbutton;
+	            $scope.device.offUrl = currentOff.substr(0, currentOff.indexOf("]")) + ",{\"device\":\"" + harmonydevice.device.id + "\",\"button\":\"" + offbutton + "\"}]";        		
-            $scope.device.onUrl = "{\"device\":\"" + harmonydevice.device.id + "\",\"button\":\"" + onbutton + "\"}";
+        	}
-            $scope.device.offUrl = "{\"device\":\"" + harmonydevice.device.id + "\",\"button\":\"" + offbutton + "\"}";
+        	else if ($scope.device.mapType == null || $scope.device.mapType == "") {
+	            $scope.device.deviceType = "button";
+	            $scope.device.targetDevice = harmonydevice.hub;
+	            $scope.device.name = harmonydevice.device.label;
+	            $scope.device.mapType = "harmonyButton";
+	            $scope.device.mapId = harmonydevice.device.id + "-" + onbutton + "-" + offbutton;
+	            $scope.device.onUrl = "[{\"device\":\"" + harmonydevice.device.id + "\",\"button\":\"" + onbutton + "\"}]";
+	            $scope.device.offUrl = "[{\"device\":\"" + harmonydevice.device.id + "\",\"button\":\"" + offbutton + "\"}]";
+	        }
         };
 
         $scope.buildNestHomeUrls = function (nestitem) {
@@ -651,6 +663,8 @@ app.controller('AddingController', function ($scope, $location, $http, bridgeSer
         };
 
         $scope.addDevice = function () {
+        	if($scope.device.name == "" && $scope.device.onUrl == "")
+        		return;
             bridgeService.addDevice($scope.device).then(
                 function () {
                     $scope.device.id = "";
@@ -665,21 +679,12 @@ app.controller('AddingController', function ($scope, $location, $http, bridgeSer
                     $scope.device.contentType = null;
                     $scope.device.contentBody = null;
                     $scope.device.contentBodyOff = null;
-                    $location.path('/#');
                 },
                 function (error) {
                 }
             );
         }
 
-        $scope.toggleActivities = function () {
-            $scope.activitiesVisible = !$scope.activitiesVisible;
-            if($scope.activitiesVisible)
-                $scope.imgActivitiesUrl = "glyphicon glyphicon-minus";
-            else
-                $scope.imgActivitiesUrl = "glyphicon glyphicon-plus";
-        };
-        
         $scope.toggleButtons = function () {
             $scope.buttonsVisible = !$scope.buttonsVisible;
             if($scope.buttonsVisible)
@@ -687,23 +692,7 @@ app.controller('AddingController', function ($scope, $location, $http, bridgeSer
             else
                 $scope.imgButtonsUrl = "glyphicon glyphicon-plus";
         };
-        
+       
-        $scope.toggleDevices = function () {
-            $scope.devicesVisible = !$scope.devicesVisible;
-            if($scope.devicesVisible)
-                $scope.imgDevicesUrl = "glyphicon glyphicon-minus";
-            else
-                $scope.imgDevicesUrl = "glyphicon glyphicon-plus";
-        };
-        
-        $scope.toggleScenes = function () {
-            $scope.scenesVisible = !$scope.scenesVisible;
-            if($scope.scenesVisible)
-                $scope.imgScenesUrl = "glyphicon glyphicon-minus";
-            else
-                $scope.imgScenesUrl = "glyphicon glyphicon-plus";
-        };
-        
         $scope.deleteDeviceByMapId = function (id, mapType) {
         	bridgeService.deleteDeviceByMapId(id, mapType);
         };

src/main/resources/public/views/editdevice.html

@@ -17,7 +17,7 @@
 	updating these fields as you may break the settings used by the bridge to call a specific end point device.</p>
 	<ul class="list-group">
 		<li class="list-group-item">
-			<form class="form-horizontal" ng-submit="addDevice()">
+			<form class="form-horizontal">
 				<div class="form-group">
 					<label class="col-xs-12 col-sm-2 control-label" for="device-name">Name
 					</label>
@@ -26,7 +26,7 @@
 						<input type="text" class="form-control" id="device-name"
 							ng-model="device.name" placeholder="Device Name">
 					</div>
-					<button type="submit" class="col-xs-4 col-sm-2 btn btn-primary">
+					<button type="submit" class="col-xs-4 col-sm-2 btn btn-primary" ng-click="addDevice()">
 						Update Bridge Device</button>
 				</div>
 				<div class="form-group">
@@ -37,6 +37,8 @@
 						<input type="text" class="form-control" id="device-target"
 							ng-model="device.targetDevice" placeholder="default">
 					</div>
+					<button class="btn btn-danger" ng-click="clearDevice()">
+						Clear Device</button>
 				</div>
 				<div class="form-group">
 					<div class="row">

src/main/resources/public/views/editor.html

@@ -78,7 +78,7 @@
 	the http verb type below and configure a payload for either on or off methods. Currently, https is not supported.</p>
 	<ul class="list-group">
 		<li class="list-group-item">
-			<form class="form-horizontal" ng-submit="addDevice()">
+			<form class="form-horizontal">
 				<div class="form-group">
 					<div class="row">
 					<label class="col-xs-12 col-sm-2 control-label" for="device-name">Name
@@ -88,7 +88,7 @@
 						<input type="text" class="form-control" id="device-name"
 							ng-model="device.name" placeholder="Device Name">
 					</div>
-					<button type="submit" class="col-xs-4 col-sm-2 btn btn-primary">
+					<button type="submit" class="col-xs-4 col-sm-2 btn btn-primary" ng-click="addDevice()">
 						Add Bridge Device</button>
 					</div>
 				</div>
@@ -101,6 +101,8 @@
 						<textarea rows="3" class="form-control" id="device-on-url"
 							ng-model="device.onUrl" placeholder="URL to turn device on"></textarea>
 					</div>
+					<button class="btn btn-danger" ng-click="clearDevice()">
+						Clear Device</button>
 					</div>
 				</div>
 				<div class="form-group">

src/main/resources/public/views/harmonyactivity.html

@@ -50,9 +50,9 @@
 		</li>
 	</ul>
 	<div class="panel-heading">
-		<h2 class="panel-title">Already Configured Activities <a ng-click="toggleActivities()"><span class={{imgActivitiesUrl}} aria-hidden="true"></a></h2>
+		<h2 class="panel-title">Already Configured Activities <a ng-click="toggleButtons()"><span class={{imgButtonsUrl}} aria-hidden="true"></span></a></h2>
 	</div>
-	<ul ng-if="activitiesVisible" class="list-group">
+	<ul ng-if="buttonsVisible" class="list-group">
 		<li class="list-group-item">
 			<table class="table table-bordered table-striped table-hover">
 				<thead>
@@ -89,7 +89,7 @@
 	</div>
 	<ul class="list-group">
 		<li class="list-group-item">
-			<form class="form-horizontal" ng-submit="addDevice()">
+			<form class="form-horizontal">
 				<div class="form-group">
 					<label class="col-xs-12 col-sm-2 control-label" for="device-name">Name
 					</label>
@@ -98,7 +98,7 @@
 						<input type="text" class="form-control" id="device-name"
 							ng-model="device.name" placeholder="Device Name">
 					</div>
-					<button type="submit" class="col-xs-4 col-sm-2 btn btn-primary">
+					<button type="submit" class="col-xs-4 col-sm-2 btn btn-primary" ng-click="addDevice()">
 						Add Bridge Device</button>
 				</div>
 				<div class="form-group">
@@ -110,6 +110,8 @@
 						<textarea rows="3" class="form-control" id="device-on-url"
 							ng-model="device.onUrl" placeholder="URL to turn device on"></textarea>
 					</div>
+					<button class="btn btn-danger" ng-click="clearDevice()">
+						Clear Device</button>
 					</div>
 				</div>
 				<div class="form-group">

src/main/resources/public/views/harmonydevice.html

@@ -14,7 +14,8 @@
 	</div>
 	<ul class="list-group">
 		<li class="list-group-item">
-			<p class="text-muted">For any Harmony Device and Buttons, use the action buttons to generate the device addition information below automatically. 
+			<p class="text-muted">For any Harmony Device and Buttons, use the build button to generate the configuration for this bridge device. You can add button presses by
+			selecting yoru devic and buttons and then selecting the Build Button. This will allow multiple button presses to be built for a given device. 
 			Then you can modify the name to anything you want that will be the keyword for Alexa. Click the 'Add Bridge Device' to finish that selection setup.
 			The 'Already Configured Harmony Buttons' list below will show what is already setup for your Harmony Hubs.</p>
 
@@ -58,8 +59,8 @@
 					</td>
 					<td>
 						<button class="btn btn-success" type="submit"
-							ng-click="buildButtonUrls(harmonydevice, devicectrlon, devicectrloff)">Generate
+							ng-click="buildButtonUrls(harmonydevice, devicectrlon, devicectrloff)">Build
-							Button URLs</button>
+							A Button</button>
 					</td>
 				</tr>
 			</table>
@@ -112,7 +113,7 @@
 	</div>
 	<ul class="list-group">
 		<li class="list-group-item">
-			<form class="form-horizontal" ng-submit="addDevice()">
+			<form class="form-horizontal">
 				<div class="form-group">
 					<label class="col-xs-12 col-sm-2 control-label" for="device-name">Name
 					</label>
@@ -121,7 +122,7 @@
 						<input type="text" class="form-control" id="device-name"
 							ng-model="device.name" placeholder="Device Name">
 					</div>
-					<button type="submit" class="col-xs-4 col-sm-2 btn btn-primary">
+					<button type="submit" class="col-xs-4 col-sm-2 btn btn-primary" ng-click="addDevice()">
 						Add Bridge Device</button>
 				</div>
 				<div class="form-group">
@@ -133,6 +134,8 @@
 						<textarea rows="3" class="form-control" id="device-on-url"
 							ng-model="device.onUrl" placeholder="URL to turn device on"></textarea>
 					</div>
+					<button class="btn btn-danger" ng-click="clearDevice()">
+						Clear Device</button>
 					</div>
 				</div>
 				<div class="form-group">

src/main/resources/public/views/nestactions.html

@@ -71,9 +71,9 @@
 		</li>
 	</ul>
 	<div class="panel-heading">
-		<h2 class="panel-title">Already Configured Nest Items <a ng-click="toggleActivities()"><span class={{imgActivitiesUrl}} aria-hidden="true"></a></h2>
+		<h2 class="panel-title">Already Configured Nest Items <a ng-click="toggleButtons()"><span class={{imgButtonsUrl}} aria-hidden="true"></span></a></h2>
 	</div>
-	<ul ng-if="activitiesVisible" class="list-group">
+	<ul ng-if="buttonsVisible" class="list-group">
 		<li class="list-group-item">
 			<table class="table table-bordered table-striped table-hover">
 				<thead>
@@ -110,7 +110,7 @@
 	</div>
 	<ul class="list-group">
 		<li class="list-group-item">
-			<form class="form-horizontal" ng-submit="addDevice()">
+			<form class="form-horizontal">
 				<div class="form-group">
 					<label class="col-xs-12 col-sm-2 control-label" for="device-name">Name
 					</label>
@@ -119,7 +119,7 @@
 						<input type="text" class="form-control" id="device-name"
 							ng-model="device.name" placeholder="Device Name">
 					</div>
-					<button type="submit" class="col-xs-4 col-sm-2 btn btn-primary">
+					<button type="submit" class="col-xs-4 col-sm-2 btn btn-primary" ng-click="addDevice()">
 						Add Bridge Device</button>
 				</div>
 				<div class="form-group">
@@ -131,6 +131,8 @@
 						<textarea rows="3" class="form-control" id="device-on-url"
 							ng-model="device.onUrl" placeholder="URL to turn device on"></textarea>
 					</div>
+					<button class="btn btn-danger" ng-click="clearDevice()">
+						Clear Device</button>
 					</div>
 				</div>
 				<div class="form-group">

src/main/resources/public/views/veradevice.html

@@ -62,9 +62,9 @@
 		</li>
 	</ul>
 	<div class="panel-heading">
-		<h2 class="panel-title">Already Configured Vera Devices <a ng-click="toggleDevices()"><span class={{imgDevicesUrl}} aria-hidden="true"></a></h2>
+		<h2 class="panel-title">Already Configured Vera Devices <a ng-click="toggleButtons()"><span class={{imgButtonsUrl}} aria-hidden="true"></span></a></a></h2>
 	</div>
-	<ul ng-if="devicesVisible" class="list-group">
+	<ul ng-if="buttonsVisible" class="list-group">
 		<li class="list-group-item">
 			<table class="table table-bordered table-striped table-hover">
 				<thead>
@@ -108,7 +108,7 @@
 	</div>
 	<ul class="list-group">
 		<li class="list-group-item">
-			<form class="form-horizontal" ng-submit="addDevice()">
+			<form class="form-horizontal">
 				<div class="form-group">
 					<label class="col-xs-12 col-sm-2 control-label" for="device-name">Name
 					</label>
@@ -117,7 +117,7 @@
 						<input type="text" class="form-control" id="device-name"
 							ng-model="device.name" placeholder="Device Name">
 					</div>
-					<button type="submit" class="col-xs-4 col-sm-2 btn btn-primary">
+					<button type="submit" class="col-xs-4 col-sm-2 btn btn-primary" ng-click="addDevice()">
 						 Add Bridge Device</button>
 				</div>
 				<div class="form-group">
@@ -129,6 +129,8 @@
 						<textarea rows="3" class="form-control" id="device-on-url"
 							ng-model="device.onUrl" placeholder="URL to turn device on"></textarea>
 					</div>
+					<button class="btn btn-danger" ng-click="clearDevice()">
+						Clear Device</button>
 				</div>
 				<div class="form-group">
 					<div class="row">

src/main/resources/public/views/verascene.html

@@ -50,9 +50,9 @@
 		</li>
 	</ul>
 	<div class="panel-heading">
-		<h2 class="panel-title">Already Configured Vera Scenes <a ng-click="toggleScenes()"><span class={{imgScenesUrl}} aria-hidden="true"></a></h2>
+		<h2 class="panel-title">Already Configured Vera Scenes <a ng-click="toggleButtons()"><span class={{imgButtonsUrl}} aria-hidden="true"></span></a></h2>
 	</div>
-	<ul ng-if="scenesVisible" class="list-group">
+	<ul ng-if="buttonsVisible" class="list-group">
 		<li class="list-group-item">
 			<table class="table table-bordered table-striped table-hover">
 				<thead>
@@ -91,7 +91,7 @@
 	</div>
 	<ul class="list-group">
 		<li class="list-group-item">
-			<form class="form-horizontal" ng-submit="addDevice()">
+			<form class="form-horizontal">
 				<div class="form-group">
 					<label class="col-xs-12 col-sm-2 control-label" for="device-name">Name
 					</label>
@@ -100,7 +100,7 @@
 						<input type="text" class="form-control" id="device-name"
 							ng-model="device.name" placeholder="Device Name">
 					</div>
-					<button type="submit" class="col-xs-4 col-sm-2 btn btn-primary">
+					<button type="submit" class="col-xs-4 col-sm-2 btn btn-primary" ng-click="addDevice()">
 						Add Bridge Device</button>
 				</div>
 				<div class="form-group">
@@ -112,6 +112,8 @@
 						<textarea rows="3" class="form-control" id="device-on-url"
 							ng-model="device.onUrl" placeholder="URL to turn device on"></textarea>
 					</div>
+					<button class="btn btn-danger" ng-click="clearDevice()">
+						Clear Device</button>
 				</div>
 				<div class="form-group">
 					<div class="row">