diff -r a85c1d4c4d12 -r e95d2886f49f www/js/global.js --- a/www/js/global.js Mon Feb 04 15:21:49 2019 +0100 +++ b/www/js/global.js Mon Feb 04 20:30:41 2019 +0100 @@ -428,6 +428,10 @@ theme: theme, width: 150, height: 23, allowNullDate: true, todayString: 'Vandaag', clearString: 'Wissen', showFooter: true, formatString: 'yyyy-MM-dd', enableBrowserBoundsDetection: true }; +var DateTimeopts = { + theme: theme, width: 230, height: 23, allowNullDate: true, todayString: 'Vandaag', clearString: 'Wissen', showFooter: true, + formatString: 'yyyy-MM-dd HH:mm:ss', enableBrowserBoundsDetection: true, showTimeButton: true +}; var sugardensity = 1.611; //kg/l in solution @@ -1010,8 +1014,6 @@ var BD; - console.log("estimate_fg("+percSugar+","+percCara+","+WGratio+","+TotTme+","+Temp+","+attenuation+","+og+")"); - if (percSugar > 40) percSugar = 0; if (percCara > 50) @@ -1030,7 +1032,8 @@ var AttBeer = 0.00825 * attenuation + 0.00817 * BD - 0.00684 * Temp + 0.00026 * TotTme - 0.00356 * percCara + 0.00553 * percSugar + 0.547; var fg = Math.round((1 + (1 - AttBeer) * (og - 1)) * 1000) / 1000; - console.log("fg:"+fg); + + console.log("estimate_fg("+percSugar+","+percCara+","+WGratio+","+TotTme+","+Temp+","+attenuation+","+og+") :"+fg); return fg; }