Fixes graphing to remove total graph for single data

www/pocwww/pocwww/json.py

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

www/pocwww/pocwww/static/graphs.js

@@ -135,7 +135,7 @@ function drawSlider(data){
     var endD = new Date();
     var end = endD.toISOString().replace("T", " ");
     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", " ");
 
 

www/pocwww/pocwww/static/theme.css

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

www/pocwww/pocwww/templates/dashboard.jinja2

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

www/pocwww/pocwww/templates/values_single.jinja2

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