changeset
Phase 6, most of the water tab is now a viewer.
Wed, 03 Aug 2022 20:58:18 +0200
- author
- Michiel Broek <mbroek@mbse.eu>
- date
- Wed, 03 Aug 2022 20:58:18 +0200
- changeset 809
- 8b30068497a9
- parent 808
- f6dcde592a7b
- child 810
- 1f2ca835fe9d
Phase 6, most of the water tab is now a viewer.
| www/js/rec_edit.js | file | annotate | diff | comparison | revisions | |
| www/rec_edit.php | file | annotate | diff | comparison | revisions |
--- a/www/js/rec_edit.js Wed Aug 03 17:37:30 2022 +0200 +++ b/www/js/rec_edit.js Wed Aug 03 20:58:18 2022 +0200 @@ -97,33 +97,6 @@ } -function setReadonly(ro) { - var rw = ! ro, w100 = 110, w80 = 80; - if (ro) { // jqxNumberInput width -20 for no spinbuttons - w100 = 90; - w80 = 60; - } - $('#w1_name').jqxDropDownList({ disabled: ro }); - $('#w2_name').jqxDropDownList({ disabled: ro }); - $('#pr_name').jqxDropDownList({ disabled: ro }); - $('#wa_cacl2').jqxNumberInput({ spinButtons: rw, readOnly: ro, width: w100 }); - $('#wa_caso4').jqxNumberInput({ spinButtons: rw, readOnly: ro, width: w100 }); - $('#wa_mgso4').jqxNumberInput({ spinButtons: rw, readOnly: ro, width: w100 }); - $('#wa_nacl').jqxNumberInput({ spinButtons: rw, readOnly: ro, width: w100 }); - $('#mash_ph').jqxNumberInput({ spinButtons: rw, readOnly: ro, width: w100 }); - $('#calc_acid').jqxCheckBox({ disabled: ro }); - $('#wa_acid_name').jqxDropDownList({ disabled: ro }); - $('#wa_acid').jqxNumberInput({ spinButtons: rw, readOnly: ro, width: w100 }); - $('#wa_acid_perc').jqxNumberInput({ spinButtons: rw, readOnly: ro, width: w80 }); - $('#sparge_temp').jqxNumberInput({ spinButtons: rw, readOnly: ro, width: w100 }); - $('#sparge_volume').jqxNumberInput({ spinButtons: rw, readOnly: ro, width: w100 }); - $('#sparge_ph').jqxNumberInput({ spinButtons: rw, readOnly: ro, width: w100 }); - $('#sparge_source').jqxDropDownList({ disabled: ro }); - $('#sparge_acid_type').jqxDropDownList({ disabled: ro }); - $('#sparge_acid_perc').jqxNumberInput({ spinButtons: rw, readOnly: ro, width: w100 }); -} - - function calcPercentages() { console.log('calcPercentages()'); @@ -399,47 +372,6 @@ $('#hop_aroma').jqxProgressBar('val', hop_aroma); } -/* -function adjustHops(factor) { - - var i, row, amount, rowscount = $('#hopGrid').jqxGrid('getdatainformation').rowscount; - if (rowscount == 0) - return; - - for (i = 0; i < rowscount; i++) { - row = $('#hopGrid').jqxGrid('getrowdata', i); - amount = row.h_amount * factor; - $('#hopGrid').jqxGrid('setcellvalue', i, 'h_amount', amount); - } -} -*/ - -function adjustMiscs(factor) { - - var i, row, amount, rowscount = $('#miscGrid').jqxGrid('getdatainformation').rowscount; - if (rowscount == 0) - return; - - for (i = 0; i < rowscount; i++) { - row = $('#miscGrid').jqxGrid('getrowdata', i); - amount = row.m_amount * factor; - $('#miscGrid').jqxGrid('setcellvalue', i, 'm_amount', amount); - switch (row.m_name) { - case 'CaCl2': $('#wa_cacl2').val(row.m_amount * 1000); break; - case 'CaSO4': $('#wa_caso4').val(row.m_amount * 1000); break; - case 'MgSO4': $('#wa_mgso4').val(row.m_amount * 1000); break; - case 'NaCl': $('#wa_nacl').val(row.m_amount * 1000); break; - case 'MgCl2': $('#wa_mgcl2').val(row.m_amount * 1000); break; - case 'NaHCO3': $('#wa_nahco3').val(row.m_amount * 1000); break; - case 'CaCO3': $('#wa_caco3').val(row.m_amount * 1000); break; - case 'Melkzuur': - case 'Zoutzuur': - case 'Fosforzuur': - case 'Zwavelzuur': $('#wa_acid').val(row.m_amount * 1000); break; - } - } -} - function adjustYeasts(factor) { @@ -752,7 +684,7 @@ // Hidden record uuid $('#name').val(dataRecord.name); $('#notes').val(dataRecord.notes); - $('#locked').val(dataRecord.locked); + // Hidden record locked $('#st_name').val(dataRecord.st_name); $('#st_letter').val(dataRecord.st_letter); $('#st_guide').val(dataRecord.st_guide); @@ -795,11 +727,11 @@ $('#st_carb_max').val(dataRecord.st_carb_max); $('#mash_name').val(dataRecord.mash_name); $('#mash_ph').val(dataRecord.mash_ph); - $('#sparge_temp').val(dataRecord.sparge_temp); +// $('#sparge_temp').val(dataRecord.sparge_temp); $('#sparge_ph').val(dataRecord.sparge_ph); - $('#sparge_volume').val(dataRecord.sparge_volume); +// $('#sparge_volume').val(dataRecord.sparge_volume); $('#sparge_source').val(dataRecord.sparge_source); - $('#sparge_acid_type').val(dataRecord.sparge_acid_type); + $('#sparge_acid_type').val(AcidTypeData[dataRecord.sparge_acid_type].nl); $('#sparge_acid_perc').val(dataRecord.sparge_acid_perc); $('#sparge_acid_amount').val(dataRecord.sparge_acid_amount * 1000); $('#calc_acid').val(dataRecord.calc_acid); @@ -838,7 +770,7 @@ $('#wb_magnesium').val(dataRecord.wb_magnesium); $('#wb_total_alkalinity').val(dataRecord.wb_total_alkalinity); $('#wb_ph').val(dataRecord.wb_ph); - $('#wa_acid_name').val(dataRecord.wa_acid_name); + $('#wa_acid_name').val(AcidTypeData[dataRecord.wa_acid_name].nl); $('#wa_acid_perc').val(dataRecord.wa_acid_perc); editFermentable(dataRecord); editHop(dataRecord); @@ -1063,25 +995,25 @@ $('#wa_caco3').val(row.m_amount * 1000); break; case 'Melkzuur': - $('#wa_acid_name').val(0); + $('#wa_acid_name').val(AcidTypeData[0].nl); $('#wa_acid').val(row.m_amount * 1000); $('#wa_acid_perc').val(AcidTypeData[0].AcidPrc); last_acid = 'Melkzuur'; break; case 'Zoutzuur': - $('#wa_acid_name').val(1); + $('#wa_acid_name').val(AcidTypeData[1].nl); $('#wa_acid').val(row.m_amount * 1000); $('#wa_acid_perc').val(AcidTypeData[1].AcidPrc); last_acid = 'Zoutzuur'; break; case 'Fosforzuur': - $('#wa_acid_name').val(2); + $('#wa_acid_name').val(AcidTypeData[2].nl); $('#wa_acid').val(row.m_amount * 1000); $('#wa_acid_perc').val(AcidTypeData[2].AcidPrc); last_acid = 'Fosforzuur'; break; case 'Zwavelzuur': - $('#wa_acid_name').val(3); + $('#wa_acid_name').val(AcidTypeData[3].nl); $('#wa_acid').val(row.m_amount * 1000); $('#wa_acid_perc').val(AcidTypeData[3].AcidPrc); last_acid = 'Zwavelzuur'; @@ -1089,53 +1021,47 @@ } } if (row.m_use_use == 6) { // Sparge - /*switch (row.m_name) { - case 'CaCl2': - $('#wa_cacl2').val(row.m_amount * 1000); - break; - case 'CaSO4': - $('#wa_caso4').val(row.m_amount * 1000); - break; - case 'MgSO4': - $('#wa_mgso4').val(row.m_amount * 1000); - break; - case 'NaCl': - $('#wa_nacl').val(row.m_amount * 1000); - break; - case 'MgCl2': - $('#wa_mgcl2').val(row.m_amount * 1000); - break; - case 'NaHCO3': - $('#wa_nahco3').val(row.m_amount * 1000); - break; - case 'CaCO3': - $('#wa_caco3').val(row.m_amount * 1000); - break; - case 'Melkzuur': - $('#wa_acid_name').val(0); - $('#wa_acid').val(row.m_amount * 1000); - $('#wa_acid_perc').val(AcidTypeData[0].AcidPrc); // TODO: this ignores changed percentages. - last_acid = 'Melkzuur'; - break; - case 'Zoutzuur': - $('#wa_acid_name').val(1); - $('#wa_acid').val(row.m_amount * 1000); - $('#wa_acid_perc').val(AcidTypeData[1].AcidPrc); - last_acid = 'Zoutzuur'; - break; - case 'Fosforzuur': - $('#wa_acid_name').val(2); - $('#wa_acid').val(row.m_amount * 1000); - $('#wa_acid_perc').val(AcidTypeData[2].AcidPrc); - last_acid = 'Fosforzuur'; - break; - case 'Zwavelzuur': - $('#wa_acid_name').val(3); - $('#wa_acid').val(row.m_amount * 1000); - $('#wa_acid_perc').val(AcidTypeData[3].AcidPrc); - last_acid = 'Zwavelzuur'; - break; - } */ + switch (row.m_name) { + case 'CaCl2': + $('#ss_cacl2').val(row.m_amount * 1000); + break; + case 'CaSO4': + $('#ss_caso4').val(row.m_amount * 1000); + break; + case 'MgSO4': + $('#ss_mgso4').val(row.m_amount * 1000); + break; + case 'NaCl': + $('#ss_nacl').val(row.m_amount * 1000); + break; + case 'MgCl2': + $('#ss_mgcl2').val(row.m_amount * 1000); + break; + case 'Melkzuur': +// $('#wa_acid_name').val(0); +// $('#wa_acid').val(row.m_amount * 1000); +// $('#wa_acid_perc').val(AcidTypeData[0].AcidPrc); // TODO: this ignores changed percentages. +// last_acid = 'Melkzuur'; + break; + case 'Zoutzuur': + // $('#wa_acid_name').val(1); +// $('#wa_acid').val(row.m_amount * 1000); +// $('#wa_acid_perc').val(AcidTypeData[1].AcidPrc); +// last_acid = 'Zoutzuur'; + break; + case 'Fosforzuur': +// $('#wa_acid_name').val(2); +// $('#wa_acid').val(row.m_amount * 1000); +// $('#wa_acid_perc').val(AcidTypeData[2].AcidPrc); +// last_acid = 'Fosforzuur'; + break; + case 'Zwavelzuur': +// $('#wa_acid_name').val(3); +// $('#wa_acid').val(row.m_amount * 1000); +// $('#wa_acid_perc').val(AcidTypeData[3].AcidPrc); +// last_acid = 'Zwavelzuur'; + break; + } } } return data; @@ -1773,7 +1699,7 @@ if (AT < 0 || AT >= AcidTypeData.length) { AT = 0; dataRecord.sparge_acid_type = 0; - $('#sparge_acid_type').val(0); + $('#sparge_acid_type').val(AcidTypeData[0].nl); dataRecord.sparge_acid_perc = AcidTypeData[0].AcidPrc; $('#sparge_acid_perc').val(dataRecord.sparge_acid_perc); } @@ -1796,14 +1722,7 @@ function calcInit() { console.log('calc.init()'); - $('#calc_acid').on('checked', function(event) { - dataRecord.calc_acid = 1; - calcWater(); - }); - $('#calc_acid').on('unchecked', function(event) { - dataRecord.calc_acid = 0; - calcWater(); - }); + calcWater(); $('#w1_name').jqxDropDownList('selectItem', dataRecord.w1_name); $('#w2_name').jqxDropDownList('selectItem', dataRecord.w2_name); // Fix tap water if zero using mash infuse amount. @@ -1815,248 +1734,11 @@ dataRecord.w2_amount = 0; } calcWater(); - $('#w2_amount').on('change', function(event) { - var newval = parseFloat(event.args.value); - if (newval > mash_infuse) { - $('#w2_amount').val(dataRecord.w2_amount); - return; - } - dataRecord.w1_amount = parseFloat($('#wg_amount').jqxNumberInput('decimal')) - newval; - $('#w1_amount').val(dataRecord.w1_amount); - dataRecord.w2_amount = newval; - console.log('new: ' + event.args.value + ' w1: ' + dataRecord.w1_amount + ' w2: ' + dataRecord.w2_amount); - calcWater(); - }); - $('#wa_cacl2').on('change', function(event) { - if (event.args) { - setWaterAgent('CaCl2', 0); // This can prevent double entries. - setWaterAgent('CaCl2', event.args.value); - calcWater(); - } - }); - $('#wa_caso4').on('change', function(event) { - if (event.args) { - setWaterAgent('CaSO4', 0); - setWaterAgent('CaSO4', event.args.value); - calcWater(); - } - }); - $('#wa_mgso4').on('change', function(event) { - if (event.args) { - setWaterAgent('MgSO4', 0); - setWaterAgent('MgSO4', event.args.value); - calcWater(); - } - }); - $('#wa_nacl').on('change', function(event) { - if (event.args) { - setWaterAgent('NaCl', 0); - setWaterAgent('NaCl', event.args.value); - calcWater(); - } - }); - $('#wa_mgcl2').on('change', function(event) { - if (event.args) { - setWaterAgent('MgCl2', 0); - setWaterAgent('MgCl2', event.args.value); - calcWater(); - } - }); - $('#wa_nahco3').on('change', function(event) { - if (event.args) { - setWaterAgent('NaHCO3', 0); - setWaterAgent('NaHCO3', event.args.value); - calcWater(); - } - }); - $('#wa_caco3').on('change', function(event) { - if (event.args) { - setWaterAgent('CaCO3', 0); - setWaterAgent('CaCO3', event.args.value); - calcWater(); - } - }); - $('#wa_acid_name').on('select', function(event) { - if (event.args) { - var index = event.args.index; - setWaterAgent(last_acid, 0); - last_acid = AcidTypeData[index].nl; - dataRecord.wa_acid_name = index; - dataRecord.wa_acid_perc = AcidTypeData[index].AcidPrc; - $('#wa_acid_perc').val(dataRecord.wa_acid_perc); - calcWater(); - setWaterAgent(last_acid, parseFloat($('#wa_acid').jqxNumberInput('decimal'))); - } - }); - $('#wa_acid').on('change', function(event) { - var name = AcidTypeData[$('#wa_acid_name').val()].nl; - setWaterAgent(name, parseFloat(event.args.value)); - calcWater(); - }); - $('#wa_acid_perc').on('change', function(event) { - dataRecord.wa_acid_perc = parseFloat(event.args.value); - calcWater(); - }); - - $('#mash_ph').on('change', function(event) { - dataRecord.mash_ph = parseFloat(event.args.value); - calcWater(); - }); - - $('#sparge_ph').on('change', function(event) { - dataRecord.sparge_ph = parseFloat(event.args.value); - calcSparge(); - }); - $('#sparge_volume').on('change', function(event) { - dataRecord.sparge_volume = parseFloat(event.args.value); - calcSparge(); - }); - $('#sparge_source').on('select', function(event) { - if (event.args) { - var index = event.args.index; - dataRecord.sparge_source = index; - calcSparge(); - } - }); - $('#sparge_acid_type').on('select', function(event) { - if (event.args) { - var index = event.args.index; - dataRecord.sparge_acid_type = index; - console.log('new sparge_acid_type: ' + dataRecord.sparge_acid_type); - calcSparge(); - } - }); - $('#sparge_acid_perc').on('change', function(event) { - dataRecord.sparge_acid_perc = parseFloat(event.args.value); - calcSparge(); - }); - $('#locked').on('checked', function(event) { - dataRecord.locked = 1; - setReadonly(true); - }); - $('#locked').on('unchecked', function(event) { - dataRecord.locked = 0; - setReadonly(true); - }); }; function saveRecord(goback) { - var row = { - record: my_record, - uuid: dataRecord.uuid, - name: $('#name').val(), - locked: dataRecord.locked, - notes: $('#notes').val(), - st_name: $('#st_name').val(), - st_letter: $('#st_letter').val(), - st_guide: $('#st_guide').val(), - st_type: dataRecord.st_type, - st_category: $('#st_category').val(), - st_category_number: $('#st_category_number').val(), - st_og_min: parseFloat($('#st_og_min').jqxNumberInput('decimal')), - st_og_max: parseFloat($('#st_og_max').jqxNumberInput('decimal')), - st_fg_min: parseFloat($('#st_fg_min').jqxNumberInput('decimal')), - st_fg_max: parseFloat($('#st_fg_max').jqxNumberInput('decimal')), - st_ibu_min: parseFloat($('#st_ibu_min').jqxNumberInput('decimal')), - st_ibu_max: parseFloat($('#st_ibu_max').jqxNumberInput('decimal')), - st_color_min: parseFloat($('#st_color_min').jqxNumberInput('decimal')), - st_color_max: parseFloat($('#st_color_max').jqxNumberInput('decimal')), - st_carb_min: parseFloat($('#st_carb_min').jqxNumberInput('decimal')), - st_carb_max: parseFloat($('#st_carb_max').jqxNumberInput('decimal')), - st_abv_min: parseFloat($('#st_abv_min').jqxNumberInput('decimal')), - st_abv_max: parseFloat($('#st_abv_max').jqxNumberInput('decimal')), - type: $('#type').val(), - batch_size: parseFloat($('#batch_size').jqxNumberInput('decimal')), - boil_size: parseFloat($('#boil_size').jqxNumberInput('decimal')), - boil_time: parseFloat($('#boil_time').jqxNumberInput('decimal')), - efficiency: parseFloat($('#efficiency').jqxNumberInput('decimal')), - est_og: parseFloat($('#est_og').jqxNumberInput('decimal')), - est_fg: parseFloat($('#est_fg').jqxNumberInput('decimal')), - est_abv: parseFloat($('#est_abv').jqxNumberInput('decimal')), - est_color: parseFloat($('#est_color').jqxNumberInput('decimal')), - color_method: $('#color_method').val(), - est_ibu: parseFloat($('#est_ibu').jqxNumberInput('decimal')), - ibu_method: $('#ibu_method').val(), - est_carb: parseFloat($('#est_carb').jqxNumberInput('decimal')), - mash_name: $('#mash_name').val(), - mash_ph: parseFloat($('#mash_ph').jqxNumberInput('decimal')), - sparge_temp: parseFloat($('#sparge_temp').jqxNumberInput('decimal')), - sparge_ph: parseFloat($('#sparge_ph').jqxNumberInput('decimal')), - sparge_volume: parseFloat($('#sparge_volume').jqxNumberInput('decimal')), - sparge_source: $('#sparge_source').val(), - sparge_acid_type: $('#sparge_acid_type').val(), - sparge_acid_perc: parseFloat($('#sparge_acid_perc').jqxNumberInput('decimal')), - sparge_acid_amount: dataRecord.sparge_acid_amount, - calc_acid: dataRecord.calc_acid, - w1_name: $('#w1_name').val(), - w1_amount: parseFloat($('#w1_amount').jqxNumberInput('decimal')), - w1_calcium: parseFloat($('#w1_calcium').jqxNumberInput('decimal')), - w1_sulfate: parseFloat($('#w1_sulfate').jqxNumberInput('decimal')), - w1_chloride: parseFloat($('#w1_chloride').jqxNumberInput('decimal')), - w1_sodium: parseFloat($('#w1_sodium').jqxNumberInput('decimal')), - w1_magnesium: parseFloat($('#w1_magnesium').jqxNumberInput('decimal')), - w1_total_alkalinity: parseFloat($('#w1_total_alkalinity').jqxNumberInput('decimal')), - w1_ph: parseFloat($('#w1_ph').jqxNumberInput('decimal')), - w1_cost: dataRecord.w1_cost, - w2_name: $('#w2_name').val(), - w2_amount: parseFloat($('#w2_amount').jqxNumberInput('decimal')), - w2_calcium: parseFloat($('#w2_calcium').jqxNumberInput('decimal')), - w2_sulfate: parseFloat($('#w2_sulfate').jqxNumberInput('decimal')), - w2_chloride: parseFloat($('#w2_chloride').jqxNumberInput('decimal')), - w2_sodium: parseFloat($('#w2_sodium').jqxNumberInput('decimal')), - w2_magnesium: parseFloat($('#w2_magnesium').jqxNumberInput('decimal')), - w2_total_alkalinity: parseFloat($('#w2_total_alkalinity').jqxNumberInput('decimal')), - w2_ph: parseFloat($('#w2_ph').jqxNumberInput('decimal')), - w2_cost: dataRecord.w2_cost, - wg_amount: parseFloat($('#wg_amount').jqxNumberInput('decimal')), - wg_calcium: parseFloat($('#wg_calcium').jqxNumberInput('decimal')), - wg_sulfate: parseFloat($('#wg_sulfate').jqxNumberInput('decimal')), - wg_chloride: parseFloat($('#wg_chloride').jqxNumberInput('decimal')), - wg_sodium: parseFloat($('#wg_sodium').jqxNumberInput('decimal')), - wg_magnesium: parseFloat($('#wg_magnesium').jqxNumberInput('decimal')), - wg_total_alkalinity: parseFloat($('#wg_total_alkalinity').jqxNumberInput('decimal')), - wg_ph: parseFloat($('#wg_ph').jqxNumberInput('decimal')), - wb_calcium: parseFloat($('#wb_calcium').jqxNumberInput('decimal')), - wb_sulfate: parseFloat($('#wb_sulfate').jqxNumberInput('decimal')), - wb_chloride: parseFloat($('#wb_chloride').jqxNumberInput('decimal')), - wb_sodium: parseFloat($('#wb_sodium').jqxNumberInput('decimal')), - wb_magnesium: parseFloat($('#wb_magnesium').jqxNumberInput('decimal')), - wb_total_alkalinity: parseFloat($('#wb_total_alkalinity').jqxNumberInput('decimal')), - wb_ph: parseFloat($('#wb_ph').jqxNumberInput('decimal')), - wa_acid_name: parseInt($('#wa_acid_name').val()), - wa_acid_perc: parseFloat($('#wa_acid_perc').jqxNumberInput('decimal')), - wa_base_name: 0, - fermentables: $('#fermentableGrid').jqxGrid('getrows'), - hops: $('#hopGrid').jqxGrid('getrows'), - miscs: $('#miscGrid').jqxGrid('getrows'), - yeasts: $('#yeastGrid').jqxGrid('getrows'), - mashs: $('#mashGrid').jqxGrid('getrows') - }, - data = 'update=true&' + $.param(row); - $.ajax({ - dataType: 'json', - url: url, - cache: false, - async: false, - data: data, - type: 'POST', - success: function(data) { - if (data.error) { - console.log('saveRecord(' + goback + ') error ' + data.msg); - alert('SQL fout: ' + data.msg); - } else { - console.log('saveRecord(' + goback + ') success'); - } -// if (goback) - window.location.href = my_return; -// else -// window.location.href = 'rec_export.php?record=' + my_record + '&return=' + my_return + '&name=' + dataRecord.name; - }, - error: function(jqXHR, textStatus, errorThrown) { - console.log('saveRecord() ' + textStatus); - } - }); + window.location.href = my_return; }; dataAdapter.dataBind(); @@ -2065,7 +1747,6 @@ // Tab 1, Algemeen $('#name').jqxTooltip({ content: 'De naam voor dit recept.' }); $('#name').jqxInput({ theme: theme, width: 640, height: 23 }); - $('#locked').jqxCheckBox({ theme: theme, width: 120, height: 23 }); $('#notes').jqxTooltip({ content: 'De uitgebreide opmerkingen over dit recept.' }); $('#notes').jqxInput({ theme: theme, width: 960, height: 200 }); $('#type').jqxTooltip({ content: 'Het brouw type van dit recept.' }); @@ -2358,12 +2039,10 @@ dataRecord.w2_ph = datarecord.ph; $('#w2_cost').val(datarecord.cost); dataRecord.w2_cost = datarecord.cost; - $('#w2_amount').jqxNumberInput({ max: 100000, readOnly: false }); // Set high max to enable the spinbuttons. calcWater(); } }); - $('#w2_amount').jqxTooltip({ content: 'De verdeling van het hoofd en meng water. Het totale maisch water volume blijft gelijk.'}); - $('#w2_amount').jqxNumberInput({ inputMode: 'simple', theme: theme, width: 94, height: 23, min: 0, decimalDigits: 1, spinButtons: true, readOnly: true }); + $('#w2_amount').jqxNumberInput(Show1wat); $('#w2_calcium').jqxNumberInput(Show1wat); $('#w2_magnesium').jqxNumberInput(Show1wat); $('#w2_sodium').jqxNumberInput(Show1wat); @@ -2432,42 +2111,48 @@ // 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(Spin1dec); + $('#wa_cacl2').jqxNumberInput(Show1wat); + $('#ss_cacl2').jqxNumberInput(Show1wat); + $('#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(Spin1dec); + $('#wa_caso4').jqxNumberInput(Show1wat); + $('#ss_caso4').jqxNumberInput(Show1wat); + $('#wa_mgso4').jqxTooltip({ content: 'Epsom zout. Voor het maken van een ander waterprofiel. Voegt magnesium en sulfaat toe. Gebruik spaarzaam!'}); - $('#wa_mgso4').jqxNumberInput(Spin1dec); + $('#wa_mgso4').jqxNumberInput(Show1wat); + $('#ss_mgso4').jqxNumberInput(Show1wat); + $('#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(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); + $('#wa_nacl').jqxNumberInput(Show1wat); + $('#ss_nacl').jqxNumberInput(Show1wat); + $('#wa_mgcl2').jqxTooltip({ content: 'Magnesiumchloride'}); + $('#wa_mgcl2').jqxNumberInput(Show1wat); + $('#ss_mgcl2').jqxNumberInput(Show1wat); + $('#wa_nahco3').jqxTooltip({ content: 'Baksoda'}); $('#wa_caco3').jqxTooltip({ content: 'Kalk'}); - $('#wa_mgcl2,#wa_nahco3,#wa_caco3').jqxNumberInput(Spin1dec); - $('#calc_acid').jqxCheckBox({ theme: theme, width: 120, height: 23 }); - $('#wa_acid_name').jqxDropDownList({ - theme: theme, - source: AcidTypeAdapter, - valueMember: 'id', - displayMember: 'nl', - width: 130, - height: 23, - autoDropDownHeight: true - }); - $('#wa_acid').jqxNumberInput(Spin2dec); + $('#wa_nahco3,#wa_caco3').jqxNumberInput(Show1wat); + + $('#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(Show2dec); + + $('#calc_acid').jqxCheckBox({ theme: theme, width: 120, height: 23, disabled: true }); + + $('#wa_acid_name').jqxInput({ theme: theme, width: 130, height: 23 }); + $('#wa_acid').jqxNumberInput(Show2dec); $('#wa_acid').jqxNumberInput({ symbol: ' ml', symbolPosition: 'right' }); - $('#wa_acid_perc').jqxNumberInput(Perc0); - $('#wa_acid_perc').jqxNumberInput({ width: 70, symbol: '%', symbolPosition: 'right' }); + $('#wa_acid_perc').jqxNumberInput(Show0dec); + $('#wa_acid_perc').jqxNumberInput({ symbol: '%', symbolPosition: 'right' }); + // Sparge water - $('#sparge_temp').jqxNumberInput(Spin1dec); - $('#sparge_volume').jqxNumberInput(Spin1dec); - $('#sparge_ph').jqxNumberInput(SpinpH); +// $('#sparge_volume').jqxNumberInput(Spin1dec); + $('#sparge_ph').jqxNumberInput(Show2dec); $('#sparge_source').jqxDropDownList({ theme: theme, source: SpargeSourceAdapter, @@ -2477,18 +2162,10 @@ height: 23, autoDropDownHeight: true }); - $('#sparge_acid_amount').jqxNumberInput(Spin2dec); - $('#sparge_acid_amount').jqxNumberInput({ spinButtons: false, readOnly: true, symbol: ' ml', symbolPosition: 'right' }); - $('#sparge_acid_type').jqxDropDownList({ - theme: theme, - source: AcidTypeAdapter, - valueMember: 'id', - displayMember: 'nl', - width: 110, - height: 23, - autoDropDownHeight: true - }); - $('#sparge_acid_perc').jqxNumberInput(Perc0); + $('#sparge_acid_amount').jqxNumberInput(Show2dec); + $('#sparge_acid_amount').jqxNumberInput({ symbol: ' ml', symbolPosition: 'right' }); + $('#sparge_acid_type').jqxInput({ theme: theme, width: 130, height: 23 }); + $('#sparge_acid_perc').jqxNumberInput(Show0dec); $('#sparge_acid_perc').jqxNumberInput({ symbol: '%', symbolPosition: 'right' }); // Tabs inside the popup window.
--- a/www/rec_edit.php Wed Aug 03 17:37:30 2022 +0200 +++ b/www/rec_edit.php Wed Aug 03 20:58:18 2022 +0200 @@ -21,9 +21,7 @@ <table style="width: 100%;"> <tr> <td style="vertical-align: top; float: right; padding: 3px;">Recept naam:</td> - <td align="left" colspan="3" style="vertical-align: top; padding: 3px;"><input id="name" /></td> - <td style="vertical-align: top; float: right; padding: 3px;">Alleen lezen:</td> - <td align="left" style="padding: 3px;"><div id="locked"></div></td> + <td align="left" colspan="5" style="vertical-align: top; padding: 3px;"><input id="name" /></td> </tr> <tr> <td style="vertical-align: top; float: right; padding: 3px;">Opmerkingen:</td> @@ -190,20 +188,8 @@ <div> <!-- tab water --> <div style="overflow: hidden;"> <table style="width: 100%;"> - <td colspan="6"> - <table style="width: 100%;"> - <tr> - <td style="vertical-align: top; float: right; padding: 3px;">Bitterheidsindex:</td> - <td style="padding: 3px;"><div style="float: left;" id="tgt_bu"></div><div style="float: left; margin-left: 10px;" id="wr_bu"></div></td> - <td style="vertical-align: top; float: right; padding: 3px;">Richtgetal SO4:Cl:</td> - <td style="padding: 3px;"><div style="float: left;" id="tgt_so4_cl"></div><div style="float: left; margin-left: 10px;" id="wrt_so4_cl"></div></td> - <td style="vertical-align: top; float: right; padding: 3px;">Huidig SO4:Cl:</td> - <td style="padding: 3px;"><div style="float: left;" id="got_so4_cl"></div><div style="float: left; margin-left: 10px;" id="wr_so4_cl"></div></td> - </tr> - </table> - </td> <tr> - <td align="center" colspan="6"> + <td align="center" colspan="9"> <div id='water_totals'> <table style="width: 100%;"> <caption>Water overzicht</caption> @@ -296,61 +282,80 @@ </td> </tr> <tr> - <th style="text-align: center;" colspan="2">Brouwzouten</th> - <th style="text-align: center;" colspan="2">Maischwater pH</th> - <th style="text-align: center;" colspan="2">Spoelwater</th> + <th style="text-align: center;" colspan="3">Brouwzouten</th> + <th colspan="3"></th> + <th style="text-align: center;" colspan="3">Zuur toevoegingen</th> </tr> <tr> - <td style="vertical-align: top; float: right; padding: 3px;">Calciumchloride (CaCl2) gr:</td> + <td style="vertical-align: top; float: right; padding: 3px;">CaCl2 gr:</td> <td style="padding: 3px;"><div id="wa_cacl2"></div></td> - <td style="vertical-align: top; float: right; padding: 3px;"><div class='c_mashph'>Maish pH:</div></td> - <td style="padding: 3px;"><div id="mash_ph" class='c_mashph'></div></td> - <td style="vertical-align: top; float: right; padding: 3px;">Spoelwater liters:</td> - <td style="padding: 3px;"><div id="sparge_volume"></div></td> + <td style="padding: 3px;"><div id="ss_cacl2"></div></td> + <td style="vertical-align: top; float: right; padding: 3px;">Bitterheidsindex:</td> + <td style="padding: 3px;"><div style="float: left;" id="tgt_bu"></div></td> + <td style="padding: 3px;"><div style="float: left;" id="wr_bu"></div></td> + <td style="vertical-align: top; float: right; padding: 3px;">Auto bereken:</td> + <td style="padding: 3px;"><div id="calc_acid"></div></td> + <td></td> </tr> <tr> - <td style="vertical-align: top; float: right; padding: 3px;">Gips (CaSO4) gr:</td> + <td style="vertical-align: top; float: right; padding: 3px;">CaSO4 gr:</td> <td style="padding: 3px;"><div id="wa_caso4"></div></td> - <td style="vertical-align: top; float: right; padding: 3px;">pH Automatisch:</td> - <td style="padding: 3px;"><div id="calc_acid"></div></td> - <td style="vertical-align: top; float: right; padding: 3px;">Spoelwater °C:</td> - <td style="padding: 3px;"><div id="sparge_temp"></div></td> + <td style="padding: 3px;"><div id="ss_caso4"></div></td> + <td style="vertical-align: top; float: right; padding: 3px;">Richtgetal SO4:Cl:</td> + <td style="padding: 3px;"><div style="float: left;" id="tgt_so4_cl"></div></td> + <td style="padding: 3px;"><div style="float: left;" id="wrt_so4_cl"></div></td> + <td style="vertical-align: top; float: right; padding: 3px;"><div class='c_mashph'>Gewenst maish pH:</div></td> + <td style="padding: 3px;"><div id="mash_ph" class='c_mashph'></div></td> + <td></td> </tr> <tr> - <td style="vertical-align: top; float: right; padding: 3px;">Epsom zout (MgSO4) gr:</td> + <td style="vertical-align: top; float: right; padding: 3px;">MgSO4 gr:</td> <td style="padding: 3px;"><div id="wa_mgso4"></div></td> + <td style="padding: 3px;"><div id="ss_mgso4"></div></td> + <td style="vertical-align: top; float: right; padding: 3px;">Huidig SO4:Cl:</td> + <td style="padding: 3px;"><div style="float: left;" id="got_so4_cl"></div></td> + <td style="padding: 3px;"><div style="float: left;" id="wr_so4_cl"></div></td> <td style="vertical-align: top; float: right; padding: 3px;">Aanzuren met:</td> - <td style="padding: 3px;"><div style="float: left;" id="wa_acid_name"></div><div style="float: left; margin-left: 15px;" id="wa_acid"></div><div style="float: left; margin-left: 15px;" id="wa_acid_perc"></div></td> - <td style="vertical-align: top; float: right; padding: 3px;">Spoelwater bron:</td> - <td style="padding: 3px;"><div id="sparge_source"></div></td> + <td style="padding: 3px;"><input readonly="1" id="wa_acid_name" /></td> + <td style="padding: 3px;"><div style="float: left;" id="wa_acid_perc"></div></td> </tr> <tr> - <td style="vertical-align: top; float: right; padding: 3px;">Keukenzout (NaCl) gr:</td> + <td style="vertical-align: top; float: right; padding: 3px;">NaCl gr:</td> <td style="padding: 3px;"><div id="wa_nacl"></div></td> - <td colspan="2"></td> - <td style="vertical-align: top; float: right; padding: 3px;">Spoelwater pH:</td> - <td style="padding: 3px;"><div id="sparge_ph"></div></td> + <td style="padding: 3px;"><div style="float: left;" id="ss_nacl"></div></td> + <td colspan="3"></td> + <td style="vertical-align: top; float: right; padding: 3px;">Zuur hoeveelheid:</td> + <td style="padding: 3px;"><div style="float: left;" id="wa_acid"></div></td> + <td></td> </tr> <tr> - <td style="vertical-align: top; float: right; padding: 3px;">Magnesiumchloride (MgCl2) gr:</td> - <td style="padding: 3px;"><div id="wa_mgcl2"></div></td> - <td colspan="2"></td> - <td style="vertical-align: top; float: right; padding: 3px;">Aanzuren met:</td> - <td style="padding: 3px;"><div id="sparge_acid_type"></div></td> + <td style="vertical-align: top; float: right; padding: 3px;">MgCl2 gr:</td> + <td style="padding: 3px;"><div id="wa_mgcl2"></div></td> + <td style="padding: 3px;"><div id="ss_mgcl2"></div></td> + <td colspan="3"></td> + <td style="vertical-align: top; float: right; padding: 3px;">Gewenst spoel pH:</td> + <td style="padding: 3px;"><div id="sparge_ph"></div></td> + <td></td> </tr> <tr> - <td style="vertical-align: top; float: right; padding: 3px;">Baksoda (NaHCO3) gr:</td> - <td style="padding: 3px;"><div id="wa_nahco3"></div></td> - <td colspan="2"></td> - <td style="vertical-align: top; float: right; padding: 3px;">Sterkte %:</td> - <td style="padding: 3px;"><div id="sparge_acid_perc"></div></td> + <td style="vertical-align: top; float: right; padding: 3px;">NaHCO3 gr:</td> + <td style="padding: 3px;"><div id="wa_nahco3"></div></td> + <td></td> + <td colspan="3"></td> + <td style="vertical-align: top; float: right; padding: 3px;">Aanzuren met:</td> + <td style="padding: 3px;"><input readonly="1" id="sparge_acid_type" /></td> + <td style="padding: 3px;"><div id="sparge_acid_perc"></div></td> </tr> <tr> - <td style="vertical-align: top; float: right; padding: 3px;">Kalk (CaCO3) gr:</td> - <td style="padding: 3px;"><div id="wa_caco3"></div></td> - <td colspan="2"></td> - <td style="vertical-align: top; float: right; padding: 3px;">Benodigd:</td> - <td style="padding: 3px;"><div id="sparge_acid_amount"></div></td> + <td style="vertical-align: top; float: right; padding: 3px;">CaCO3 gr:</td> + <td style="padding: 3px;"><div id="wa_caco3"></div></td> + <td></td> + <td style="vertical-align: top; float: right; padding: 3px;">Spoelwater bron:</td> + <td style="padding: 3px;"><div id="sparge_source"></div></td> + <td></td> + <td style="vertical-align: top; float: right; padding: 3px;">Zuur hoeveelheid:</td> + <td style="padding: 3px;"><div id="sparge_acid_amount"></div></td> + <td></td> </tr> </table> </div>
