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

Fixes graphing to remove total graph for single data

Browse Source
This commit is contained in:
Patrick McDonagh
2017-02-21 19:10:44 -06:00
parent ca7da1f012
commit 88d30e5a9b
5 changed files with 14 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
www/pocwww/pocwww/json.py
View File

@@ -20,7 +20,7 @@ def json_valuesbetween(request):
except KeyError: except KeyError:
pass pass
start = end - timedelta(days=7) start = end - timedelta(days=2)
try: # Attempt to get a value from the request. try: # Attempt to get a value from the request.
start = request.matchdict['startdt'] start = request.matchdict['startdt']
start = start.replace("T", " ") start = start.replace("T", " ")

2
www/pocwww/pocwww/static/graphs.js
View File

@@ -135,7 +135,7 @@ function drawSlider(data){
var endD = new Date(); var endD = new Date();
var end = endD.toISOString().replace("T", " "); var end = endD.toISOString().replace("T", " ");
var dummyDate = new Date(); var dummyDate = new Date();
var startD = new Date(dummyDate.setDate(endD.getDate() - 7)); var startD = new Date(dummyDate.setDate(endD.getDate() - 2));
var start = startD.toISOString().replace("T", " "); var start = startD.toISOString().replace("T", " ");

2
www/pocwww/pocwww/static/theme.css
View File

@@ -26,7 +26,7 @@ body {
.allcaps{ .allcaps{
text-transform: uppercase; text-transform: uppercase;
/*font-size: 14px;*/ /*font-size: 14px;*/
color: #666; /*color: #666;*/
font-weight: 400; font-weight: 400;
letter-spacing: 1px; letter-spacing: 1px;
z-index: 100; z-index: 100;

15
www/pocwww/pocwww/templates/dashboard.jinja2
View File

@@ -2,19 +2,18 @@
{% block content %} {% block content %}
<div class="content"> <div class="content">
<h1>Henry Pump POC</h1>
<div class="row"> <div class="row">
<div class="col-md-6"> <div class="col-md-6">
<h2>Latest Tag Values</h2> <h2 class="allcaps">Latest Tag Values</h2>
{% if tag_values|length > 0 %} {% if tag_values|length > 0 %}
<div class="table-responsive"> <div class="table-responsive">
<table class="table table-striped"> <table class="table table-striped">
<thead> <thead>
<tr> <tr>
<th>Name</th> <th class="allcaps">Name</th>
<th></th> <th class="allcaps"></th>
<th>Value</th> <th class="allcaps">Value</th>
<th>Timestamp</th> <th class="allcaps">Timestamp</th>
<!-- <th>Max</th> <!-- <th>Max</th>
<th>Min</th> <th>Min</th>
<th>Average</th> <th>Average</th>
@@ -35,7 +34,7 @@
</button> </button>
</td> </td>
<td>{{t.value | round(3)}}</td> <td>{{t.value | round(3)}}</td>
<td>{{t.timestamp | datetime('medium')}}</td> <td>{{t.timestamp | datetime('short')}}</td>
<!-- <td>{{t.max | round(3)}}</td> <!-- <td>{{t.max | round(3)}}</td>
<td>{{t.min | round(3)}}</td> <td>{{t.min | round(3)}}</td>
<td>{{t.average | round(3)}}</td> <td>{{t.average | round(3)}}</td>
@@ -53,7 +52,7 @@
</div> </div>
<div class="col-md-6"> <div class="col-md-6">
<h2>Latest Card</h2> <h2 class="allcaps">Latest Card</h2>
{% if card is defined %} {% if card is defined %}
<h3>{{card.timestamp | datetime('long')}}</h1> <h3>{{card.timestamp | datetime('long')}}</h1>
<canvas id="surfacecard" height="140"></canvas> <canvas id="surfacecard" height="140"></canvas>

10
www/pocwww/pocwww/templates/values_single.jinja2
View File

@@ -5,16 +5,11 @@
<div class="row"> <div class="row">
<div class="col-xs-12"> <div class="col-xs-12">
<h2>Latest Tag Values: {{tagname}}</h2> <h2>Latest Tag Values: {{tagname}}</h2>
<pre>
{% for t in tag_values %}
{{t}}
{% endfor %}
</pre>
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-xs-12"> <div class="col-xs-12">
<canvas id="myChart" width="400" height="400"></canvas> <canvas id="myChart" height="120"></canvas>
</div> </div>
</div> </div>
</div> </div>
@@ -39,6 +34,9 @@
lineTension: 0.05, lineTension: 0.05,
borderColor: color_scale[i % color_scale.length] borderColor: color_scale[i % color_scale.length]
} }
if (lines[i] == "dailyTotal"){
baseObj['hidden'] = true;
}
graph_data.push(baseObj); graph_data.push(baseObj);
} }