Mercurial > mbsePi-apps / changeset

--- a/www/fermenter.php	Fri May 03 20:41:26 2024 +0200
+++ b/www/fermenter.php	Sat May 04 13:49:36 2024 +0200
@@ -74,7 +74,7 @@
        <div id="fermenter_led2"></div>
        <div id="fermenter_led3"></div>
       </div>
-      <div>
+      <div id="fermenter_switches">
        <div id="fermenter_toggle1"></div>
        <div id="fermenter_toggle2"></div>
        <div id="fermenter_toggle3"></div>

--- a/www/js/fermenter.js	Fri May 03 20:41:26 2024 +0200
+++ b/www/js/fermenter.js	Sat May 04 13:49:36 2024 +0200
@@ -241,11 +241,10 @@
    }
   } else {
    $('#fermenter_led3').html('<div class="LEDgreen_hide"></div>');
-   $('#fermenter_toggle3').hide();
   }
 
   if (record.mode == 'NONE') {
-   $('#fermenter_toggle1,#fermenter_toggle2,#fermenter_toggle3').show();
+   $('#fermenter_switches').show();
    $('#fermenter_toggle1').jqxSwitchButton({ disabled: (record.heater_address) ? false:true });
    $('#fermenter_toggle2').jqxSwitchButton({ disabled: (record.cooler_address) ? false:true });
    $('#fermenter_toggle3').jqxSwitchButton({ disabled: (record.fan_address) ? false:true });
@@ -256,7 +255,7 @@
    if ((record.fan_state != 0) != $('#fermenter_toggle3').jqxSwitchButton('val'))
     $('#fermenter_toggle3').val(record.fan_state != 0);
   } else {
-   $('#fermenter_toggle1,#fermenter_toggle2,#fermenter_toggle3').hide();
+   $('#fermenter_switches').hide();
   }
 
   $('#info_profile').html(record.profile_name);
@@ -347,10 +346,6 @@
  $('#Profile1').hide(); // Hide these until they are needed.
  $('#Profile2').hide();
 
- // Get the data immediatly and then via websockets to refresh.
- globalData.dataBind();
- dataAdapter.dataBind();
-
  $('#info_mode').on('select', function(event) {
   if (event.args && event.args.item.value != record.mode) {
    record.mode = event.args.item.value;
@@ -445,6 +440,10 @@
   }
  });
 
