Mercurial > bms / file diff

--- a/www/js/prod_view.js	Sat Oct 22 15:27:50 2022 +0200
+++ b/www/js/prod_view.js	Sun Oct 30 16:46:03 2022 +0100
@@ -161,17 +161,22 @@
    { name: 'eq_trub_chiller_loss', type: 'float' },
    { name: 'eq_evap_rate', type: 'float' },
    { name: 'eq_boil_time', type: 'float' },
-   { name: 'eq_calc_boil_volume', type: 'int' },
+   { name: 'xeq_calc_boil_volume', type: 'int' },
    { name: 'eq_top_up_kettle', type: 'float' },
    { name: 'eq_notes', type: 'string' },
-   { name: 'eq_lauter_volume', type: 'float' },
-   { name: 'eq_lauter_height', type: 'float' },
+   { name: 'xeq_lauter_volume', type: 'float' },
+   { name: 'xeq_lauter_height', type: 'float' },
    { name: 'eq_lauter_deadspace', type: 'float' },
    { name: 'eq_kettle_volume', type: 'float' },
    { name: 'eq_kettle_height', type: 'float' },
    { name: 'eq_mash_volume', type: 'float' },
    { name: 'eq_mash_max', type: 'float' },
    { name: 'eq_efficiency', type: 'float' },
+   { name: 'eq_chiller_type', type: 'int' },
+   { name: 'eq_chiller_to79', type: 'float' },
+   { name: 'eq_chiller_volume', type: 'float' },
+   { name: 'eq_chiller_lpm', type: 'float' },
+   { name: 'eq_chiller_loss', type: 'float' },
    { name: 'brew_date_start', type: 'string' },
    { name: 'brew_mash_ph', type: 'float' },
    { name: 'brew_mash_sg', type: 'float' },
@@ -373,12 +378,18 @@
    $('#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);
-   $('#eq_lauter_volume').val(dataRecord.eq_lauter_volume);
+//   $('#eq_lauter_volume').val(dataRecord.eq_lauter_volume);
    $('#eq_lauter_deadspace').val(dataRecord.eq_lauter_deadspace);
    $('#eq_kettle_volume').val(dataRecord.eq_kettle_volume);
    $('#eq_mash_volume').val(dataRecord.eq_mash_volume);
    $('#eq_mash_max').val(dataRecord.eq_mash_max);
    $('#eq_efficiency').val(dataRecord.eq_efficiency);
+   $('#eq_chiller_type').val(CoolingTypeData[dataRecord.eq_chiller_type].nl);
+   $('#eq_chiller_to79').val(dataRecord.eq_chiller_to79);
+   $('#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 );
    // Brewdate
    $('#brew_date_start').val(dataRecord.brew_date_start);
    $('#brew_mash_ph').val(dataRecord.brew_mash_ph);
@@ -2908,19 +2919,22 @@
  $('#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.' });
  $('#eq_notes').jqxTooltip({ content: 'Opmerkingen over deze apparatuur.' });
- $('#eq_lauter_volume').jqxTooltip({ content: 'Filterkuip volume.' });
  $('#eq_lauter_deadspace').jqxTooltip({ content: 'Filterkuip verlies in liters.' });
  $('#eq_kettle_volume').jqxTooltip({ content: 'Kook ketel volume in liters.' });
  $('#eq_mash_volume').jqxTooltip({ content: 'Maisch water voor de eerste stap.' });
  $('#eq_mash_max').jqxTooltip({ content: 'De maximale moutstort in Kg.' });
  $('#eq_efficiency').jqxTooltip({ content: 'Gemiddeld brouwzaal rendement.' });
 
+ $('#eq_fermenter_volume').jqxNumberInput(Show1dec);
  $('#eq_name').jqxInput({ theme: theme, width: 250, height: 23 });
  $('#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_lauter_volume,#eq_lauter_deadspace,#eq_kettle_volume,#eq_mash_volume,#eq_mash_max,#eq_efficiency').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);
+ $('#eq_chiller_volume,#eq_chiller_lpm,#eq_chiller_loss').jqxNumberInput(Show2dec);
 
  // Tab 3, Fermentables
  $('#est_color2').jqxTooltip({ content: 'De kleur in EBC. Dit wordt automatisch berekend.' });