Add Somfy devices

src/main/java/com/bwssystems/HABridge/BridgeSettingsDescriptor.java

@@ -40,6 +40,8 @@ public class BridgeSettingsDescriptor {
 	private String hubversion;
 	private IpList domoticzaddress;
 	private boolean domoticzconfigured;
+	private IpList somfyaddress;
+	private boolean somfyconfigured;
 
 	public BridgeSettingsDescriptor() {
 		super();
@@ -47,6 +49,7 @@ public class BridgeSettingsDescriptor {
 		this.traceupnp = false;
 		this.nestconfigured = false;
 		this.veraconfigured = false;
+		this.somfyconfigured = false;
 		this.harmonyconfigured = false;
 		this.hueconfigured = false;
 		this.halconfigured = false;
@@ -92,9 +95,15 @@ public class BridgeSettingsDescriptor {
 	public IpList getVeraAddress() {
 		return veraaddress;
 	}
+	public IpList getSomfyAddress() {
+		return somfyaddress;
+	}
 	public void setVeraAddress(IpList veraAddress) {
 		this.veraaddress = veraAddress;
 	}
+	public void setSomfyAddress(IpList somfyAddress) {
+		this.somfyaddress = somfyAddress;
+	}
 	public IpList getHarmonyAddress() {
 		return harmonyaddress;
 	}
@@ -128,9 +137,15 @@ public class BridgeSettingsDescriptor {
 	public boolean isVeraconfigured() {
 		return veraconfigured;
 	}
+	public boolean isSomfyconfigured() {
+		return somfyconfigured;
+	}
 	public void setVeraconfigured(boolean veraconfigured) {
 		this.veraconfigured = veraconfigured;
 	}
+	public void setSomfyconfigured(boolean somfyconfigured) {
+		this.somfyconfigured = somfyconfigured;
+	}
 	public boolean isHarmonyconfigured() {
 		return harmonyconfigured;
 	}
@@ -328,4 +343,12 @@ public class BridgeSettingsDescriptor {
 			return false;
 		return true;
 	}
+	public Boolean isValidSomfy() {
+		if(this.getSomfyAddress() == null || this.getSomfyAddress().getDevices().size() <= 0)
+			return false;
+		List<NamedIP> devicesList = this.getSomfyAddress().getDevices();
+		if(devicesList.get(0).getIp().contains(Configuration.DEFAULT_ADDRESS))
+			return false;
+		return true;
+	}
 }

src/main/java/com/bwssystems/HABridge/DeviceMapTypes.java

@@ -26,6 +26,7 @@ public class DeviceMapTypes {
 	public final static String[] UDP_DEVICE_COMPAT = { "UDP", "UDP Device"};
 	public final static String[] HTTP_DEVICE = { "httpDevice", "HTTP Device"};
 	public final static String[] DOMOTICZ_DEVICE = { "domoticzDevice", "Domoticz Device"};
+	public final static String[] SOMFY_DEVICE = { "somfyDevice", "Somfy Device"};
 
 	public final static int typeIndex = 0;
 	public final static int displayIndex = 1;
@@ -53,6 +54,7 @@ public class DeviceMapTypes {
 		deviceMapTypes.add(UDP_DEVICE);
 		deviceMapTypes.add(VERA_DEVICE);
 		deviceMapTypes.add(VERA_SCENE);
+		deviceMapTypes.add(SOMFY_DEVICE);
 	}
 	public static int getTypeIndex() {
 		return typeIndex;

src/main/java/com/bwssystems/HABridge/devicemanagmeent/DeviceResource.java

@@ -219,6 +219,12 @@ public class DeviceResource {
 	      	return homeManager.findResource(DeviceMapTypes.DOMOTICZ_DEVICE[DeviceMapTypes.typeIndex]).getItems(DeviceMapTypes.DOMOTICZ_DEVICE[DeviceMapTypes.typeIndex]);
 	    }, new JsonTransformer());
 
+		get (API_CONTEXT + "/somfy/devices", "application/json", (request, response) -> {
+			log.debug("Get somfy devices");
+			response.status(HttpStatus.SC_OK);
+			return homeManager.findResource(DeviceMapTypes.SOMFY_DEVICE[DeviceMapTypes.typeIndex]).getItems(DeviceMapTypes.SOMFY_DEVICE[DeviceMapTypes.typeIndex]);
+		}, new JsonTransformer());
+
 		get (API_CONTEXT + "/map/types", "application/json", (request, response) -> {
 	    	log.debug("Get map types");
 	      	return new DeviceMapTypes().getDeviceMapTypes();

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

@@ -45,6 +45,9 @@ app.config (function ($locationProvider, $routeProvider) {
 	}).when ('/domoticzdevices', {
 		templateUrl: 'views/domoticzdevice.html',
 		controller: 'DomoticzController'
+	}).when('/somfydevices', {
+           templateUrl: 'views/somfydevice.html',
+           controller: 'SomfyController'
        }).otherwise ({
 		templateUrl: 'views/configuration.html',
 		controller: 'ViewingController'
@@ -71,7 +74,7 @@ String.prototype.replaceAll = function (search, replace)
 
 app.service ('bridgeService', function ($http, $window, ngToast) {
 	var self = this;
-	this.state = {base: window.location.origin + "/api/devices", bridgelocation: window.location.origin, systemsbase: window.location.origin + "/system", huebase: window.location.origin + "/api", configs: [], backups: [], devices: [], device: {}, mapandid: [], type: "", settings: [], myToastMsg: [], logMsgs: [], loggerInfo: [], mapTypes: [], olddevicename: "", logShowAll: false, isInControl: false, showVera: false, showHarmony: false, showNest: false, showHue: false, showHal: false, showMqtt: false, showHass: false, showDomoticz: false, habridgeversion: ""};
+	this.state = {base: window.location.origin + "/api/devices", bridgelocation: window.location.origin, systemsbase: window.location.origin + "/system", huebase: window.location.origin + "/api", configs: [], backups: [], devices: [], device: {}, mapandid: [], type: "", settings: [], myToastMsg: [], logMsgs: [], loggerInfo: [], mapTypes: [], olddevicename: "", logShowAll: false, isInControl: false, showVera: false, showHarmony: false, showNest: false, showHue: false, showHal: false, showMqtt: false, showHass: false, showDomoticz: false, showSomfy: false, habridgeversion: ""};
 
 	this.displayWarn = function(errorTitle, error) {
 		var toastContent = errorTitle;
@@ -257,6 +260,11 @@ app.service ('bridgeService', function ($http, $window, ngToast) {
 		return;
 	}
 
+    this.updateShowSomfy = function () {
+        this.state.showSomfy = self.state.settings.somfyconfigured;
+        return;
+    }
+
 	this.loadBridgeSettings = function () {
 		return $http.get(this.state.systemsbase + "/settings").then(
 				function (response) {
@@ -269,6 +277,7 @@ app.service ('bridgeService', function ($http, $window, ngToast) {
 					self.updateShowMqtt();
 					self.updateShowHass();
 					self.updateShowDomoticz();
+					self.updateShowSomfy();
 				},
 				function (error) {
 					self.displayWarn("Load Bridge Settings Error: ", error);
@@ -450,6 +459,20 @@ app.service ('bridgeService', function ($http, $window, ngToast) {
 		);
 	};
 
+	this.viewSomfyDevices = function () {
+    		if(!this.state.showSomfy)
+    			return;
+    		return $http.get(this.state.base + "/somfy/devices").then(
+    				function (response) {
+    					self.state.somfydevices = response.data;
+    				},
+    				function (error) {
+    					self.displayWarn("Get Somfy Devices Error: ", error);
+    				}
+    		);
+    	};
+
+
 	this.formatCallItem = function (currentItem) {
 		if(!currentItem.startsWith("{\"item") && !currentItem.startsWith("[{\"item")) {
 			if (currentItem.startsWith("[") || currentItem.startsWith("{"))
@@ -1002,6 +1025,25 @@ app.controller ('SystemController', function ($scope, $location, $http, $window,
     	    }
     	}
     };
+    $scope.addSomfytoSettings = function (newsomfyname, newsomfyip, newsomfyusername, newsomfypassword) {
+        	if($scope.bridge.settings.somfyaddress == null) {
+        		$scope.bridge.settings.somfyaddress = { devices: [] };
+    		}
+        	var newSomfy = {name: newsomfyname, ip: newsomfyip, username: newsomfyusername, password: newsomfypassword }
+        	$scope.bridge.settings.somfyaddress.devices.push(newSomfy);
+        	$scope.newsomfyname = null;
+        	$scope.newsomfyip = null;
+        	$scope.newsomfyusername = null;
+        	$scope.newsomfypassword = null;
+        };
+    $scope.removeSomfytoSettings = function (somfyname, somfyip) {
+        for(var i = $scope.bridge.settings.somfyaddress.devices.length - 1; i >= 0; i--) {
+            if($scope.bridge.settings.somfyaddress.devices[i].name === somfyname && $scope.bridge.settings.somfyaddress.devices[i].ip === somfyip) {
+                $scope.bridge.settings.somfyaddress.devices.splice(i, 1);
+            }
+        }
+    };
+
     $scope.bridgeReinit = function () {
     	bridgeService.reinit();
     };
@@ -2295,6 +2337,130 @@ app.controller('DomoticzController', function ($scope, $location, $http, bridgeS
 	};
 });
 
+app.controller('SomfyController', function ($scope, $location, $http, bridgeService, ngDialog) {
+	$scope.bridge = bridgeService.state;
+	$scope.device = bridgeService.state.device;
+	$scope.device_dim_control = "";
+	$scope.bulk = { devices: [] };
+	$scope.selectAll = false;
+	$scope.somfy = {base: "http://", port: "3480", id: ""};
+	bridgeService.viewSomfyDevices();
+	$scope.imgButtonsUrl = "glyphicon glyphicon-plus";
+	$scope.buttonsVisible = false;
+	$scope.comparatorUniqueId = bridgeService.compareUniqueId;
+
+	$scope.clearDevice = function () {
+		bridgeService.clearDevice();
+		$scope.device = bridgeService.state.device;
+	};
+
+	$scope.buildDeviceUrls = function (somfydevice, dim_control) {
+        //TODO - support partial window opening
+        dimpayload = "";
+        onpayload = "{\"label\":\"Label that is ignored probably\",\"actions\":[{\"deviceURL\":\""+ somfydevice.deviceUrl+"\",\"commands\":[{\"name\":\"open\",\"parameters\":[]}]}]}";
+        offpayload = "{\"label\":\"Label that is ignored probably\",\"actions\":[{\"deviceURL\":\""+ somfydevice.deviceUrl+"\",\"commands\":[{\"name\":\"close\",\"parameters\":[]}]}]}";
+
+        bridgeService.buildUrls(onpayload, dimpayload, offpayload, true, somfydevice.id,  somfydevice.name, somfydevice.somfyname, "switch",  "somfyDevice", null, null);
+        $scope.device = bridgeService.state.device;
+        bridgeService.editNewDevice($scope.device);
+        $location.path('/editdevice');
+
+	};
+
+
+	$scope.bulkAddDevices = function(dim_control) {
+		var devicesList = [];
+		for(var i = 0; i < $scope.bulk.devices.length; i++) {
+			for(var x = 0; x < bridgeService.state.somfydevices.length; x++) {
+				if(bridgeService.state.somfydevices[x].id === $scope.bulk.devices[i]) {
+					$scope.buildDeviceUrls(bridgeService.state.somfydevices[x],dim_control);
+					devicesList[i] = {
+							name: $scope.device.name,
+							mapId: $scope.device.mapId,
+							mapType: $scope.device.mapType,
+							deviceType: $scope.device.deviceType,
+							targetDevice: $scope.device.targetDevice,
+							onUrl: $scope.device.onUrl,
+							dimUrl: $scope.device.dimUrl,
+							offUrl: $scope.device.offUrl,
+							headers: $scope.device.headers,
+							httpVerb: $scope.device.httpVerb,
+							contentType: $scope.device.contentType,
+							contentBody: $scope.device.contentBody,
+							contentBodyDim: $scope.device.contentBodyDim,
+							contentBodyOff: $scope.device.contentBodyOff
+					};
+				}
+			}
+		}
+		bridgeService.bulkAddDevice(devicesList).then(
+				function () {
+					$scope.clearDevice();
+					bridgeService.viewDevices();
+					bridgeService.viewSomfyDevices();
+				},
+				function (error) {
+					bridgeService.displayWarn("Error adding Somfy devices in bulk.", error)
+				}
+			);
+		$scope.bulk = { devices: [] };
+		$scope.selectAll = false;
+	};
+
+	$scope.toggleSelection = function toggleSelection(deviceId) {
+		var idx = $scope.bulk.devices.indexOf(deviceId);
+
+		// is currently selected
+		if (idx > -1) {
+			$scope.bulk.devices.splice(idx, 1);
+			if($scope.bulk.devices.length === 0 && $scope.selectAll)
+				$scope.selectAll = false;
+		}
+
+		// is newly selected
+		else {
+			$scope.bulk.devices.push(deviceId);
+			$scope.selectAll = true;
+		}
+	};
+
+	$scope.toggleSelectAll = function toggleSelectAll() {
+		if($scope.selectAll) {
+			$scope.selectAll = false;
+			$scope.bulk = { devices: [] };
+		}
+		else {
+			$scope.selectAll = true;
+			for(var x = 0; x < bridgeService.state.somfydevices.length; x++) {
+				if($scope.bulk.devices.indexOf(bridgeService.state.somfydevices[x]) < 0 && !bridgeService.findDeviceByMapId(bridgeService.state.somfydevices[x].id, bridgeService.state.somfydevices[x].somfyname, "somfyDevice"))
+					$scope.bulk.devices.push(bridgeService.state.somfydevices[x].id);
+			}
+		}
+	};
+
+	$scope.toggleButtons = function () {
+		$scope.buttonsVisible = !$scope.buttonsVisible;
+		if($scope.buttonsVisible)
+			$scope.imgButtonsUrl = "glyphicon glyphicon-minus";
+		else
+			$scope.imgButtonsUrl = "glyphicon glyphicon-plus";
+	};
+
+	$scope.deleteDevice = function (device) {
+		$scope.bridge.device = device;
+		ngDialog.open({
+			template: 'deleteDialog',
+			controller: 'DeleteDialogCtrl',
+			className: 'ngdialog-theme-default'
+		});
+	};
+
+	$scope.editDevice = function (device) {
+		bridgeService.editDevice(device);
+		$location.path('/editdevice');
+	};
+});
+
 app.controller('EditController', function ($scope, $location, $http, bridgeService) {
 	bridgeService.viewMapTypes();
 	$scope.bridge = bridgeService.state;
@@ -2566,6 +2732,36 @@ app.filter('configuredDomoticzItems', function (bridgeService) {
 	}
 });
 
+
+app.filter('availableSomfyDeviceId', function(bridgeService) {
+	return function(input) {
+		var out = [];
+		if(input == null)
+			return out;
+		for (var i = 0; i < input.length; i++) {
+			if(!bridgeService.findDeviceByMapId(input[i].id, input[i].somfyname, "somfyDevice")){
+				out.push(input[i]);
+			}
+		}
+		return out;
+	}
+});
+
+app.filter('unavailableSomfyDeviceId', function(bridgeService) {
+	return function(input) {
+		var out = [];
+		if(input == null)
+			return out;
+		for (var i = 0; i < input.length; i++) {
+			if(bridgeService.findDeviceByMapId(input[i].id, input[i].somfyname, "somfyDevice")){
+				out.push(input[i]);
+			}
+		}
+		return out;
+	}
+});
+
+
 app.controller('VersionController', function ($scope, bridgeService) {
 	$scope.bridge = bridgeService.state;
 });