bms: comparison www/js/prod_edit.js

comparison: www/js/prod_edit.js

www/js/prod_edit.js

changeset 352: 9d2a4703bdac
parent 349: 0e44535f7435
child 356: 36c72e368948

equal deleted inserted replaced

-:58c350f286e5
+:9d2a4703bdac
 		}
 		$("#yeast_cells").val(initcells);
 		$("#need_cells").val(getNeededYeastCells());
 	};
+	function calcMash() {
+		if (!(rows = $('#mashGrid').jqxGrid('getrows')))
+			return;
+		if (mashkg == 0)
+			return;
+		var infused = 0;
+		for (var i = 0; i < rows.length; i++) {
+			var row = $("#mashGrid").jqxGrid('getrowdata', i);
+			if (row.step_type == 0) // Infusion
+				infused += row.step_infuse_amount;
+			$("#mashGrid").jqxGrid('setcellvalue', i, "step_thickness", infused / mashkg);
+		}
+	}
 	/*
 	 * Change OG of recipe but keep the water volumes.
 	 */
 	function calcFermentablesFromOG(OG) {
 			adjustMiscs(factor);
 			adjustYeasts(factor);
 			calcIBUs();
 			calcWater();
 			calcSparge();
+			calcMash();
 		});
 		$('#boil_time').on('change', function (event) {
 			console.log("boil_time change:"+parseFloat(event.args.value)+" old:"+dataRecord.boil_time);
 			var old_evap = parseFloat(dataRecord.boil_size) - parseFloat(dataRecord.batch_size);
 			var new_evap = old_evap * (parseFloat(event.args.value) / dataRecord.boil_time);
 			console.log("est_og change:"+dataRecord.est_og);
 			$('#est_og2').val(dataRecord.est_og);
 			calcFermentablesFromOG(dataRecord.est_og);	// Adjust fermentables amounts
 			calcFermentables();                             // Update the recipe details
 			calcIBUs();                                     // and the IBU's.
+			calcMash();
 			calcYeast();
 		});
 		$('#mash_ph').on('change', function (event) {
 			dataRecord.mash_ph = parseFloat(event.args.value);
 			calcWater();
 { name: 'step_name', type: 'string' },
 { name: 'step_type', type: 'int' },
 { name: 'step_infuse_amount', type: 'float' },
 { name: 'step_temp', type: 'float' },
 { name: 'step_time', type: 'float' },
+				{ name: 'step_thickness', type: 'float' },
 { name: 'ramp_time', type: 'float' },
 { name: 'end_temp', type: 'float' }
 ],
 addrow: function (rowid, rowdata, position, commit) {
 commit(true);
 var data = new Array();
 for (var i = 0; i < records.length; i++) {
 var row = records[i];
 if (row.step_type == 0)	// Infusion
 mash_infuse += parseFloat(row.step_infuse_amount);
+					row.step_thickness = 0; // Init this field.
+					data.push(row);
 }
 },
 });
 $("#mashGrid").jqxGrid({
 width: 1240,
 						row["step_type"] = 0;
 						row["step_infuse_amount"] = 15;
 					}
 					row["step_temp"] = 62.0;
 					row['step_time'] = 20.0;
+					row['step_thickness'] = 0;
 					row['ramp_time'] = 1.0;
 					row['end_temp'] = 62.0;
 var commit = $("#mashGrid").jqxGrid('addrow', null, row);
 });
 // delete selected step.
 }
 });
 },
 ready: function() {
 calcInit();
+				calcMash();
 $('#jqxLoader').jqxLoader('close');
 $('#jqxTabs').jqxTabs('first');
 },
 columns: [
 { text: 'Stap naam', datafield: 'step_name' },
 { text: 'Start &deg;C', datafield: 'step_temp', width: 90, align: 'right', cellsalign: 'right', cellsformat: 'f1' },
 { text: 'Eind &deg;C', datafield: 'end_temp', width: 90, align: 'right', cellsalign: 'right', cellsformat: 'f1' },
 { text: 'Rust min.', datafield: 'step_time', width: 90, align: 'right', cellsalign: 'right' },
 { text: 'Stap min.', datafield: 'ramp_time', width: 90, align: 'right', cellsalign: 'right' },
 { text: 'Infuse L.', datafield: 'step_infuse_amount', width: 90, align: 'right', cellsalign: 'right', cellsformat: 'f1' },
+				{ text: 'L/Kg.', datafield: 'step_thickness', width: 90, align: 'right', cellsalign: 'right', cellsformat: 'f2' },
 				{ text: '', datafield: 'Edit', columntype: 'button', width: 100, align: 'center', cellsrenderer: function () {
 					return "Wijzig";
 					}, buttonclick: function (row) {
 						if (dataRecord.stage <= 3) {
 							mashRow = row;
 	$("#FermentableReady").click(function () {
 		$("#fermentableGrid").jqxGrid('sortby', 'f_amount', 'desc');
 		// Recalc percentages
 		calcFermentables();
 		calcIBUs();
+		calcMash();
 		// Waters: yes there is impact.
 	});
 	$("#wf_name").jqxInput({ theme: theme, width: 320, height: 23 });
 	$("#wf_instock").jqxCheckBox({ theme: theme, height: 23 });
 	$("#wf_instock").on('change', function (event) {
 			} else {
 				$("#fermentableGrid").jqxGrid('setcellvalue', 0, "f_percentage", 100);
 			}
 			calcFermentables();
 			calcIBUs();
+			calcMash();
 		};
 	});
 	$("#wf_percentage").jqxNumberInput( Perc1dec );
 	$("#wf_percentage").on('change', function (event) {
 		var oldvalue = Math.round(fermentableData.f_percentage * 10) / 10.0;
 							$("#fermentableGrid").jqxGrid('setcellvalue', i, 'f_amount', namount);
 						}
 					}
 					calcFermentables();
 					calcIBUs();
+					calcMash();
 				} else {
 					// Adjust all the rows.
 					var nw = tw * diff / 100;
 					for (i = 0; i < rowscount; i++) {
 						var rowdata = $("#fermentableGrid").jqxGrid('getrowdata', i);
 							$("#fermentableGrid").jqxGrid('setcellvalue', i, 'f_percentage', newperc);
 						}
 					}
 					calcFermentables();
 					calcIBUs();
+					calcMash();
 				}
 			}
 		}
 	});
 	$("#wf_max_in_batch").jqxNumberInput( Show1dec );
 		if (event.args) {
 			var index = event.args.index;
 			$("#fermentableGrid").jqxGrid('setcellvalue', fermentableRow, 'f_added', index);
 			calcFermentables();
 			calcIBUs();
+			calcMash();
 		}
 	});
 	// Tab 4, Hops
 	$("#est_ibu2").jqxTooltip({ content: 'De bitterheid in IBU. Dit wordt automatisch berekend.' });
 					mash_infuse = dataRecord.w1_amount;
 				if (i == 0)
 					row["step_infuse_amount"] = mash_infuse;
 				else
 					row["step_infuse_amount"] = 0;
+				if (mashkg > 0)
+					row['step_thickness'] = parseFloat(mash_infuse / mashkg);
+				else
+					row['step_thickness'] = 0;
 				row["step_temp"] = data.step_temp;
 				row["end_temp"] = data.end_temp;
 				row["step_time"] = data.step_time;
 				row["ramp_time"] = data.ramp_time;
 				var commit = $("#mashGrid").jqxGrid('addrow', null, row);
 		modalOpacity: 0.40
 	});
 	$("#MashReady").jqxButton({ template: "success", width: '90px', theme: theme });
 	$("#MashReady").click(function () {
 		$("#mashGrid").jqxGrid('sortby', 'step_temp', 'asc');
+		calcMash();
 	});
 	$("#wstep_name").jqxInput({ theme: theme, width: 320, height: 23 });
 	$("#wstep_name").on('change', function (event) {
 		var rowdata = $("#mashGrid").jqxGrid('getrowdata', mashRow);
 rowdata.step_name = event.args.value;