Mercurial > bms / file diff

--- a/www/js/inv_miscs.js	Sat Feb 23 22:56:35 2019 +0100
+++ b/www/js/inv_miscs.js	Sun Feb 24 17:23:52 2019 +0100
@@ -175,7 +175,6 @@
 		source: dataAdapter,
 		theme: theme,
 		showstatusbar: true,
-		localization: getLocalization(),
 		renderstatusbar: function (statusbar) {
 			var container = $("<div style='overflow: hidden; position: relative; margin: 5px;'></div>");
 			var addButton = $("<div style='float: right; margin-right: 15px;'><img style='position: relative; margin-top: 2px;' src='images/add.png'/><span style='margin-left: 4px; position: relative; top: -3px;'>Nieuw</span></div>");
@@ -205,44 +204,50 @@
 		filtermode: 'excel',
 		columns: [
 			{ text: 'Ingredient naam', datafield: 'name', menu: false },
-			{ text: 'Type', datafield: 'type', align: 'center', cellsalign: 'center', width: 120,
+			{ text: 'Type', datafield: 'type', align: 'left', width: 120,
 			  cellsrenderer: function (index, datafield, value, defaultvalue, column, rowdata) {
-				return "<div style='margin: 4px;' class='jqx-center-align'>" + MiscTypeData[value].nl + "</div>";
+				return "<span style='margin: 3px; margin-top: 6px; float: left;'>" + MiscTypeData[value].nl + "</span>";
 			  }
 		       	},
-			{ text: 'Gebruik', datafield: 'use_use', align: 'center', cellsalign: 'center', width: 120,
+			{ text: 'Gebruik', datafield: 'use_use', align: 'left', width: 120,
 			  cellsrenderer: function (index, datafield, value, defaultvalue, column, rowdata) {
-				return "<div style='margin: 4px;' class='jqx-center-align'>" + MiscUseData[value].nl + "</div>";
+				return "<span style='margin: 3px; margin-top: 6px; float: left;'>" + MiscUseData[value].nl + "</span>";
 			  }
 			},
 			{ 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>";
+				var duration = "";
+				if (value > 0) {
+					if (value == 1)
+						duration = "1 minuut";
+					else if (value < 60)
+						duration = dataAdapter.formatNumber(value, "f0")+" minuten";
+					else if (value == 60)
+						duration = "1 uur";
+					else if (value < 1440)
+						duration = dataAdapter.formatNumber(value / 60, "f0")+" uren";
+					else if (value == 1440)
+						duration = "1 dag";
+					else
+						duration = dataAdapter.formatNumber(value / 1440, "f0")+" dagen";
+				}
+				return "<span style='margin: 3px; margin-top: 6px; float: left;'>" + duration + "</span>";
 			  }
 		       	},
-			{ text: 'Voorraad', datafield: 'inventory', width: 110, menu: false, align: 'right', cellsalign: 'right',
+			{ text: 'Voorraad', datafield: 'inventory', width: 110, menu: false, align: 'right',
 			  cellsrenderer: function (index, datafield, value, defaultvalue, column, rowdata) {
-				if (value == 0)
-					return "<div style='margin: 4px;' class='jqx-right-align'></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>";
+				var amount = "";
+				if (value > 0) {
+					if (rowdata.amount_is_weight)
+						amount = dataAdapter.formatNumber(value,"f1")+" gr";
+					else
+						amount = dataAdapter.formatNumber(value,"f1")+" ml";
+				}
+				return "<span style='margin: 3px; margin-top: 6px; float: right;'>" + amount + "</span>";
 			  }
 		       	},
 			{ 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 () {
+			{ text: '', 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.