Continuation of nest implementation

This commit is contained in:
Admin
2016-01-12 16:34:05 -06:00
parent 32a5f26ddd
commit 8687f3482a
4 changed files with 49 additions and 12 deletions

View File

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

View File

@@ -575,6 +575,15 @@ app.controller('AddingController', function ($scope, $location, $http, bridgeSer
$scope.device.offUrl = "{\"device\":\"" + harmonydevice.device.id + "\",\"button\":\"" + offbutton + "\"}";
};
$scope.buildNestHomeUrls = function (nestitem, onbutton, offbutton) {
$scope.device.deviceType = "home";
$scope.device.name = nestitem.name;
$scope.device.mapType = "nestHomeAway";
$scope.device.mapId = nestitem.Id;
$scope.device.onUrl = "{\"name\":\"" + nestitem.Id + "\",\"away\":false}";
$scope.device.offUrl = "{\"name\":\"" + nestitem.Id + "\",\"away\":true}";
};
$scope.testUrl = function (device, type) {
bridgeService.testUrl(device, type);
};
@@ -723,6 +732,34 @@ return function(input) {
}
});
app.filter('availableNestItemId', 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, null, "nestHomeAway")){
out.push(input[i]);
}
}
return out;
}
});
app.filter('unavailableNestItemId', 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, null, "nestHomeAway")){
out.push(input[i]);
}
}
return out;
}
});
app.filter('configuredButtons', function() {
return function(input) {
var out = [];

View File

@@ -48,6 +48,7 @@
<option value="veraScene">Vera Scene</option>
<option value="harmonyActivity">Harmony Activity</option>
<option value="harmonyButton">Harmony Button</option>
<option value="nestHomeAway">Nest Home Status</option>
</select>
</div>
</div>

View File

@@ -15,7 +15,7 @@
<ul class="list-group">
<li class="list-group-item">
<p class="text-muted">You can select a Nest item and generate
the add activity box selections automatically.</p>
the add nest item box selections automatically.</p>
<table class="table table-bordered table-striped table-hover">
<thead>
@@ -41,15 +41,14 @@
<td>{{nestitem.location}}</td>
<td>
<button class="btn btn-success" type="submit"
ng-click="buildNestUrls(nestitem)">Generate
Activity URLs</button>
ng-click="buildNestHomeUrls(nestitem)">Gen Home URLs</button>
</td>
</tr>
</table>
</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 Nest Items <a ng-click="toggleActivities()"><span class={{imgActivitiesUrl}} aria-hidden="true"></a></h2>
</div>
<ul ng-if="activitiesVisible" class="list-group">
<li class="list-group-item">
@@ -57,16 +56,16 @@
<thead>
<tr>
<th>
<a href="" ng-click="order('label')">Name</a>
<a href="" ng-click="order('name')">Name</a>
<span class="sortorder" ng-show="predicate === 'name'" ng-class="{reverse:reverse}"></span>
</th>
<th>
<a href="" ng-click="order('id')">Id</a>
<a href="" ng-click="order('type')">Type</a>
<span class="sortorder" ng-show="predicate === 'id'" ng-class="{reverse:reverse}"></span>
</th>
<th>
<a href="" ng-click="order('hub')">Hub</a>
<span class="sortorder" ng-show="predicate === 'hub'" ng-class="{reverse:reverse}"></span>
<a href="" ng-click="order('location')">Location</a>
<span class="sortorder" ng-show="predicate === 'location'" ng-class="{reverse:reverse}"></span>
</th>
<th>Actions</th>
</tr>
@@ -76,7 +75,7 @@
<td>{{nestitem.type}}</td>
<td>{{nestitem.location}}</td>
<td><button class="btn btn-danger" type="submit"
ng-click="deleteDeviceByMapId(nestitem.activity.id, 'nestitem')">Delete</button></td>
ng-click="deleteDeviceByMapId(nestitem.Id, 'nestHomeAway')">Delete</button></td>
</tr>
</table>
</li>
@@ -84,7 +83,7 @@
</div>
<div class="panel panel-default bridgeServer" ng-if="!bridge.error">
<div class="panel-heading">
<h2 class="panel-title">Add a Harmony Activity</h2>
<h2 class="panel-title">Add a Nest Item</h2>
</div>
<ul class="list-group">
<li class="list-group-item">
@@ -98,7 +97,7 @@
ng-model="device.name" placeholder="Device Name">
</div>
<button type="submit" class="col-xs-4 col-sm-2 btn btn-primary">
Add Activity</button>
Add Nest Item</button>
</div>
<div class="form-group">
<div class="row">