Mercurial > bms / file diff

--- a/www/js/inv_waters.js	Wed Aug 29 19:58:36 2018 +0200
+++ b/www/js/inv_waters.js	Wed Aug 29 23:13:13 2018 +0200
@@ -44,6 +44,21 @@
 
 $(document).ready(function () {
 	var url = "includes/db_inventory_water.php";
+	// tooltips
+	$("#name").jqxTooltip({ content: 'De unieke naam van dit brouwwater.' });
+	$("#notes").jqxTooltip({ content: 'Extra opmerkingen over dit water.' });
+	$("#unlimited_stock").jqxTooltip({ content: 'Onbeperkte voorraad zoals kraanwater en bronnen.' });
+	$("#calcium").jqxTooltip({ content: 'Calcium (Ca).' });
+	$("#bicarbonate").jqxTooltip({ content: 'Bicarbonaat (HCO3) kan worden gebruikt als invoer voor de Totale alkaliteit.' });
+	$("#sulfate").jqxTooltip({ content: 'Calcium Sulfaat (CaSO4).' });
+	$("#chloride").jqxTooltip({ content: 'Chloride (Cl).' });
+	$("#sodium").jqxTooltip({ content: 'Natrium, oftewel keukenzout (Na). In berekeningen ook vaak als Sodium.' });
+	$("#magnesium").jqxTooltip({ content: 'Magnesium (Mg).' });
+	$("#ph").jqxTooltip({ content: 'De zuurgraad (pH).' });
+	$("#total_alkalinity").jqxTooltip({ content: 'Totale alkaliniteit.' });
+	$("#default_water").jqxTooltip({ content: 'Is dit het standaard water voor de meeste bieren.' });
+	$("#inventory").jqxTooltip({ content: 'Voorraad in liters.' });
+	$("#cost").jqxTooltip({ content: 'Kostprijs per liter. 5 cijfers achter de comma zodat het kraanwater er ook in kan.' });
 	// prepare the data
 	var source = {
 		datatype: "json",
@@ -51,7 +66,7 @@
 		datafields: [
 			{ name: 'record', type: 'number' },
 			{ name: 'name', type: 'string' },
-			{ name: 'always_on_stock', type: 'bool' },
+			{ name: 'unlimited_stock', type: 'bool' },
 			{ name: 'calcium', type: 'float' },
 			{ name: 'bicarbonate', type: 'float' },
 			{ name: 'sulfate', type: 'float' },
@@ -62,7 +77,7 @@
 			{ name: 'notes', type: 'string' },
 			{ name: 'total_alkalinity', type: 'float' },
 			{ name: 'default_water', type: 'bool' },
-			{ name: 'inventory', type: 'string' },
+			{ name: 'inventory', type: 'float' },
 			{ name: 'cost', type: 'float' }
 		],
 		id: 'record',
@@ -118,7 +133,7 @@
 	};
 	// initialize the input fields.
 	$("#name").jqxInput({ theme: theme, width: 250, height: 23 });
-	$("#always_on_stock").jqxCheckBox({ theme: theme, width: 120, height: 23 });
+	$("#unlimited_stock").jqxCheckBox({ theme: theme, width: 120, height: 23 });
 	$("#calcium").jqxNumberInput({ inputMode: 'simple', spinMode: 'simple', theme: theme, width: 70, height: 23, min: 0, decimalDigits: 1, spinButtons: true });
 	$("#bicarbonate").jqxNumberInput({ inputMode: 'simple', spinMode: 'simple', theme: theme, width: 70, height: 23, min: 0, decimalDigits: 1, spinButtons: true });
 	$("#sulfate").jqxNumberInput({ inputMode: 'simple', spinMode: 'simple', theme: theme, width: 70, height: 23, min: 0, decimalDigits: 1, spinButtons: true });
@@ -153,7 +168,7 @@
 				editrow = -1;
 				$("#popupWindow").jqxWindow({ position: { x: 230, y: 30 } });
 				$("#name").val('');
-				$("#always_on_stock").val('');
+				$("#unlimited_stock").val('');
 				$("#calcium").val('');
 				$("#bicarbonate").val('');
 				$("#sulfate").val('');
@@ -172,10 +187,12 @@
 		filterable: true,
 		filtermode: 'excel',
 		columns: [
-			{ text: 'Water leverancier', datafield: 'name', width: 250 },
-			{ text: 'Opmerkingen', datafield: 'notes', width: 850 },
+			{ text: 'Water leverancier', datafield: 'name', width: 225 },
+			{ text: 'Opmerkingen', datafield: 'notes' },
 			{ text: 'Standaard', datafield: 'default_water', columntype: 'checkbox', width: 80 },
-			{ text: 'Wijzig', datafield: 'Edit', columntype: 'button', cellsrenderer: function () {
+			{ text: 'Onbeperkt', datafield: 'unlimited_stock', columntype: 'checkbox', width: 80 },
+			{ text: 'Liters', datafield: 'inventory', width: 70, align: 'right', cellsalign: 'right', cellsformat: 'f1' },
+			{ text: 'Wijzig', datafield: 'Edit', width: 120, align: 'center', columntype: 'button', cellsrenderer: function () {
 				return "Wijzig";
 				}, buttonclick: function (row) {
 					// open the popup window when the user clicks a button.
@@ -184,7 +201,7 @@
 					// get the clicked row's data and initialize the input fields.
 					var dataRecord = $("#jqxgrid").jqxGrid('getrowdata', editrow);
 					$("#name").val(dataRecord.name);
-					$("#always_on_stock").val(dataRecord.always_on_stock);
+					$("#unlimited_stock").val(dataRecord.unlimited_stock);
 					$("#calcium").val(dataRecord.calcium);
 					$("#bicarbonate").val(dataRecord.bicarbonate);
 					$("#sulfate").val(dataRecord.sulfate);
@@ -231,7 +248,7 @@
 			var row = {
 				record: rowID,
 				name: $("#name").val(),
-				always_on_stock: $("#always_on_stock").val(),
+				unlimited_stock: $("#unlimited_stock").val(),
 				calcium: parseFloat($("#calcium").jqxNumberInput('decimal')),
 				bicarbonate: parseFloat($("#bicarbonate").jqxNumberInput('decimal')),
 				sulfate: parseFloat($("#sulfate").jqxNumberInput('decimal')),
@@ -252,7 +269,7 @@
 			var newrow = {
 				record: -1,
 				name: $("#name").val(),
-				always_on_stock: $("#always_on_stock").val(),
+				unlimited_stock: $("#unlimited_stock").val(),
 				calcium: parseFloat($("#calcium").jqxNumberInput('decimal')),
 				bicarbonate: parseFloat($("#bicarbonate").jqxNumberInput('decimal')),
 				sulfate: parseFloat($("#sulfate").jqxNumberInput('decimal')),