fixed underscore in channel name, updated HTML Templates

This commit is contained in:
Patrick McDonagh
2016-03-03 08:41:35 -06:00
parent ee322cb9b8
commit a60c0eb483
4 changed files with 533 additions and 297 deletions

View File

@@ -0,0 +1,236 @@
<div class="text-center"><h1>LIVE VALUES</h1></div>
<div class='row overview'>
<div class='col-xs-4 text-center'>
<h2>Intake Pressure</h2>
<div class="gauge-box">
<div data-labelheight="10" style="height: 170px; background: transparent; margin: 0 auto;" id="gauge1" data-chart="solidgauge" data-nodename="vfdipp.dhintakepressure" data-units="PSI" data-min="0" data-max="<%= channels["vfdipp.dhpsirating"].value %>" data-colors="0.1:#DF5353,0.5:#DDDF0D,0.9:#55BF3B" data-valuefontsize="18px"></div>
<span data-timeupdate="dhintakepressure"><%= channels["vfdipp.dhintakepressure"].timestamp %></span>
</div>
</div>
<div class='col-xs-4 text-center'>
<h2>Fluid Level</h2>
<div class="gauge-box">
<div data-labelheight="10" style="height: 170px; background: transparent; margin: 0 auto;" id="gauge1" data-chart="solidgauge" data-nodename="vfdipp.dhfluidlevel" data-units="ft." data-min="0" data-max="1000" data-colors="0.1:#DF5353,0.5:#DDDF0D,0.9:#55BF3B" data-valuefontsize="18px"></div>
<span data-timeupdate="dhfluidlevel"><%= channels["vfdipp.dhfluidlevel"].timestamp %></span>
</div>
</div>
<div class='col-xs-4 text-center'>
<h2>Intake Temperature</h2>
<div class="gauge-box">
<div data-labelheight="10" style="height: 170px; background: transparent; margin: 0 auto;" id="gauge4" data-chart="solidgauge" data-nodename="vfdipp.dhintaketemperature" data-units="deg F" data-min="0" data-max="200" data-colors="0.1:#DF5353,0.5:#DDDF0D,0.9:#55BF3B" data-valuefontsize="18px"></div>
<span data-timeupdate="dhintaketemperature"><%= channels["vfdipp.dhintaketemperature"].timestamp %></span>
</div>
</div>
<div class='col-xs-4 text-center'>
<h2>Instrument Status</h2>
<div class="gauge-box">
<span data-timeupdate="dhdownholestatusint"><%= channels["vfdipp.dhdownholestatusint"].value %></span>
</div>
</div>
<div class='col-xs-8 text-center fill-vertically'>
<h2>MAX VALUES</h2>
<div class="gauge-box">
<table class="table">
<tbody>
<tr>
<td>Max Pressure (Startup)</td>
<td><%= channels["vfdipp.dhmaxintakepressurestartup"].value %></td>
</tr>
<tr>
<td>Max Pressure (Lifetime)</td>
<td><%= channels["vfdipp.dhmaxintakepressureforever"].value %></td>
</tr>
<tr>
<td>Max Temp. (Startup)</td>
<td><%= channels["vfdipp.dhmaxintaketemperaturestartup"].value %></td>
</tr>
<tr>
<td>Max Temp. (Lifetime)</td>
<td><%= channels["vfdipp.dhmaxintaketemperatureforever"].value %></td>
</tr>
</tbody>
</table>
</div>
</div>
</div>
<div class="text-center"><h1>TRENDS</h1></div>
<div class="row overview">
<div class='col-xs-12' style="padding-top: 1em; margin-bottom: 1em;">
<div class="input-daterange input-group" id="datepicker">
<input data-chartid="dynamicChart" id="fromDate" data-daysofhistory="7" type="text" class="form-control" name="start">
<span class="input-group-addon">to</span>
<input class="form-control" data-chartid="dynamicChart" id="toDate" type="text" name="end">
<span class='input-group-btn'>
<a href="#!" data-chartid="dynamicChart" data-otherchartids="statusTimeline" class="btn chart-update btn-theme">Run</a>
</span>
</div>
</div>
<hr>
<div class='clearfix col-xs-12' style='height: 300px' id="dynamicChart" data-chart="dynamicchart" data-daysofhistory="7" data-chartlabel="Data" data-ylabel="" data-xlabel="Date" data-units="" data-channelnames="vfdipp.dhintakepressure,vfdipp.dhintaketemperature,vfdipp.dhmaxintakepressureforever,vfdipp.dhmaxintakepressurestartup,vfdipp.dhmaxintaketemperaturestartup,vfdipp.dhmaxintaketemperatureforever"></div>
</div>
<div class="text-center"><h1>CONFIGURATION</h1></div>
<div class="row overview">
<div class='col-xs-4 text-center fill-vertically'>
<h2>Pressure Trip</h2>
<div class="gauge-box">
<table class="table">
<tbody>
<tr>
<td>Pressure Shutdown Enabled</td>
<td>
<% if (channels["vfdipp.dhpressureshutdownenabled"].value == 1){ %>
<span class="label label-success">True</span>
<% } else { %>
<span class="label label-warning">False</span>
<% } %>
</td>
</tr>
<tr>
<td>Pressure Shutdown Limit</td>
<td><%= channels["vfdipp.dhpressureshutdownlimit"].value %> PSI</td>
</tr>
<tr>
<td>Pressure Restart Enabled</td>
<td>
<% if (channels["vfdipp.dhpressurestartupenabled"].value == 1){ %>
<span class="label label-success">True</span>
<% } else { %>
<span class="label label-warning">False</span>
<% } %>
</td>
</tr>
<tr>
<td>Pressure Startup Limit</td>
<td><%= channels["vfdipp.dhpressurestartup"].value %> PSI</td>
</tr>
</tbody>
</table>
</div>
</div>
<div class='col-xs-4 text-center fill-vertically'>
<h2>Temperature Trip</h2>
<div class="gauge-box">
<table class="table">
<tbody>
<tr>
<td>Temperature Shutdown Enabled</td>
<td>
<% if (channels["vfdipp.dhtempshutdownenabled"].value == 1){ %>
<span class="label label-success">True</span>
<% } else { %>
<span class="label label-warning">False</span>
<% } %>
</td>
</tr>
<tr>
<td>Temperature Shutdown Limit</td>
<td><%= channels["vfdipp.dhtempshutdown"].value %> degF</td>
</tr>
<tr>
<td>Temperature Restart Enabled</td>
<td>
<% if (channels["vfdipp.dhtempstartupenabled"].value == 1){ %>
<span class="label label-success">True</span>
<% } else { %>
<span class="label label-warning">False</span>
<% } %>
</td>
</tr>
<tr>
<td>Temperature Startup Limit</td>
<td><%= channels["vfdipp.dhtempstartuplimit"].value %> degF</td>
</tr>
</tbody>
</table>
</div>
</div>
<div class='col-xs-4 text-center fill-vertically'>
<h2>Sensor Info.</h2>
<div class="gauge-box">
<table class="table">
<tbody>
<tr>
<td>Number of Channels</td>
<td><%= channels["vfdipp.dhnumchannels"].value %></td>
</tr>
<tr>
<td>PSI Rating</td>
<td><%= channels["vfdipp.dhpsirating"].value %> PSI</td>
</tr>
<tr>
<td>Tool Type</td>
<td><%= channels["vfdipp.dhtooltype"].value %></td>
</tr>
<tr>
<td>Tool Voltage</td>
<td><%= channels["vfdipp.dhtoolvoltage"].value %> V</td>
</tr>
</tbody>
</table>
</div>
</div>
</div>
<style>
.overview .col-xs-4 {
position: relative;
padding: 0.5em;
padding-bottom: 1.5em;
border: 1px solid #eee;
/*margin: 1em 0;*/
}
.overview .gauge-box {
margin-top: -0.25em;
}
.overview h2 {
text-transform: uppercase;
font-size: 14px;
color: #666;
font-weight: 400;
letter-spacing: 1px;
z-index: 100;
}
.dynamic-chart-form {
background-color: whiteSmoke;
padding: 1em 0.5em;
margin-top: 1em;
}
.fill-vertically {
height:261px;
}
#systemStatusTimelineContainer h2 {
text-transform: uppercase;
font-size: 14px;
color: #666;
font-weight: 400;
letter-spacing: 1px;
z-index: 100;
}
</style>

