nmelone/MaxWaterSystem-Lite
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes trends and adds tables for MAXH2O-44

Browse Source
This commit is contained in:
Patrick McDonagh
2017-11-02 09:53:16 -05:00
parent de29a62f09
commit 28159cf32a
2 changed files with 63 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
HTML/Overview.html
View File

@@ -51,7 +51,7 @@
</div> </div>
</div> </div>
<div class='col-xs-3 text-center box-me'> <!--<div class='col-xs-3 text-center box-me'>
<h2>Gallons Today</h2> <h2>Gallons Today</h2>
<div class="gauge-box"> <div class="gauge-box">
<div data-labelheight="10" <div data-labelheight="10"
@@ -158,9 +158,13 @@
<div class='col-xs-3 text-center box-me'> <div class='col-xs-3 text-center box-me'>
<h2>Gallons This Month</h2> <h2>Gallons This Month</h2>
<h4 data-updatevalue="gal_total_thismonth"> <h4 data-valueupdate="gal_total_thismonth">
<%= Math.round(channels["flowmonitor.gal_total_thismonth"].value * 100) / 100 %> <%= Math.round(channels["flowmonitor.gal_total_thismonth"].value * 100) / 100 %>
</h4> </h4>
<% if (channels["flowmonitor.cost_per_bbl"].value > 0.0){ %>
<h4> </h4>
<% } %>
<p data-timeupdate="gal_total_thismonth"> <p data-timeupdate="gal_total_thismonth">
<%= channels["flowmonitor.gal_total_thismonth"].timestamp %> <%= channels["flowmonitor.gal_total_thismonth"].timestamp %>
@@ -170,9 +174,13 @@
<div class='col-xs-3 text-center box-me'> <div class='col-xs-3 text-center box-me'>
<h2>Gallons Last Month</h2> <h2>Gallons Last Month</h2>
<h4 data-updatevalue="gal_total_lastmonth"> <h4 data-valueupdate="gal_total_lastmonth">
<%= Math.round(channels["flowmonitor.gal_total_lastmonth"].value * 100) / 100 %> <%= Math.round(channels["flowmonitor.gal_total_lastmonth"].value * 100) / 100 %>
</h4> </h4>
<% if (channels["flowmonitor.cost_per_bbl"].value > 0.0){ %>
<h4> </h4>
<% } %>
<p data-timeupdate="gal_total_lastmonth"> <p data-timeupdate="gal_total_lastmonth">
<%= channels["flowmonitor.gal_total_lastmonth"].timestamp %> <%= channels["flowmonitor.gal_total_lastmonth"].timestamp %>
@@ -182,13 +190,13 @@
<div class='col-xs-3 text-center box-me'> <div class='col-xs-3 text-center box-me'>
<h2>BBL This Month</h2> <h2>BBL This Month</h2>
<h4 data-updatevalue="bbl_total_thismonth"> <h4 data-valueupdate="bbl_total_thismonth">
<%= Math.round(channels["flowmonitor.bbl_total_thismonth"].value * 100) / 100 %> <%= Math.round(channels["flowmonitor.bbl_total_thismonth"].value * 100) / 100 %>
</h4> </h4>
<% if (channels["flowmonitor.cost_per_bbl"].value > 0.0){ %> <% if (channels["flowmonitor.cost_per_bbl"].value > 0.0){ %>
<h4 data-updatevalue="bbl_total_thismonth"> <h4 data-valueupdate="bbl_total_thismonth">
$<%= Math.round(channels["flowmonitor.bbl_total_thismonth"].value * channels["flowmonitor.cost_per_bbl"].value * 100) / 100 %> $<%= Math.round(channels["flowmonitor.cost_thismonth"].value * 100) / 100 %>
</h4> </h4>
<% } %> <% } %>
@@ -200,21 +208,64 @@
<div class='col-xs-3 text-center box-me'> <div class='col-xs-3 text-center box-me'>
<h2>BBL Last Month</h2> <h2>BBL Last Month</h2>
<h4 data-updatevalue="bbl_total_lastmonth"> <h4 data-valueupdate="bbl_total_lastmonth">
<%= Math.round(channels["flowmonitor.bbl_total_lastmonth"].value * 100) / 100 %> <%= Math.round(channels["flowmonitor.bbl_total_lastmonth"].value * 100) / 100 %>
</h4> </h4>
<% if (channels["flowmonitor.cost_per_bbl"].value > 0.0){ %> <% if (channels["flowmonitor.cost_per_bbl"].value > 0.0){ %>
<h4 data-updatevalue="bbl_total_lastmonth"> <h4 data-valueupdate="bbl_total_lastmonth">
$<%= Math.round(channels["flowmonitor.bbl_total_lastmonth"].value * channels["flowmonitor.cost_per_bbl"].value * 100) / 100 %> $<%= Math.round(channels["flowmonitor.cost_lastmonth"].value * 100) / 100 %>
</h4> </h4>
<% } %> <% } %>
<p data-timeupdate="bbl_total_lastmonth"> <p data-timeupdate="bbl_total_lastmonth">
<%= channels["flowmonitor.bbl_total_lastmonth"].timestamp %> <%= channels["flowmonitor.bbl_total_lastmonth"].timestamp %>
</p> </p>
</div>-->
</div>
<div class="row box-me">
<div class="col-md-12">
<table class="table">
<thead>
<tr>
<th></th>
<th>Today</th>
<th>Yesterday</th>
<th>This Month</th>
<th>Last Month</th>
</tr>
</thead>
<tbody>
<tr>
<td>Gallon Total</td>
<td data-valueupdate="gal_total" data-refreshonupdate=true><%= Math.round(channels["flowmonitor.gal_total"].value * 100) / 100 %></td>
<td data-valueupdate="gal_total_yesterday" data-refreshonupdate=true><%= Math.round(channels["flowmonitor.gal_total_yesterday"].value * 100) / 100 %> Gal.</td>
<td data-valueupdate="gal_total_thismonth" data-refreshonupdate=true><%= Math.round(channels["flowmonitor.gal_total_thismonth"].value * 100) / 100 %> Gal.</td>
<td data-valueupdate="gal_total_lastmonth" data-refreshonupdate=true><%= Math.round(channels["flowmonitor.gal_total_lastmonth"].value * 100) / 100 %> Gal.</td>
</tr>
<tr>
<td>BBL Total</td>
<td data-valueupdate="bbl_total" data-refreshonupdate=true><%= Math.round(channels["flowmonitor.bbl_total"].value * 100) / 100 %></td>
<td data-valueupdate="bbl_total_yesterday" data-refreshonupdate=true><%= Math.round(channels["flowmonitor.bbl_total_yesterday"].value * 100) / 100 %> BBL</td>
<td data-valueupdate="bbl_total_thismonth" data-refreshonupdate=true><%= Math.round(channels["flowmonitor.bbl_total_thismonth"].value * 100) / 100 %> BBL</td>
<td data-valueupdate="bbl_total_lastmonth" data-refreshonupdate=true><%= Math.round(channels["flowmonitor.bbl_total_lastmonth"].value * 100) / 100 %> BBL</td>
</tr>
<% if (channels["flowmonitor.cost_per_bbl"].value > 0.0){ %>
<tr>
<td>Cost ($<%= channels["flowmonitor.cost_per_bbl"].value %> / BBL)</td>
<td data-valueupdate="bbl_total" data-refreshonupdate=true>$<%= Math.round(channels["flowmonitor.gal_total"].value * channels["flowmonitor.cost_per_bbl"].value * 100) / 100 %></td>
<td data-valueupdate="bbl_total_yesterday" data-refreshonupdate=true>$<%= Math.round(channels["flowmonitor.gal_total_yesterday"].value * channels["flowmonitor.cost_per_bbl"].value * 100) / 100 %></td>
<td data-valueupdate="bbl_total_thismonth" data-refreshonupdate=true>$<%= Math.round(channels["flowmonitor.cost_thismonth"].value * 100) / 100 %></td>
<td data-valueupdate="bbl_total_lastmonth" data-refreshonupdate=true>$<%= Math.round(channels["flowmonitor.cost_lastmonth"].value * 100) / 100 %></td>
</tr>
<% } %>
</tbody>
</table>
</div> </div>
</div> </div>
<div class="row box-me"> <div class="row box-me">
<div class='col-xs-12'> <div class='col-xs-12'>
<div style="height:300px" <div style="height:300px"
@@ -228,4 +279,5 @@
data-xlabel="Date" data-xlabel="Date"
data-units=""></div> data-units=""></div>
</div> </div>
</div> </div>

2
HTML/Trends.html
View File

@@ -30,7 +30,7 @@
data-ylabel="" data-ylabel=""
data-xlabel="Date" data-xlabel="Date"
data-units="" data-units=""
data-channelnames="flowmonitor.gal_total,flowmonitor.gal_total_yesterday,flowmonitor.bbl_total,flowmonitor.bbl_total_yesterday,flowmonitor.gpm_flow,flowmonitor.bpd_flow"></div> data-channelnames="flowmonitor.gal_total,flowmonitor.gal_total_yesterday,flowmonitor.bbl_total,flowmonitor.bbl_total_yesterday,flowmonitor.gpm_flow,flowmonitor.gal_total_thismonth,flowmonitor.gal_total_lastmonth,flowmonitor.bbl_total_thismonth,flowmonitor.bbl_total_lastmonth,flowmonitor.bpd_flow"></div>
<style> <style>
.dynamic-chart-form { .dynamic-chart-form {