bms: comparison www/js/prod_edit.js

comparison: www/js/prod_edit.js

www/js/prod_edit.js

changeset 738: 11e6bd8d8107
parent 726: 872a3635e4ef
child 740: 04c0e444e48e

equal deleted inserted replaced

-:3f823bc205ca
+:11e6bd8d8107
 /*****************************************************************************
-* Copyright (C) 2018-2020
+* Copyright (C) 2018-2021
 *
 * Michiel Broek <mbroek at mbse dot eu>
 *
 * This file is part of BMS
 *
 modalOpacity: 0.40
 });
 $('#popupMash').jqxWindow({
 width: 800,
-height: 375,
+height: 400,
 position: { x: 230, y: 100 },
 resizable: false,
 theme: theme,
 isModal: true,
 autoOpen: false,
 { name: 'step_infuse_temp', type: 'float' },
 { name: 'step_temp', type: 'float' },
 { name: 'step_time', type: 'float' },
 { name: 'step_wg_ratio', type: 'float' },
 { name: 'ramp_time', type: 'float' },
-{ name: 'end_temp', type: 'float' }
+{ name: 'end_temp', type: 'float' },
+{ name: 'step_ph', type: 'float' },
+{ name: 'step_sg', type: 'float' }
 ],
 addrow: function(rowid, rowdata, position, commit) { commit(true); },
 deleterow: function(rowid, commit) { commit(true); }
 },
 mashAdapter = new $.jqx.dataAdapter(mashSource, {
 row['step_temp'] = 62.0;
 row['step_time'] = 20.0;
 row['step_wg_ratio'] = 0;
 row['ramp_time'] = 1.0;
 row['end_temp'] = 62.0;
+row['step_ph'] = 0.0;
+row['step_sg'] = 0.0;
 $('#mashGrid').jqxGrid('addrow', null, row);
 calcMash();
 });
 // delete selected step.
 $('#sdeleterowbutton').jqxButton({ template: 'danger', theme: theme, height: 27, width: 150, disabled: (dataRecord.stage > 3) });
 $('#jqxLoader').jqxLoader('close');
 $('#jqxTabs').jqxTabs('first');
 },
 columns: [
 { text: 'Stap naam', datafield: 'step_name' },
-{ text: 'Stap type', datafield: 'step_type', width: 175,
+{ text: 'Stap type', datafield: 'step_type', width: 150,
 cellsrenderer: function(index, datafield, value, defaultvalue, column, rowdata) {
 return '<span style="margin: 4px; margin-top: 6px; float: left;">' + MashStepTypeData[value].nl + '</span>';
 }
 },
-{ text: 'Start &deg;C', datafield: 'step_temp', width: 90, align: 'right', cellsalign: 'right', cellsformat: 'f1' },
+{ text: 'Start &deg;C', datafield: 'step_temp', width: 80, align: 'right', cellsalign: 'right', cellsformat: 'f1' },
-{ text: 'Eind &deg;C', datafield: 'end_temp', width: 90, align: 'right', cellsalign: 'right', cellsformat: 'f1' },
+{ text: 'Eind &deg;C', datafield: 'end_temp', width: 80, align: 'right', cellsalign: 'right', cellsformat: 'f1' },
-{ text: 'Rust min.', datafield: 'step_time', width: 90, align: 'right', cellsalign: 'right' },
+{ text: 'Rust min.', datafield: 'step_time', width: 80, align: 'right', cellsalign: 'right' },
-{ text: 'Stap min.', datafield: 'ramp_time', width: 90, align: 'right', cellsalign: 'right' },
+{ text: 'Stap min.', datafield: 'ramp_time', width: 80, align: 'right', cellsalign: 'right' },
-{ text: 'Inf/dec L.', datafield: 'step_infuse_amount', width: 90, align: 'right',
+{ text: 'Inf/dec L.', datafield: 'step_infuse_amount', width: 80, align: 'right',
 cellsrenderer: function(row, columnfield, value, defaulthtml, columnproperties, rowdata) {
 if (rowdata.step_type == 1)
 return '<span></span>';
 var color = '#ffffff';
 var mvol = mashkg * MaltVolume;
 if (rowdata.step_type == 1)
 return '<span></span>';
 return '<span style="margin: 4px; margin-top: 6px; float: right;">' + dataAdapter.formatNumber(value, 'f2') + '</span>';
 }
 },
-{ text: 'L/Kg.', datafield: 'step_wg_ratio', width: 90, align: 'right',
+{ text: 'L/Kg.', datafield: 'step_wg_ratio', width: 80, align: 'right',
 cellsrenderer: function(row, columnfield, value, defaulthtml, columnproperties, rowdata) {
 var color = '#ffffff';
 if (value < 2.0 || value > 6.0)
 color = '#ff4040';
 return '<span style="margin: 4px; margin-top: 6px; float: right; color: ' + color + ';">' + dataAdapter.formatNumber(value, 'f2') + '</span>';
 }
 },
+{ text: 'pH', datafield: 'step_ph', width: 70, align: 'right', cellsalign: 'right', cellsformat: 'f2' },
+{ text: 'SG', datafield: 'step_sg', width: 80, align: 'right', cellsalign: 'right', cellsformat: 'f3' },
 { text: '', columntype: 'button', width: 15, align: 'center',
 cellsrenderer: function(row) {
 if (row < 2)
 return ' ';
 return '▴';
 } else {
 $('#wstep_infuse_temp').show();
 $('#wstep_pmpt_temp').show();
 }
 }
+$('#wstep_ph').val(mashData.step_ph);
+$('#wstep_sg').val(mashData.step_sg);
 // show the popup window.
 $('#popupMash').jqxWindow('open');
 }
 }
 }
 console.log('swap mash rows ' + r1 + ' ' + r2);
 var row1 = $('#mashGrid').jqxGrid('getrowdata', r1);
 var row2 = $('#mashGrid').jqxGrid('getrowdata', r2);
 var obj1 = { step_name: row1.step_name, step_type: row1.step_type, step_volume: row1.step_volume, step_infuse_amount: row1.step_infuse_amount,
 step_infuse_temp: row1.step_infuse_temp, step_temp: row1.step_temp, step_time: row1.step_time,
-ramp_time: row1.ramp_time, end_temp: row1.end_temp, step_wg_ratio: row1.step_wg_ratio };
+ramp_time: row1.ramp_time, end_temp: row1.end_temp, step_wg_ratio: row1.step_wg_ratio, step_ph: row1.step_ph, step_sg: row1.step_sg };
 var obj2 = { step_name: row2.step_name, step_type: row2.step_type, step_volume: row2.step_volume, step_infuse_amount: row2.step_infuse_amount,
 step_infuse_temp: row2.step_infuse_temp, step_temp: row2.step_temp, step_time: row2.step_time,
-ramp_time: row2.ramp_time, end_temp: row2.end_temp, step_wg_ratio: row2.step_wg_ratio };
+ramp_time: row2.ramp_time, end_temp: row2.end_temp, step_wg_ratio: row2.step_wg_ratio, step_ph: row2.step_ph, step_sg: row2.step_sg };
 $("#mashGrid").jqxGrid('updaterow', r1, obj2);
 $("#mashGrid").jqxGrid('updaterow', r2, obj1);
 }
 function infusionVol(step_infused, step_mashkg, infuse_temp, step_temp, last_temp) {
 row['step_infuse_amount'] = parseFloat(mash_infuse);
 } else {
 row['step_infuse_temp'] = 99.0;
 }
 }
+row['step_ph'] = 0.0;
+row['step_sg'] = 0.0;
 //console.log(i + ' type: ' + row['step_type'] + ' start infusion: ' + parseFloat(row['step_infuse_amount']) + ' mash_infuse: ' + mash_infuse);
 infused += parseFloat(row['step_infuse_amount']);
 row['step_volume'] = infused;
 if (mashkg > 0)
 row['step_wg_ratio'] = Round(parseFloat(mash_infuse / mashkg), 2);
 $('#wstep_time').on('change', function(event) {
 var rowdata = $('#mashGrid').jqxGrid('getrowdata', mashRow);
 rowdata.step_time = parseFloat(event.args.value);
 calcMash();
 });
+$('#wstep_ph').jqxNumberInput(Spin2pH);
+$('#wstep_ph').on('change', function(event) {
+var rowdata = $('#mashGrid').jqxGrid('getrowdata', mashRow);
+rowdata.step_ph = parseFloat(event.args.value);
+});
+$('#wstep_sg').jqxNumberInput(SGopts);
+$('#wstep_sg').on('change', function(event) {
+var rowdata = $('#mashGrid').jqxGrid('getrowdata', mashRow);
+rowdata.step_sg = parseFloat(event.args.value);
+});
+$('#wstep_brix').jqxNumberInput(Spin1dec);
+$('#wstep_brix').on('change', function(event) {
+var sg = brix_to_sg(parseFloat(event.args.value));
+console.log('brix: ' + parseFloat(event.args.value) + ' sg: ' + sg);
+if (sg > 1.005) {
+var rowdata = $('#mashGrid').jqxGrid('getrowdata', mashRow);
+rowdata.step_sg = sg;
+$('#wstep_sg').val(sg);
+}
+});
 $('#wramp_time').on('change', function(event) {
 var rowdata = $('#mashGrid').jqxGrid('getrowdata', mashRow);
 rowdata.ramp_time = parseFloat(event.args.value);
 calcMash();
 });
 $('#brew_sparge_temperature').jqxTooltip({ content: 'De spoelwater temperatuur, in te stellen in de Water tab.' });
 $('#brew_sparge_volume').jqxTooltip({ content: 'Het spoelwater voorraad volume, in te stellen in de Water tab.' });
 $('#brew_date_start,#brew_date_end').jqxDateTimeInput(DateTimeopts);
 $('#brew_date_start,#brew_date_end').on('close', function(event) { calcStage(); });
 $('#est_mash_ph').jqxNumberInput(Show2wat);
-$('#brew_mash_ph,#brew_preboil_ph,#brew_aboil_ph').jqxNumberInput(SpinpH);
+$('#brew_mash_ph,#brew_preboil_ph,#brew_aboil_ph').jqxNumberInput(Spin2pH);
 $('#brew_mash_sg').on('valueChanged', function() { calcMashEfficiency(); });
 $('#brew_preboil_sg').on('valueChanged', function(event) {
 dataRecord.brew_preboil_sg = event.args.value;
 calcEfficiencyBeforeBoil();
 });
 $('#volumeWindow').jqxWindow('open');
 });
 $('#est_pre_vol,#est_a_vol').jqxNumberInput(Show1wat);
 $('#brew_preboil_efficiency,#brew_aboil_efficiency,#brew_sparge_temperature,#brew_sparge_volume,#brew_sparge_est').jqxNumberInput(Show1dec);
 $('#brew_cooling_to').jqxNumberInput(Spin1dec);
-$('#brew_sparge_ph').jqxNumberInput(SpinpH);
+$('#brew_sparge_ph').jqxNumberInput(Spin2pH);
 $('#brew_cooling_method').jqxDropDownList({
 theme: theme,
 source: CoolingTypeAdapter,
 valueMember: 'id',
 displayMember: 'nl',