+ // Get the data immediatly and then via websockets to refresh.
+ globalData.dataBind();
+ dataAdapter.dataBind();
+
  createAbortElements();
 
  websocket.onmessage = function(evt) {

--- a/www/js/set_fermenters.js	Fri May 03 20:41:26 2024 +0200
+++ b/www/js/set_fermenters.js	Sat May 04 13:49:36 2024 +0200
@@ -308,60 +308,63 @@
    { text: 'Code', datafield: 'product_code', width: 150 },
    { text: 'Beer', datafield: 'product_name' },
    { text: '', datafield: 'Edit', width: 100, align: 'center', columntype: 'button', cellsrenderer: function() {
-    return 'Edit';
+     return 'Edit';
     }, buttonclick: function(row) {
      // open the popup window when the user clicks a button.
      editrow = row;
-     $('#popupWindow').jqxWindow({ position: { x: 40, y: 15 } });
      dataRecord = $('#jqxgrid').jqxGrid('getrowdata', editrow);
-     $('#uuid').val(dataRecord.uuid);
-     $('#alias').val(dataRecord.alias);
-     $('#product_code').val(dataRecord.product_code);
-     $('#product_name').val(dataRecord.product_name);
-     $('#air_address').val(dataRecord.air_address);
-     $('#air_idx').val(dataRecord.air_idx);
-     $('#beer_address').val(dataRecord.beer_address);
-     $('#beer_address2').val(dataRecord.beer_address2);
-     $('#beer_idx').val(dataRecord.beer_idx);
-     $('#chiller_address').val(dataRecord.chiller_address);
-     $('#chiller_idx').val(dataRecord.chiller_idx);
-     $('#heater_address').val(dataRecord.heater_address);
-     $('#heater_idx').val(dataRecord.heater_idx);
-     $('#heater_state').val(dataRecord.heater_state);
-     $('#heater_delay').val(dataRecord.heater_delay);
-     $('#cooler_address').val(dataRecord.cooler_address);
-     $('#cooler_idx').val(dataRecord.cooler_idx);
-     $('#cooler_state').val(dataRecord.cooler_state);
-     $('#cooler_delay').val(dataRecord.cooler_delay);
-     $('#fan_address').val(dataRecord.fan_address);
-     $('#fan_idx').val(dataRecord.fan_idx);
-     $('#fan_state').val(dataRecord.fan_state);
-     $('#fan_delay').val(dataRecord.fan_delay);
-     $('#light_address').val(dataRecord.light_address);
-     $('#light_idx').val(dataRecord.light_idx);
-     $('#light_state').val(dataRecord.light_state);
-     $('#light_delay').val(dataRecord.light_delay);
-     $('#door_address').val(dataRecord.door_address);
-     $('#door_idx').val(dataRecord.door_idx);
-     $('#door_state').val(dataRecord.door_state);
-     $('#psu_address').val(dataRecord.psu_address);
-     $('#psu_idx').val(dataRecord.psu_idx);
-     $('#psu_state').val(dataRecord.psu_state);
-     $('#mode').val(dataRecord.mode);
-     $('#stage').val(dataRecord.stage);
-     $('#pidc_p').val(dataRecord.pidc_p);
-     $('#pidc_i').val(dataRecord.pidc_i);
-     $('#pidc_d').val(dataRecord.pidc_d);
-     $('#pidc_imax').val(dataRecord.pidc_imax);
-     $('#pidc_idle').val(dataRecord.pidc_idle);
-     $('#pidh_p').val(dataRecord.pidh_p);
-     $('#pidh_i').val(dataRecord.pidh_i);
-     $('#pidh_d').val(dataRecord.pidh_d);
-     $('#pidh_imax').val(dataRecord.pidh_imax);
-     $('#pidh_idle').val(dataRecord.pidh_idle);
-
-     // show the popup window.
-     $('#popupWindow').jqxWindow('open');
+     if (dataRecord.mode == 'OFF') {
+      $('#popupWindow').jqxWindow({ position: { x: 40, y: 15 } });
+      $('#uuid').val(dataRecord.uuid);
+      $('#alias').val(dataRecord.alias);
+      $('#product_code').val(dataRecord.product_code);
+      $('#product_name').val(dataRecord.product_name);
+      $('#air_address').val(dataRecord.air_address);
+      $('#air_idx').val(dataRecord.air_idx);
+      $('#beer_address').val(dataRecord.beer_address);
+      $('#beer_address2').val(dataRecord.beer_address2);
+      $('#beer_idx').val(dataRecord.beer_idx);
+      $('#chiller_address').val(dataRecord.chiller_address);
+      $('#chiller_idx').val(dataRecord.chiller_idx);
+      $('#heater_address').val(dataRecord.heater_address);
+      $('#heater_idx').val(dataRecord.heater_idx);
+      $('#heater_state').val(dataRecord.heater_state);
+      $('#heater_delay').val(dataRecord.heater_delay);
+      $('#cooler_address').val(dataRecord.cooler_address);
+      $('#cooler_idx').val(dataRecord.cooler_idx);
+      $('#cooler_state').val(dataRecord.cooler_state);
+      $('#cooler_delay').val(dataRecord.cooler_delay);
+      $('#fan_address').val(dataRecord.fan_address);
+      $('#fan_idx').val(dataRecord.fan_idx);
+      $('#fan_state').val(dataRecord.fan_state);
+      $('#fan_delay').val(dataRecord.fan_delay);
+      $('#light_address').val(dataRecord.light_address);
+      $('#light_idx').val(dataRecord.light_idx);
+      $('#light_state').val(dataRecord.light_state);
+      $('#light_delay').val(dataRecord.light_delay);
+      $('#door_address').val(dataRecord.door_address);
+      $('#door_idx').val(dataRecord.door_idx);
+      $('#door_state').val(dataRecord.door_state);
+      $('#psu_address').val(dataRecord.psu_address);
+      $('#psu_idx').val(dataRecord.psu_idx);
+      $('#psu_state').val(dataRecord.psu_state);
+      $('#mode').val(dataRecord.mode);
+      $('#stage').val(dataRecord.stage);
+      $('#pidc_p').val(dataRecord.pidc_p);
+      $('#pidc_i').val(dataRecord.pidc_i);
+      $('#pidc_d').val(dataRecord.pidc_d);
+      $('#pidc_imax').val(dataRecord.pidc_imax);
+      $('#pidc_idle').val(dataRecord.pidc_idle);
+      $('#pidh_p').val(dataRecord.pidh_p);
+      $('#pidh_i').val(dataRecord.pidh_i);
+      $('#pidh_d').val(dataRecord.pidh_d);
+      $('#pidh_imax').val(dataRecord.pidh_imax);
+      $('#pidh_idle').val(dataRecord.pidh_idle);
+      // show the popup window.
+      $('#popupWindow').jqxWindow('open');
+     } else {
+      alert('The fermenter is in use and Edit is not allowed. Stop this fermenter first.');
+     }
     }
    }
   ],