Miscs inventory disable filter menu on some fields. Friendy display of stock inventory.

Fri, 25 Jan 2019 20:38:31 +0100

author
Michiel Broek <mbroek@mbse.eu>
date
Fri, 25 Jan 2019 20:38:31 +0100
changeset 204
5df88c6dc903
parent 203
e29b53962cd1
child 205
08488ac3bbb1

Miscs inventory disable filter menu on some fields. Friendy display of stock inventory.

www/js/inv_miscs.js file | annotate | diff | comparison | revisions
--- a/www/js/inv_miscs.js	Fri Jan 25 20:24:00 2019 +0100
+++ b/www/js/inv_miscs.js	Fri Jan 25 20:38:31 2019 +0100
@@ -205,7 +205,7 @@
 		filterable: true,
 		filtermode: 'excel',
 		columns: [
-			{ text: 'Ingredient naam', datafield: 'name' },
+			{ text: 'Ingredient naam', datafield: 'name', menu: false },
 			{ text: 'Type', datafield: 'type', align: 'center', cellsalign: 'center', width: 120,
 			  cellsrenderer: function (index, datafield, value, defaultvalue, column, rowdata) {
 				return "<div style='margin: 4px;' class='jqx-center-align'>" + MiscTypeData[value].nl + "</div>";
@@ -216,27 +216,34 @@
 				return "<div style='margin: 4px;' class='jqx-center-align'>" + MiscUseData[value].nl + "</div>";
 			  }
 			},
-			{ text: 'Tijd', datafield: 'time', width: 90, align: 'right', cellsalign: 'right', cellsformat: 'f0',
+			{ text: 'Tijd', datafield: 'time', width: 90, align: 'left', menu: false,
+			  cellsrenderer: function (index, datafield, value, defaultvalue, column, rowdata) {
+				if (value == 0)
+					return "<div style='margin: 4px;' class='jqx-left-align'></div>";
+				if (value == 1)
+					return "<div style='margin: 4px;' class='jqx-left-align'>1 minuut</div>";
+				if (value < 60)
+					return "<div style='margin: 4px;' class='jqx-left-align'>"+dataAdapter.formatNumber(value, "f0")+" minuten</div>";
+				if (value == 60)
+					return "<div style='margin: 4px;' class='jqx-left-align'>1 uur</div>";
+				if (value < 1440)
+					return "<div style='margin: 4px;' class='jqx-left-align'>"+dataAdapter.formatNumber(value / 60, "f0")+" uren</div>";
+				if (value == 1440)
+					return "<div style='margin: 4px;' class='jqx-left-align'>1 dag</div>";
+				return "<div style='margin: 4px;' class='jqx-left-align'>"+dataAdapter.formatNumber(value / 1440, "f0")+" dagen</div>";
+			  }
+		       	},
+			{ text: 'Voorraad', datafield: 'inventory', width: 110, menu: false, align: 'right', cellsalign: 'right',
 			  cellsrenderer: function (index, datafield, value, defaultvalue, column, rowdata) {
 				if (value == 0)
 					return "<div style='margin: 4px;' class='jqx-right-align'></div>";
-				if (value == 1)
-					return "<div style='margin: 4px;' class='jqx-right-align'>1 minuut</div>";
-				if (value < 60)
-					return "<div style='margin: 4px;' class='jqx-right-align'>"+dataAdapter.formatNumber(value, "f0")+" minuten</div>";
-				if (value == 60)
-					return "<div style='margin: 4px;' class='jqx-right-align'>1 uur</div>";
-				if (value < 1440)
-					return "<div style='margin: 4px;' class='jqx-right-align'>"+dataAdapter.formatNumber(value / 60, "f0")+" uren</div>";
-				if (value == 1440)
-					return "<div style='margin: 4px;' class='jqx-right-align'>1 dag</div>";
-				return "<div style='margin: 4px;' class='jqx-right-align'>"+dataAdapter.formatNumber(value / 1440, "f0")+" dagen</div>";
+				if (rowdata.amount_is_weight)
+					return "<div style='margin: 4px;' class='jqx-right-align'>"+dataAdapter.formatNumber(value,"f1")+" gr</div>";
+				return "<div style='margin: 4px;' class='jqx-right-align'>"+dataAdapter.formatNumber(value,"f1")+" ml</div>";
 			  }
 		       	},
-			{ text: 'Voor. gr/ml.', datafield: 'inventory', width: 110, align: 'right', cellsalign: 'right' },
-			{ text: 'Prijs kg/l', datafield: 'cost', width: 90, align: 'right', cellsalign: 'right', cellsformat: 'c2' },
-			{ text: 'THT datum', datafield: 'tht_date', width: 100, align: 'center', cellsalign: 'center' },
-			{ text: 'Wijzig', datafield: 'Edit', columntype: 'button', width: 100, align: 'center', cellsrenderer: function () {
+			{ text: 'THT datum', datafield: 'tht_date', width: 100, menu: false, align: 'center', cellsalign: 'center' },
+			{ text: 'Wijzig', datafield: 'Edit', columntype: 'button', width: 100, menu: false, align: 'center', cellsrenderer: function () {
 				return "Wijzig";
 				}, buttonclick: function (row) {
 					// open the popup window when the user clicks a button.

mercurial