FOSS
/
BangleApps
mirror of https://github.com/espruino/BangleApps
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

Fixes

pull/2033/head
Hank 2022-07-09 19:55:54 +02:00
parent 9430b2faef
commit 3fe261821d
1 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
apps/drinkcounter/app.js
View File

@ -28,19 +28,26 @@ var confWeight;
var confWeightUnit; var confWeightUnit;
// Load Status ===============
var drinkStatus = require("Storage").open("drinkcounter.status.json", "r"); var drinkStatus = require("Storage").open("drinkcounter.status.json", "r");
var test = drinkStatus.read(drinkStatus.getLength()); var test = drinkStatus.read(drinkStatus.getLength());
if(test!== undefined) { if(test!== undefined) {
drinkStatus = JSON.parse(test); drinkStatus = JSON.parse(test);
console.log("read status: " + test); console.log("read status: " + test);
for (let i = 0; i <= maxDrinks; i++) {
drinks[i] = drinkStatus.drinks[i];
}
firstDrinkTime = Date.parse(drinkStatus.firstDrinkTime);
console.log("read firstDrinkTime: " + firstDrinkTime);
if (firstDrinkTime) firstDrinkTimeTime = require("locale").time(new Date(firstDrinkTime), 1);
console.log("read firstDrinkTimeTime: " + firstDrinkTimeTime);
} else { } else {
drinkStatus = { drinkStatus = {
drinks: [0,0,0] drinks: [0,0,0]
}; };
console.log("no status file - applying default"); console.log("no status file - applying default");
} }
// Load Status ===============
var drinksAlcohol = [12,16,5.6]; // in gramm var drinksAlcohol = [12,16,5.6]; // in gramm
@ -71,11 +78,14 @@ function drawBac(){
var currentTime = new Date(); var currentTime = new Date();
var time_diff = Math.floor(((currentTime - firstDrinkTime) % 86400000) / 3600000); // in hours! var time_diff = Math.floor(((currentTime - firstDrinkTime) % 86400000) / 3600000); // in hours!
console.log("currentTime: " + currentTime)
console.log("firstDrinkTime: " + firstDrinkTime)
//console.log("timediff: " + time_diff); console.log("timediff: " + time_diff);
ebac = Math.round( ((sum_drinks) / (weight / 100 * sex) - (0.15 * time_diff) ) * 100) / 100; ebac = Math.round( ((sum_drinks) / (weight / 100 * sex) - (0.15 * time_diff) ) * 100) / 100;
//console.log("BAC: " + ebac + " weight: " + confWeight + " weightInKilo: " + weight + " Unit: " + confWeightUnit); console.log("BAC: " + ebac + " weight: " + confWeight + " weightInKilo: " + weight + " Unit: " + confWeightUnit);
console.log("sum_drinks: " + sum_drinks);
g.clearRect(0,34 + 20 + 8,176,34 + 20 + 20 + 8); //Clear g.clearRect(0,34 + 20 + 8,176,34 + 20 + 20 + 8); //Clear
g.setFontAlign(0,0).setFont("8x16").setColor(g.theme.fg).drawString("BAC: " + ebac, 90, 74); g.setFontAlign(0,0).setFont("8x16").setColor(g.theme.fg).drawString("BAC: " + ebac, 90, 74);
} }
@ -151,6 +161,7 @@ function updateDrinks(){
g.drawImage(icoResetB,145,145); g.drawImage(icoResetB,145,145);
} }
drinkStatus.firstDrinkTime = firstDrinkTime;
settings_file = require("Storage").open("drinkcounter.status.json", "w"); settings_file = require("Storage").open("drinkcounter.status.json", "w");
settings_file.write(JSON.stringify(drinkStatus)); settings_file.write(JSON.stringify(drinkStatus));
@ -168,6 +179,7 @@ function addDrink(){
if (!firstDrinkTime){ if (!firstDrinkTime){
firstDrinkTime = new Date(); firstDrinkTime = new Date();
firstDrinkTimeTime = require("locale").time(new Date(), 1); firstDrinkTimeTime = require("locale").time(new Date(), 1);
console.log("init drinking! " + firstDrinkTime);
} }
drinks[activeDrink] = drinks[activeDrink] + 1; drinks[activeDrink] = drinks[activeDrink] + 1;
updateFirstDrinkTime(); updateFirstDrinkTime();
@ -260,4 +272,5 @@ updateTime();
queueDrawTime(); queueDrawTime();
initDragEvents(); initDragEvents();
updateDrinks(); updateDrinks();
updateFirstDrinkTime();