diff -r 65ca985fe789 -r 736c8d29bc87 www/js/prod_edit.js --- a/www/js/prod_edit.js Mon Mar 16 21:16:49 2020 +0100 +++ b/www/js/prod_edit.js Tue Mar 17 14:47:34 2020 +0100 @@ -106,6 +106,7 @@ source = { datatype: 'json', cache: false, + async: true, datafields: [ // From prod_main { name: 'record', type: 'number' }, @@ -1619,6 +1620,11 @@ console.log('record:' + my_record + ' return:' + my_return + ' theme:' + theme); $('#jqxLoader').jqxLoader({ width: 250, height: 150, isModal: true, text: 'Laden product ...', theme: theme }); + /* Moved to before all functions */ + console.log('dataAdapter.dataBind() start'); + dataAdapter.dataBind(); + console.log('dataAdapter.dataBind() ready'); + /* * Generic functions */ @@ -2902,16 +2908,16 @@ chloride += 1000 * RA / liters; // Einde noot. - if (parseFloat($('#wa_acid_name').val()) < 0 || parseFloat($('#wa_acid_name').val()) > 3) { + 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()); + 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 (parseFloat($('#wa_base_name').val()) < 0 || parseFloat($('#wa_base_name').val()) > 3) { + 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'); @@ -4434,9 +4440,9 @@ wb_magnesium: parseFloat($('#wb_magnesium').jqxNumberInput('decimal')), wb_total_alkalinity: parseFloat($('#wb_total_alkalinity').jqxNumberInput('decimal')), wb_ph: parseFloat($('#wb_ph').jqxNumberInput('decimal')), - wa_acid_name: $('#wa_acid_name').val(), + wa_acid_name: parseInt($('#wa_acid_name').val()), wa_acid_perc: parseFloat($('#wa_acid_perc').jqxNumberInput('decimal')), - wa_base_name: $('#wa_base_name').val(), + wa_base_name: parseInt($('#wa_base_name').val()), starter_enable: dataRecord.starter_enable, starter_type: $('#starter_type').val(), starter_sg: parseFloat($('#starter_sg').jqxNumberInput('decimal')), @@ -4484,7 +4490,7 @@ }); }; - dataAdapter.dataBind(); +// dataAdapter.dataBind(); // initialize the input fields. // Tab 1, Algemeen @@ -5348,7 +5354,6 @@ $('#starter_viability').jqxNumberInput(Show0dec); $('#starter_try').jqxButton({ template: 'primary', width: '100px', height: 23, theme: theme }); - // Tab 7, Mashing $('#mash_name').jqxTooltip({ content: 'De omschrijving van dit maisch profiel.' }); $('#mash_name').jqxInput({ theme: theme, width: 320, height: 23 });