# HG changeset patch
# User Michiel Broek <mbroek@mbse.eu>
# Date 1536236522 -7200
# Node ID 294dda7f177934f113899fe8fe5c42edce06dada
# Parent  a17c644a0510af5901c492c6b027af55800bed88
Beginning of water totals and selecting

diff -r a17c644a0510 -r 294dda7f1779 README.design
--- a/README.design	Wed Sep 05 15:38:20 2018 +0200
+++ b/README.design	Thu Sep 06 14:22:02 2018 +0200
@@ -24,7 +24,7 @@
   8.  bmsd productie platform upgraden, versie 0.0.3
 
 
-Web interface bouwen met jqwidgets, breeze en knockout.
+Web interface bouwen met jqwidgets.
 
 
 Database inventaris:		Werking	Maten
@@ -32,12 +32,12 @@
 inventory_equipments		Ok.	Ok.
 inventory_fermentables		Ok.	Ok.
 inventory_hops			Ok.	Ok.
-inventory_mash_profiles		Ok.	Ok.
+profile_mash			Ok.	Ok.
 inventory_miscs			Ok.
-inventory_styles		Ok.	Ok.
+profile_styles			Ok.	Ok.
 inventory_suppliers		Ok.	Ok.
-inventory_water_profiles	Ok.	Ok.
-inventory_water_sources		Ok.	Ok.
+profile_water			Ok.	Ok.
+inventory_water			Ok.	Ok.
 inventory_yeasts		Ok.	Ok.
 
 Handelsmaten (een zooitje ongeregeld):
diff -r a17c644a0510 -r 294dda7f1779 www/getwatersources.php
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/www/getwatersources.php	Thu Sep 06 14:22:02 2018 +0200
@@ -0,0 +1,27 @@
+<?php
+require_once('config.php');
+
+$query = "SELECT * FROM inventory_waters ORDER BY name";
+$connect = mysqli_connect(DBASE_HOST,DBASE_USER,DBASE_PASS,DBASE_NAME);
+if (! $connect) {
+	echo "[]";
+	return;
+}
+$result = mysqli_query($connect, $query);
+while ($row = mysqli_fetch_array($result, MYSQLI_ASSOC)) {
+	$waters[] = array(
+		'record' => $row['record'],
+		'name' => $row['name'],
+		'unlimited_stock' => $row['unlimited_stock'],
+		'calcium' => $row['calcium'],
+		'sulfate' => $row['sulfate'],
+		'chloride' => $row['chloride'],
+		'sodium' => $row['sodium'],
+		'magnesium' => $row['magnesium'],
+		'ph' => $row['ph'],
+		'total_alkalinity' => $row['total_alkalinity'],
+		'default_water' => $row['default_water'],
+		'cost' => $row['cost']
+	);
+}
+echo json_encode($waters);
diff -r a17c644a0510 -r 294dda7f1779 www/import/from_brouwhulp.php
--- a/www/import/from_brouwhulp.php	Wed Sep 05 15:38:20 2018 +0200
+++ b/www/import/from_brouwhulp.php	Thu Sep 06 14:22:02 2018 +0200
@@ -694,8 +694,6 @@
 				$waters .= ',"w_amount":' . floatval($water->AMOUNT);
 				if ($water->CALCIUM)
 					$waters .= ',"w_calcium":' . floatval($water->CALCIUM);
-				if ($water->BICARBONATE)
-					$waters .= ',"w_bicarbonate":' . floatval($water->BICARBONATE);
 				if ($water->SULFATE)
 					$waters .= ',"w_sulfate":' . floatval($water->SULFATE);
 				if ($water->CHLORIDE)
diff -r a17c644a0510 -r 294dda7f1779 www/js/recipes.js
--- a/www/js/recipes.js	Wed Sep 05 15:38:20 2018 +0200
+++ b/www/js/recipes.js	Thu Sep 06 14:22:02 2018 +0200
@@ -154,7 +154,6 @@
 				{ name: 'w_name', type: 'string' },
 				{ name: 'w_amount', type: 'float' },
 				{ name: 'w_calcium', type: 'float' },
-				{ name: 'w_bicarbonate', type: 'float' },
 				{ name: 'w_sulfate', type: 'float' },
 				{ name: 'w_chloride', type: 'float' },
 				{ name: 'w_sodium', type: 'float' },
@@ -172,6 +171,29 @@
 			}
 		};
 		var waterAdapter = new $.jqx.dataAdapter(waterSource);
+
+		var waterUrl = "getwatersources.php";
+		var waterInvSource = {
+			datatype: "json",
+			datafields: [
+				{ name: 'record', type: 'number' },
+				{ name: 'name', type: 'string' },
+				{ name: 'unlimited_stock', type: 'bool' },
+				{ name: 'calcium', type: 'float' },
+		                { name: 'sulfate', type: 'float' },
+				{ name: 'chloride', type: 'float' },
+				{ name: 'sodium', type: 'float' },
+				{ name: 'magnesium', type: 'float' },
+				{ name: 'ph', type: 'float' },
+				{ name: 'total_alkalinity', type: 'float' },
+				{ name: 'cost', type: 'float' },
+				{ name: 'default_water', type: 'bool' }
+			],
+			url: waterUrl,
+			async: true
+		};
+		var waterlist = new $.jqx.dataAdapter(waterInvSource);
+
 		$("#waterGrid").jqxGrid({
 			width: 960,
 			height: 200,
@@ -183,13 +205,53 @@
 			showtoolbar: true,
 			rendertoolbar: function (toolbar) {
 				var me = this;
-				var container = $("<div style='margin: 5px;'></div>");
+				var container = $("<div style='margin: 5px; white-space: nowrap;'></div>");
 				toolbar.append(container);
-				container.append('<input style="margin-left: 100px;" id="addrowbutton" type="button" value="Nieuwe stap" />');
-				container.append('<input style="margin-left: 140px;" id="deleterowbutton" type="button" value="Verwijder stap" />');
-				$("#addrowbutton").jqxButton({ theme: theme, width: 150 });
+//				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" />');
+				$("#addrowbutton").jqxDropDownList({
+					placeHolder: "Kies water:",
+					theme: theme,
+					source: waterlist,
+					displayMember: "name",
+					width: 150,
+					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;
+
+//						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);
+				});
 				$("#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);
diff -r a17c644a0510 -r 294dda7f1779 www/recipes.php
--- a/www/recipes.php	Wed Sep 05 15:38:20 2018 +0200
+++ b/www/recipes.php	Thu Sep 06 14:22:02 2018 +0200
@@ -152,7 +152,7 @@
              <td style="width: 80px; padding: 3px;">Ca</td>
              <td style="width: 80px; padding: 3px;">Mg</td>
              <td style="width: 80px; padding: 3px;">Na</td>
-             <td style="width: 80px; padding: 3px;">HCO3</td>
+             <td style="width: 80px; padding: 3px;">CaCO3</td>
              <td style="width: 80px; padding: 3px;">Cl</td>
 	     <td style="width: 80px; padding: 3px;">SO4</td>
              <td style="width: 80px; padding: 3px;">pH</td>