# HG changeset patch # User Michiel Broek # Date 1659636821 -7200 # Node ID 4e3409cfd2b14e3d96b5705464d5f7eee0a6b2ba # Parent 1f2ca835fe9d21ad71f154385b28b772d86f6993 Code cleanup diff -r 1f2ca835fe9d -r 4e3409cfd2b1 www/js/rec_edit.js --- a/www/js/rec_edit.js Thu Aug 04 20:04:52 2022 +0200 +++ b/www/js/rec_edit.js Thu Aug 04 20:13:41 2022 +0200 @@ -97,34 +97,6 @@ } -function calcPercentages() { - - console.log('calcPercentages()'); - var tw, rowdata, percentage, i, rowscount = $('#fermentableGrid').jqxGrid('getdatainformation').rowscount; - if (rowscount > 1) { - tw = 0; - for (i = 0; i < rowscount; i++) { - rowdata = $('#fermentableGrid').jqxGrid('getrowdata', i); - if (rowdata.f_added < 4) - tw += Round(rowdata.f_amount, 3); - } - tw = Round(tw, 3); - - for (i = 0; i < rowscount; i++) { - rowdata = $('#fermentableGrid').jqxGrid('getrowdata', i); - if (rowdata.f_added < 4) { - percentage = Round(rowdata.f_amount / tw * 100, 1); - $('#fermentableGrid').jqxGrid('setcellvalue', i, 'f_percentage', percentage); - } else { - $('#fermentableGrid').jqxGrid('setcellvalue', i, 'f_percentage', 0); - } - } - } else { - $('#fermentableGrid').jqxGrid('setcellvalue', 0, 'f_percentage', 100); - } -} - - function calcFermentables() { console.log('calcFermentables()'); var i, row, rows, org, s = 0, d, x, @@ -341,81 +313,6 @@ } -function calcIBUs() { - var total_ibus = 0, - rows = {}, - i, row; - - hop_aroma = hop_flavour = 0; - if (!(rows = $('#hopGrid').jqxGrid('getrows'))) { - return; - } - for (i = 0; i < rows.length; i++) { - row = rows[i]; - total_ibus += toIBU(row.h_useat, row.h_form, preboil_sg, parseFloat(dataRecord.batch_size), - parseFloat(row.h_amount), parseFloat(row.h_time), parseFloat(row.h_alpha), dataRecord.ibu_method, 0, parseFloat(row.h_time), 0); - hop_flavour += hopFlavourContribution(parseFloat(row.h_time), parseFloat(dataRecord.batch_size), row.h_useat, parseFloat(row.h_amount)); - hop_aroma += hopAromaContribution(parseFloat(row.h_time), parseFloat(dataRecord.batch_size), row.h_useat, parseFloat(row.h_amount)); - } - total_ibus = Round(total_ibus, 1); - hop_flavour = Round(hop_flavour * 100 / 5, 1); - hop_aroma = Round(hop_aroma * 100 / 6, 1); - if (hop_flavour > 100) - hop_flavour = 100; - if (hop_aroma > 100) - hop_aroma = 100; - console.log('calcIBUs(): ' + total_ibus + ' flavour: ' + hop_flavour + ' aroma: ' + hop_aroma); - dataRecord.est_ibu = total_ibus; - $('#est_ibu').val(total_ibus); - $('#est_ibu2').val(total_ibus); - $('#hop_flavour').jqxProgressBar('val', hop_flavour); - $('#hop_aroma').jqxProgressBar('val', hop_aroma); -} - - -function adjustYeasts(factor) { - - var i, row, amount, rowscount = $('#yeastGrid').jqxGrid('getdatainformation').rowscount; - if (rowscount == 0) - return; - - for (i = 0; i < rowscount; i++) { - row = $('#yeastGrid').jqxGrid('getrowdata', i); - if (row.y_form == 1) { // Only adjust dry yeast - amount = row.y_amount * factor; - $('#yeastGrid').jqxGrid('setcellvalue', i, 'y_amount', amount); - } - } -} - - -function adjustWaters(factor) { - - var i, row, amount, rowscount = $('#mashGrid').jqxGrid('getdatainformation').rowscount; - if (rowscount == 0) - return; - mash_infuse = 0; - for (i = 0; i < rowscount; i++) { - row = $('#mashGrid').jqxGrid('getrowdata', i); - if (row.step_type == 0) { // Infusion - amount = Round(row.step_infuse_amount * factor, 1); - $('#mashGrid').jqxGrid('setcellvalue', i, 'step_infuse_amount', amount); - mash_infuse += amount; - } - } - if (dataRecord.w2_amount == 0) { - dataRecord.w1_amount = mash_infuse; - $('#w1_amount').val(mash_infuse); - } else { - dataRecord.w1_amount = (dataRecord.w1_amount / (dataRecord.w1_amount + dataRecord.w2_amount)) * mash_infuse; - dataRecord.w2_amount = (dataRecord.w2_amount / (dataRecord.w1_amount + dataRecord.w2_amount)) * mash_infuse; - $('#w1_amount').val(dataRecord.w1_amount); - $('#w2_amount').val(dataRecord.w2_amount); - } - $('#wg_amount').val(mash_infuse); -} - - function GetBUGU() { var gu = (dataRecord.est_og - 1) * 1000; if (gu > 0)