From 326791b825f45833f68581482eb88184ffecf72e Mon Sep 17 00:00:00 2001
From: Ahosking <alexander@ahosking.com>
Date: Sun, 3 Dec 2023 16:25:18 -0500
Subject: [PATCH] Update Queries to enable editing records Change Winter values
 to 1 or 0

---
 influx_frontend.py | 43 +++++++++++++++++++++++++++++++------------
 1 file changed, 31 insertions(+), 12 deletions(-)

diff --git a/influx_frontend.py b/influx_frontend.py
index ef8b04b..f426b87 100644
--- a/influx_frontend.py
+++ b/influx_frontend.py
@@ -22,15 +22,29 @@ client = influxdb_client.InfluxDBClient(
 def success():
     return "Form success!"
 
+
 def fetch_timeseries_data(timestamp=None):
     query_api = client.query_api()
-    query = 'from(bucket: "gas")\
-    |> range(start: -90d)\
-    |> filter(fn: (r) => r["_measurement"] == "2016_odyssey")\
-    |> filter(fn: (r) => r["_field"] == "odometer")\
-    |> sort(columns: ["_value"], desc: false)\
-    |> yield(name: "last")\
-    |> limit(n:10)'
+    if timestamp is not None:
+        newTime = pendulum.parse(timestamp)
+        print(newTime.to_atom_string())
+        # "2023-11-14T08:21:00.000Z"
+        query = 'from(bucket: "gas")\
+        |> range(start: time(v: "' + str(newTime.subtract(seconds=1).to_atom_string()) + '"), stop: time(v: "' + str(newTime.add(seconds=1).to_atom_string()) + '"))\
+        |> filter(fn: (r) => r["_measurement"] == "2016_odyssey")\
+        |> filter(fn: (r) => r["_field"] == "odometer")\
+        |> sort(columns: ["_value"], desc: false)\
+        |> yield(name: "last")\
+        |> limit(n:10)'
+        print("searching for fixed time")
+    else:
+        query = 'from(bucket: "gas")\
+        |> range(start: -90d)\
+        |> filter(fn: (r) => r["_measurement"] == "2016_odyssey")\
+        |> filter(fn: (r) => r["_field"] == "odometer")\
+        |> sort(columns: ["_value"], desc: false)\
+        |> yield(name: "last")\
+        |> limit(n:10)'
 
     result = query_api.query(org=config['DB_ORG'], query=query)
     results = []
@@ -62,11 +76,14 @@ def fetch_timeseries_data(timestamp=None):
             continue
         else:
             newlist.append(value)
+    print(newlist)
+    print()
     return newlist
 
+
 @app.route('/', methods=['GET', 'POST'])
 def main_page():
-    ### Call fetch function
+    # Call fetch function
     newlist = fetch_timeseries_data()
     # print(newlist)
     return render_template('index.html', data=newlist[:10])
@@ -96,9 +113,9 @@ def add_time():
         fuelcost = float(fuelcost)
     winter = request.form['winter']
     if winter == 'TRUE':
-        winter = True
+        winter = 1
     else:
-        winter = False
+        winter = 0
 
     json_body = [
         {
@@ -128,17 +145,19 @@ def add_time():
 
     return redirect(url_for('main_page'))
 
+
 @app.route('/edit/<timestamp>')
 def edit_odometer_entry(timestamp):
     '''Retrieve the time entry from influxdb'''
     print('Fetching data!')
-    ### Call fetch function
+    # Call fetch function
     newlist = fetch_timeseries_data()
-    
+
     # Fill entry_data with timestamp based data
     entry_data = fetch_timeseries_data(timestamp)
     return render_template('index.html', page_title="Edit Entry", timestamp_data=entry_data, data=newlist[:10])
 
+
 @app.route('/repeat_last_odometer/<odometer>/<winter>')
 def repeat_last_odometer(odometer, winter=False):
     '''Retrieve the passed in odometer value and submit as a new entry'''