diff -r 9856238e9217 -r f9d266eb0ec6 www/js/prod_edit.js --- a/www/js/prod_edit.js Sun Jul 11 15:55:44 2021 +0200 +++ b/www/js/prod_edit.js Wed Jul 14 20:51:45 2021 +0200 @@ -725,7 +725,6 @@ $('#wb_ph').val(dataRecord.wb_ph); $('#wa_acid_name').val(dataRecord.wa_acid_name); $('#wa_acid_perc').val(dataRecord.wa_acid_perc); -// $('#wa_base_name').val(dataRecord.wa_base_name); $('#starter_type').val(dataRecord.starter_type); $('#starter_sg').val(dataRecord.starter_sg); $('#starter_viability').val(dataRecord.starter_viability); @@ -919,7 +918,7 @@ calcIBUs(); }); }, - ready: function() { $('#jqxTabs').jqxTabs('next'); }, + ready: function() { calcFermentables(); $('#jqxTabs').jqxTabs('next'); }, columns: [ { text: 'Vergistbaar ingrediënt', datafield: 'f_name', cellsrenderer: function(index, datafield, value, defaultvalue, column, rowdata) { @@ -1144,7 +1143,7 @@ }, { text: 'IBU', datafield: 'ibu', width: 80, align: 'right', cellsrenderer: function(index, datafield, value, defaultvalue, column, rowdata) { - var ibu = toIBU(rowdata.h_useat, rowdata.h_form, preboil_sg, parseFloat($('#batch_size').jqxNumberInput('decimal')), + var ibu = toIBU(rowdata.h_useat, rowdata.h_form, preboil_sg, parseFloat(dataRecord.batch_size), parseFloat(rowdata.h_amount), parseFloat(rowdata.h_time), parseFloat(rowdata.h_alpha), $('#ibu_method').val(), dataRecord.brew_whirlpool9, dataRecord.brew_whirlpool7, dataRecord.brew_whirlpool6); return '' + dataAdapter.formatNumber(ibu, 'f1') + '';