Mercurial > bms / changeset

--- a/www/js/global.js	Fri Mar 27 16:23:30 2020 +0100
+++ b/www/js/global.js	Sun Mar 29 17:05:52 2020 +0200
@@ -321,9 +321,6 @@
  { id: 0, en: 'Tinseth', nl: 'Tinseth' },
  { id: 1, en: 'Rager', nl: 'Rager' },
  { id: 2, en: 'Daniels', nl: 'Daniels' }
-// { id: 3, en: 'Garetz', nl: 'Garetz' }, // Not yet supported.
-// { id: 4, en: 'Mosher', nl: 'Mosher' },
-// { id: 5, en: 'Noonan', nl: 'Noonan' }
 ],
 IBUmethodSource = {
  localdata: IBUmethodData,

--- a/www/js/prod_edit.js	Fri Mar 27 16:23:30 2020 +0100
+++ b/www/js/prod_edit.js	Sun Mar 29 17:05:52 2020 +0200
@@ -348,7 +348,6 @@
  // Load data and select one record.
  dataAdapter = new $.jqx.dataAdapter(source, {
   loadComplete: function() {
-   console.log('main data begin load');
    var records = dataAdapter.records;
    dataRecord = records[0];
    // Hidden record uuid
@@ -577,7 +576,6 @@
    editMash(dataRecord);
    calcStage();
    $('#jqxTabs').jqxTabs('select', 2);
-   console.log('main data ready');
    data_loaded = 1;
   },
   loadError: function(jqXHR, status, error) {
@@ -737,7 +735,7 @@
      calcIBUs();
     });
    },
-   ready: function() { console.log('ready fermentables'); $('#jqxTabs').jqxTabs('next'); },
+   ready: function() { calcFermentables(); $('#jqxTabs').jqxTabs('next'); },
    columns: [
     { text: 'Vergistbaar ingrediënt', datafield: 'f_name',
      cellsrenderer: function(index, datafield, value, defaultvalue, column, rowdata) {
@@ -926,7 +924,7 @@
      calcIBUs();
     });
    },
-   ready: function() { console.log('ready hops'); $('#jqxTabs').jqxTabs('next'); },
+   ready: function() { $('#jqxTabs').jqxTabs('next'); },
    columns: [
     { text: 'Hop', datafield: 'h_name',
      cellsrenderer: function(index, datafield, value, defaultvalue, column, rowdata) {
@@ -1172,7 +1170,7 @@
      }
     });
    },
-   ready: function() { console.log('ready miscs'); $('#jqxTabs').jqxTabs('next'); },
+   ready: function() { $('#jqxTabs').jqxTabs('next'); },
    columns: [
     { text: 'Ingredient', datafield: 'm_name' },
     { text: 'Type', width: 140, datafield: 'm_type',
@@ -1370,7 +1368,7 @@
      }
     });
    },
-   ready: function() { console.log('ready yeasts'); $('#jqxTabs').jqxTabs('next'); },
+   ready: function() { $('#jqxTabs').jqxTabs('next'); },
    columns: [
     { text: 'Gist', datafield: 'y_name' },
     { text: 'Laboratorium', width: 150, datafield: 'y_laboratory' },
@@ -1608,7 +1606,6 @@
 
  /* Moved to before all functions */
  dataAdapter.dataBind();
- console.log('dataAdapter.dataBind() ready');
 
  /*
   * Generic functions
@@ -2446,7 +2443,6 @@
 
  function whirlpoolHops() {
   var row, i, time, rowscount;
-  console.log('whirlpoolHops()');
   if (!(rowscount = $('#hopGrid').jqxGrid('getdatainformation').rowscount))
    return;
   if (rowscount == 0)
@@ -3977,7 +3973,6 @@
     dataRecord.bottle_amount = tnew;
     dataRecord.keg_amount = 0;
    }
-   //console.log('diff:' + diff + ' old:' + told + ' bottle:' + dataRecord.bottle_amount + ' keg:' + dataRecord.keg_amount);
    $('#bottle_amount').val(parseFloat(dataRecord.bottle_amount));
    $('#keg_amount').val(parseFloat(dataRecord.keg_amount));
    calcCarbonation();
@@ -3994,7 +3989,6 @@
     dataRecord.bottle_amount = tnew;
     dataRecord.keg_amount = 0;
    }
-   //console.log('diff:' + diff + ' old:' + told + ' bottle:' + dataRecord.bottle_amount + ' keg:' + dataRecord.keg_amount);
    $('#bottle_amount').val(parseFloat(dataRecord.bottle_amount));
    $('#keg_amount').val(parseFloat(dataRecord.keg_amount));
    calcCarbonation();
@@ -4489,8 +4483,6 @@
   });
  };
 
- console.log('start init input fields and selectors');
-
  // initialize the input fields.
  // Tab 1, Algemeen
  $('#name').jqxTooltip({ content: 'De naam voor dit product.' });
@@ -5023,7 +5015,6 @@
   ibu = toIBU(hopData.h_useat, hopData.h_form, preboil_sg, parseFloat($('#batch_size').jqxNumberInput('decimal')),
     parseFloat(hopData.h_amount), parseFloat(hopData.h_time), parseFloat(hopData.h_alpha), $('#ibu_method').val(),
     dataRecord.brew_whirlpool9, dataRecord.brew_whirlpool7, dataRecord.brew_whirlpool6);
-  // console.log("time changed: "+newtime+" final:"+hopData.h_time+" ibu:"+ibu);
   $('#wh_ibu').val(ibu);
  });
  $('#wh_useat').jqxDropDownList({
@@ -6062,6 +6053,5 @@
   saveRecord(1);
  });
  createDelElements();
- console.log('reached the end');
 });
 

--- a/www/js/rec_edit.js	Fri Mar 27 16:23:30 2020 +0100
+++ b/www/js/rec_edit.js	Sun Mar 29 17:05:52 2020 +0200
@@ -275,7 +275,6 @@
   }
  }
  $('#ferm_lintner').val(Math.round(parseFloat(lintner / mashkg)));
- //console.log('lintner:' + lintner + ' kg:' + mashkg);
  to_100 = my_100;
  if (to_100) {
   $('#wf_amount').jqxNumberInput({ width: 90, readOnly: true, spinButtons: false });
@@ -398,7 +397,6 @@
 
 function adjustHops(factor) {
 
- //console.log('adjustHops(' + factor + ')');
  var i, row, amount, rowscount = $('#hopGrid').jqxGrid('getdatainformation').rowscount;
  if (rowscount == 0)
   return;
@@ -413,7 +411,6 @@
 
 function adjustMiscs(factor) {
 
- //console.log('adjustMiscs(' + factor + ')');
  var i, row, amount, rowscount = $('#miscGrid').jqxGrid('getdatainformation').rowscount;
  if (rowscount == 0)
   return;
@@ -442,7 +439,6 @@
 
 function adjustYeasts(factor) {
 
- //console.log('adjustYeasts(' + factor + ')');
  var i, row, amount, rowscount = $('#yeastGrid').jqxGrid('getdatainformation').rowscount;
  if (rowscount == 0)
   return;
@@ -459,7 +455,6 @@
 
 function adjustWaters(factor) {
 
- //console.log('adjustWaters(' + factor + ')');
  var i, row, amount, rowscount = $('#mashGrid').jqxGrid('getdatainformation').rowscount;
  if (rowscount == 0)
   return;
@@ -890,18 +885,9 @@
     { name: 'f_inventory', type: 'float' },
     { name: 'f_avail', type: 'int' }
    ],
-   addrow: function(rowid, rowdata, position, commit) {
-    //console.log("fermentable addrow "+rowid);
-    commit(true);
-   },
-   deleterow: function(rowid, commit) {
-    //console.log("fermentable deleterow "+rowid);
-    commit(true);
-   },
-   updaterow: function(rowid, rowdata, commit) {
-    //console.log("fermentable updaterow "+rowid);
-    commit(true);
-   }
+   addrow: function(rowid, rowdata, position, commit) { commit(true); },
+   deleterow: function(rowid, commit) { commit(true); },
+   updaterow: function(rowid, rowdata, commit) { commit(true); }
   },
   fermentableAdapter = new $.jqx.dataAdapter(fermentableSource);
 
@@ -1105,18 +1091,9 @@
     { name: 'h_inventory', type: 'float' },
     { name: 'h_avail', type: 'int' }
    ],
-   addrow: function(rowid, rowdata, position, commit) {
-    //console.log("hop addrow "+rowid);
-    commit(true);
-   },
-   deleterow: function(rowid, commit) {
-    //console.log("hop deleterow "+rowid);
-    commit(true);
-   },
-   updaterow: function(rowid, rowdata, commit) {
-    //console.log("hop updaterow "+rowid);
-    commit(true);
-   }
+   addrow: function(rowid, rowdata, position, commit) { commit(true); },
+   deleterow: function(rowid, commit) { commit(true); },
+   updaterow: function(rowid, rowdata, commit) { commit(true); }
   },
   hopAdapter = new $.jqx.dataAdapter(hopSource);
 
@@ -1304,18 +1281,9 @@
     { name: 'm_inventory', type: 'float' },
     { name: 'm_avail', type: 'int' }
    ],
-   addrow: function(rowid, rowdata, position, commit) {
-    //console.log("misc addrow "+rowid);
-    commit(true);
-   },
-   deleterow: function(rowid, commit) {
-    //console.log("misc deleterow "+rowid);
-    commit(true);
-   },
-   updaterow: function(rowid, rowdata, commit) {
-    //console.log("misc updaterow "+rowid);
-    commit(true);
-   }
+   addrow: function(rowid, rowdata, position, commit) { commit(true); },
+   deleterow: function(rowid, commit) { commit(true); },
+   updaterow: function(rowid, rowdata, commit) { commit(true); }
   },
   miscAdapter = new $.jqx.dataAdapter(miscSource, {
    beforeLoadComplete: function(records) {
@@ -1548,18 +1516,9 @@
     { name: 'y_zymocide', type: 'int' },
     { name: 'y_avail', type: 'int' }
    ],
-   addrow: function(rowid, rowdata, position, commit) {
-    //console.log("yeast addrow "+rowid);
-    commit(true);
-   },
-   deleterow: function(rowid, commit) {
-    //console.log("yeast deleterow "+rowid);
-    commit(true);
-   },
-   updaterow: function(rowid, rowdata, commit) {
-    //console.log("yeast updaterow "+rowid);
-    commit(true);
-   }
+   addrow: function(rowid, rowdata, position, commit) { commit(true); },
+   deleterow: function(rowid, commit) { commit(true); },
+   updaterow: function(rowid, rowdata, commit) { commit(true); }
   },
   yeastAdapter = new $.jqx.dataAdapter(yeastSource);
 
@@ -1922,9 +1881,8 @@
  // Procedure TFrmWaterAdjustment.CalcWater2;
  function calcWater() {
 
-  console.log('calcWater()');
   if (! data_loaded) {
-   console.log('failsave');
+   console.log('calcWater(): failsave');
    return;
   }