View File

@@ -116,7 +116,7 @@
</div>
<div class="text-center"><h1>TRENDS</h1></div>
<div class="row">
<div class="row overview">
<div class='col-xs-12' style="padding-top: 1em; margin-bottom: 1em;">
<div class="input-daterange input-group" id="datepicker">
<input data-chartid="dynamicChart" id="fromDate" data-daysofhistory="7" type="text" class="form-control" name="start">
@@ -131,8 +131,8 @@
<div class='clearfix col-xs-12' style='height: 300px' id="dynamicChart" data-chart="dynamicchart" data-daysofhistory="7" data-chartlabel="Data" data-ylabel="" data-xlabel="Date" data-units="" data-channelnames="vfdipp.vfdspeedref,vfdipp.vfdspeedfdbk,vfdipp.vfdoutputcurrent,vfdipp.vfdoutputcurrent,vfdipp.vfddcbusvoltage"></div>
</div>
<div class="text-center"><h1>TRENDS</h1></div>
<div class="row">
<div class="text-center"><h1>CONFIGURATION</h1></div>
<div class="row overview">
<div class="col-md-6">
<h2>MOTOR NAMEPLATE DATA</h2>
<table class="table">

File diff suppressed because it is too large Load Diff

View File

@@ -145,7 +145,7 @@ channels = {
'last_time_uploaded':0,
'last_value':''
},
'dhmaxintaketemperature_forever':{
'dhmaxintaketemperatureforever':{
'data_type':'REAL',
'change_amount':0.5,
'max_time_between_uploads':3600,