Vera device and scene creation testing and added Copy capability to add

an already configured device with a different name.

Fixes #32
Fixes #38

pom.xml

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

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

@@ -378,7 +378,7 @@ public class HueMulator {
 	        	else {
 	        		if(thermoSetting.getControl().equalsIgnoreCase("temp")) {
 	        			if(request.body().contains("bri")) {
-	        				thermoSetting.setTemp(String.valueOf(Math.round((Integer.parseInt(replaceIntensityValue(thermoSetting.getTemp(), state.getBri())) - 32)/1.8)));
+	        				thermoSetting.setTemp(String.valueOf((Double.parseDouble(replaceIntensityValue(thermoSetting.getTemp(), state.getBri())) - 32.0)/1.8));
 	        				log.debug("Setting thermostat: " + thermoSetting.getName() + " to " + thermoSetting.getTemp() + "C");
 	        				theNest.getThermostat(thermoSetting.getName()).setTargetTemperature(Float.parseFloat(thermoSetting.getTemp()));
 	        			}

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

@@ -38,7 +38,7 @@ app.run( function (bridgeService) {
 
 app.service('bridgeService', function ($http, $window) {
         var self = this;
-        this.state = {base: window.location.origin + "/api/devices", upnpbase: window.location.origin + "/upnp/settings", huebase: window.location.origin + "/api", backups: [], devices: [], device: [], settings: [], error: "", showVera: false, showHarmony: false, showNest: false, habridgeversion: ""};
+        this.state = {base: window.location.origin + "/api/devices", upnpbase: window.location.origin + "/upnp/settings", huebase: window.location.origin + "/api", backups: [], devices: [], device: [], settings: [], olddevicename: "", error: "", showVera: false, showHarmony: false, showNest: false, habridgeversion: ""};
 
         this.viewDevices = function () {
             this.state.error = "";
@@ -386,6 +386,7 @@ app.service('bridgeService', function ($http, $window) {
 
         this.editDevice = function (device) {
             self.state.device = device;
+            self.state.olddevicename = device.name;
         };
 
         this.testUrl = function (device, type) {
@@ -477,7 +478,8 @@ app.controller('AddingController', function ($scope, $location, $http, bridgeSer
         $scope.device = $scope.bridge.device;
         $scope.device_dim_control = "";
         $scope.bulk = { devices: [] };
-        $scope.vera = {base: "http://" + $scope.bridge.settings.veraaddress, port: "3480", id: ""};
+		var veraList = angular.fromJson($scope.bridge.settings.veraaddress);
+        $scope.vera = {base: "http://" + veraList.devices[0].ip, port: "3480", id: ""};
         bridgeService.viewVeraDevices();
         bridgeService.viewVeraScenes();
         bridgeService.viewHarmonyActivities();
@@ -506,6 +508,7 @@ app.controller('AddingController', function ($scope, $location, $http, bridgeSer
 	        $scope.device.contentType = null;
 	        $scope.device.contentBody = null;
 	        $scope.device.contentBodyOff = null;
+            $scope.bridge.olddevice.name = "";
 	    };
 
 	    $scope.buildUrlsUsingDevice = function (dim_control) {
@@ -513,7 +516,7 @@ app.controller('AddingController', function ($scope, $location, $http, bridgeSer
                 $scope.vera.base = "http://" + $scope.vera.base;
             }
             $scope.device.deviceType = "switch";
-            $scope.device.targetDevice = $scope.bridge.settings.veraaddress;
+            $scope.device.targetDevice = "Encapsulated";
             $scope.device.mapType = "veraDevice";
             $scope.device.mapId = $scope.vera.id;
             if(dim_control.indexOf("byte") >= 0 || dim_control.indexOf("percent") >= 0 || dim_control.indexOf("math") >= 0)
@@ -536,7 +539,7 @@ app.controller('AddingController', function ($scope, $location, $http, bridgeSer
                 $scope.vera.base = "http://" + $scope.vera.base;
             }
             $scope.device.deviceType = "scene";
-            $scope.device.targetDevice = $scope.bridge.settings.veraaddress;
+            $scope.device.targetDevice = "Encapsulated";
             $scope.device.mapType = "veraScene";
             $scope.device.mapId = $scope.vera.id;
             $scope.device.onUrl = $scope.vera.base + ":" + $scope.vera.port
@@ -548,42 +551,36 @@ app.controller('AddingController', function ($scope, $location, $http, bridgeSer
         };
 
         $scope.buildDeviceUrls = function (veradevice, dim_control) {
-            if ($scope.vera.base.indexOf("http") < 0) {
-                $scope.vera.base = "http://" + $scope.vera.base;
-            }
             $scope.device.deviceType = "switch";
             $scope.device.name = veradevice.name;
             $scope.device.targetDevice = veradevice.veraname;
             $scope.device.mapType = "veraDevice";
             $scope.device.mapId = veradevice.id;
             if(dim_control.indexOf("byte") >= 0 || dim_control.indexOf("percent") >= 0 || dim_control.indexOf("math") >= 0)
-            	$scope.device.onUrl = $scope.vera.base + ":" + $scope.vera.port
+            	$scope.device.onUrl = "http://" + veradevice.veraaddress + ":" + $scope.vera.port
                 	+ "/data_request?id=action&output_format=json&DeviceNum="
                 	+ veradevice.id
                 	+ "&serviceId=urn:upnp-org:serviceId:Dimming1&action=SetLoadLevelTarget&newLoadlevelTarget="
                 	+ dim_control;
             else
-            	$scope.device.onUrl = $scope.vera.base + ":" + $scope.vera.port
+            	$scope.device.onUrl = "http://" + veradevice.veraaddress + ":" + $scope.vera.port
                 	+ "/data_request?id=action&output_format=json&serviceId=urn:upnp-org:serviceId:SwitchPower1&action=SetTarget&newTargetValue=1&DeviceNum="
                 	+ veradevice.id;
-            $scope.device.offUrl = $scope.vera.base + ":" + $scope.vera.port
+            $scope.device.offUrl = "http://" + veradevice.veraaddress + ":" + $scope.vera.port
                 + "/data_request?id=action&output_format=json&serviceId=urn:upnp-org:serviceId:SwitchPower1&action=SetTarget&newTargetValue=0&DeviceNum="
                 + veradevice.id;
         };
 
         $scope.buildSceneUrls = function (verascene) {
-            if ($scope.vera.base.indexOf("http") < 0) {
-                $scope.vera.base = "http://" + $scope.vera.base;
-            }
             $scope.device.deviceType = "scene";
             $scope.device.name = verascene.name;
             $scope.device.targetDevice = verascene.veraname;
             $scope.device.mapType = "veraScene";
             $scope.device.mapId = verascene.id;
-            $scope.device.onUrl = $scope.vera.base + ":" + $scope.vera.port
+            $scope.device.onUrl = "http://" + verascene.veraaddress + ":" + $scope.vera.port
                 + "/data_request?id=action&output_format=json&serviceId=urn:micasaverde-com:serviceId:HomeAutomationGateway1&action=RunScene&SceneNum="
                 + verascene.id;
-            $scope.device.offUrl = $scope.vera.base + ":" + $scope.vera.port
+            $scope.device.offUrl = "http://" + verascene.veraaddress + + ":" + $scope.vera.port
                 + "/data_request?id=action&output_format=json&serviceId=urn:micasaverde-com:serviceId:HomeAutomationGateway1&action=RunScene&SceneNum="
                 + verascene.id;
         };
@@ -601,18 +598,20 @@ app.controller('AddingController', function ($scope, $location, $http, bridgeSer
         $scope.buildButtonUrls = function (harmonydevice, onbutton, offbutton) {
         	var currentOn = $scope.device.onUrl;
         	var currentOff = $scope.device.offUrl;
+        	var actionOn = angular.fromJson(onbutton);
+        	var actionOff = angular.fromJson(offbutton);
         	if( $scope.device.mapType == "harmonyButton") {
-	            $scope.device.onUrl = currentOn.substr(0, currentOn.indexOf("]")) + ",{\"device\":\"" + harmonydevice.device.id + "\",\"button\":\"" + onbutton + "\"}]";
-	            $scope.device.offUrl = currentOff.substr(0, currentOff.indexOf("]")) + ",{\"device\":\"" + harmonydevice.device.id + "\",\"button\":\"" + offbutton + "\"}]";        		
+	            $scope.device.onUrl = currentOn.substr(0, currentOn.indexOf("]")) + ",{\"device\":\"" + harmonydevice.device.id + "\",\"button\":\"" + actionOn.command + "\"}]";
+	            $scope.device.offUrl = currentOff.substr(0, currentOff.indexOf("]")) + ",{\"device\":\"" + harmonydevice.device.id + "\",\"button\":\"" + actionOff.command + "\"}]";        		
         	}
         	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.device.mapId = harmonydevice.device.id + "-" + actionOn.command + "-" + actionOff.command;
+	            $scope.device.onUrl = "[{\"device\":\"" + harmonydevice.device.id + "\",\"button\":\"" + actionOn.command + "\"}]";
+	            $scope.device.offUrl = "[{\"device\":\"" + harmonydevice.device.id + "\",\"button\":\"" + actionOff.command + "\"}]";
 	        }
         };
 
@@ -703,6 +702,27 @@ app.controller('AddingController', function ($scope, $location, $http, bridgeSer
 
         };
         
+        $scope.copyDevice = function () {
+        	if($scope.device.name == "" && $scope.device.onUrl == "") {
+        		$scope.clearDevice();
+        		return;
+        	}
+        	
+        	if($scope.device.name == $scope.bridge.olddevicename) {
+        		$scope.clearDevice();
+        		return;
+        	}
+        	$scope.device.id = null;
+            bridgeService.addDevice($scope.device).then(
+                function () {
+                    $scope.clearDevice();
+                },
+                function (error) {
+                }
+            );
+
+        };
+        
         $scope.bulkAddDevices = function(dim_control) {
         	for(var i = 0; i < $scope.bulk.devices.length; i++) {
         		for(var x = 0; x < bridgeService.state.veradevices.length; x++) {

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

@@ -57,7 +57,7 @@
 					<button class="btn btn-info" type="submit"
 						ng-click="testUrl(device, 'off')">Test OFF</button>
 					<button class="btn btn-warning" type="submit"
-						ng-click="editDevice(device)">Edit</button>
+						ng-click="editDevice(device)">Edit/Copy</button>
 					<button class="btn btn-danger" type="submit"
 						ng-click="deleteDevice(device)">Delete</button>
 				</td>

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

@@ -11,10 +11,11 @@
 
 <div class="panel panel-default bridgeServer" ng-if="!bridge.error">
 	<div class="panel-heading">
-		<h2 class="panel-title">Edit a device</h2>
+		<h2 class="panel-title">Edit/Copy a device</h2>
 	</div>
 	<p class="text-muted">This screen allows the modification of many fields the bridge uses. Please use care when
 	updating these fields as you may break the settings used by the bridge to call a specific end point device.</p>
+	<p>When copying, update the name and select the "Add Bridge Device" Button.</p>
 	<ul class="list-group">
 		<li class="list-group-item">
 			<form class="form-horizontal">
@@ -26,7 +27,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" ng-click="addDevice()">
+					<button type="submit" class="col-xs-4 col-sm-2 btn btn-success" ng-click="addDevice()">
 						Update Bridge Device</button>
 				</div>
 				<div class="form-group">
@@ -37,8 +38,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>
+					<button class="btn btn-primary" ng-click="copyDevice()">
+						Add Bridge Device</button>
 				</div>
 				<div class="form-group">
 					<div class="row">
@@ -56,6 +57,8 @@
 					      <option value="nestThermoSet">Nest Thermostat</option>
 					    </select>
 					</div>
+					<button class="btn btn-danger" ng-click="clearDevice()">
+						Clear Device</button>
 					</div>
 				</div>
 				<div ng-if="device.mapType" class="form-group">

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

@@ -48,21 +48,20 @@
 					<td>
 						<select name="device-ctrlon" id="device-ctrlon" ng-model="devicectrlon">
 							<optgroup ng-repeat="ctrlon in harmonydevice.device.controlGroup" label="{{ctrlon.name}}">
-								<option ng-repeat="funcon in ctrlon.function" value="{{funcon.label}}">{{funcon.name}}</option>
+								<option ng-repeat="funcon in ctrlon.function" value="{{funcon.action}}">{{funcon.label}}</option>
 							</optgroup >
 						</select>
 					</td>
 					<td>
 						<select name="device-ctrloff" id="device-ctrloff" ng-model="devicectrloff">
 							<optgroup ng-repeat="ctrloff in harmonydevice.device.controlGroup" label="{{ctrloff.name}}">
-								<option ng-repeat="funcoff in ctrloff.function" value="{{funcoff.label}}">{{funcoff.name}}</option>
+								<option ng-repeat="funcoff in ctrloff.function" value="{{funcoff.action}}">{{funcoff.label}}</option>
 							</optgroup >
 						</select>
 					</td>
 					<td>
 						<button class="btn btn-success" type="submit"
-							ng-click="buildButtonUrls(harmonydevice, devicectrlon, devicectrloff)">Build
-							A Button</button>
+							ng-click="buildButtonUrls(harmonydevice, devicectrlon, devicectrloff)">Build A Button</button>
 					</td>
 				</tr>
 			</table>