Mercurial > bms / file diff

--- a/www/js/prod_edit.js	Thu Mar 19 13:42:59 2020 +0100
+++ b/www/js/prod_edit.js	Thu Mar 19 20:41:18 2020 +0100
@@ -31,6 +31,7 @@
   resizable: false,
   isModal: true,
   modalOpacity: 0.4,
+  autoOpen: false,
   okButton: $('#delOk'),
   cancelButton: $('#delCancel'),
   initContent: function() {
@@ -40,6 +41,19 @@
   }
  });
  $('#eventWindow').jqxWindow('hide');
+
+ $('#volumeWindow').jqxWindow({
+  theme: theme,
+  position: { x: 380, y: 210 },
+  width: 500,
+  height: 200,
+  resizable: false,
+  isModal: true,
+  modalOpacity: 0.4,
+  autoOpen: false,
+  cancelButton: $('#volumeReady')
+ });
+ $('#volumeWindow').jqxWindow('hide');
 }
 
 
@@ -66,6 +80,9 @@
 
  data_loaded = 0;
  error_count = 0;
+ k_cm = 0;
+ k_vol = 0;
+ k_what = 0;
 
  hop_flavour = 0,
  hop_aroma = 0,
@@ -3594,6 +3611,8 @@
    $('#brew_aeration_time').jqxNumberInput({ spinButtons: false, readOnly: true, width: 90 });
    $('#brew_fermenter_extrawater').jqxNumberInput({ spinButtons: false, readOnly: true, width: 90 });
    $('#brew_aeration_speed').jqxNumberInput({ spinButtons: false, readOnly: true, width: 90 });
+   $('#but_pre_boil').jqxButton({ disabled: true });
+   $('#but_after_boil').jqxButton({ disabled: true });
   }
   if (dataRecord.stage == 5) // Lagering, allow packaging
    $('#package_date').jqxDateTimeInput({ disabled: false });
@@ -5720,6 +5739,50 @@
   calcFermentables();
   calcIBUs();
  });
+ $('#ketel_volume').jqxNumberInput(Show1dec);
+ $('#ketel_cm').jqxNumberInput(Spin1dec);
+ $('#ketel_cm').on('change', function(event) {
+  k_cm = parseFloat(event.args.value);
+  k_vol = kettle_vol(k_cm, dataRecord.eq_kettle_volume, dataRecord.eq_kettle_height);
+  $('#ketel_volume').val(k_vol);
+ });
+ $('#volumeReady').jqxButton({ template: 'success', width: '90px', theme: theme });
+ $('#volumeReady').click(function() {
+  /* Is it pre or after boil */
+  console.log('volumeReady ' + k_what + ' volume: ' + Round(k_vol, 1));
+  if (k_what == 0) {
+   dataRecord.brew_preboil_volume = Round(k_vol, 1);
+   $('#brew_preboil_volume').val(Round(k_vol, 1));
+  } else if (k_what == 1) {
+   dataRecord.brew_aboil_volume = Round(k_vol, 1);
+   $('#brew_aboil_volume').val(Round(k_vol, 1));
+  }
+ });
+ $('#but_pre_boil').jqxButton({ template: 'success', width: '23px', height: 23, theme: theme });
+ $('#but_pre_boil').bind('click', function() {
+  /* If we already have measured a value, use that. Else use the estimated value. */
+  if (dataRecord.brew_preboil_volume > 0)
+   k_cm = kettle_cm(dataRecord.brew_preboil_volume, dataRecord.eq_kettle_volume, dataRecord.eq_kettle_height);
+  else
+   k_cm = kettle_cm(dataRecord.boil_size * 1.04, dataRecord.eq_kettle_volume, dataRecord.eq_kettle_height);
+  k_vol = kettle_vol(k_cm, dataRecord.eq_kettle_volume, dataRecord.eq_kettle_height);
+  k_what = 0;
+  $('#ketel_cm').val(k_cm);
+  $('#ketel_volume').val(k_vol);
+  $('#volumeWindow').jqxWindow('open');
+ });
+ $('#but_after_boil').jqxButton({ template: 'success', width: 23, height: 23, theme: theme });
+ $('#but_after_boil').bind('click', function() {
+  if (dataRecord.brew_aboil_volume > 0)
+   k_cm = kettle_cm(dataRecord.brew_aboil_volume, dataRecord.eq_kettle_volume, dataRecord.eq_kettle_height);
+  else
+   k_cm = kettle_cm(dataRecord.batch_size * 1.04, dataRecord.eq_kettle_volume, dataRecord.eq_kettle_height);
+  k_vol = kettle_vol(k_cm, dataRecord.eq_kettle_volume, dataRecord.eq_kettle_height);
+  k_what = 1;
+  $('#ketel_cm').val(k_cm);
+  $('#ketel_volume').val(k_vol);
+  $('#volumeWindow').jqxWindow('open');
+ });
  $('#est_pre_vol,#est_a_vol').jqxNumberInput(Show1wat);
  $('#brew_preboil_efficiency,#brew_aboil_efficiency,#brew_sparge_temperature,#brew_sparge_volume,#brew_sparge_est').jqxNumberInput(Show1dec);
  $('#brew_cooling_to').jqxNumberInput(Spin1dec);