Updated limits and added Charger Voltage

This commit is contained in:
Patrick McDonagh
2016-12-14 14:35:39 -06:00
parent 94f3190bcf
commit 3341ddd392
2 changed files with 269 additions and 243 deletions

View File

@@ -1,4 +1,4 @@
<div class='clearfix col-xs-12' style='height: 450px' id="dynamicChart" data-chart="dynamicchart" data-daysofhistory="7" data-chartlabel="Data" data-ylabel="" data-xlabel="Date" data-units="" data-channelnames="abbflow.battery_voltage,abbflow.volume_flow,abbflow.today_volume,abbflow.yesterday_volume,abbflow.accumulated_volume,abbflow.last_calculation_period_volume,abbflow.differential_pressure,abbflow.static_pressure,abbflow.temperature"></div>
<div class='clearfix col-xs-12' style='height: 450px' id="dynamicChart" data-chart="dynamicchart" data-daysofhistory="7" data-chartlabel="Data" data-ylabel="" data-xlabel="Date" data-units="" data-channelnames="abbflow.volume_flow,abbflow.today_volume,abbflow.yesterday_volume,abbflow.accumulated_volume,abbflow.last_calculation_period_volume,abbflow.differential_pressure,abbflow.static_pressure,abbflow.temperature,abbflow.battery_voltage,abbflow.charger_voltage"></div>
<style>
.dynamic-chart-form {
background-color: whiteSmoke;

View File

@@ -60,37 +60,6 @@
</div>
</div>
<div class='row row-flex box-me'>
<div class='col-xs-4 text-center'>
<h2>Accumulated Volume</h2>
<div class="gauge-box">
<div data-labelheight="10"
style="height: 170px; background: transparent; margin: 0 auto;"
id="gauge-accumulated_volume"
data-chart="solidgauge"
data-nodename="abbflow.accumulated_volume"
data-units="MCF"
data-min="0"
data-max="1000"
data-decimalplaces="2"
data-colors="0.1:#DF5353,0.5:#DDDF0D,0.9:#55BF3B"
data-valuefontsize="18px">
</div>
<div class="timestamp-box">
<a href="#" data-channelId="<%= channels['abbflow.accumulated_volume'].channelId %>" class="data-table" title="Download Channel History">
<i class="fa fa-download"></i>
</a>
</div>
<span data-timeupdate="accumulated_volume">
<%= channels["abbflow.accumulated_volume"].timestamp %>
</span>
</div>
</div>
<div class='col-xs-8'>
<div style="height:300px" id="chart-accumulated_volume" data-chart="chart" data-nodename1="abbflow.accumulated_volume" data-datalabel1="Accumulated Volume" data-daysofhistory="2" data-chartlabel="Accumulated Volume" data-ylabel="" data-xlabel="Date" data-units=" MCF"></div>
</div>
</div>
<div class='row row-flex box-me'>
<div class='col-xs-4 text-center'>
<h2>Differential Pressure</h2>
@@ -102,7 +71,7 @@
data-nodename="abbflow.differential_pressure"
data-units="PSIA"
data-min="0"
data-max="500"
data-max="75"
data-decimalplaces="2"
data-colors="0.1:#DF5353,0.5:#DDDF0D,0.9:#55BF3B"
data-valuefontsize="18px">
@@ -133,7 +102,7 @@
data-nodename="abbflow.static_pressure"
data-units="PSIA"
data-min="0"
data-max="500"
data-max="150"
data-decimalplaces="2"
data-colors="0.1:#DF5353,0.5:#DDDF0D,0.9:#55BF3B"
data-valuefontsize="18px">
@@ -164,7 +133,7 @@
data-nodename="abbflow.temperature"
data-units="deg F"
data-min="0"
data-max="300"
data-max="150"
data-decimalplaces="2"
data-colors="0.1:#DF5353,0.5:#DDDF0D,0.9:#55BF3B"
data-valuefontsize="18px">
@@ -193,9 +162,9 @@
id="gauge-battery_voltage"
data-chart="solidgauge"
data-nodename="abbflow.battery_voltage"
data-units="deg F"
data-units="V"
data-min="0"
data-max="300"
data-max="25"
data-decimalplaces="2"
data-colors="0.1:#DF5353,0.5:#DDDF0D,0.9:#55BF3B"
data-valuefontsize="18px">
@@ -215,6 +184,37 @@
</div>
</div>
<div class='row row-flex box-me'>
<div class='col-xs-4 text-center'>
<h2>Charger Voltage</h2>
<div class="gauge-box">
<div data-labelheight="10"
style="height: 170px; background: transparent; margin: 0 auto;"
id="gauge-charger_voltage"
data-chart="solidgauge"
data-nodename="abbflow.charger_voltage"
data-units="V"
data-min="0"
data-max="25"
data-decimalplaces="2"
data-colors="0.1:#DF5353,0.5:#DDDF0D,0.9:#55BF3B"
data-valuefontsize="18px">
</div>
<div class="timestamp-box">
<a href="#" data-channelId="<%= channels['abbflow.charger_voltage'].channelId %>" class="data-table" title="Download Channel History">
<i class="fa fa-download"></i>
</a>
</div>
<span data-timeupdate="charger_voltage">
<%= channels["abbflow.charger_voltage"].timestamp %>
</span>
</div>
</div>
<div class='col-xs-8'>
<div style="height:300px" id="chart-charger_voltage" data-chart="chart" data-nodename1="abbflow.charger_voltage" data-datalabel1="Battery Voltage" data-daysofhistory="2" data-chartlabel="Charger Voltage" data-ylabel="" data-xlabel="Date" data-units=" V"></div>
</div>
</div>
<div class='row row-flex box-me'>
<div class='col-xs-4 text-center box-me'>
<h2>Yesterday Volume</h2>
@@ -267,6 +267,32 @@
</span>
</div>
</div>
<div class='col-xs-4 text-center'>
<h2>Accumulated Volume</h2>
<div class="gauge-box">
<div data-labelheight="10"
style="height: 170px; background: transparent; margin: 0 auto;"
id="gauge-accumulated_volume"
data-chart="solidgauge"
data-nodename="abbflow.accumulated_volume"
data-units="MCF"
data-min="0"
data-max="1000000"
data-decimalplaces="2"
data-colors="0.1:#DF5353,0.5:#DDDF0D,0.9:#55BF3B"
data-valuefontsize="18px">
</div>
<div class="timestamp-box">
<a href="#" data-channelId="<%= channels['abbflow.accumulated_volume'].channelId %>" class="data-table" title="Download Channel History">
<i class="fa fa-download"></i>
</a>
</div>
<span data-timeupdate="accumulated_volume">
<%= channels["abbflow.accumulated_volume"].timestamp %>
</span>
</div>
</div>
</div>
<style>