From 0349bba59d438000c6adae73b47906b1149deefa Mon Sep 17 00:00:00 2001 From: Benjamyn Love Date: Thu, 2 Apr 2020 14:36:42 +1100 Subject: [PATCH] Added no longer shows temp when print is inactive --- print.py | 1 + static/js/reload.js | 16 ++++++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/print.py b/print.py index 07be6c3..c7be013 100644 --- a/print.py +++ b/print.py @@ -15,6 +15,7 @@ if os.environ.get('IPADDR') == None: print("IPADDR environment variable not set please set to printer IP") SystemExit() HOST = os.environ.get('IPADDR') # The server's hostname or IP address +# HOST = '10.6.9.198' PORT = 8899 # The port used by the server application = Flask(__name__) diff --git a/static/js/reload.js b/static/js/reload.js index 65246af..73b853d 100644 --- a/static/js/reload.js +++ b/static/js/reload.js @@ -1,13 +1,17 @@ function loadContent() { - let domain = window.location.href + "/percent" + let domain = window.location.href + "/percent"; let xhttp = new XMLHttpRequest(); - let ele = document.getElementById('number') - let temp = document.getElementById('temp') + let ele = document.getElementById('number'); + let temp = document.getElementById('temp'); xhttp.onreadystatechange = function() { if (this.readyState == 4 && this.status == 200) { - let obj = JSON.parse(this.responseText) - ele.innerHTML = obj.percent - temp.innerHTML = obj.temp[0] + "°C / " + obj.temp[1] + "°C" + let obj = JSON.parse(this.responseText); + ele.innerHTML = obj.percent; + if (obj.temp[1] == "0") { + temp.innerHTML = obj.temp[0] + "°C" + } else { + temp.innerHTML = obj.temp[0] + "°C / " + obj.temp[1] + "°C"; + } } }; xhttp.open("GET", domain, true);