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 });