diff -r a4cde20e4ced -r 99dcd8488b62 www/js/prod_edit.js --- a/www/js/prod_edit.js Fri Jun 28 20:12:54 2019 +0200 +++ b/www/js/prod_edit.js Sun Jun 30 13:18:36 2019 +0200 @@ -2045,10 +2045,8 @@ $("#brew_aboil_sg").jqxNumberInput({ spinButtons: false, readOnly: true, width: 90 }); $("#brew_preboil_volume").jqxNumberInput({ spinButtons: false, readOnly: true, width: 90 }); $("#brew_aboil_volume").jqxNumberInput({ spinButtons: false, readOnly: true, width: 90 }); - $("#brew_sparge_temperature").jqxNumberInput({ spinButtons: false, readOnly: true, width: 90 }); $("#brew_whirlpool9").jqxNumberInput({ spinButtons: false, readOnly: true, width: 90 }); $("#brew_cooling_to").jqxNumberInput({ spinButtons: false, readOnly: true, width: 90 }); - $("#brew_sparge_volume").jqxNumberInput({ spinButtons: false, readOnly: true, width: 90 }); $("#brew_whirlpool7").jqxNumberInput({ spinButtons: false, readOnly: true, width: 90 }); $("#brew_cooling_method").jqxDropDownList({ disabled: true }); $("#brew_whirlpool6").jqxNumberInput({ spinButtons: false, readOnly: true, width: 90 }); @@ -2338,6 +2336,7 @@ $("#est_pre_vol").val(Math.round(new_boil * 1.04 * 100) / 100); dataRecord.sparge_volume *= factor; $("#sparge_volume").val(dataRecord.sparge_volume); + $("#brew_sparge_volume").val(dataRecord.sparge_volume); dataRecord.batch_size = parseFloat(event.args.value); calcFermentablesFromOG(parseFloat($("#est_og").jqxNumberInput('decimal'))); // Keep the OG adjustWaters(factor); @@ -2394,8 +2393,13 @@ }); $('#sparge_volume').on('change', function (event) { dataRecord.sparge_volume = parseFloat(event.args.value); + $('#brew_sparge_volume').val(dataRecord.sparge_volume); calcSparge(); }); + $("#sparge_temp").on('change', function (event) { + dataRecord.sparge_temp = parseFloat(event.args.value); + $('#brew_sparge_temperature').val(dataRecord.sparge_temp); + }); $('#sparge_source').on('change', function (event) { if (event.args) { var index = event.args.index; @@ -2674,6 +2678,7 @@ dataRecord.sparge_volume = Math.round(datarecord.boil_size * 5) / 10; $("#sparge_volume").val(dataRecord.sparge_volume); + $("#brew_sparge_volume").val(dataRecord.sparge_volume); $("#est_pre_vol").val(datarecord.boil_size * 1.04); calcFermentablesFromOG(parseFloat($("#est_og").jqxNumberInput('decimal'))); // Keep the OG adjustWaters(factor); @@ -2734,8 +2739,6 @@ brew_mash_ph: parseFloat($("#brew_mash_ph").jqxNumberInput('decimal')), brew_mash_sg: parseFloat($("#brew_mash_sg").jqxNumberInput('decimal')), brew_mash_efficiency: parseFloat($("#brew_mash_efficiency").jqxNumberInput('decimal')), - brew_sparge_temperature: parseFloat($("#brew_sparge_temperature").jqxNumberInput('decimal')), - brew_sparge_volume: parseFloat($("#brew_sparge_volume").jqxNumberInput('decimal')), brew_sparge_est: parseFloat($("#brew_sparge_est").jqxNumberInput('decimal')), brew_sparge_ph: parseFloat($("#brew_sparge_ph").jqxNumberInput('decimal')), brew_preboil_volume: parseFloat($("#brew_preboil_volume").jqxNumberInput('decimal')), @@ -2962,8 +2965,6 @@ { name: 'brew_mash_ph', type: 'float' }, { name: 'brew_mash_sg', type: 'float' }, { name: 'brew_mash_efficiency', type: 'float' }, - { name: 'brew_sparge_temperature', type: 'float' }, - { name: 'brew_sparge_volume', type: 'float' }, { name: 'brew_sparge_est', type: 'float' }, { name: 'brew_sparge_ph', type: 'float' }, { name: 'brew_preboil_volume', type: 'float' }, @@ -3163,8 +3164,8 @@ $("#brew_mash_sg").val(dataRecord.brew_mash_sg); $("#brew_mash_efficiency").val(dataRecord.brew_mash_efficiency); // Header Spoelen en filteren - $("#brew_sparge_temperature").val(dataRecord.brew_sparge_temperature); - $("#brew_sparge_volume").val(dataRecord.brew_sparge_volume); + $("#brew_sparge_temperature").val(dataRecord.sparge_temp); + $("#brew_sparge_volume").val(dataRecord.sparge_volume); $("#brew_sparge_est").val(dataRecord.brew_sparge_est); $("#brew_sparge_ph").val(dataRecord.brew_sparge_ph); // Header Beluchten @@ -5729,8 +5730,10 @@ $("#brew_preboil_efficiency").jqxNumberInput( Show1dec ); $("#brew_aboil_efficiency").jqxTooltip({ content: 'Het bereikte rendement na het koken.' }); $("#brew_aboil_efficiency").jqxNumberInput( Show1dec ); - $("#brew_sparge_temperature").jqxNumberInput( Spin1dec ); - $("#brew_sparge_volume").jqxNumberInput( Spin1dec ); + $("#brew_sparge_temperature").jqxTooltip({ content: 'De spoelwater temperatuur, in te stellen in de Water tab.' }); + $("#brew_sparge_temperature").jqxNumberInput( Show1dec ); + $("#brew_sparge_volume").jqxTooltip({ content: 'Het spoelwater voorraad volume, in te stellen in de Water tab.' }); + $("#brew_sparge_volume").jqxNumberInput( Show1dec ); $("#brew_sparge_est").jqxNumberInput( Show1dec ); $("#brew_whirlpool9").jqxNumberInput( PosInt ); $("#brew_whirlpool9").jqxNumberInput({ max: 120 });