-
Notifications
You must be signed in to change notification settings - Fork 48
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Move humidity outside of zone row - Issue #16
Hide gauges without values - Issue #11
- Loading branch information
John Lifsey
committed
Mar 2, 2016
1 parent
8418820
commit 5a4e3af
Showing
4 changed files
with
29 additions
and
35 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| <h3>Status</h3><blockquote>{{ notifications.notification[0].message[0] }} <strong>{{ notifications.notification[0].timestamp[0] | date:"EEE yyyy-MM-dd 'at' h:mma" }}</strong></blockquote><div ng-repeat="zone in status.zones[0].zone" ng-if="zone.enabled[0]=='on'"><h4>{{zone.name[0]}}</h4><div class="row"><div class="col-md-3"><ng-dial-gauge title="Inside" units="°F" border-width="0" bar-color="#0000FF" bar-color-end="#FF2010" bar-width="10" ng-model="zone.rt[0]"></ng-dial-gauge></div><div class="col-md-3"><ng-dial-gauge title="Humidity" units="%" border-width="0" bar-color="#0000FF" bar-color-end="#FF2010" bar-width="10" ng-model="zone.rh[0]"></ng-dial-gauge></div><div class="col-md-3"><ng-dial-gauge title="Heat Setpoint" units="°F" border-width="0" bar-color="#0000FF" bar-color-end="#FF2010" bar-width="10" ng-model="zone.htsp[0]"></ng-dial-gauge></div><div class="col-md-3"><ng-dial-gauge title="Cool Setpoint" units="°F" border-width="0" bar-color="#0000FF" bar-color-end="#FF2010" bar-width="10" ng-model="zone.clsp[0]"></ng-dial-gauge></div></div></div><div class="row"><div class="col-md-3"><ng-dial-gauge title="Outside" units="°F" border-width="0" bar-color="#0000FF" bar-color-end="#FF2010" bar-width="10" ng-model="carbus.outsideTemp"></ng-dial-gauge></div><div class="col-md-3"><ng-dial-gauge title="Coil" units="°F" border-width="0" bar-color="#0000FF" bar-color-end="#FF0000" bar-width="10" ng-model="carbus.coilTemp"></ng-dial-gauge></div><div class="col-md-3"><ng-dial-gauge title="Airflow" units="CFM" border-width="0" scale-min="0" scale-max="1000" bar-color="#FFFF00" bar-color-end="#FF0000" bar-width="10" ng-model="carbus.airflowCFM"></ng-dial-gauge></div><div class="col-md-3"><ng-dial-gauge title="Blower speed" units="RPM" border-width="0" bar-color="#FFFF00" bar-color-end="#FF0000" scale-min="0" scale-max="1000" bar-width="10" ng-model="carbus.blowerRPM"></ng-dial-gauge></div></div><div class="row"><div class="col-md-6"><canvas id="oduline" class="chart chart-line" chart-data="oduData" chart-labels="oduLabels" chart-series="oduSeries"></canvas></div></div><div class="row"><div class="col-md-6"><div class="table-responsive"><table class="table table-striped table-bordered table-rounded"><tr ng-repeat="(key,value) in status.zones[0].zone[0]"><th>{{key}}<td>{{ value[0] }}</table></div></div><div class="col-md-6"><div class="table-responsive"><table class="table table-striped table-bordered table-rounded"><tr ng-repeat="(key,value) in status"><th>{{key}}<td>{{ value[0] }}</table></div></div></div> | ||
| <h3>Status</h3><blockquote>{{ notifications.notification[0].message[0] }} <strong>{{ notifications.notification[0].timestamp[0] | date:"EEE yyyy-MM-dd 'at' h:mma" }}</strong></blockquote><h4>Global</h4><div class="row"><div class="col-xs-6 col-sm-4 col-md-2"><ng-dial-gauge title="Humidity" units="%" border-width="0" bar-color="#0000FF" bar-color-end="#FF2010" bar-width="10" ng-model="status.zones[0].zone[0].rh[0]"></ng-dial-gauge></div><div class="col-xs-6 col-sm-4 col-md-2" ng-if="carbus.outsideTemp"><ng-dial-gauge title="Outside" units="°F" border-width="0" bar-color="#0000FF" bar-color-end="#FF2010" bar-width="10" ng-model="carbus.outsideTemp"></ng-dial-gauge></div><div class="col-xs-6 col-sm-4 col-md-2" ng-if="carbus.coilTemp"><ng-dial-gauge title="Coil" units="°F" border-width="0" bar-color="#0000FF" bar-color-end="#FF0000" bar-width="10" ng-model="carbus.coilTemp"></ng-dial-gauge></div><div class="col-xs-6 col-sm-4 col-md-2" ng-if="carbus.airflowCFM"><ng-dial-gauge title="Airflow" units="CFM" border-width="0" scale-min="0" scale-max="1000" bar-color="#FFFF00" bar-color-end="#FF0000" bar-width="10" ng-model="carbus.airflowCFM"></ng-dial-gauge></div><div class="col-xs-6 col-sm-4 col-md-2" ng-if="carbus.blowerRPM"><ng-dial-gauge title="Blower speed" units="RPM" border-width="0" bar-color="#FFFF00" bar-color-end="#FF0000" scale-min="0" scale-max="1000" bar-width="10" ng-model="carbus.blowerRPM"></ng-dial-gauge></div></div><div class="row"><div class="col-md-10 col-xs-12"><canvas id="oduline" class="chart chart-line" chart-data="oduData" chart-labels="oduLabels" chart-series="oduSeries"></canvas></div></div><div ng-repeat="zone in status.zones[0].zone" ng-if="zone.enabled[0]=='on'"><h4>{{zone.name[0]}}</h4><div class="row"><div class="col-xs-6 col-sm-4 col-md-4"><ng-dial-gauge title="Inside" units="°F" border-width="0" bar-color="#0000FF" bar-color-end="#FF2010" bar-width="10" ng-model="zone.rt[0]"></ng-dial-gauge></div><div class="col-xs-6 col-sm-4 col-md-4"><ng-dial-gauge title="Heat Setpoint" units="°F" border-width="0" bar-color="#0000FF" bar-color-end="#FF2010" bar-width="10" ng-model="zone.htsp[0]"></ng-dial-gauge></div><div class="col-xs-6 col-sm-4 col-md-4"><ng-dial-gauge title="Cool Setpoint" units="°F" border-width="0" bar-color="#0000FF" bar-color-end="#FF2010" bar-width="10" ng-model="zone.clsp[0]"></ng-dial-gauge></div></div></div><div class="row"><div class="col-md-6"><div class="table-responsive"><table class="table table-striped table-bordered table-rounded"><tr ng-repeat="(key,value) in status.zones[0].zone[0]"><th>{{key}}<td>{{ value[0] }}</table></div></div><div class="col-md-6"><div class="table-responsive"><table class="table table-striped table-bordered table-rounded"><tr ng-repeat="(key,value) in status"><th>{{key}}<td>{{ value[0] }}</table></div></div></div> |