Update offline monitoring page (openaps#923)

* Offline monitoring page to show in mmol

* tabs to spaces

* offline monitoring page

* Read BG data till out of date range for chart

* center data in BG pill

* various fixes, move to all ajax calls

bin/oref0-pump-loop.sh

@@ -44,6 +44,7 @@ old_main() {
             && refresh_pumphistory_and_enact \
             && refresh_profile \
             && refresh_pumphistory_24h \
+            && touch /tmp/pump_loop_success \
             && echo Completed basal-only pump-loop at $(date) \
             && touch /tmp/pump_loop_completed -r /tmp/pump_loop_enacted \
             && echo); do
@@ -82,6 +83,7 @@ main() {
                     && refresh_pumphistory_and_enact \
                     && refresh_profile \
                     && refresh_pumphistory_24h \
+                    && touch /tmp/pump_loop_success \
                     && echo Completed pump-loop at $(date) \
                     && echo \
                     )
@@ -98,6 +100,7 @@ main() {
                 fi
             fi
             cat /tmp/oref0-updates.txt 2>&3
+            touch /tmp/pump_loop_success
             echo Completed oref0-pump-loop at $(date)
             echo
         else

www/app.py

@@ -2,6 +2,9 @@
 import socket
 
 from flask import Flask, render_template, url_for, json, jsonify
+from datetime import datetime
+import pytz
+
 app = Flask(__name__)
 
 @app.route("/")
@@ -12,26 +15,18 @@ def index():
         myopenaps_dir = "/root/myopenaps/"
     data=dict()
     try:
+        error_text = "getHost"
         data['hostname']=socket.gethostname()
-        data['glucose'] = json.load(open(os.path.join(myopenaps_dir, "monitor/glucose.json")))
-        iob = json.load(open(os.path.join(myopenaps_dir, "monitor/iob.json")))
-        data['iob'] = iob[0]
-        data['battery'] = json.load(open(os.path.join(myopenaps_dir, "monitor/battery.json")))
-        data['edison_battery'] = json.load(open(os.path.join(myopenaps_dir, "monitor/edison-battery.json")))
-        data['meal'] = json.load(open(os.path.join(myopenaps_dir, "monitor/meal.json")))
-
-        data['suggested'] = json.load(open(os.path.join(myopenaps_dir, "enact/suggested.json")))
-        data['smb_suggested'] = json.load(open(os.path.join(myopenaps_dir, "enact/smb-suggested.json")))
-
-        data['enacted'] = json.load(open(os.path.join(myopenaps_dir, "enact/enacted.json")))
-        data['smb_enacted'] = json.load(open(os.path.join(myopenaps_dir, "enact/smb-enacted.json")))
-
-        data['temp_basal'] = json.load(open(os.path.join(myopenaps_dir, "monitor/temp_basal.json")))
-        data['target'] = json.load(open(os.path.join(myopenaps_dir, "settings/bg_targets.json")))
+        error_text = "pump_loop_success"
+        if os.path.isfile("/tmp/pump_loop_success"):
+            data['loop_completed']=datetime.fromtimestamp(os.path.getmtime("/tmp/pump_loop_success"), pytz.utc)
+        else:
+            data['loop_completed']=""
+
     except ValueError:
-        return render_template('indexError.html', data=data )
+        return render_template('indexError.html', data=data, error_text=error_text )
     except IOError:
-        return render_template('indexError.html', data=data )
+        return render_template('indexError.html', data=data, error_text=error_text )
     else:
         return render_template('index.html', data=data )
 
@@ -49,7 +44,10 @@ def enacted():
 
 @app.route("/glucose")
 def glucose():
-    json_url = os.path.join("/root/myopenaps/monitor/glucose.json")
+    if os.path.isfile("/root/myopenaps/xdrip/glucose.json"):
+        json_url = os.path.join("/root/myopenaps/xdrip/glucose.json")
+    else:
+        json_url = os.path.join("/root/myopenaps/monitor/glucose.json")
     data = json.load(open(json_url))
     return jsonify(data)
 
@@ -59,11 +57,47 @@ def temptargets():
     data = json.load(open(json_url))
     return jsonify(data)
 
-@app.route("/target")
-def target():
-    json_url = os.path.join("/root/myopenaps/settings/bg_targets.json")
+@app.route("/profile")
+def profile():
+    json_url = os.path.join("/root/myopenaps/settings/profile.json")
+    data = json.load(open(json_url))
+    return jsonify(data)
+
+@app.route("/pumphistory")
+def pumphistory():
+    json_url = os.path.join("/root/myopenaps/monitor/pumphistory-merged.json")
+    data = json.load(open(json_url))
+    return jsonify(data)
+
+@app.route("/iob")
+def iob():
+    json_url = os.path.join("/root/myopenaps/monitor/iob.json")
     data = json.load(open(json_url))
     return jsonify(data)
 
+@app.route("/pump_battery")
+def pump_battery():
+    json_url = os.path.join("/root/myopenaps/monitor/battery.json")
+    data = json.load(open(json_url))
+    return jsonify(data)
+
+@app.route("/edison_battery")
+def edison_battery():
+    json_url = os.path.join("/root/myopenaps/monitor/edison-battery.json")
+    data = json.load(open(json_url))
+    return jsonify(data)
+
+@app.route("/meal")
+def meal():
+    json_url = os.path.join("/root/myopenaps/monitor/meal.json")
+    data = json.load(open(json_url))
+    return jsonify(data)
+
+@app.route("/temp_basal")
+def temp_basal():
+    json_url = os.path.join("/root/myopenaps/monitor/temp_basal.json")
+    data = json.load(open(json_url))
+    return jsonify(data)
+
 if __name__ == '__main__':
     app.run(debug=True, host='0.0.0.0')