Wed, 15 May 2019 16:44:09 +0200
Added some info yo the about screen. Added calculating beer color using the method documented by Dirk Naudt. This looks like originated from a European Brewing Convention in 1948.
README.design | file | annotate | diff | comparison | revisions | |
www/gen_about.php | file | annotate | diff | comparison | revisions | |
www/js/global.js | file | annotate | diff | comparison | revisions | |
www/js/prod_edit.js | file | annotate | diff | comparison | revisions | |
www/js/rec_edit.js | file | annotate | diff | comparison | revisions |
--- a/README.design Mon May 13 16:26:28 2019 +0200 +++ b/README.design Wed May 15 16:44:09 2019 +0200 @@ -1,3 +1,6 @@ + +MIT licentie? + Main table: products. In Progress: view logs.
--- a/www/gen_about.php Mon May 13 16:26:28 2019 +0200 +++ b/www/gen_about.php Wed May 15 16:44:09 2019 +0200 @@ -10,6 +10,9 @@ <tr><th colspan=2>Over BMS</th></tr> <tr><td> </td><td> </td></tr> <tr><td>Versie:</td><td><?php echo $my_version;?> </td></tr> + <tr><td>Geschreven door:</td><td>M. Broek</td></tr> + <tr><td>Diverse berekeningen:</td><td>A. Otte, H. Halberstadt</td></tr> + <tr><td>Widgets en stijl:</td><td><a style="color:white; text-decoration:none;" href="https://www.jqwidgets.com/">jQWidgets</a></td></tr> </table> </div> </div>
--- a/www/js/global.js Mon May 13 16:26:28 2019 +0200 +++ b/www/js/global.js Wed May 15 16:44:09 2019 +0200 @@ -297,7 +297,8 @@ { id: 0, en: 'Morey', nl: 'Morey' }, { id: 1, en: 'Mosher', nl: 'Mosher' }, { id: 2, en: 'Daniels', nl: 'Daniels' }, - { id: 3, en: 'Halberstadt', nl: 'Halberstadt' } + { id: 3, en: 'Halberstadt', nl: 'Halberstadt' }, + { id: 4, en: 'Naudts', nl: 'Naudts' } ]; var ColorMethodSource = { localdata: ColorMethodData, @@ -799,7 +800,7 @@ /* - * Kleurwerking naar SRM. Niet voor Halberstadt. + * Kleurwerking naar SRM. Niet voor Halberstadt, Naudts */ function kw_to_srm(colormethod, c) { @@ -811,6 +812,8 @@ return 0.2 * c + 8.4; if (colormethod == 3) // Halberstadt return 0; + if (colormethod == 4) + return 0; }
--- a/www/js/prod_edit.js Mon May 13 16:26:28 2019 +0200 +++ b/www/js/prod_edit.js Wed May 15 16:44:09 2019 +0200 @@ -142,6 +142,7 @@ var mvol = 0; // mash volume var colort = 0; // Colors srm * vol totals var colorh = 0; // Colors ebc * vol * kt + var colorn = 0; // Colors ebc * pt * pct var my_100 = false; var mashtime = 0; // Total mash time var mashtemp = 0; // Average mash temperature @@ -194,6 +195,7 @@ } colort += row.f_amount * ebc_to_srm(row.f_color); colorh += row.f_amount * row.f_color * get_kt(row.f_color); + colorn += (row.f_percentage / 100) * row.f_color; // For 8.6 Pt wort. // Check supplies. if ((((dataRecord.inventory_reduced <= 2) && (row.f_added <= 1)) || // Mash or boil ((dataRecord.inventory_reduced <= 3) && (row.f_added == 2)) || // Primary @@ -260,7 +262,9 @@ dataRecord.brew_fermenter_sg = Math.round(plato_to_sg(pt) * 10000) / 10000; $("#brew_fermenter_sg").val(dataRecord.brew_fermenter_sg); // color - if (dataRecord.color_method == 3) { + if (dataRecord.color_method == 4) { + dataRecord.brew_fermenter_color = Math.round(((pt / 8.6) * colorn) + (dataRecord.boil_time / 60)); + } else if (dataRecord.color_method == 3) { dataRecord.brew_fermenter_color = Math.round((4.46 * bv * sr) / (aboil_volume + top) * colorh); } else { var cw = colort / (aboil_volume + top) * 8.34436; @@ -280,7 +284,9 @@ } // Color of the wort - if (dataRecord.color_method == 3) { // Hans Halberstadt + if (dataRecord.color_method == 4) { + var color = Math.round(((sg_to_plato(dataRecord.est_og) / 8.6) * colorn) + (dataRecord.boil_time / 60)); + } else if (dataRecord.color_method == 3) { // Hans Halberstadt var color = Math.round((4.46 * bv * sr) / parseFloat(dataRecord.batch_size) * colorh); } else { var cw = colort / parseFloat(dataRecord.batch_size) * 8.34436;
--- a/www/js/rec_edit.js Mon May 13 16:26:28 2019 +0200 +++ b/www/js/rec_edit.js Wed May 15 16:44:09 2019 +0200 @@ -170,6 +170,7 @@ var mvol = 0; // mash volume var colort = 0; // Colors srm * vol totals var colorh = 0; // Colors ebc * vol * kt + var colorn = 0; // Colors ebc * pt * pct var my_100 = false; var mashtime = 0; // Total mash time var mashtemp = 0; // Average mash temperature @@ -222,6 +223,7 @@ } colort += row.f_amount * ebc_to_srm(row.f_color); colorh += row.f_amount * row.f_color * get_kt(row.f_color); + colorn += (row.f_percentage / 100) * row.f_color; // For 8.6 Pt wort. } to_100 = my_100; if (to_100) { @@ -239,7 +241,9 @@ preboil_sg = estimate_sg(sugarsm, parseFloat(dataRecord.boil_size)); // Color of the wort - if (dataRecord.color_method == 3) { // Hans Halberstadt + if (dataRecord.color_method == 4) { + var color = Math.round(((sg_to_plato(dataRecord.est_og) / 8.6) * colorn) + (dataRecord.boil_time / 60)); + } else if (dataRecord.color_method == 3) { // Hans Halberstadt var color = Math.round((4.46 * bv * sr) / parseFloat(dataRecord.batch_size) * colorh); } else { var cw = colort / parseFloat(dataRecord.batch_size) * 8.34436;