# HG changeset patch # User Michiel Broek # Date 1549462481 -3600 # Node ID 3649c3d31d15d2e7fb386d8998eaf6df153d0dc7 # Parent 3755db6044324c1fca4fad5208aa907f25c9f46f Fixed the mousewheel, spinner buttons to use the full min/max ranges. The 1.002 SG block to be precise. diff -r 3755db604432 -r 3649c3d31d15 www/js/global.js --- a/www/js/global.js Tue Feb 05 23:09:52 2019 +0100 +++ b/www/js/global.js Wed Feb 06 15:14:41 2019 +0100 @@ -385,45 +385,16 @@ // options for editors -var SGopts = { - inputMode: 'simple', spinMode: 'simple', theme: theme, width: 110, height: 23, min: 1.000, max: 1.199, decimalDigits: 3, spinButtons: true, spinButtonsStep: 0.001 -}; -var Spin1dec1 = { - inputMode: 'simple', spinMode: 'simple', theme: theme, width: 110, height: 23, min: 0, decimalDigits: 1, spinButtons: true, spinButtonsStep: 0.1 -}; -var Spin1dec5 = { - inputMode: 'simple', spinMode: 'simple', theme: theme, width: 110, height: 23, min: 0, decimalDigits: 1, spinButtons: true, spinButtonsStep: 0.5 -}; -var Spin2dec1 = { - inputMode: 'simple', spinMode: 'simple', theme: theme, width: 110, height: 23, min: 0, decimalDigits: 2, spinButtons: true, spinButtonsStep: 0.01 -}; -var Spin2dec5 = { - inputMode: 'simple', spinMode: 'simple', theme: theme, width: 110, height: 23, min: 0, decimalDigits: 2, spinButtons: true, spinButtonsStep: 0.05 -}; -var Spin3dec5 = { - inputMode: 'simple', spinMode: 'simple', theme: theme, width: 110, height: 23, min: 0, decimalDigits: 3, spinButtons: true, spinButtonsStep: 0.005 -}; -var SpinpH = { - inputMode: 'simple', spinMode: 'simple', theme: theme, width: 110, height: 23, min: 1, max: 14, decimalDigits: 1, spinButtons: true, spinButtonsStep: 0.1 -}; -var Spin2pH = { - inputMode: 'simple', spinMode: 'simple', theme: theme, width: 110, height: 23, min: 1, max: 14, decimalDigits: 2, spinButtons: true, spinButtonsStep: 0.05 -}; -var YeastT = { - inputMode: 'simple', spinMode: 'simple', theme: theme, width: 110, height: 23, min: 0, max: 40, decimalDigits: 1, spinButtons: true, spinButtonsStep: 0.5 -}; -var PosInt = { - inputMode: 'simple', spinMode: 'simple', theme: theme, width: 110, height: 23, min: 0, decimalDigits: 0, spinButtons: true, -}; -var Perc1dec5 = { - inputMode: 'simple', spinMode: 'simple', theme: theme, width: 110, height: 23, min: 0, max: 100, decimalDigits: 1, spinButtons: true, spinButtonsStep: 0.5 -}; -var Perc1dec1 = { - inputMode: 'simple', spinMode: 'simple', theme: theme, width: 110, height: 23, min: 0, max: 100, decimalDigits: 1, spinButtons: true, spinButtonsStep: 0.1 -}; -var Perc0 = { - inputMode: 'simple', spinMode: 'simple', theme: theme, width: 110, height: 23, min: 0, max: 100, decimalDigits: 0, spinButtons: true -}; +var SGopts = { inputMode: 'simple', theme: theme, width: 110, height: 23, min: 0.990, max: 1.199, decimalDigits: 3, spinButtons: true }; +var Spin1dec = { inputMode: 'simple', theme: theme, width: 110, height: 23, min: 0, decimalDigits: 1, spinButtons: true }; +var Spin2dec = { inputMode: 'simple', theme: theme, width: 110, height: 23, min: 0, decimalDigits: 2, spinButtons: true }; +var Spin3dec = { inputMode: 'simple', theme: theme, width: 110, height: 23, min: 0, decimalDigits: 3, spinButtons: true }; +var SpinpH = { inputMode: 'simple', theme: theme, width: 110, height: 23, min: 1, max: 14, decimalDigits: 1, spinButtons: true }; +var Spin2pH = { inputMode: 'simple', theme: theme, width: 110, height: 23, min: 1, max: 14, decimalDigits: 2, spinButtons: true }; +var YeastT = { inputMode: 'simple', theme: theme, width: 110, height: 23, min: 0, max: 40, decimalDigits: 1, spinButtons: true }; +var PosInt = { inputMode: 'simple', theme: theme, width: 110, height: 23, min: 0, decimalDigits: 0, spinButtons: true }; +var Perc1dec = { inputMode: 'simple', theme: theme, width: 110, height: 23, min: 0, max: 100, decimalDigits: 1, spinButtons: true }; +var Perc0 = { inputMode: 'simple', theme: theme, width: 110, height: 23, min: 0, max: 100, decimalDigits: 0, spinButtons: true }; var Dateopts = { theme: theme, width: 150, height: 23, allowNullDate: true, todayString: 'Vandaag', clearString: 'Wissen', showFooter: true, formatString: 'yyyy-MM-dd', enableBrowserBoundsDetection: true diff -r 3755db604432 -r 3649c3d31d15 www/js/inv_equipments.js --- a/www/js/inv_equipments.js Tue Feb 05 23:09:52 2019 +0100 +++ b/www/js/inv_equipments.js Wed Feb 06 15:14:41 2019 +0100 @@ -172,11 +172,11 @@ // initialize the input fields. $("#name").jqxInput({ theme: theme, width: 250, height: 23 }); $("#notes").jqxInput({ theme: theme, width: 640, height: 100 }); - $("#boil_size").jqxNumberInput( Spin1dec5 ); - $("#batch_size").jqxNumberInput( Spin2dec1 ); + $("#boil_size").jqxNumberInput( Spin1dec ); + $("#batch_size").jqxNumberInput( Spin2dec ); $("#batch_size").jqxNumberInput({ spinButtonsStep: 0.5 }); - $("#tun_volume").jqxNumberInput( Spin1dec5 ); - $("#tun_weight").jqxNumberInput( Spin2dec1 ); + $("#tun_volume").jqxNumberInput( Spin1dec ); + $("#tun_weight").jqxNumberInput( Spin2dec ); $("#tun_specific_heat").jqxNumberInput({ inputMode: 'simple', readOnly: true, theme: theme, width: 70, height: 23, decimalDigits: 3 }); $("#tun_material").jqxDropDownList({ theme: theme, @@ -188,10 +188,10 @@ height: 23, autoDropDownHeight: true }); - $("#tun_height").jqxNumberInput( Spin1dec1 ); - $("#top_up_water").jqxNumberInput( Spin1dec1 ); - $("#trub_chiller_loss").jqxNumberInput( Spin1dec1 ); - $("#evap_rate").jqxNumberInput( Spin2dec1 ); + $("#tun_height").jqxNumberInput( Spin1dec ); + $("#top_up_water").jqxNumberInput( Spin1dec ); + $("#trub_chiller_loss").jqxNumberInput( Spin1dec ); + $("#evap_rate").jqxNumberInput( Spin2dec ); $("#boil_time").jqxNumberInput( PosInt ); $("#boil_time").jqxNumberInput({ max: 1440 }); $("#calc_boil_volume").jqxCheckBox({ theme: theme, width: 120, height: 23 }); @@ -201,17 +201,17 @@ $("#calc_boil_volume").on('unchecked', function (event) { $("#batch_size").jqxNumberInput({ readOnly: false, width: 110, spinButtons: true }); }); - $("#top_up_kettle").jqxNumberInput( Spin1dec1 ); + $("#top_up_kettle").jqxNumberInput( Spin1dec ); $("#hop_utilization").jqxNumberInput( Perc0 ); $("#hop_utilization").jqxNumberInput({ Max: 200 }); - $("#lauter_volume").jqxNumberInput( Spin1dec5 ); - $("#lauter_height").jqxNumberInput( Spin1dec1 ); - $("#lauter_deadspace").jqxNumberInput( Spin1dec1 ); - $("#kettle_volume").jqxNumberInput( Spin1dec5 ); - $("#kettle_height").jqxNumberInput( Spin1dec1 ); - $("#mash_volume").jqxNumberInput( Spin1dec5 ); - $("#mash_max").jqxNumberInput( Spin1dec5 ); - $("#efficiency").jqxNumberInput( Perc1dec5 ); + $("#lauter_volume").jqxNumberInput( Spin1dec ); + $("#lauter_height").jqxNumberInput( Spin1dec ); + $("#lauter_deadspace").jqxNumberInput( Spin1dec ); + $("#kettle_volume").jqxNumberInput( Spin1dec ); + $("#kettle_height").jqxNumberInput( Spin1dec ); + $("#mash_volume").jqxNumberInput( Spin1dec ); + $("#mash_max").jqxNumberInput( Spin1dec ); + $("#efficiency").jqxNumberInput( Perc1dec ); var dataAdapter = new $.jqx.dataAdapter(source); var editrow = -1; diff -r 3755db604432 -r 3649c3d31d15 www/js/inv_fermentables.js --- a/www/js/inv_fermentables.js Tue Feb 05 23:09:52 2019 +0100 +++ b/www/js/inv_fermentables.js Wed Feb 06 15:14:41 2019 +0100 @@ -148,18 +148,18 @@ height: 23, autoDropDownHeight: true }); - $("#yield").jqxNumberInput( Spin1dec1 ); - $("#color").jqxNumberInput( Spin1dec5 ); + $("#yield").jqxNumberInput( Spin1dec ); + $("#color").jqxNumberInput( Spin1dec ); $("#add_after_boil").jqxCheckBox({ theme: theme, width: 120, height: 23 }); $("#origin").jqxInput({ theme: theme, width: 250, height: 23 }); $("#supplier").jqxInput({ theme: theme, width: 250, height: 23 }); $("#notes").jqxInput({ theme: theme, width: 640, height: 100 }); - $("#coarse_fine_diff").jqxNumberInput( Spin1dec1 ); - $("#moisture").jqxNumberInput( Spin1dec1 ); - $("#diastatic_power").jqxNumberInput( Spin1dec1 ); - $("#protein").jqxNumberInput( Spin1dec1 ); - $("#dissolved_protein").jqxNumberInput( Spin1dec1 ); - $("#max_in_batch").jqxNumberInput( Perc1dec5 ); + $("#coarse_fine_diff").jqxNumberInput( Spin1dec ); + $("#moisture").jqxNumberInput( Spin1dec ); + $("#diastatic_power").jqxNumberInput( Spin1dec ); + $("#protein").jqxNumberInput( Spin1dec ); + $("#dissolved_protein").jqxNumberInput( Spin1dec ); + $("#max_in_batch").jqxNumberInput( Perc1dec ); $("#recommend_mash").jqxCheckBox({ theme: theme, width: 120, height: 23 }); $("#added").jqxDropDownList({ theme: theme, @@ -182,11 +182,11 @@ height: 23, autoDropDownHeight: true }); - $("#inventory").jqxNumberInput( Spin1dec1 ); + $("#inventory").jqxNumberInput( Spin1dec ); $("#production_date").jqxDateTimeInput( Dateopts ); - $("#cost").jqxNumberInput( Spin2dec1 ); + $("#cost").jqxNumberInput( Spin2dec ); $("#tht_date").jqxDateTimeInput( Dateopts ); - $("#totval").jqxNumberInput( Spin2dec1 ); + $("#totval").jqxNumberInput( Spin2dec ); $("#totval").jqxNumberInput({ width: 90, readOnly: true, spinButtons: false }); var dataAdapter = new $.jqx.dataAdapter(source); diff -r 3755db604432 -r 3649c3d31d15 www/js/inv_hops.js --- a/www/js/inv_hops.js Tue Feb 05 23:09:52 2019 +0100 +++ b/www/js/inv_hops.js Wed Feb 06 15:14:41 2019 +0100 @@ -134,13 +134,13 @@ }; // initialize the input fields. $("#name").jqxInput({ theme: theme, width: 640, height: 23 }); - $("#alpha").jqxNumberInput( Perc1dec1 ); - $("#beta").jqxNumberInput( Perc1dec1 ); - $("#humulene").jqxNumberInput( Perc1dec1 ); - $("#caryophyllene").jqxNumberInput( Perc1dec1 ); - $("#cohumulone").jqxNumberInput( Perc1dec1 ); - $("#myrcene").jqxNumberInput( Perc1dec1 ); - $("#hsi").jqxNumberInput( Perc1dec5 ); + $("#alpha").jqxNumberInput( Perc1dec ); + $("#beta").jqxNumberInput( Perc1dec ); + $("#humulene").jqxNumberInput( Perc1dec ); + $("#caryophyllene").jqxNumberInput( Perc1dec ); + $("#cohumulone").jqxNumberInput( Perc1dec ); + $("#myrcene").jqxNumberInput( Perc1dec ); + $("#hsi").jqxNumberInput( Perc1dec ); $("#type").jqxDropDownList({ theme: theme, @@ -164,12 +164,12 @@ $("#origin").jqxInput({ theme: theme, width: 320, height: 23 }); $("#substitutes").jqxInput({ theme: theme, width: 320, height: 23 }); $("#always_on_stock").jqxCheckBox({ theme: theme, width: 120, height: 23 }); - $("#inventory").jqxNumberInput( Spin1dec1 ); + $("#inventory").jqxNumberInput( Spin1dec ); $("#production_date").jqxDateTimeInput( Dateopts ); - $("#cost").jqxNumberInput( Spin2dec1 ); + $("#cost").jqxNumberInput( Spin2dec ); $("#tht_date").jqxDateTimeInput( Dateopts ); - $("#total_oil").jqxNumberInput( Perc1dec1 ); - $("#totval").jqxNumberInput( Spin2dec1 ); + $("#total_oil").jqxNumberInput( Perc1dec ); + $("#totval").jqxNumberInput( Spin2dec ); $("#totval").jqxNumberInput({ width: 90, readOnly: true, spinButtons: false }); var dataAdapter = new $.jqx.dataAdapter(source); diff -r 3755db604432 -r 3649c3d31d15 www/js/inv_miscs.js --- a/www/js/inv_miscs.js Tue Feb 05 23:09:52 2019 +0100 +++ b/www/js/inv_miscs.js Wed Feb 06 15:14:41 2019 +0100 @@ -160,11 +160,11 @@ $("#amount_is_weight").jqxCheckBox({ theme: theme, width: 120, height: 23 }); $("#use_for").jqxInput({ theme: theme, width: 640, height: 48 }); $("#always_on_stock").jqxCheckBox({ theme: theme, width: 120, height: 23 }); - $("#inventory").jqxNumberInput( Spin1dec1 ); + $("#inventory").jqxNumberInput( Spin1dec ); $("#production_date").jqxDateTimeInput( Dateopts ); - $("#cost").jqxNumberInput( Spin2dec1 ); + $("#cost").jqxNumberInput( Spin2dec ); $("#tht_date").jqxDateTimeInput( Dateopts ); - $("#totval").jqxNumberInput( Spin2dec1 ); + $("#totval").jqxNumberInput( Spin2dec ); $("#totval").jqxNumberInput({ width: 90, readOnly: true, spinButtons: false }); var dataAdapter = new $.jqx.dataAdapter(source); diff -r 3755db604432 -r 3649c3d31d15 www/js/inv_waters.js --- a/www/js/inv_waters.js Tue Feb 05 23:09:52 2019 +0100 +++ b/www/js/inv_waters.js Wed Feb 06 15:14:41 2019 +0100 @@ -139,15 +139,15 @@ $("#name").jqxInput({ theme: theme, width: 640, height: 23 }); $("#notes").jqxInput({ theme: theme, width: 640, height: 100 }); $("#unlimited_stock").jqxCheckBox({ theme: theme, width: 120, height: 23 }); - $("#calcium").jqxNumberInput( Spin1dec1 ); - $("#bicarbonate").jqxNumberInput( Spin1dec1 ); - $("#sulfate").jqxNumberInput( Spin1dec1 ); - $("#chloride").jqxNumberInput( Spin1dec1 ); - $("#sodium").jqxNumberInput( Spin1dec1 ); - $("#magnesium").jqxNumberInput( Spin1dec1 ); + $("#calcium").jqxNumberInput( Spin1dec ); + $("#bicarbonate").jqxNumberInput( Spin1dec ); + $("#sulfate").jqxNumberInput( Spin1dec ); + $("#chloride").jqxNumberInput( Spin1dec ); + $("#sodium").jqxNumberInput( Spin1dec ); + $("#magnesium").jqxNumberInput( Spin1dec ); $("#ph").jqxNumberInput( Spin2pH ); - $("#total_alkalinity").jqxNumberInput( Spin1dec1 ); - $("#inventory").jqxNumberInput( Spin1dec1 ); + $("#total_alkalinity").jqxNumberInput( Spin1dec ); + $("#inventory").jqxNumberInput( Spin1dec ); $("#cost").jqxNumberInput({inputMode: 'simple', spinMode: 'simple', theme: theme, width: 110, height: 23, min: 0, decimalDigits: 5, spinButtons: true }); var dataAdapter = new $.jqx.dataAdapter(source); var editrow = -1; diff -r 3755db604432 -r 3649c3d31d15 www/js/inv_yeasts.js --- a/www/js/inv_yeasts.js Tue Feb 05 23:09:52 2019 +0100 +++ b/www/js/inv_yeasts.js Wed Feb 06 15:14:41 2019 +0100 @@ -171,7 +171,7 @@ }); $("#notes").jqxInput({ theme: theme, width: 800, height: 120 }); $("#best_for").jqxInput({ theme: theme, width: 320, height: 75 }); - $("#inventory").jqxNumberInput( Spin1dec1 ); + $("#inventory").jqxNumberInput( Spin1dec ); $("#production_date").jqxDateTimeInput( Dateopts ); $("#min_temperature").jqxNumberInput( YeastT ); $("#max_temperature").jqxNumberInput( YeastT ); @@ -184,14 +184,14 @@ height: 23, autoDropDownHeight: true }); - $("#attenuation").jqxNumberInput( Perc1dec5 ); + $("#attenuation").jqxNumberInput( Perc1dec ); $("#max_reuse").jqxNumberInput( PosInt ); $("#max_reuse").jqxNumberInput({ max: 10 }); - $("#cost").jqxNumberInput( Spin2dec1 ); + $("#cost").jqxNumberInput( Spin2dec ); $("#tht_date").jqxDateTimeInput( Dateopts ); - $("#totval").jqxNumberInput( Spin2dec1 ); + $("#totval").jqxNumberInput( Spin2dec ); $("#totval").jqxNumberInput({ width: 90, readOnly: true, spinButtons: false }); - $("#cells").jqxNumberInput( Spin1dec1 ); + $("#cells").jqxNumberInput( Spin1dec ); var dataAdapter = new $.jqx.dataAdapter(source); var editrow = -1; diff -r 3755db604432 -r 3649c3d31d15 www/js/prod_edit.js --- a/www/js/prod_edit.js Tue Feb 05 23:09:52 2019 +0100 +++ b/www/js/prod_edit.js Wed Feb 06 15:14:41 2019 +0100 @@ -2876,9 +2876,9 @@ autoDropDownHeight: true }); $("#efficiency").jqxTooltip({ content: 'Het rendement van maischen en koken.' }); - $("#efficiency").jqxNumberInput( Perc1dec5 ); + $("#efficiency").jqxNumberInput( Perc1dec ); $("#batch_size").jqxTooltip({ content: 'Het volume van het gekoelde wort na het koken.' }); - $("#batch_size").jqxNumberInput( Spin1dec5 ); + $("#batch_size").jqxNumberInput( Spin1dec ); $("#batch_size").jqxNumberInput({ min: 4 }); $("#boil_time").jqxTooltip({ content: 'De kooktijd in minuten.' }); $("#boil_time").jqxNumberInput( PosInt ); @@ -3073,7 +3073,7 @@ rowdata.f_inventory = datarecord.inventory; } }); - $("#wf_amount").jqxNumberInput( Spin3dec5 ); + $("#wf_amount").jqxNumberInput( Spin3dec ); $('#wf_amount').on('change', function (event) { console.log("amount changed: "+event.args.value); $("#fermentableGrid").jqxGrid('setcellvalue', fermentableRow, 'f_amount', event.args.value); @@ -3100,7 +3100,7 @@ calcFermentables(); }; }); - $("#wf_percentage").jqxNumberInput( Perc1dec1 ); + $("#wf_percentage").jqxNumberInput( Perc1dec ); $("#wf_percentage").on('change', function (event) { var oldvalue = Math.round(fermentableData.f_percentage * 10) / 10.0; var newvalue = event.args.value; @@ -3252,7 +3252,7 @@ rowdata.h_inventory = datarecord.inventory; } }); - $("#wh_amount").jqxNumberInput( Spin1dec1 ); + $("#wh_amount").jqxNumberInput( Spin1dec ); $('#wh_amount').on('change', function (event) { console.log("amount changed: "+event.args.value); var amount = parseFloat(event.args.value) / 1000; @@ -3375,7 +3375,7 @@ rowdata.m_inventory = datarecord.inventory; } }); - $("#wm_amount").jqxNumberInput( Spin1dec1 ); + $("#wm_amount").jqxNumberInput( Spin1dec ); $('#wm_amount').on('change', function (event) { console.log("amount changed: "+event.args.value); var amount = parseFloat(event.args.value) / 1000; @@ -3504,7 +3504,7 @@ calcABV(); } }); - $("#wy_amount").jqxNumberInput( Spin1dec5 ); + $("#wy_amount").jqxNumberInput( Spin1dec ); $('#wy_amount').on('change', function (event) { console.log("amount changed: "+event.args.value); var rowdata = $("#yeastGrid").jqxGrid('getrowdata', yeastRow); @@ -3633,12 +3633,12 @@ } } }); - $("#wstep_temp").jqxNumberInput( Spin1dec5 ); + $("#wstep_temp").jqxNumberInput( Spin1dec ); $('#wstep_temp').on('change', function (event) { var rowdata = $("#mashGrid").jqxGrid('getrowdata', mashRow); rowdata.step_temp = parseFloat(event.args.value); }); - $("#wend_temp").jqxNumberInput( Spin1dec5 ); + $("#wend_temp").jqxNumberInput( Spin1dec ); $('#wend_temp').on('change', function (event) { var rowdata = $("#mashGrid").jqxGrid('getrowdata', mashRow); rowdata.end_temp = parseFloat(event.args.value); @@ -3653,7 +3653,7 @@ var rowdata = $("#mashGrid").jqxGrid('getrowdata', mashRow); rowdata.ramp_time = parseFloat(event.args.value); }); - $("#wstep_infuse_amount").jqxNumberInput( Spin1dec5 ); + $("#wstep_infuse_amount").jqxNumberInput( Spin1dec ); $('#wstep_infuse_amount').on('change', function (event) { var rowdata = $("#mashGrid").jqxGrid('getrowdata', mashRow); rowdata.step_infuse_amount = parseFloat(event.args.value); @@ -3814,13 +3814,13 @@ // Water agents $("#wa_cacl2").jqxTooltip({ content: 'Voor het maken van een ander waterprofiel. Voegt calcium en chloride toe. Voor het verbeteren van zoetere bieren.' }); - $("#wa_cacl2").jqxNumberInput( Spin1dec1 ); + $("#wa_cacl2").jqxNumberInput( Spin1dec ); $("#wa_caso4").jqxTooltip({ content: 'Gips. Voor het maken van een ander waterprofiel. Voegt calcium en sulfaat toe. Voor het verbeteren van bittere bieren.' }); - $("#wa_caso4").jqxNumberInput( Spin1dec1 ); + $("#wa_caso4").jqxNumberInput( Spin1dec ); $("#wa_mgso4").jqxTooltip({ content: 'Epsom zout. Voor het maken van een ander waterprofiel. Voegt magnesium en sulfaat toe. Gebruik spaarzaam!' }); - $("#wa_mgso4").jqxNumberInput( Spin1dec1 ); + $("#wa_mgso4").jqxNumberInput( Spin1dec ); $("#wa_nacl").jqxTooltip({ content: 'Keukenzout. Voor het maken van een ander waterprofiel. Voegt natrium en chloride toe. Voor het accentueren van zoetheid. Bij hoge dosering wordt het bier ziltig.' }); - $("#wa_nacl").jqxNumberInput( Spin1dec1 ); + $("#wa_nacl").jqxNumberInput( Spin1dec ); $("#mash_ph").jqxTooltip({ content: 'Maisch pH tussen 5.2 en 5.6. Gebruik 5.2 voor lichte en 5.5 voor donkere bieren.'}); $("#mash_ph").jqxNumberInput( SpinpH ); $("#calc_acid").jqxCheckBox({ theme: theme, width: 120, height: 23 }); @@ -3833,7 +3833,7 @@ height: 23, autoDropDownHeight: true }); - $("#wa_base").jqxNumberInput( Spin2dec5 ); + $("#wa_base").jqxNumberInput( Spin2dec ); $("#wa_base").jqxNumberInput({ symbol: ' gr', symbolPosition: 'right' }); $("#wa_acid_name").jqxDropDownList({ theme: theme, @@ -3844,13 +3844,13 @@ height: 23, autoDropDownHeight: true }) - $("#wa_acid").jqxNumberInput( Spin2dec5 ); + $("#wa_acid").jqxNumberInput( Spin2dec ); $("#wa_acid").jqxNumberInput({ symbol: ' ml', symbolPosition: 'right' }); $("#wa_acid_perc").jqxNumberInput( Perc0 ); $("#wa_acid_perc").jqxNumberInput({ width: 70, symbol: '%', symbolPosition: 'right' }); // Sparge water - $("#sparge_temp").jqxNumberInput( Spin1dec5 ); - $("#sparge_volume").jqxNumberInput( Spin1dec5 ); + $("#sparge_temp").jqxNumberInput( Spin1dec ); + $("#sparge_volume").jqxNumberInput( Spin1dec ); $("#sparge_ph").jqxNumberInput( SpinpH ); $("#sparge_source").jqxDropDownList({ theme: theme, @@ -3861,7 +3861,7 @@ height: 23, autoDropDownHeight: true }); - $("#sparge_acid_amount").jqxNumberInput( Spin2dec1 ); + $("#sparge_acid_amount").jqxNumberInput( Spin2dec ); $("#sparge_acid_amount").jqxNumberInput({ spinButtons: false, readOnly: true, symbol: ' ml', symbolPosition: 'right' }); $("#sparge_acid_type").jqxDropDownList({ theme: theme, @@ -3908,22 +3908,22 @@ $("#brew_mash_efficiency").jqxTooltip({ content: 'Het behaalde maisch rendement.' }); $("#brew_mash_efficiency").jqxNumberInput({ inputMode: 'simple', readOnly: true, theme: theme, width: 90, height: 23, decimalDigits: 1 }); $("#brew_preboil_volume").jqxTooltip({ content: 'Het volume van het wort voor het koken.' }); - $("#brew_preboil_volume").jqxNumberInput( Spin1dec5 ); + $("#brew_preboil_volume").jqxNumberInput( Spin1dec ); $("#est_pre_vol").jqxTooltip({ content: 'Het berekende volume van het wort voor het koken.' }); $("#est_pre_vol").jqxNumberInput({ inputMode: 'simple', readOnly: true, theme: theme, width: 70, height: 23, decimalDigits: 1 }); $("#brew_aboil_volume").jqxTooltip({ content: 'Het volume van het wort na het koken.' }); - $("#brew_aboil_volume").jqxNumberInput( Spin1dec5 ); + $("#brew_aboil_volume").jqxNumberInput( Spin1dec ); $("#est_a_vol").jqxTooltip({ content: 'Het gewenste volume na het koken.' }); $("#est_a_vol").jqxNumberInput({ inputMode: 'simple', readOnly: true, theme: theme, width: 70, height: 23, decimalDigits: 1 }); $("#brew_preboil_efficiency").jqxTooltip({ content: 'Het berekende rendement voor het koken.' }); $("#brew_preboil_efficiency").jqxNumberInput({ inputMode: 'simple', readOnly: true, theme: theme, width: 90, height: 23, decimalDigits: 1 }); $("#brew_aboil_efficiency").jqxTooltip({ content: 'Het bereikte rendement na het koken.' }); $("#brew_aboil_efficiency").jqxNumberInput({ inputMode: 'simple', readOnly: true, theme: theme, width: 90, height: 23, decimalDigits: 1 }); - $("#brew_sparge_temperature").jqxNumberInput( Spin1dec5 ); - $("#brew_sparge_volume").jqxNumberInput( Spin1dec5 ); + $("#brew_sparge_temperature").jqxNumberInput( Spin1dec ); + $("#brew_sparge_volume").jqxNumberInput( Spin1dec ); $("#brew_whirlpool9").jqxNumberInput( PosInt ); $("#brew_whirlpool9").jqxNumberInput({ max: 120 }); - $("#brew_cooling_to").jqxNumberInput( Spin1dec5 ); + $("#brew_cooling_to").jqxNumberInput( Spin1dec ); $("#brew_sparge_ph").jqxNumberInput( SpinpH ); $("#brew_whirlpool7").jqxNumberInput( PosInt ); $("#brew_whirlpool7").jqxNumberInput({ max: 120 }); @@ -3955,10 +3955,10 @@ $("#brew_aeration_time").jqxNumberInput({ max: 1440 }); $("#brew_aeration_speed").jqxNumberInput( PosInt ); $("#brew_aeration_speed").jqxNumberInput({ max: 1440 }); - $("#brew_fermenter_volume").jqxNumberInput( Spin1dec5 ); - $("#brew_fermenter_extrawater").jqxNumberInput( Spin1dec1 ); + $("#brew_fermenter_volume").jqxNumberInput( Spin1dec ); + $("#brew_fermenter_extrawater").jqxNumberInput( Spin1dec ); $("#brew_fermenter_sg").jqxNumberInput({ inputMode: 'simple', readOnly: true, theme: theme, width: 90, height: 23, decimalDigits: 3 }); - $("#brew_fermenter_extrasugar").jqxNumberInput( Spin1dec1 ); + $("#brew_fermenter_extrasugar").jqxNumberInput( Spin1dec ); $("#brew_fermenter_ibu").jqxNumberInput({ inputMode: 'simple', readOnly: true, theme: theme, width: 90, height: 23, decimalDigits: 0 }); $("#brew_fermenter_color").jqxNumberInput({ inputMode: 'simple', readOnly: true, theme: theme, width: 90, height: 23, decimalDigits: 0 }); $("#BLog").jqxButton({ template: "info", width: '150px', theme: theme }); @@ -4004,14 +4004,14 @@ $("#st_carb_max2").jqxTooltip({ content: 'Het maximum aamnevolen koolzuur volume voor deze bierstijl.'}); $("#st_carb_max2").jqxNumberInput({ inputMode: 'simple', theme: theme, width: 50, height: 23, decimalDigits: 1, readOnly: true }); $("#bottle_amount").jqxTooltip({ content: 'De totale hoeveelheid te bottelen bier.' }); - $("#bottle_amount").jqxNumberInput( Spin1dec5 ); + $("#bottle_amount").jqxNumberInput( Spin1dec ); $("#keg_amount").jqxTooltip({ content: 'De totale hoeveelheid op fust te zetten bier.' }); - $("#keg_amount").jqxNumberInput( Spin1dec5 ); + $("#keg_amount").jqxNumberInput( Spin1dec ); $("#bottle_carbonation").jqxTooltip({ content: 'Het gewenste CO2 volume in de flessen.' }); - $("#bottle_carbonation").jqxNumberInput( Spin2dec5 ); + $("#bottle_carbonation").jqxNumberInput( Spin2dec ); $("#bottle_carbonation").jqxNumberInput({ max: 5 }); $("#keg_carbonation").jqxTooltip({ content: 'Het gewenste CO2 volume door de suiker in de fusten.' }); - $("#keg_carbonation").jqxNumberInput( Spin2dec5 ); + $("#keg_carbonation").jqxNumberInput( Spin2dec ); $("#keg_carbonation").jqxNumberInput({ max: 5 }); $("#bottle_priming_sugar").jqxDropDownList({ theme: theme, @@ -4047,7 +4047,7 @@ $("#taste_date").jqxDateTimeInput( Dateopts ); $('#taste_date').on('close', function (event) { calcStage(); }); $("#taste_rate").jqxTooltip({ content: 'Het cijfer voor dit bier van 1 tot 10.' }); - $("#taste_rate").jqxNumberInput( Spin1dec5 ); + $("#taste_rate").jqxNumberInput( Spin1dec ); $("#taste_rate").jqxNumberInput({ max: 10 }); $("#taste_color").jqxTooltip({ content: 'De kleur van het bier.' }); $("#taste_color").jqxInput({ theme: theme, width: 320, height: 23 }); diff -r 3755db604432 -r 3649c3d31d15 www/js/profile_fermentation.js --- a/www/js/profile_fermentation.js Tue Feb 05 23:09:52 2019 +0100 +++ b/www/js/profile_fermentation.js Wed Feb 06 15:14:41 2019 +0100 @@ -225,9 +225,9 @@ // initialize the input fields. $("#name").jqxInput({ theme: theme, width: 640, height: 23 }); - $("#inittemp_lo").jqxNumberInput( Spin1dec5 ); + $("#inittemp_lo").jqxNumberInput( Spin1dec ); $("#inittemp_lo").jqxNumberInput({ max: 40 }); - $("#inittemp_hi").jqxNumberInput( Spin1dec5 ); + $("#inittemp_hi").jqxNumberInput( Spin1dec ); $("#inittemp_hi").jqxNumberInput({ max: 40 }); $("#fridgemode").jqxCheckBox({ theme: theme, height: 23, enableContainerClick: false }); diff -r 3755db604432 -r 3649c3d31d15 www/js/profile_mash.js --- a/www/js/profile_mash.js Tue Feb 05 23:09:52 2019 +0100 +++ b/www/js/profile_mash.js Wed Feb 06 15:14:41 2019 +0100 @@ -127,9 +127,9 @@ height: 23, autoDropDownHeight: true }); - $("#m_step_temp").jqxNumberInput( Spin1dec5 ); + $("#m_step_temp").jqxNumberInput( Spin1dec ); $("#m_step_temp").jqxNumberInput({ Min: 30, Max: 80 }); - $("#m_end_temp").jqxNumberInput( Spin1dec5 ); + $("#m_end_temp").jqxNumberInput( Spin1dec ); $("#m_end_temp").jqxNumberInput({ Min: 30, Max: 80 }); $("#m_step_time").jqxNumberInput( PosInt ); $("#m_step_time").jqxNumberInput({ Min: 1, Max: 120 }); diff -r 3755db604432 -r 3649c3d31d15 www/js/profile_styles.js --- a/www/js/profile_styles.js Tue Feb 05 23:09:52 2019 +0100 +++ b/www/js/profile_styles.js Wed Feb 06 15:14:41 2019 +0100 @@ -158,13 +158,13 @@ $("#color_min").jqxNumberInput({ max: 200 }); $("#color_max").jqxNumberInput( PosInt ); $("#color_max").jqxNumberInput({ max: 200 }); - $("#carb_min").jqxNumberInput( Spin1dec1 ); + $("#carb_min").jqxNumberInput( Spin1dec ); $("#carb_min").jqxNumberInput({ max: 5 }); - $("#carb_max").jqxNumberInput( Spin1dec1 ); + $("#carb_max").jqxNumberInput( Spin1dec ); $("#carb_max").jqxNumberInput({ max: 5 }); - $("#abv_min").jqxNumberInput( Spin1dec1 ); + $("#abv_min").jqxNumberInput( Spin1dec ); $("#abv_min").jqxNumberInput({ max: 20 }); - $("#abv_max").jqxNumberInput( Spin1dec1 ); + $("#abv_max").jqxNumberInput( Spin1dec ); $("#abv_max").jqxNumberInput({ max: 20 }); $("#notes").jqxInput({ theme: theme, width: 800, height: 100 }); $("#profile").jqxInput({ theme: theme, width: 800, height: 48 }); diff -r 3755db604432 -r 3649c3d31d15 www/js/profile_water.js --- a/www/js/profile_water.js Tue Feb 05 23:09:52 2019 +0100 +++ b/www/js/profile_water.js Wed Feb 06 15:14:41 2019 +0100 @@ -133,14 +133,14 @@ // initialize the input fields. $("#name").jqxInput({ theme: theme, width: 640, height: 23 }); $("#notes").jqxInput({ theme: theme, width: 800, height: 100 }); - $("#calcium").jqxNumberInput( Spin1dec1 ); - $("#bicarbonate").jqxNumberInput( Spin1dec1 ); - $("#sulfate").jqxNumberInput( Spin1dec1 ); - $("#chloride").jqxNumberInput( Spin1dec1 ); - $("#sodium").jqxNumberInput( Spin1dec1 ); - $("#magnesium").jqxNumberInput( Spin1dec1 ); + $("#calcium").jqxNumberInput( Spin1dec ); + $("#bicarbonate").jqxNumberInput( Spin1dec ); + $("#sulfate").jqxNumberInput( Spin1dec ); + $("#chloride").jqxNumberInput( Spin1dec ); + $("#sodium").jqxNumberInput( Spin1dec ); + $("#magnesium").jqxNumberInput( Spin1dec ); $("#ph").jqxNumberInput( Spin2pH ); - $("#total_alkalinity").jqxNumberInput( Spin1dec1 ); + $("#total_alkalinity").jqxNumberInput( Spin1dec ); var dataAdapter = new $.jqx.dataAdapter(source); var editrow = -1; diff -r 3755db604432 -r 3649c3d31d15 www/js/rec_edit.js --- a/www/js/rec_edit.js Tue Feb 05 23:09:52 2019 +0100 +++ b/www/js/rec_edit.js Wed Feb 06 15:14:41 2019 +0100 @@ -2388,9 +2388,9 @@ autoDropDownHeight: true }); $("#efficiency").jqxTooltip({ content: 'Het rendement van maischen en koken.' }); - $("#efficiency").jqxNumberInput( Perc1dec5 ); + $("#efficiency").jqxNumberInput( Perc1dec ); $("#batch_size").jqxTooltip({ content: 'Het volume van het gekoelde wort na het koken.' }); - $("#batch_size").jqxNumberInput( Spin1dec5 ); + $("#batch_size").jqxNumberInput( Spin1dec ); $("#batch_size").jqxNumberInput({ min: 4 }); $("#boil_size").jqxTooltip({ content: 'Het volume van het wort voor het koken.' }); $("#boil_size").jqxNumberInput({ inputMode: 'simple', theme: theme, width: 90, height: 23, decimalDigits: 2, readOnly: true }); @@ -2549,7 +2549,7 @@ rowdata.f_inventory = datarecord.inventory; } }); - $("#wf_amount").jqxNumberInput( Spin3dec5 ); + $("#wf_amount").jqxNumberInput( Spin3dec ); $('#wf_amount').on('change', function (event) { console.log("amount changed: "+event.args.value); $("#fermentableGrid").jqxGrid('setcellvalue', fermentableRow, 'f_amount', event.args.value); @@ -2576,7 +2576,7 @@ calcFermentables(); }; }); - $("#wf_percentage").jqxNumberInput( Perc1dec1 ); + $("#wf_percentage").jqxNumberInput( Perc1dec ); $("#wf_percentage").on('change', function (event) { var oldvalue = Math.round(fermentableData.f_percentage * 10) / 10.0; var newvalue = event.args.value; @@ -2729,7 +2729,7 @@ rowdata.h_inventory = datarecord.inventory; } }); - $("#wh_amount").jqxNumberInput( Spin1dec1 ); + $("#wh_amount").jqxNumberInput( Spin1dec ); $('#wh_amount').on('change', function (event) { console.log("amount changed: "+event.args.value); var amount = parseFloat(event.args.value) / 1000; @@ -2853,7 +2853,7 @@ rowdata.m_inventory = datarecord.inventory; } }); - $("#wm_amount").jqxNumberInput( Spin1dec1 ); + $("#wm_amount").jqxNumberInput( Spin1dec ); $('#wm_amount').on('change', function (event) { console.log("amount changed: "+event.args.value); var amount = parseFloat(event.args.value) / 1000; @@ -2982,7 +2982,7 @@ calcABV(); } }); - $("#wy_amount").jqxNumberInput( Spin1dec5 ); + $("#wy_amount").jqxNumberInput( Spin1dec ); $('#wy_amount').on('change', function (event) { console.log("amount changed: "+event.args.value); var rowdata = $("#yeastGrid").jqxGrid('getrowdata', yeastRow); @@ -3110,12 +3110,12 @@ } } }); - $("#wstep_temp").jqxNumberInput( Spin1dec5 ); + $("#wstep_temp").jqxNumberInput( Spin1dec ); $('#wstep_temp').on('change', function (event) { var rowdata = $("#mashGrid").jqxGrid('getrowdata', mashRow); rowdata.step_temp = parseFloat(event.args.value); }); - $("#wend_temp").jqxNumberInput( Spin1dec5 ); + $("#wend_temp").jqxNumberInput( Spin1dec ); $('#wend_temp').on('change', function (event) { var rowdata = $("#mashGrid").jqxGrid('getrowdata', mashRow); rowdata.end_temp = parseFloat(event.args.value); @@ -3130,7 +3130,7 @@ var rowdata = $("#mashGrid").jqxGrid('getrowdata', mashRow); rowdata.ramp_time = parseFloat(event.args.value); }); - $("#wstep_infuse_amount").jqxNumberInput( Spin1dec5 ); + $("#wstep_infuse_amount").jqxNumberInput( Spin1dec ); $('#wstep_infuse_amount').on('change', function (event) { var rowdata = $("#mashGrid").jqxGrid('getrowdata', mashRow); rowdata.step_infuse_amount = parseFloat(event.args.value); @@ -3289,13 +3289,13 @@ // Water agents $("#wa_cacl2").jqxTooltip({ content: 'Voor het maken van een ander waterprofiel. Voegt calcium en chloride toe. Voor het verbeteren van zoetere bieren.'}); - $("#wa_cacl2").jqxNumberInput( Spin1dec1 ); + $("#wa_cacl2").jqxNumberInput( Spin1dec ); $("#wa_caso4").jqxTooltip({ content: 'Gips. Voor het maken van een ander waterprofiel. Voegt calcium en sulfaat toe. Voor het verbeteren van bittere bieren.'}); - $("#wa_caso4").jqxNumberInput( Spin1dec1 ); + $("#wa_caso4").jqxNumberInput( Spin1dec ); $("#wa_mgso4").jqxTooltip({ content: 'Epsom zout. Voor het maken van een ander waterprofiel. Voegt magnesium en sulfaat toe. Gebruik spaarzaam!'}); - $("#wa_mgso4").jqxNumberInput( Spin1dec1 ); + $("#wa_mgso4").jqxNumberInput( Spin1dec ); $("#wa_nacl").jqxTooltip({ content: 'Keukenzout. Voor het maken van een ander waterprofiel. Voegt natrium en chloride toe. Voor het accentueren van zoetheid. Bij hoge dosering wordt het bier ziltig.'}); - $("#wa_nacl").jqxNumberInput( Spin1dec1 ); + $("#wa_nacl").jqxNumberInput( Spin1dec ); $("#mash_ph").jqxTooltip({ content: 'Maisch pH tussen 5.2 en 5.6. Gebruik 5.2 voor lichte en 5.5 voor donkere bieren.'}); $("#mash_ph").jqxNumberInput( SpinpH ); $("#calc_acid").jqxCheckBox({ theme: theme, width: 120, height: 23 }); @@ -3308,7 +3308,7 @@ height: 23, autoDropDownHeight: true }); - $("#wa_base").jqxNumberInput( Spin2dec5 ); + $("#wa_base").jqxNumberInput( Spin2dec ); $("#wa_base").jqxNumberInput({ symbol: ' gr', symbolPosition: 'right' }); $("#wa_acid_name").jqxDropDownList({ theme: theme, @@ -3319,13 +3319,13 @@ height: 23, autoDropDownHeight: true }); - $("#wa_acid").jqxNumberInput( Spin2dec5 ); + $("#wa_acid").jqxNumberInput( Spin2dec ); $("#wa_acid").jqxNumberInput({ symbol: ' ml', symbolPosition: 'right' }); $("#wa_acid_perc").jqxNumberInput( Perc0 ); $("#wa_acid_perc").jqxNumberInput({ width: 70, symbol: '%', symbolPosition: 'right' }); // Sparge water - $("#sparge_temp").jqxNumberInput( Spin1dec5 ); - $("#sparge_volume").jqxNumberInput( Spin1dec5 ); + $("#sparge_temp").jqxNumberInput( Spin1dec ); + $("#sparge_volume").jqxNumberInput( Spin1dec ); $("#sparge_ph").jqxNumberInput( SpinpH ); $("#sparge_source").jqxDropDownList({ theme: theme, @@ -3336,7 +3336,7 @@ height: 23, autoDropDownHeight: true }); - $("#sparge_acid_amount").jqxNumberInput( Spin2dec1 ); + $("#sparge_acid_amount").jqxNumberInput( Spin2dec ); $("#sparge_acid_amount").jqxNumberInput({ spinButtons: false, readOnly: true, symbol: ' ml', symbolPosition: 'right' }); $("#sparge_acid_type").jqxDropDownList({ theme: theme, diff -r 3755db604432 -r 3649c3d31d15 www/prod_print.php --- a/www/prod_print.php Tue Feb 05 23:09:52 2019 +0100 +++ b/www/prod_print.php Wed Feb 06 15:14:41 2019 +0100 @@ -576,7 +576,7 @@ $this->Checkheader('Filteren en spoelen'); $s = sprintf("%.1f",$row['sparge_volume']).' liter spoelwater opwarmen tot '.sprintf("%.1f",$row['sparge_temp']).' '.DEG.'C'; $this->Checkline($s); - $s = 'spoelwater aanzuren to pH <= '.sprintf("%.1f",$row['sparge_ph']).' met '; + $s = 'spoelwater aanzuren tot pH <= '.sprintf("%.1f",$row['sparge_ph']).' met '; $s .= sprintf("%.1f",$row['sparge_acid_amount']*1000).' ml. '.$acidtype[$row['sparge_acid_type']]; $this->Checkline($s);