pi_temp.py

@@ -135,13 +135,15 @@ def history():
                                             graphJSON = graphJSON,
                                             total_minutes = sum(streak_minutes),
                                             range_hours = range_hours,
+                                            from_date = from_date_str, 
+ 											to_date = to_date_str,
                                             debug = streak_minutes,
                                             )
 
 # Calculate streak lengths. Based on https://stackoverflow.com/a/33403822/2152245.
 def streak_lengths(x): 
     # find the boundaries where numbers are not consecutive
-    boundaries = [i for i in range(1, len(x)) if x[i] < x[i-1]]
+    boundaries = [i for i in range(1, len(x)) if x[i] <= x[i-1]]
     # add the start and end boundaries
     boundaries = [0] + boundaries + [len(x)]
     # take the boundaries as pairwise slices
@@ -189,10 +191,13 @@ def get_records():
         to_date_utc     = arrow_time_to.strftime("%Y-%m-%d %H:%M")
         from_date_str   = arrow_time_from.to(timezone).strftime("%Y-%m-%d %H:%M")
         to_date_str     = arrow_time_to.to(timezone).strftime("%Y-%m-%d %H:%M")
+        range_hours     = range_h_int
     else:
         #Convert datetimes to UTC so we can retrieve the appropriate records from the database
         from_date_utc   = arrow.get(from_date_obj, timezone).to('Etc/UTC').strftime("%Y-%m-%d %H:%M")   
         to_date_utc     = arrow.get(to_date_obj, timezone).to('Etc/UTC').strftime("%Y-%m-%d %H:%M")
+        difference      = (arrow.get(to_date_obj, timezone) - arrow.get(from_date_obj, timezone))
+        range_hours     = (difference.total_seconds()) / 3600
 
     conn                = sqlite3.connect('pi_temp.db')
     curs                = conn.cursor()
@@ -202,7 +207,7 @@ def get_records():
     humidities          = curs.fetchall()
     conn.close()
 
-    return [temperatures, humidities, timezone, from_date_str, to_date_str, range_h_int]
+    return [temperatures, humidities, timezone, from_date_str, to_date_str, range_hours]
 
 def validate_date(d):
     try:

templates/history.html

@@ -58,7 +58,7 @@
       <div class="row">
       <div class="eleven columns">
         <div class="one column">
-                <a href="/">Live</a>
+            <a href="/">Live</a>
         </div>
         <form id="range_select" action = "/history" method="GET">  
           <input type="hidden" class="timezone" name="timezone" />      
@@ -74,7 +74,7 @@
           <div class="one column">
             <input type="radio" name="range_h" value="24" id="radio_24" /><label for="radio_24">24hrs</label>
           </div>
-        </form>          
+        </form>   
       </div>
     </div>
     
@@ -82,7 +82,9 @@
 
     <div class='row' id='plotly-plot'></div>
 
+    <div class='debug'>
     {{ debug }}
+    </div>
 
   </body>