mhop/ha-bridge
1
0
Fork 0
mirror of https://github.com/bwssytems/ha-bridge.git synced 2025-12-16 18:24:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

starting new editor

Browse Source
This commit is contained in:
Admin
2017-01-05 16:05:20 -06:00
parent a0a2d90617
commit e694660af3
3 changed files with 94 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

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

28
src/main/resources/public/scripts/app.js
View File

@@ -384,6 +384,30 @@ app.service ('bridgeService', function ($http, $window, ngToast) {
);
};
this.getCallObjects = function (deviceString) {
if (!deviceString.startsWith("[")) {
if (deviceString.startsWith("{\"item"))
deviceString = "[" + deviceString + "]"
else {
if (deviceString.startsWith("{"))
deviceString = "[{\"item\":" + deviceString + "}]"
else
deviceString = "[{\"item\":\"" + deviceString + "\"}]"
}
} else if (!deviceString.startsWith("[{\"item\""))
deviceString = "[{\"item\":" + deviceString + "}]"
var newDevices = angular.fromJson(deviceString)
var i, s, len = newDevices.length
for (i=0; i<len; ++i) {
if (i in newDevices) {
s = newDevices[i];
if (s.type !== null)
s.type = self.getMapType(s.type)
}
}
return newDevices
}
this.viewMapTypes = function () {
return $http.get(this.state.base + "/map/types").then(
function (response) {
@@ -705,7 +729,7 @@ app.service ('bridgeService', function ($http, $window, ngToast) {
currentOff = "[{\"item\":\"" + currentOff + "\",\"type\":\"" + deviceMapType + "\"}]";
}
self.state.device.offUrl = currentOff.substr(0, currentOff.indexOf("]")) + ",{\"item\":";
} else if (self.state.device.mapType ==== undefined || self.state.device.mapType === null || self.state.device.mapType === "") {
} else if (self.state.device.mapType === undefined || self.state.device.mapType === null || self.state.device.mapType === "") {
this.clearDevice();
self.state.device.deviceType = deviceType;
self.state.device.name = deviceName;
@@ -2027,6 +2051,7 @@ app.controller('EditController', function ($scope, $location, $http, bridgeServi
bridgeService.viewMapTypes();
$scope.bridge = bridgeService.state;
$scope.device = $scope.bridge.device;
$scope.onDevices = bridgeService.getCallObjects($scope.bridge.device.onUrl);
$scope.mapTypeSelected = bridgeService.getMapType($scope.device.mapType);
$scope.device_dim_control = "";
$scope.bulk = { devices: [] };
@@ -2035,6 +2060,7 @@ app.controller('EditController', function ($scope, $location, $http, bridgeServi
$scope.clearDevice = function () {
bridgeService.clearDevice();
$scope.onDevices = null;
};
$scope.addDevice = function () {

71
src/main/resources/public/views/editdevice.html
View File

@@ -108,17 +108,78 @@
</div>
<div class="form-group">
<div class="row">
<label class="col-xs-12 col-sm-2 control-label" for="device-on-url">On URL</label>
<label class="col-xs-12 col-sm-2 control-label" for="device-on-url">On Items</label>
<div class="col-xs-8 col-sm-7">
<textarea rows="3" class="form-control" id="device-on-url"
ng-model="device.onUrl" placeholder="URL to turn device on"></textarea>
<scrollable-table watch="onDevices">
<table class="table table-bordered table-striped table-hover">
<thead>
<tr>
<th>Type</th>
<th>Target Item</th>
<th>Delay</th>
<th>Count</th>
<th>Filter IPs</th>
<th>Http Verb</th>
<th>Http Body</th>
<th>Http Headers</th>
<th>Content Type</th>
</tr>
</thead>
<tr ng-repeat="anItem in onDevices">
<td>
<select ng-options="mapType as mapType[1] for mapType in bridge.mapTypes track by mapType[0]" ng-model="anItem.type"></select>
</td>
<td><textarea rows="1" class="form-control" id="item-target"
ng-model="anItem.item" placeholder="Target Desc"></textarea></td>
<td><textarea rows="1" class="form-control" id="item-delay"
ng-model="anItem.delay" placeholder="Delay millis"></textarea></td>
<td><textarea rows="1" class="form-control" id="item-count"
ng-model="anItem.count" placeholder="Delay millis"></textarea></td>
<td><textarea rows="1" class="form-control" id="item-filterIPs"
ng-model="anItem.filterIPs" placeholder="Delay millis"></textarea></td>
<td>
<select name="item-http-verb" id="item-http-verb" ng-model="anItem.httpVerb">
<option value="">---Please select---</option>
<!-- not selected / blank option -->
<option value="GET">GET</option>
<option value="PUT">PUT</option>
<option value="POST">POST</option>
</select>
</td>
<td><textarea rows="1" class="form-control" id="item-httpBody"
ng-model="anItem.httpBody" placeholder="Delay millis"></textarea></td>
<td><textarea rows="1" class="form-control" id="item-httpHeaders"
ng-model="anItem.httpHeaders" placeholder="Delay millis"></textarea></td>
<td>
<select name="item-content-type" id="item-content-type"
ng-model="item.contentType">
<option value="">---Please select---</option>
<!-- not selected / blank option -->
<option value="application/atom+xml">application/atom+xml</option>
<option value="application/x-www-form-urlencoded">application/x-www-form-urlencoded</option>
<option value="application/json">application/json</option>
<option value="application/octet-stream">application/octet-stream</option>
<option value="application/svg+xml">application/svg+xml</option>
<option value="application/xhtml+xml">application/xhtml+xml</option>
<option value="application/xml">application/xml</option>
<option value="*">*</option>
<option value="multipart/form-data">multipart/form-data</option>
<option value="text/html">text/html</option>
<option value="text/plain">text/plain</option>
<option value="text/xml">text/xml</option>
<option value="*/*">*/*</option>
</select>
</td>
</tr>
</table>
</scrollable-table>
</div>
</div>
</div>
<div class="form-group">
<div class="row">
<label class="col-xs-12 col-sm-2 control-label" for="device-dim-url">Dim URL</label>
<label class="col-xs-12 col-sm-2 control-label" for="device-dim-url">Dim Items</label>
<div class="col-xs-8 col-sm-7">
<textarea rows="3" class="form-control" id="device-dim-url"
@@ -128,7 +189,7 @@
</div>
<div class="form-group">
<div class="row">
<label class="col-xs-12 col-sm-2 control-label" for="device-off-url">Off URL</label>
<label class="col-xs-12 col-sm-2 control-label" for="device-off-url">Off Items</label>
<div class="col-xs-8 col-sm-7">
<textarea rows="3" class="form-control" id="device-off-url"