# HG changeset patch
# User Michiel Broek <mbroek@mbse.eu>
# Date 1536260744 -7200
# Node ID 3e29755638b6e7df07998076daa074a293f838db
# Parent  294dda7f177934f113899fe8fe5c42edce06dada
Add and delete water completed.

diff -r 294dda7f1779 -r 3e29755638b6 www/js/recipes.js
--- a/www/js/recipes.js	Thu Sep 06 14:22:02 2018 +0200
+++ b/www/js/recipes.js	Thu Sep 06 21:05:44 2018 +0200
@@ -171,7 +171,7 @@
 			}
 		};
 		var waterAdapter = new $.jqx.dataAdapter(waterSource);
-
+		// dropdownlist datasource from inventory_waters
 		var waterUrl = "getwatersources.php";
 		var waterInvSource = {
 			datatype: "json",
@@ -205,67 +205,51 @@
 			showtoolbar: true,
 			rendertoolbar: function (toolbar) {
 				var me = this;
-				var container = $("<div style='margin: 5px; white-space: nowrap;'></div>");
+				var container = $("<div style='overflow: hidden; position: relative; margin: 5px;'></div>");
 				toolbar.append(container);
-//				container.append('<input style="margin-left: 100px;" id="addrowbutton" type="button" value="Nieuwe stap" />');
-				container.append('<div  id="addrowbutton"></div>');
-				container.append('<input id="deleterowbutton" type="button" value="Verwijder water" />');
+				container.append('<div style="float: left; margin-left: 165px;" id="addrowbutton"></div>');
+				container.append('<input style="float: left; margin-left: 230px;" id="deleterowbutton" type="button" value="Verwijder water" />');
+				// add water from dropdownlist.
 				$("#addrowbutton").jqxDropDownList({
 					placeHolder: "Kies water:",
 					theme: theme,
 					source: waterlist,
 					displayMember: "name",
 					width: 150,
+					height: 27,
 					dropDownWidth: 300
 				});
-//				$("#addrowbutton").jqxButton({ theme: theme, width: 150 });
-//				$("#addrowbutton").on('click', function () {
 				$("#addrowbutton").on('select', function (event) {
-//					if (event.args) {
-//						var index = event.args.index;
-//						var datarecord = data[index];
-//						var row = {};
-//						row["w_name"] = datarecord.name;
-//						row["w_amount"] = 0;
-//						row["w_calcium"] = datarecord.calcium;
-//						row["w_sulfate"] = datarecord.sulfate;
-//						row["w_chloride"] = datarecord.chloride;
+					if (event.args) {
+						var index = event.args.index;
+						var datarecord = waterlist.records[index];
+						var row = {};
+						row["w_name"] = datarecord.name;
+						row["w_amount"] = 0;
+						row["w_calcium"] = datarecord.calcium;
+						row["w_sulfate"] = datarecord.sulfate;
+						row["w_chloride"] = datarecord.chloride;
+						row["w_sodium"] = datarecord.sodium;
+						row["w_magnesium"] = datarecord.magnesium;
+						row["w_ph"] = datarecord.ph;
+						row["w_total_alkalinity"] = datarecord.total_alkalinity;
+						row["w_default_water"] = datarecord.default_water;
+						row["w_cost"] = datarecord.cost;
+						var commit = $("#waterGrid").jqxGrid('addrow', null, row);
+					}
+				});
 
-//						var commit = $("#waterGrid").jqxGrid('addrow', null, row);
-//					}
-					var row = {};
-					row["w_name"] = "Vies water";
-					row["w_amount"] = 0;
-					row["w_calcium"] = 0;
-					row["w_sulfate"] = 0;
-					row["w_chloride"] = 0;
-					row["w_sodium"] = 0;
-					row["w_magnesium"] = 0;
-					row["w_ph"] = 7.1;
-					row["w_total_alkalinity"] = 0;
-					row["w_default_water"] = 0;
-					row["w_cost"] = 0;
-					var commit = $("#waterGrid").jqxGrid('addrow', null, row);
+				// delete selected water.
+				// Overgebleven waters in volume verhogen met het verwijderde water.
+				$("#deleterowbutton").jqxButton({ theme: theme, height: 27, width: 150 });
+				$("#deleterowbutton").on('click', function () {
+					var selectedrowindex = $("#waterGrid").jqxGrid('getselectedrowindex');
+					var rowscount = $("#waterGrid").jqxGrid('getdatainformation').rowscount;
+					if (selectedrowindex >= 0 && selectedrowindex < rowscount) {
+						var id = $("#waterGrid").jqxGrid('getrowid', selectedrowindex);
+						var commit = $("#waterGrid").jqxGrid('deleterow', id);
+					}
 				});
-				$("#deleterowbutton").jqxButton({ theme: theme, width: 150 });
-				// create new row. Dropdown uit water inventory.
-//				$("#addrowbutton").on('select', function (event) {
-//					var item = event.args.item;
-//				});
-//				$("#addrowbutton").on('click', function () {
-//					var datarow = generaterow();
-//					var commit = $("#waterGrid").jqxGrid('addrow', null, datarow);
-//				});
-				// delete row.
-				// Overgebleven waters in volume verhogen met het verwijderde water.
-//				$("#deleterowbutton").on('click', function () {
-//					var selectedrowindex = $("#grid").jqxGrid('getselectedrowindex');
-//					var rowscount = $("#grid").jqxGrid('getdatainformation').rowscount;
-//					if (selectedrowindex >= 0 && selectedrowindex < rowscount) {
-//						var id = $("#grid").jqxGrid('getrowid', selectedrowindex);
-//						var commit = $("#grid").jqxGrid('deleterow', id);
-//					}
-//				});
 			},
 			columns: [
 				{ text: 'Water bron', editable: false, datafield: 'w_name' },