bms: comparison www/js/prod_edit.js

comparison: www/js/prod_edit.js

www/js/prod_edit.js

changeset 774: 92e1e8f175a2
parent 772: f9d266eb0ec6
child 783: 006078146107

equal deleted inserted replaced

-:f4161330ed01
+:92e1e8f175a2
 { name: 'divide_type', type: 'int' },
 { name: 'divide_size', type: 'float' },
 { name: 'divide_factor', type: 'float' },
 { name: 'divide_parts', type: 'int' },
 { name: 'divide_part', type: 'int' },
-{ name: 'fermentables', type: 'array' },
+{ name: 'fermentables', type: 'string' },
-{ name: 'hops', type: 'array' },
+{ name: 'hops', type: 'string' },
-{ name: 'miscs', type: 'array' },
+{ name: 'miscs', type: 'string' },
-{ name: 'yeasts', type: 'array' },
+{ name: 'yeasts', type: 'string' },
-{ name: 'mashs', type: 'array' }
+{ name: 'mashs', type: 'string' }
 ],
 id: 'record',
 url: url + '?record=' + my_record
 },
 { name: 'step_sg', type: 'float' }
 ],
 addrow: function(rowid, rowdata, position, commit) { commit(true); },
 deleterow: function(rowid, commit) { commit(true); }
 },
-mashAdapter = new $.jqx.dataAdapter(mashSource, {
+mashAdapter = new $.jqx.dataAdapter(mashSource);
-beforeLoadComplete: function(records) {
-mash_infuse = 0;
-var i, row, data = new Array();
-for (i = 0; i < records.length; i++) {
-row = records[i];
-if (row.step_type == 0) // Infusion
-mash_infuse += parseFloat(row.step_infuse_amount);
-row.step_wg_ratio = 0; // Init this field.
-data.push(row);
-}
-},
-});
 $('#mashGrid').jqxGrid({
 width: 1240,
 height: 400,
 source: mashAdapter,
 theme: theme,
 }
 function infusionVol(step_infused, step_mashkg, infuse_temp, step_temp, last_temp) {
 var a = last_temp * (dataRecord.eq_tun_weight * dataRecord.eq_tun_specific_heat + step_infused * SpecificHeatWater + step_mashkg * SpecificHeatMalt);
 var b = step_temp * (dataRecord.eq_tun_weight * dataRecord.eq_tun_specific_heat + step_infused * SpecificHeatWater + step_mashkg * SpecificHeatMalt);
-//console.log('b - a: ' + (b - a) + ' t: ' + ((infuse_temp - step_temp) * SpecificHeatWater));
-//console.log('res: ' + ((b - a) / ((infuse_temp - step_temp) * SpecificHeatWater)));
 var vol = Round(((b - a) / ((infuse_temp - step_temp) * SpecificHeatWater)), 2);
-console.log('infusionVol(' + step_infused + ', ' + step_mashkg + ', ' + infuse_temp + ', ' + step_temp + ', ' + last_temp + '): ' + vol);
+//console.log('infusionVol(' + step_infused + ', ' + step_mashkg + ', ' + infuse_temp + ', ' + step_temp + ', ' + last_temp + '): ' + vol);
 return vol;
 }
 function decoctionVol(step_volume, step_temp, prev_temp) {
 var a = (dataRecord.eq_tun_weight * dataRecord.eq_tun_specific_heat + step_volume * SpecificHeatWater) * (step_temp - prev_temp);
 }
 //console.log('init infuse temp: ' + row.step_infuse_temp);
 } else {
 // Calculate amount of infusion water.
 row.step_infuse_amount = infusionVol(infused, mashkg, row.step_infuse_temp, row.step_temp, lasttemp);
-console.log('vol: ' + row.step_infuse_amount + ' temp: ' + row.step_infuse_temp);
+//console.log('vol: ' + row.step_infuse_amount + ' temp: ' + row.step_infuse_temp);
 }
-infused += row.step_infuse_amount;
+infused += parseFloat(row.step_infuse_amount);
 } else if (row.step_type == 1) { // Temperature
 if (i > 0)
 row.step_infuse_amount = 0;
 row.step_infuse_temp = 0;
 } else if (row.step_type == 2) { // Decoction
 mashtime += row.step_time + row.ramp_time;
 row.step_wg_ratio = Round(infused / mashkg, 6);
 $('#mashGrid').jqxGrid('updaterow', i, row);
 }
 }
-mashvol = mashkg * MaltVolume + infused;
+mashvol = Round(mashkg * MaltVolume + infused, 6);
 $('#est_mashvol').val(mashvol);
 h = Math.floor(mashtime / 60);
 m = Math.floor(mashtime - (h * 60));
 if (h < 10)
 h = '0' + h;
 rowdata.step_sg = parseFloat(event.args.value);
 });
 $('#wstep_brix').jqxNumberInput(Spin1dec);
 $('#wstep_brix').on('change', function(event) {
 /* Use plato_to_sg at this stage */
-var sg = plato_to_sg(parseFloat(event.args.value));
+var sg = Round(plato_to_sg(parseFloat(event.args.value)), 4);
 console.log('brix: ' + parseFloat(event.args.value) + ' sg: ' + sg);
-if (sg > 1.005) {
+var rowdata = $('#mashGrid').jqxGrid('getrowdata', mashRow);
-var rowdata = $('#mashGrid').jqxGrid('getrowdata', mashRow);
+if (sg <= 1.005) {
-rowdata.step_sg = sg;
+sg = 0.0;
-$('#wstep_sg').val(sg);
+}
-}
+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();