Tab 2 is a viewer.

Fri, 05 Aug 2022 14:24:29 +0200

author
Michiel Broek <mbroek@mbse.eu>
date
Fri, 05 Aug 2022 14:24:29 +0200
changeset 819
d759d9ed357e
parent 818
f9c071906643
child 820
16ae12aa872e

Tab 2 is a viewer.

www/js/prod_edit.js file | annotate | diff | comparison | revisions
www/prod_edit.php file | annotate | diff | comparison | revisions
--- a/www/js/prod_edit.js	Fri Aug 05 14:19:21 2022 +0200
+++ b/www/js/prod_edit.js	Fri Aug 05 14:24:29 2022 +0200
@@ -3703,10 +3703,6 @@
   }
  }
 
- function en_stage_equipment(state) {
-  $('#equipmentSelect').jqxDropDownList({ disabled: (state) ? true:false });
- }
-
  function en_stage_brewday(state) {
   $('#jqxTabs').jqxTabs((state) ? 'disableAt':'enableAt', 8);	// Brewday tab
  }
@@ -3915,7 +3911,6 @@
   /*
    * Enable or disable parts of the screens.
    */
-  en_stage_equipment(dataRecord.stage > 1);		// When the brew is in progress or done
   en_stage_brewday(dataRecord.stage < 1);		// Planning, no ingredients
   en_stage_afterbrew(dataRecord.stage > 2);		// After the brew
   en_stage_afterprimary(dataRecord.stage > 3);		// Primary fermentation done
@@ -4332,76 +4327,6 @@
   $('#CLog').jqxButton({ disabled: (dataRecord.log_co2pressure) ? false : true});
  }
 
- // Equipemnt dropdown list
- $('#equipmentSelect').jqxDropDownList({
-  placeHolder: 'Kies apparatuur:',
-  theme: theme,
-  source: equipmentlist,
-  displayMember: 'name',
-  width: 170,
-  height: 23,
-  dropDownWidth: 300,
-  renderer: function(index, label, value) {
-   var datarecord = equipmentlist.records[index];
-   return datarecord.batch_size + ' liter ' + datarecord.name;
-  }
- });
- $('#equipmentSelect').on('select', function(event) {
-  if (event.args) {
-   var datarecord, factor, index = event.args.index;
-   datarecord = equipmentlist.records[index];
-   factor = datarecord.batch_size / dataRecord.batch_size;
-   $('#eq_name').val(datarecord.name);
-   $('#eq_boil_size').val(datarecord.boil_size);
-   dataRecord.boil_size = datarecord.boil_size;
-   $('#boil_size').val(datarecord.boil_size);
-   $('#eq_batch_size').val(datarecord.batch_size);
-   dataRecord.batch_size = datarecord.batch_size;
-   $('#batch_size').val(datarecord.batch_size);
-   $('#est_a_vol').val(datarecord.batch_size * 1.04);
-   $('#eq_tun_volume').val(datarecord.tun_volume);
-   dataRecord.eq_tun_weight = datarecord.tun_weight;
-   dataRecord.eq_tun_specific_heat = datarecord.tun_specific_heat;
-   dataRecord.eq_tun_material = datarecord.tun_material;
-   dataRecord.eq_tun_height = datarecord.tun_height / 100.0;
-   $('#eq_top_up_water').val(datarecord.top_up_water);
-   dataRecord.eq_trub_chiller_loss = datarecord.trub_chiller_loss;
-   $('#eq_trub_chiller_loss').val(datarecord.trub_chiller_loss);
-   $('#eq_evap_rate').val(datarecord.evap_rate);
-   $('#eq_boil_time').val(datarecord.boil_time);
-   dataRecord.eq_calc_boil_volume = datarecord.calc_boil_volume;
-   $('#eq_top_up_kettle').val(datarecord.top_up_kettle);
-   $('#eq_hop_utilization').val(datarecord.hop_utilization);
-   $('#eq_notes').val(datarecord.notes);
-   $('#eq_lauter_volume').val(datarecord.lauter_volume);
-   dataRecord.eq_lauter_height = datarecord.lauter_height / 100.0;
-   $('#eq_lauter_deadspace').val(datarecord.lauter_deadspace);
-   $('#eq_kettle_volume').val(datarecord.kettle_volume);
-   dataRecord.eq_kettle_height = datarecord.kettle_height / 100.0;
-   $('#eq_mash_volume').val(datarecord.mash_volume);
-   $('#eq_mash_max').val(datarecord.mash_max);
-   dataRecord.eq_mash_max = datarecord.mash_max;
-   $('#mash_max').val(datarecord.mash_max);
-   $('#eq_efficiency').val(datarecord.efficiency);
-   dataRecord.efficiency = datarecord.efficiency;
-   $('#efficiency').val(datarecord.efficiency);
-
-   dataRecord.sparge_volume = Math.round(datarecord.boil_size * 5) / 10;
-   $('#sparge_volume').val(dataRecord.sparge_volume);
-   $('#brew_sparge_volume').val(dataRecord.sparge_volume);
-   $('#est_pre_vol').val(datarecord.boil_size * 1.04);
-   calcFermentablesFromOG(parseFloat($('#est_og').jqxNumberInput('decimal')));     // Keep the OG
-   adjustWaters(factor);
-   calcFermentables();
-   adjustHops(factor);
-   adjustMiscs(factor);
-   adjustYeasts(factor);
-   calcIBUs();
-   calcWater();
-   calcSparge();
-  }
- });
-
 
  // initialize the input fields.
  // Tab 1, Algemeen
--- a/www/prod_edit.php	Fri Aug 05 14:19:21 2022 +0200
+++ b/www/prod_edit.php	Fri Aug 05 14:24:29 2022 +0200
@@ -123,10 +123,8 @@
      <div style="overflow: hidden;">
       <table style="width: 100%;">
        <tr>
-        <td align="right" style="vertical-align: top;">Kies apparatuur:</td>
-	<td align="left"><div id="equipmentSelect">Apparatuur</div></td>
         <td style="vertical-align: top; float: right; padding: 3px;">Installatie naam:</td>
-        <td align="left" style="vertical-align: top; padding: 3px;"><input id="eq_name" readonly /></td>
+        <td colspan="3" align="left" style="vertical-align: top; padding: 3px;"><input id="eq_name" readonly /></td>
        </tr>
        <tr>
         <td style="vertical-align: top; float: right; padding: 3px;">Opmerkingen:</td>

mercurial