diff -r 60bb365fb48d -r 897bf2a43253 www/js/prod_view.js --- a/www/js/prod_view.js Sun Oct 30 16:46:03 2022 +0100 +++ b/www/js/prod_view.js Sat Jan 14 11:25:20 2023 +0100 @@ -1,5 +1,5 @@ /***************************************************************************** - * Copyright (C) 2018-2022 + * Copyright (C) 2018-2023 * * Michiel Broek * @@ -158,7 +158,7 @@ { name: 'eq_tun_material', type: 'int' }, { name: 'eq_tun_height', type: 'float' }, { name: 'eq_top_up_water', type: 'float' }, - { name: 'eq_trub_chiller_loss', type: 'float' }, + { name: 'eq_trub_loss', type: 'float' }, { name: 'eq_evap_rate', type: 'float' }, { name: 'eq_boil_time', type: 'float' }, { name: 'xeq_calc_boil_volume', type: 'int' }, @@ -374,7 +374,7 @@ $('#eq_batch_size').val(dataRecord.eq_batch_size); $('#eq_tun_volume').val(dataRecord.eq_tun_volume); $('#eq_top_up_water').val(dataRecord.eq_top_up_water); - $('#eq_trub_chiller_loss').val(dataRecord.eq_trub_chiller_loss); + $('#eq_trub_loss').val(dataRecord.eq_trub_loss); $('#eq_evap_rate').val(dataRecord.eq_evap_rate); $('#eq_boil_time').val(dataRecord.eq_boil_time); $('#eq_top_up_kettle').val(dataRecord.eq_top_up_kettle); @@ -389,7 +389,7 @@ $('#eq_chiller_volume').val(dataRecord.eq_chiller_volume); $('#eq_chiller_lpm').val(dataRecord.eq_chiller_lpm); $('#eq_chiller_loss').val(dataRecord.eq_chiller_loss); - $('#eq_fermenter_volume').val((dataRecord.eq_batch_size / 1.04) - dataRecord.eq_trub_chiller_loss - dataRecord.eq_chiller_loss ); + $('#eq_fermenter_volume').val((dataRecord.eq_batch_size / 1.04) - dataRecord.eq_trub_loss - dataRecord.eq_chiller_loss ); // Brewdate $('#brew_date_start').val(dataRecord.brew_date_start); $('#brew_mash_ph').val(dataRecord.brew_mash_ph); @@ -1378,7 +1378,7 @@ if (dataRecord.brew_aboil_volume > 0) aboil_volume = dataRecord.brew_aboil_volume / 1.04; // volume @ 20 degrees if (dataRecord.brew_fermenter_tcloss == 0) { - dataRecord.brew_fermenter_tcloss = dataRecord.eq_trub_chiller_loss; + dataRecord.brew_fermenter_tcloss = dataRecord.eq_trub_loss; $('#brew_fermenter_tcloss').val(dataRecord.brew_fermenter_tcloss); } dataRecord.brew_fermenter_volume = aboil_volume - dataRecord.brew_fermenter_tcloss + dataRecord.brew_fermenter_extrawater; @@ -1577,7 +1577,7 @@ volume = dataRecord.brew_fermenter_volume; if (volume <= 0) - volume = dataRecord.batch_size - dataRecord.eq_trub_chiller_loss; + volume = dataRecord.batch_size - dataRecord.eq_trub_loss; return dataRecord.yeast_pitchrate * volume * plato; } @@ -1939,7 +1939,7 @@ if (dataRecord.brew_fermenter_extrawater > 0) volume += dataRecord.brew_fermenter_extrawater; } else { - volume = dataRecord.batch_size - dataRecord.eq_trub_chiller_loss; + volume = dataRecord.batch_size - dataRecord.eq_trub_loss; } // Also in calcFermentables() @@ -2914,7 +2914,7 @@ $('#eq_batch_size').jqxTooltip({ content: 'Berekende batch grootte in liters aan het eind van de kook.' }); $('#eq_tun_volume').jqxTooltip({ content: 'Maisch ketel volume.' }); $('#eq_top_up_water').jqxTooltip({ content: 'Extra water in het gistvat.' }); - $('#eq_trub_chiller_loss').jqxTooltip({ content: 'Standaard verlies bij het overbrengen naar het gistvat.' }); + $('#eq_trub_loss').jqxTooltip({ content: 'Standaard verlies bij het overbrengen naar het gistvat.' }); $('#eq_evap_rate').jqxTooltip({ content: 'Verdamping in liters per uur.' }); $('#eq_boil_time').jqxTooltip({ content: 'Normale kooktijd in minuten, 0 voor no-boil recepten.' }); $('#eq_top_up_kettle').jqxTooltip({ content: 'Extra water toevoegen tijdens de kook.' }); @@ -2930,7 +2930,7 @@ $('#eq_evap_rate').jqxNumberInput(Show2dec); $('#eq_boil_time').jqxNumberInput(Show0dec); $('#eq_notes').jqxInput({ theme: theme, width: 960, height: 200 }); - $('#eq_boil_size,#eq_batch_size,#eq_tun_volume,#eq_top_up_water,#eq_trub_chiller_loss,#eq_top_up_kettle').jqxNumberInput(Show1dec); + $('#eq_boil_size,#eq_batch_size,#eq_tun_volume,#eq_top_up_water,#eq_trub_loss,#eq_top_up_kettle').jqxNumberInput(Show1dec); $('#eq_lauter_deadspace,#eq_kettle_volume,#eq_mash_volume,#eq_mash_max,#eq_efficiency').jqxNumberInput(Show1dec); $('#eq_chiller_type').jqxInput({ theme: theme, width: 180, height: 23 }); $('#eq_chiller_to79').jqxNumberInput(Show0dec);