Fixes data download on Overview Page. Starts adding notes

This commit is contained in:
Patrick McDonagh
2016-11-02 16:53:15 -05:00
parent cb3e2b365f
commit 8a45a670b0

View File

@@ -1,5 +1,5 @@
<div class="row row-flex box-me">
<div class='col-xs-12' id="systemStatusTimelineContainer">
<div class='col-xs-9 box-me' id="systemStatusTimelineContainer">
<h2>Well Status</h2>
<div id="statusTimeline"
data-chart="timeline"
@@ -9,6 +9,15 @@
data-xlabel='Date'
data-colors="Running:#3AFF83,Pumped Off:#dbda35,Alarmed:#e9821b,Locked Out:#cd2f34,Stopped:#3699b4"></div>
</div>
<div class='col-xs-3 box-me'>
<div class="text-center">
<h2>Last Note</h2>
<p><%= channels['advvfdipp.notes'].value %></p>
<p> at <%= channels["advvfdipp.notes"].timestamp %></p>
<button href="#" data-channelId="<%= channels['advvfdipp.notes'].channelId %>" class="data-table btn btn-theme" title="Note History"><i style='margin-left: 0.5em; cursor: pointer' class="fa fa-th-list icon-theme"></i> All Notes</button>
</div>
</div>
</div>
<div class='row row-flex box-me'>
<div class='col-xs-4 text-center box-me'>
@@ -27,7 +36,7 @@
data-valuefontsize="18px">
</div>
<div class- "timestamp-box">
<a href="#" data-ChannelId="<%= channels['advvfdipp.fluidlevel'].ChannelId %>" class="data-csv-all" title="Download Channel History">
<a href="#" data-channelId="<%= channels['advvfdipp.fluidlevel'].channelId %>" class="data-table" title="Download Channel History">
<i class="fa fa-download"></i>
</a>
</div>
@@ -53,7 +62,7 @@
data-valuefontsize="18px">
</div>
<div class- "timestamp-box">
<a href="#" data-ChannelId="<%= channels['advvfdipp.flowrate'].ChannelId %>" class="data-csv-all" title="Download Channel History">
<a href="#" data-channelId="<%= channels['advvfdipp.flowrate'].channelId %>" class="data-table" title="Download Channel History">
<i class="fa fa-download"></i>
</a>
</div>
@@ -79,7 +88,7 @@
data-valuefontsize="18px">
</div>
<div class- "timestamp-box">
<a href="#" data-ChannelId="<%= channels['advvfdipp.intakepressure'].ChannelId %>" class="data-csv-all" title="Download Channel History">
<a href="#" data-channelId="<%= channels['advvfdipp.intakepressure'].channelId %>" class="data-table" title="Download Channel History">
<i class="fa fa-download"></i>
</a>
</div>
@@ -105,7 +114,7 @@
data-valuefontsize="18px">
</div>
<div class- "timestamp-box">
<a href="#" data-ChannelId="<%= channels['advvfdipp.vfdfrequency'].ChannelId %>" class="data-csv-all" title="Download Channel History">
<a href="#" data-channelId="<%= channels['advvfdipp.vfdfrequency'].channelId %>" class="data-table" title="Download Channel History">
<i class="fa fa-download"></i>
</a>
</div>
@@ -131,7 +140,7 @@
data-valuefontsize="18px">
</div>
<div class- "timestamp-box">
<a href="#" data-ChannelId="<%= channels['advvfdipp.vfdcurrent'].ChannelId %>" class="data-csv-all" title="Download Channel History">
<a href="#" data-channelId="<%= channels['advvfdipp.vfdcurrent'].channelId %>" class="data-table" title="Download Channel History">
<i class="fa fa-download"></i>
</a>
</div>
@@ -157,7 +166,7 @@
data-valuefontsize="18px">
</div>
<div class- "timestamp-box">
<a href="#" data-ChannelId="<%= channels['advvfdipp.tubingpressure'].ChannelId %>" class="data-csv-all" title="Download Channel History">
<a href="#" data-channelId="<%= channels['advvfdipp.tubingpressure'].channelId %>" class="data-table" title="Download Channel History">
<i class="fa fa-download"></i>
</a>
</div>
@@ -183,7 +192,7 @@
data-valuefontsize="18px">
</div>
<div class- "timestamp-box">
<a href="#" data-ChannelId="<%= channels['advvfdipp.intaketemperature'].ChannelId %>" class="data-csv-all" title="Download Channel History">
<a href="#" data-channelId="<%= channels['advvfdipp.intaketemperature'].channelId %>" class="data-table" title="Download Channel History">
<i class="fa fa-download"></i>
</a>
</div>
@@ -192,6 +201,58 @@
</span>
</div>
</div>
<div class='col-xs-4 text-center box-me'>
<h2>Flow Today</h2>
<div class="gauge-box">
<div data-labelheight="10"
style="height: 170px; background: transparent; margin: 0 auto;"
id="gauge-flowtotal"
data-chart="solidgauge"
data-nodename="advvfdipp.flowtotal"
data-units="BBL"
data-min="0"
data-max="5000"
data-decimalplaces="1"
data-colors="0.1:#DF5353,0.5:#DDDF0D,0.9:#55BF3B"
data-valuefontsize="18px">
</div>
<div class- "timestamp-box">
<a href="#" data-channelId="<%= channels['advvfdipp.flowtotal'].channelId %>" class="data-table" title="Download Channel History">
<i class="fa fa-download"></i>
</a>
</div>
<span data-timeupdate="flowtotal">
<%= channels["advvfdipp.flowtotal"].timestamp %>
</span>
</div>
</div>
<div class='col-xs-4 text-center box-me'>
<h2>Energy Today</h2>
<div class="gauge-box">
<div data-labelheight="10"
style="height: 170px; background: transparent; margin: 0 auto;"
id="gauge-energytotal"
data-chart="solidgauge"
data-nodename="advvfdipp.energytotal"
data-units="kWh"
data-min="0"
data-max="2000"
data-decimalplaces="1"
data-colors="0.1:#DF5353,0.5:#DDDF0D,0.9:#55BF3B"
data-valuefontsize="18px">
</div>
<div class- "timestamp-box">
<a href="#" data-channelId="<%= channels['advvfdipp.energytotal'].channelId %>" class="data-table" title="Download Channel History">
<i class="fa fa-download"></i>
</a>
</div>
<span data-timeupdate="energytotal">
<%= channels["advvfdipp.energytotal"].timestamp %>
</span>
</div>
</div>
</div>
<div class="row box-me">
<div class='col-xs-12'>