From a813b502fc6c3ed2d4efedd5863a9fb2b3cc1827 Mon Sep 17 00:00:00 2001
From: Jan Tuomi <jans.tuomi@gmail.com>
Date: Mon, 18 Sep 2017 23:58:45 +0300
Subject: [PATCH 1/3] Random coffee scale fixes

---
 coffee_scale/templates/coffee.html | 27 ++++++++++++++-------------
 coffee_scale/views.py              |  1 +
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/coffee_scale/templates/coffee.html b/coffee_scale/templates/coffee.html
index f34d20d..35aef50 100644
--- a/coffee_scale/templates/coffee.html
+++ b/coffee_scale/templates/coffee.html
@@ -9,7 +9,7 @@
 <meta http-equiv="expires" content="Tue, 01 Jan 1980 1:00:00 GMT" />
 <meta http-equiv="pragma" content="no-cache" />
 <meta name="viewport" content="width=device-width, initial-scale=1">
-<script type="text/javascript" src="https://code.jquery.com/jquery-2.1.4.min.js"></script>
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
 <style>
 body {
   background-color: white;
@@ -140,7 +140,6 @@ var brewtext = "";
 
 $(document).ready(function(){
  $('#text').bind("DOMSubtreeModified", resize);
- fetchdata();
  updateTime();
  setInterval(updateTime,1000);
  formatBrewTime();
@@ -151,27 +150,30 @@ $(window).resize(resize);
 
 var defaultBackoffTime = 1000;
 var modified = 0;
-function fetchdata(hxr, status){
+
+
+
+function fetchdata(data, status){
   var backoffTime = defaultBackoffTime;
   modified = 1;
-  if(typeof status !== 'undefined'){
-    if(status == "success"){
+  if (typeof status !== 'undefined'){
+    if (status == "success"){
       backoffTime = defaultBackoffTime;
-      parseData(hxr.responseText);
+      parseData(data);
     }
-    else if(status == "error"){
+    else if (status == "error"){
       backoffTime *= 2;
       modified = 0
-      setTimeout(fetchdata, backoffTime);
       handleError();
       return;
     }
   }
-  setTimeout(function() {
-    $.ajax({cache: false, ifModified: modified, url: '/coffee/cups', complete: fetchdata, timeout:120000});
-  }, 2000);
 }
 
+setInterval(function() {
+  $.getJSON("/coffee/cups", fetchdata);
+}, 2000);
+
 function formatBrewTime(){
   if(!brewtext && lastBrew instanceof Date){
     var now = new Date();
@@ -189,8 +191,7 @@ function handleError(){
   setData("?",0,0,Number.MAX_VALUE,Number.MAX_VALUE);
 }
 
-function parseData(string) {
-  var data = JSON.parse(string);
+function parseData(data) {
   if (data) {
     var date = new Date(data.date);
     lastBrew = new Date(data.last_brew);
diff --git a/coffee_scale/views.py b/coffee_scale/views.py
index affdd00..484e4a3 100644
--- a/coffee_scale/views.py
+++ b/coffee_scale/views.py
@@ -19,6 +19,7 @@ def get_cups_from_weight(weight):
     if cups > 10:
         cups = 10
 
+    print("cups: ", cups, "weight: ", weight)
     return cups
 
 

From d4d63ac99df5ecb2bd8a118c1b4cc7d690d26296 Mon Sep 17 00:00:00 2001
From: Jan Tuomi <jans.tuomi@gmail.com>
Date: Mon, 18 Sep 2017 23:59:49 +0300
Subject: [PATCH 2/3] Call fetch when opening coffee scale page

---
 coffee_scale/templates/coffee.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/coffee_scale/templates/coffee.html b/coffee_scale/templates/coffee.html
index 35aef50..72bc9c2 100644
--- a/coffee_scale/templates/coffee.html
+++ b/coffee_scale/templates/coffee.html
@@ -170,6 +170,7 @@ function fetchdata(data, status){
   }
 }
 
+$.getJSON("/coffee/cups", fetchdata);
 setInterval(function() {
   $.getJSON("/coffee/cups", fetchdata);
 }, 2000);

From a63504619ab048e19bb4ed513c856d0c07b0c620 Mon Sep 17 00:00:00 2001
From: Jan Tuomi <jans.tuomi@gmail.com>
Date: Tue, 19 Sep 2017 00:05:58 +0300
Subject: [PATCH 3/3] Add weird fix to MQTT module

---
 coffee_scale/views.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/coffee_scale/views.py b/coffee_scale/views.py
index 484e4a3..209afef 100644
--- a/coffee_scale/views.py
+++ b/coffee_scale/views.py
@@ -4,6 +4,8 @@ from django.http import JsonResponse
 import datetime
 from .mqtt import get_latest
 
+import coffee_scale.mqtt  # somehow this is needed
+
 
 def get_cups_from_weight(weight):
     if not weight: