# HG changeset patch # User Michiel Broek # Date 1584612929 -3600 # Node ID 4654b8ee4690e8cac3fe0c236e2a0dd12176232a # Parent 9ac2fb6b13116bcac2c832506388925cd106673d Version 0.3.30 Code and logging cleanup. diff -r 9ac2fb6b1311 -r 4654b8ee4690 config.status --- a/config.status Wed Mar 18 20:29:23 2020 +0100 +++ b/config.status Thu Mar 19 11:15:29 2020 +0100 @@ -621,7 +621,7 @@ S["CC"]="gcc" S["CYEARS"]="2016-2020" S["COPYRIGHT"]="Copyright (C) 2016-2020 Michiel Broek, All Rights Reserved" -S["VERSION"]="0.3.29" +S["VERSION"]="0.3.30" S["PACKAGE"]="bms" S["SUBDIRS"]="bmsd doc script tools www" S["target_alias"]="" @@ -710,7 +710,7 @@ D["PACKAGE_STRING"]=" \"\"" D["PACKAGE_BUGREPORT"]=" \"\"" D["PACKAGE_URL"]=" \"\"" -D["VERSION"]=" \"0.3.29\"" +D["VERSION"]=" \"0.3.30\"" D["COPYRIGHT"]=" \"Copyright (C) 2016-2020 Michiel Broek, All Rights Reserved\"" D["STDC_HEADERS"]=" 1" D["HAVE_SYS_TYPES_H"]=" 1" diff -r 9ac2fb6b1311 -r 4654b8ee4690 configure --- a/configure Wed Mar 18 20:29:23 2020 +0100 +++ b/configure Thu Mar 19 11:15:29 2020 +0100 @@ -2043,7 +2043,7 @@ PACKAGE="bms" -VERSION="0.3.29" +VERSION="0.3.30" COPYRIGHT="Copyright (C) 2016-2020 Michiel Broek, All Rights Reserved" CYEARS="2016-2020" diff -r 9ac2fb6b1311 -r 4654b8ee4690 configure.ac --- a/configure.ac Wed Mar 18 20:29:23 2020 +0100 +++ b/configure.ac Thu Mar 19 11:15:29 2020 +0100 @@ -8,7 +8,7 @@ dnl General settings dnl After changeing the version number, run autoconf! PACKAGE="bms" -VERSION="0.3.29" +VERSION="0.3.30" COPYRIGHT="Copyright (C) 2016-2020 Michiel Broek, All Rights Reserved" CYEARS="2016-2020" AC_SUBST(PACKAGE) diff -r 9ac2fb6b1311 -r 4654b8ee4690 www/js/prod_edit.js --- a/www/js/prod_edit.js Wed Mar 18 20:29:23 2020 +0100 +++ b/www/js/prod_edit.js Thu Mar 19 11:15:29 2020 +0100 @@ -334,7 +334,6 @@ console.log('main data begin load'); var records = dataAdapter.records; dataRecord = records[0]; - console.log('main data ' + records.length + ' records'); // Hidden record uuid $('#name').val(dataRecord.name); $('#code').val(dataRecord.code); @@ -554,17 +553,11 @@ // hidden divide_factor // hidden divide_parts // hidden divide_part - console.log('set editFermentable'); editFermentable(dataRecord); - console.log('set editHop'); editHop(dataRecord); - console.log('set editMisc'); editMisc(dataRecord); - console.log('set editYeast'); editYeast(dataRecord); - console.log('set editMash'); editMash(dataRecord); - console.log('main data loaded'); calcStage(); $('#jqxTabs').jqxTabs('select', 2); console.log('main data ready'); @@ -608,18 +601,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); @@ -1063,7 +1047,6 @@ $('#wa_nacl').val(row.m_amount * 1000); break; case 'Melkzuur': - console.log('setting the #wa_acid_name'); $('#wa_acid_name').val(0); $('#wa_acid').val(row.m_amount * 1000); $('#wa_acid_perc').val(80); @@ -1482,14 +1465,8 @@ { name: 'ramp_time', type: 'float' }, { name: 'end_temp', type: 'float' } ], - addrow: function(rowid, rowdata, position, commit) { - console.log('mash addrow ' + rowid); - commit(true); - }, - deleterow: function(rowid, commit) { - console.log('mash deleterow ' + rowid); - commit(true); - } + addrow: function(rowid, rowdata, position, commit) { commit(true); }, + deleterow: function(rowid, commit) { commit(true); } }, mashAdapter = new $.jqx.dataAdapter(mashSource, { beforeLoadComplete: function(records) { @@ -1613,7 +1590,6 @@ $('#jqxLoader').jqxLoader('open'); /* Moved to before all functions */ - console.log('dataAdapter.dataBind() start'); dataAdapter.dataBind(); console.log('dataAdapter.dataBind() ready'); @@ -2784,7 +2760,6 @@ function MashpH() { - console.log('MashpH()'); var n = 0, pH = 5.4, deltapH = 0.001, deltapd = 0.1, pd = ProtonDeficit(pH); while (((pd < -deltapd) || (pd > deltapd)) && (n < 2000)) { n++; @@ -2795,7 +2770,7 @@ pd = ProtonDeficit(pH); } pH = Round(pH, 2); - console.log('MashpH() n: ' + n + ' pH: ' + pH); + //console.log('MashpH() n: ' + n + ' pH: ' + pH); return pH; } @@ -2814,9 +2789,9 @@ function calcWater() { - console.log('calcWater()'); + /* Can be called during loading and building the screens */ if (! data_loaded) { - console.log('failsave'); + console.log('calcWater() failsave'); return; } @@ -2914,16 +2889,13 @@ if (parseInt($('#wa_acid_name').val()) < 0 || parseInt($('#wa_acid_name').val()) > 3) { $('#wa_acid_name').val(0); dataRecord.wa_acid_name = 0; - console.log('fixed #wa_acid_name'); } - console.log('#wa_acid_name: ' + $('#wa_acid_name').val() + ' / ' + parseInt($('#wa_acid_name').val())); if (last_acid == '') last_acid = AcidTypeData[$('#wa_acid_name').val()].nl; if (parseInt($('#wa_base_name').val()) < 0 || parseInt($('#wa_base_name').val()) > 3) { $('#wa_base_name').val(0); dataRecord.wa_base_name = 0; - console.log('fixed #wa_base_name'); } if (last_base == '') last_base = BaseTypeData[$('#wa_base_name').val()].nl; @@ -2942,7 +2914,7 @@ if (dataRecord.calc_acid) { TpH = parseFloat(dataRecord.mash_ph); protonDeficit = ProtonDeficit(TpH); - console.log('calc_acid tgt: ' + TpH + ' protonDeficit: ' + protonDeficit); + //console.log('calc_acid tgt: ' + TpH + ' protonDeficit: ' + protonDeficit); if (protonDeficit > 0) { // Add acid $('#wa_base').val(0); setWaterAgent(last_base, 0); @@ -4498,7 +4470,6 @@ }); }; -// dataAdapter.dataBind(); console.log('start init input fields and selectors'); // initialize the input fields.