bms: comparison www/js/rec_edit.js

comparison: www/js/rec_edit.js

www/js/rec_edit.js

branch: stable
changeset 387: 541503502b1b
parent 382: 547c23b50d00
child 392: 544d7d0183b2

equal deleted inserted replaced

-:6e80a5515dd3
+:541503502b1b
 						row.h_useat, parseFloat(row.h_amount));
 			hop_aroma += hopAromaContribution(parseFloat(row.h_time), parseFloat(dataRecord.batch_size),
 					        row.h_useat, parseFloat(row.h_amount));
 		}
 		total_ibus = Math.round(total_ibus * 10) / 10;
-		hop_flavour = Math.round(hop_flavour * 100) / 10;
+		hop_flavour = Math.round(hop_flavour * 1000 / 5) / 10;
-hop_aroma = Math.round(hop_aroma * 100) / 10;
+hop_aroma = Math.round(hop_aroma * 1000 / 6) / 10;
 		if (hop_flavour > 100)
 hop_flavour = 100;
 if (hop_aroma > 100)
 hop_aroma = 100;
 		console.log("calcIBUs(): " + total_ibus + "  flavour: " + hop_flavour + "  aroma: " + hop_aroma);
 		$("#fermentableGrid").jqxGrid({
 			width: 1240,
 			height: 470,
 			source: fermentableAdapter,
 			theme: theme,
+			sortmode: "many",
 			selectionmode: 'singlerow',
 			showtoolbar: true,
 			rendertoolbar: function (toolbar) {
 				var me = this;
 				var container = $("<div style='overflow: hidden; position: relative; margin: 5px;'></div>");
 					calcFermentables();
 					calcIBUs();
 				});
 			},
 			ready: function() {
+				var datainformation = $('#fermentableGrid').jqxGrid('getdatainformation');
+if (datainformation.rowscount) {
+					$("#fermentableGrid").jqxGrid('sortby', 'f_added', 'asc');
+					$("#fermentableGrid").jqxGrid('sortby', 'f_amount', 'desc');
+				}
 				calcFermentables();
 				$('#jqxTabs').jqxTabs('next');
 			},
 			columns: [
 				{ text: 'Vergistbaar ingredi&euml;nt', datafield: 'f_name',
 $("#hopGrid").jqxGrid({
 width: 1240,
 height: 560,
 source: hopAdapter,
 theme: theme,
+			sortmode: "many",
 selectionmode: 'singlerow',
 showtoolbar: true,
 rendertoolbar: function (toolbar) {
 var me = this;
 var container = $("<div style='overflow: hidden; position: relative; margin: 5px;'></div>");
 }
 					calcIBUs();
 });
 },
 			ready: function() {
+				var datainformation = $('#hopGrid').jqxGrid('getdatainformation');
+if (datainformation.rowscount) {
+					$("#hopGrid").jqxGrid('sortby', 'h_useat', 'asc');
+					$("#hopGrid").jqxGrid('sortby', 'h_time', 'desc');
+					$("#hopGrid").jqxGrid('sortby', 'h_amount', 'desc');
+				}
 				calcIBUs();
 				$('#jqxTabs').jqxTabs('next');
 			},
 columns: [
 { text: 'Hop', datafield: 'h_name',
 $("#miscGrid").jqxGrid({
 width: 1240,
 height: 575,
 source: miscAdapter,
 theme: theme,
+			sortmode: "many",
 selectionmode: 'singlerow',
 showtoolbar: true,
 rendertoolbar: function (toolbar) {
 var me = this;
 var container = $("<div style='overflow: hidden; position: relative; margin: 5px;'></div>");
 var commit = $("#miscGrid").jqxGrid('deleterow', id);
 }
 });
 },
 			ready: function() {
+				var datainformation = $('#miscGrid').jqxGrid('getdatainformation');
+				if (datainformation.rowscount) {
+					$("#miscGrid").jqxGrid('sortby', 'm_use_use', 'asc');
+					$("#miscGrid").jqxGrid('sortby', 'm_type', 'asc');
+				}
 				$('#jqxTabs').jqxTabs('next');
 			},
 			columns: [
 { text: 'Ingredient', datafield: 'm_name' },
 { text: 'Type', width: 140, datafield: 'm_type',
 $("#yeastGrid").jqxGrid({
 width: 1240,
 height: 350,
 source: yeastAdapter,
 theme: theme,
+			sortmode: "many",
 selectionmode: 'singlerow',
 showtoolbar: true,
 rendertoolbar: function (toolbar) {
 var me = this;
 var container = $("<div style='overflow: hidden; position: relative; margin: 5px;'></div>");
 var commit = $("#yeastGrid").jqxGrid('deleterow', id);
 }
 });
 },
 			ready: function() {
+				var datainformation = $('#yeastGrid').jqxGrid('getdatainformation');
+if (datainformation.rowscount) {
+					$("#yeastGrid").jqxGrid('sortby', 'y_use', 'asc');
+				}
 				calcFermentables();
 				$('#jqxTabs').jqxTabs('next');
 			},
 columns: [
 { text: 'Gist', datafield: 'y_name' },
 	// Tab 2, Vergistbaar
 	$("#est_color2").jqxTooltip({ content: 'De kleur in EBC. Dit wordt automatisch berekend.' });
 	$("#est_color2").jqxNumberInput( Show0dec );
 	$("#est_og2").jqxTooltip({ content: 'Het begin SG wat je wilt bereiken. De moutstort wordt automatisch herberekend.' });
 	$("#est_og2").jqxNumberInput( Show3dec );
-	$("#ferm_lintner").jqxTooltip({ content: 'De enzymkracht van alle mouten in de maisch. Moet hoger dan 35 zijn.' });
-	$("#ferm_lintner").jqxNumberInput( Show0dec );
 	$("#perc_malts").jqxProgressBar({
 		width: 300,
 		height: 23,
 		theme: theme,
 		showText: true,
+		max: 120,
 		animationDuration: 0,
 		colorRanges: [
 			{ stop:  90, color: '#008C00' },
-			{ stop:  95, color: '#EB7331' },
+			{ stop: 100, color: '#EB7331' },
-			{ stop: 100, color: '#FF0000' }
+			{ stop: 120, color: '#FF0000' }
-		]
+		],
+		renderText: function (text) {
+			return (Math.round(parseInt(text) * 1.2)) + '%';
+		}
 	});
 	$("#perc_sugars").jqxProgressBar({
 		width: 300,
 		height: 23,
 		theme: theme,
 		showText: true,
+		max: 50,
 		animationDuration: 0,
 		colorRanges: [
-			{ stop:  20, color: '#008C00' },
+			{ stop: 20, color: '#008C00' },
-			{ stop: 100, color: '#FF0000' }
+			{ stop: 50, color: '#FF0000' }
-		]
+		],
+		renderText: function (text) {
+			return (Math.round(parseInt(text) * 5) / 10) + '%';
+		}
 	});
 	$("#perc_cara").jqxProgressBar({
 		width: 300,
 		height: 23,
 		theme: theme,
 		showText: true,
+		max: 50,
 		animationDuration: 0,
 		colorRanges: [
-			{ stop:  25, color: '#008C00' },
+			{ stop: 25, color: '#008C00' },
-			{ stop: 100, color: '#FF0000' }
+			{ stop: 50, color: '#FF0000' }
-		]
+		],
-	});
+		renderText: function (text) {
+			return (Math.round(parseInt(text) * 5) / 10) + '%';
+		}
+	});
+$("#ferm_lintner").jqxProgressBar({
+width: 300,
+height: 23,
+theme: theme,
+showText: true,
+max: 200,
+animationDuration: 0,
+colorRanges: [
+{ stop:  30, color: '#FF0000' },
+{ stop:  40, color: '#EB7331' },
+{ stop: 200, color: '#008C00' }
+],
+renderText: function (text) {
+return (parseInt(text) * 2) + ' lintner';
+}
+});
 	$("#popupFermentable").jqxWindow({
 		width: 800,
 		height: 300,
 		position: { x: 230, y: 100 },
 		resizable: false,
 		cancelButton: $("#FermentableReady"),
 		modalOpacity: 0.40
 	});
 	$("#FermentableReady").jqxButton({ template: "success", width: '90px', theme: theme });
 	$("#FermentableReady").click(function () {
-		$("#fermentableGrid").jqxGrid('sortby', 'f_amount', 'desc');
 		// Recalc percentages
 		calcFermentables();
 		calcIBUs();
 		calcMash();
 		// Waters: yes there is impact.
 			{ stop:  20, color: '#004D00' },
 			{ stop:  40, color: '#008C00' },
 			{ stop:  60, color: '#00BF00' },
 			{ stop:  80, color: '#00FF00' },
 			{ stop: 100, color: '#80FF80' }
-		]
+		],
+renderText: function (text) {
+var val = parseInt(text);
+if (val < 20)
+return 'Weinig';
+else if (val < 40)
+return 'Matig';
+else if (val < 60)
+return 'Redelijk';
+else if (val < 80)
+return 'Veel';
+else
+return 'Zeer veel';
+}
 	});
 	$("#hop_aroma").jqxProgressBar({
 		width: 300,
 		height: 23,
 		theme: theme,
 			{ stop:  20, color: '#004D00' },
 			{ stop:  40, color: '#008C00' },
 			{ stop:  60, color: '#00BF00' },
 			{ stop:  80, color: '#00FF00' },
 			{ stop: 100, color: '#80FF80' }
-		]
+		],
+renderText: function (text) {
+var val = parseInt(text);
+if (val < 20)
+return 'Weinig';
+else if (val < 40)
+return 'Matig';
+else if (val < 60)
+return 'Redelijk';
+else if (val < 80)
+return 'Veel';
+else
+return 'Zeer veel';
+}
 	});
 	$("#popupHop").jqxWindow({
 		width: 800,
 		height: 300,
 		position: { x: 230, y: 100 },
 		cancelButton: $("#HopReady"),
 		modalOpacity: 0.40
 	});
 	$("#HopReady").jqxButton({ template: "success", width: '90px', theme: theme });
 	$("#HopReady").click(function () {
-		$("#hopGrid").jqxGrid('sortby', 'h_amount', 'asc');
 		calcIBUs();
 	});
 	$("#wh_name").jqxInput({ theme: theme, width: 320, height: 23 });
 	$("#wh_instock").jqxCheckBox({ theme: theme, height: 23 });
 	$("#wh_instock").on('change', function (event) {
 		autoOpen: false,
 		cancelButton: $("#MiscReady"),
 		modalOpacity: 0.40
 	});
 	$("#MiscReady").jqxButton({ template: "success", width: '90px', theme: theme });
-	$("#MiscReady").click(function () {
-		$("#miscGrid").jqxGrid('sortby', 'm_use_use', 'asc');
-	});
 	$("#wm_name").jqxInput({ theme: theme, width: 320, height: 23 });
 	$("#wm_instock").jqxCheckBox({ theme: theme, height: 23 });
 	$("#wm_instock").on('change', function (event) {
 		miscinstock = event.args.checked;
 		misclist.dataBind();
 		modalOpacity: 0.40
 	});
 	$("#YeastReady").jqxButton({ template: "success", width: '90px', theme: theme });
 	$("#YeastReady").click(function () {
 		calcFermentables();
-		$("#yeastGrid").jqxGrid('sortby', 'y_use', 'asc');
 	});
 	$("#wy_name").jqxInput({ theme: theme, width: 320, height: 23 });
 	$("#wy_laboratory").jqxInput({ theme: theme, width: 320, height: 23 });
 	$("#wy_product_id").jqxInput({ theme: theme, width: 320, height: 23 });
 	$("#wy_instock").jqxCheckBox({ theme: theme, height: 23 });