Mercurial > bms / file diff

--- a/www/js/prod_edit.js	Tue May 28 20:54:39 2019 +0200
+++ b/www/js/prod_edit.js	Thu May 30 14:07:50 2019 +0200
@@ -3203,6 +3203,7 @@
                         height: 470,
                         source: fermentableAdapter,
                         theme: theme,
+                	sortmode: "many",
                         selectionmode: 'singlerow',
                         showtoolbar: true,
                         rendertoolbar: function (toolbar) {
@@ -3322,6 +3323,11 @@
                                 });
                         },
                         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');
                         },
@@ -3432,6 +3438,7 @@
                         height: 560,
                         source: hopAdapter,
                         theme: theme,
+			sortmode: "many",
                         selectionmode: 'singlerow',
                         showtoolbar: true,
                         rendertoolbar: function (toolbar) {
@@ -3506,6 +3513,12 @@
                                 });
                         },
                         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');
                         },
@@ -3691,6 +3704,7 @@
                         height: 575,
                         source: miscAdapter,
                         theme: theme,
+			sortmode: "many",
                         selectionmode: 'singlerow',
                         showtoolbar: true,
                         rendertoolbar: function (toolbar) {
@@ -3748,6 +3762,11 @@
                                 });
                         },
                         ready: function() {
+				var datainformation = $('#miscGrid').jqxGrid('getdatainformation');
+                                if (datainformation.rowscount) {
+					$("#miscGrid").jqxGrid('sortby', 'm_use_use', 'asc');
+					$("#miscGrid").jqxGrid('sortby', 'm_type', 'asc');
+				}
 				calcMiscs();
                                 $('#jqxTabs').jqxTabs('next');
                         },
@@ -3862,6 +3881,7 @@
                         height: 350,
                         source: yeastAdapter,
                         theme: theme,
+			sortmode: "many",
                         selectionmode: 'singlerow',
                         showtoolbar: true,
                         rendertoolbar: function (toolbar) {
@@ -3932,6 +3952,10 @@
                                 });
                         },
                         ready: function() {
+				var datainformation = $('#yeastGrid').jqxGrid('getdatainformation');
+                                if (datainformation.rowscount) {
+					$("#yeastGrid").jqxGrid('sortby', 'y_use', 'asc');
+				}
 				calcFermentables();
 				showStarter();
 				calcYeast();
@@ -4369,7 +4393,6 @@
 	});
 	$("#FermentableReady").jqxButton({ template: "success", width: '90px', theme: theme });
 	$("#FermentableReady").click(function () {
-		$("#fermentableGrid").jqxGrid('sortby', 'f_amount', 'desc');
 		// Recalc percentages
 		calcFermentables();
 		calcIBUs();
@@ -4596,7 +4619,6 @@
 	});
 	$("#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 });
@@ -4735,7 +4757,6 @@
 	});
 	$("#MiscReady").jqxButton({ template: "success", width: '90px', theme: theme });
 	$("#MiscReady").click(function () {
-		$("#miscGrid").jqxGrid('sortby', 'm_use_use', 'asc');
 		calcMiscs();
 	});
 	$("#wm_name").jqxInput({ theme: theme, width: 320, height: 23 });
@@ -4843,7 +4864,6 @@
 	$("#YeastReady").click(function () {
 		calcFermentables();
 		calcYeast();
-		$("#yeastGrid").jqxGrid('sortby', 'y_use', 'asc');
 	});
 	$("#wy_name").jqxInput({ theme: theme, width: 320, height: 23 });
 	$("#wy_laboratory").jqxInput({ theme: theme, width: 320, height: 23 });