diff -r a1bcebc61ddd -r 544d7d0183b2 www/js/rec_edit.js --- a/www/js/rec_edit.js Fri May 31 22:58:03 2019 +0200 +++ b/www/js/rec_edit.js Sun Jun 02 12:48:54 2019 +0200 @@ -1525,6 +1525,21 @@ w2_total_alkalinity: parseFloat($("#w2_total_alkalinity").jqxNumberInput('decimal')), w2_ph: parseFloat($("#w2_ph").jqxNumberInput('decimal')), w2_cost: dataRecord.w2_cost, + wg_amount: parseFloat($("#wg_amount").jqxNumberInput('decimal')), + wg_calcium: parseFloat($("#wg_calcium").jqxNumberInput('decimal')), + wg_sulfate: parseFloat($("#wg_sulfate").jqxNumberInput('decimal')), + wg_chloride: parseFloat($("#wg_chloride").jqxNumberInput('decimal')), + wg_sodium: parseFloat($("#wg_sodium").jqxNumberInput('decimal')), + wg_magnesium: parseFloat($("#wg_magnesium").jqxNumberInput('decimal')), + wg_total_alkalinity: parseFloat($("#wg_total_alkalinity").jqxNumberInput('decimal')), + wg_ph: parseFloat($("#wg_ph").jqxNumberInput('decimal')), + wb_calcium: parseFloat($("#wb_calcium").jqxNumberInput('decimal')), + wb_sulfate: parseFloat($("#wb_sulfate").jqxNumberInput('decimal')), + wb_chloride: parseFloat($("#wb_chloride").jqxNumberInput('decimal')), + wb_sodium: parseFloat($("#wb_sodium").jqxNumberInput('decimal')), + 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_perc: parseFloat($("#wa_acid_perc").jqxNumberInput('decimal')), wa_base_name: $("#wa_base_name").val(), @@ -1625,6 +1640,21 @@ { name: 'w2_total_alkalinity', type: 'float' }, { name: 'w2_ph', type: 'float' }, { name: 'w2_cost', type: 'float' }, + { name: 'wg_amount', type: 'float' }, + { name: 'wg_calcium', type: 'float' }, + { name: 'wg_sulfate', type: 'float' }, + { name: 'wg_chloride', type: 'float' }, + { name: 'wg_sodium', type: 'float' }, + { name: 'wg_magnesium', type: 'float' }, + { name: 'wg_total_alkalinity', type: 'float' }, + { name: 'wg_ph', type: 'float' }, + { name: 'wb_calcium', type: 'float' }, + { name: 'wb_sulfate', type: 'float' }, + { name: 'wb_chloride', type: 'float' }, + { name: 'wb_sodium', type: 'float' }, + { name: 'wb_magnesium', type: 'float' }, + { name: 'wb_total_alkalinity', type: 'float' }, + { name: 'wb_ph', type: 'float' }, { name: 'wa_acid_name', type: 'int' }, { name: 'wa_acid_perc', type: 'int' }, { name: 'wa_base_name', type: 'int' }, @@ -1712,6 +1742,21 @@ $("#w2_total_alkalinity").val(dataRecord.w2_total_alkalinity); $("#w2_ph").val(dataRecord.w2_ph); $("#w2_cost").val(dataRecord.w2_cost); + $("#wg_amount").val(dataRecord.wg_amount); + $("#wg_calcium").val(dataRecord.wg_calcium); + $("#wg_sulfate").val(dataRecord.wg_sulfate); + $("#wg_chloride").val(dataRecord.wg_chloride); + $("#wg_sodium").val(dataRecord.wg_sodium); + $("#wg_magnesium").val(dataRecord.wg_magnesium); + $("#wg_total_alkalinity").val(dataRecord.wg_total_alkalinity); + $("#wg_ph").val(dataRecord.wg_ph); + $("#wb_calcium").val(dataRecord.wb_calcium); + $("#wb_sulfate").val(dataRecord.wb_sulfate); + $("#wb_chloride").val(dataRecord.wb_chloride); + $("#wb_sodium").val(dataRecord.wb_sodium); + $("#wb_magnesium").val(dataRecord.wb_magnesium); + $("#wb_total_alkalinity").val(dataRecord.wb_total_alkalinity); + $("#wb_ph").val(dataRecord.wb_ph); $("#wa_acid_name").val(dataRecord.wa_acid_name); $("#wa_acid_perc").val(dataRecord.wa_acid_perc); $("#wa_base_name").val(dataRecord.wa_base_name);