diff -r 7f5455806f20 -r 1de1623e1760 www/js/prod_edit.js --- a/www/js/prod_edit.js Sun May 26 16:09:50 2019 +0200 +++ b/www/js/prod_edit.js Sun May 26 20:37:28 2019 +0200 @@ -148,6 +148,7 @@ var mashtemp = 0; // Average mash temperature var bv = 0.925; // Bierverlies rendement var sr = 0.95; // Mash en spoel rendement + var lintner = 0; // Total recipe lintner if ((rows = $('#mashGrid').jqxGrid('getrows'))) { for (var i = 0; i < rows.length; i++) { @@ -203,7 +204,15 @@ ((dataRecord.inventory_reduced <= 6) && (row.f_added == 4))) && row.f_inventory < row.f_amount) { ok_fermentables = 0; } + if (row.f_added == 0 && (row.f_type == 0 || row.f_type == 4) && row.f_color < 50) { // Mash and Grain/Adjunct and Color < 50 + lintner += row.f_diastatic_power * row.f_amount; + // console.log("add "+row.f_name+" diastatic_power:"+row.f_diastatic_power*row.f_amount+" now:"+lintner); + // } else { + // console.log("ign "+row.f_name+" diastatic_power:"+row.f_diastatic_power*row.f_amount+" now:"+lintner); + } } + $("#ferm_lintner").val(Math.round(parseFloat(lintner / mashkg))); + // console.log("lintner:"+lintner+" kg:"+mashkg); $("#mash_kg").val(mashkg); console.log("calcFermentables() supplies:"+ok_fermentables); to_100 = my_100; @@ -3191,7 +3200,7 @@ var fermentableAdapter = new $.jqx.dataAdapter(fermentableSource); $("#fermentableGrid").jqxGrid({ width: 1240, - height: 500, + height: 470, source: fermentableAdapter, theme: theme, selectionmode: 'singlerow', @@ -4311,6 +4320,8 @@ $("#est_og2").jqxNumberInput( Show3dec ); $("#mash_kg").jqxTooltip({ content: 'Het gewicht van alle mouten in de maisch.' }); $("#mash_kg").jqxNumberInput( Show3dec ); + $("#ferm_lintner").jqxTooltip({ content: 'De enzymkracht van alle mouten in de maisch. Moet hoger dan 35 zijn.' }); + $("#ferm_lintner").jqxNumberInput( Show0dec ); $("#perc_malts").jqxProgressBar({ width: 300, height: 23,