Mercurial > bms / changeset

changeset

Added inventory miscs and water sources.

Fri, 17 Aug 2018 15:20:56 +0200

author
Michiel Broek <mbroek@mbse.eu>
date
Fri, 17 Aug 2018 15:20:56 +0200
changeset 21
acb2d8098f19
parent 20
22271f3598ac
child 22
99c02fa797f9

Added inventory miscs and water sources.

README.design file | annotate | diff | comparison | revisions
www/import/from_brouwhulp.php file | annotate | diff | comparison | revisions
www/includes/db_inventory_miscs.php file | annotate | diff | comparison | revisions
www/includes/db_inventory_water_sources.php file | annotate | diff | comparison | revisions
www/inv_miscs.php file | annotate | diff | comparison | revisions
www/inv_water_sources.php file | annotate | diff | comparison | revisions
www/js/inv_miscs.js file | annotate | diff | comparison | revisions
www/js/inv_water_sources.js file | annotate | diff | comparison | revisions 
--- a/README.design	Thu Aug 16 17:17:40 2018 +0200
+++ b/README.design	Fri Aug 17 15:20:56 2018 +0200
@@ -27,20 +27,30 @@
 Web interface bouwen met jqwidgets, breeze en knockout.
 
 
-Database inventaris:
-
+Database inventaris:		Werking	Maten
+----------------------------	-------	-------
 inventory_equipments
 inventory_fermentables		Ok.
 inventory_hops			Ok.
 inventory_mash_profiles
 inventory_mash_steps
-inventory_miscs
+inventory_miscs			Ok.
 inventory_styles
 inventory_suppliers		Ok.
 inventory_water_profiles
-inventory_water_sources
+inventory_water_sources		Ok.
 inventory_yeasts		Ok.
 
+Handelsmaten (een zooitje ongeregeld):
+vergistbare ingredienten:	Prijs per kilo, hoeveelheid in gram.
+hoppen				Prijs per ons, hoeveelheid in gram.
+Kruiden				Prijs per gram, hoeveelheden in gram.
+Additieven			Prijs per 100 ml, hoeveeheid in ml.
+Water				Prijs per liter of kuub, hoveelheden in liters.
+Gist				Prijs per gram / ml. hoeveelheden in gram/ml.
+
+Alles naar standaard maten in de database en presentatie naar behoefte?
+Opslag kilos, liter en Euros met veel cijfers achter de comma.
 
 Database:
 
--- a/www/import/from_brouwhulp.php	Thu Aug 16 17:17:40 2018 +0200
+++ b/www/import/from_brouwhulp.php	Fri Aug 17 15:20:56 2018 +0200
@@ -57,10 +57,10 @@
 			$sql .= "', protein='" . $fermentable->PROTEIN;
 		if ($fermentable->MAX_IN_BATCH)
 			$sql .= "', max_in_batch='" . $fermentable->MAX_IN_BATCH;
-		($fermentable->RECOMMEND_MASH == "TRUE") ? $sql .= "', recommend_mash='Y" : $sql .= "', recommend_mash='N";
+		($fermentable->RECOMMEND_MASH == "TRUE") ? $sql .= "', recommend_mash='1" : $sql .= "', recommend_mash='0";
 		if ($fermentable->IBU_GAL_PER_LB)
 			$sql .= "', ibu_gal_per_lb='" . $fermentable->IBU_GAL_PER_LB;
-		($fermentable->ALWAYS_ON_STOCK == "TRUE") ? $sql .= "', always_on_stock='Y" : $sql .= "', always_on_stock='N";
+		($fermentable->ALWAYS_ON_STOCK == "TRUE") ? $sql .= "', always_on_stock='1" : $sql .= "', always_on_stock='0";
 		if ($fermentable->INVENTORY)
 			$sql .= "', inventory='" . $fermentable->INVENTORY;
 		if ($fermentable->COST)
@@ -116,7 +116,7 @@
 		$sql .= "', notes='" . mysqli_real_escape_string($db, $hop->NOTES);
 		$sql .= "', origin='" . mysqli_real_escape_string($db, $hop->ORIGIN);
 		$sql .= "', substitutes='" . mysqli_real_escape_string($db, $hop->SUBSTITUTES);
-		($hop->ALWAYS_ON_STOCK == 'TRUE') ? $sql .= "', always_on_stock='Y" : $sql .= "', always_on_stock='N";
+		($hop->ALWAYS_ON_STOCK == 'TRUE') ? $sql .= "', always_on_stock='1" : $sql .= "', always_on_stock='0";
 		if ($hop->INVENTORY)
 			$sql .= "', inventory='" . $hop->INVENTORY;
 		if ($hop->COST)
@@ -201,12 +201,13 @@
 		if (($water->NAME == "Gedemineraliseerd water") || ($water->NAME == "Cristalline") || ($water->NAME == "Montille (Delhaize)") ||
 		    ($water->NAME == "Spa Reine") || ($water->NAME == "Velsen") || ($water->NAME == "Zutphen") || 
 		    ($water->NAME == "Aurele Bronwater (Colruyt)")) {
-			$sql  = "INSERT INTO inventory_water_sources SET name='" . mysqli_real_escape_string($db, $water->NAME);
+		    $sql  = "INSERT INTO inventory_water_sources SET name='" . mysqli_real_escape_string($db, $water->NAME);
+		    ($water->DEFAULT_WATER == 'TRUE') ? $sql .= "', default_water='1" : $sql .= "', default_water='0";
 		} else {
 			$sql  = "INSERT INTO inventory_water_profiles SET name='" . mysqli_real_escape_string($db, $water->NAME);
 		}
 
-		($water->ALWAYS_ON_STOCK == 'TRUE') ? $sql .= "', always_on_stock='Y" : $sql .= "', always_on_stock='N";
+		($water->ALWAYS_ON_STOCK == 'TRUE') ? $sql .= "', always_on_stock='1" : $sql .= "', always_on_stock='0";
 		if ($water->NOTES)
 			$sql .= "', notes='" . mysqli_real_escape_string($db, $water->NOTES);
 		$sql .= "', calcium='" . $water->CALCIUM;
@@ -218,7 +219,6 @@
 		$sql .= "', ph='" . $water->PH;
 		if ($water->TOTAL_ALKALINITY)
 			$sql .= "', total_alkalinity='" . $water->TOTAL_ALKALINITY;
-		($water->DEFAULT_WATER == 'TRUE') ? $sql .= "', default_water='Y" : $sql .= "', default_water='N";
 		$sql .= "';";
 		if (! $result = mysqli_query($db, $sql)) {
 			printf("Error: %s\n", mysqli_error($db));
@@ -248,12 +248,11 @@
 		$sql .= "', type='" . $misc->TYPE;
 		$sql .= "', use_use='" . $misc->USE;
 		$sql .= "', time='" . $misc->TIME;
-		$sql .= "', amount='" . $misc->AMOUNT;
-		($misc->AMOUNT_IS_WEIGHT == 'TRUE') ? $sql .= "', amount_is_weight='Y" : $sql .= "', amount_is_weight='N";
+		($misc->AMOUNT_IS_WEIGHT == 'TRUE') ? $sql .= "', amount_is_weight='1" : $sql .= "', amount_is_weight='0";
 		if ($misc->USE_FOR)
 			$sql .= "', use_for='" . mysqli_real_escape_string($db, $misc->USE_FOR);
 		if ($misc->ALWAYS_ON_STOCK)
-			($misc->ALWAYS_ON_STOCK == 'TRUE') ? $sql .= "', always_on_stock='Y" : $sql .= "', always_on_stock='N";
+			($misc->ALWAYS_ON_STOCK == 'TRUE') ? $sql .= "', always_on_stock='1" : $sql .= "', always_on_stock='0";
 		if ($misc->INVENTORY)
 			$sql .= "', inventory='" . $misc->INVENTORY;
 		if ($misc->COST)
@@ -297,7 +296,7 @@
 		 */
 		$sql .= "', evap_rate='" . ($equipment->EVAP_RATE * $equipment->BOIL_SIZE) / 100.0;
 		$sql .= "', boil_time='" . $equipment->BOIL_TIME;
-		($equipment->CALC_BOIL_VOLUME == 'TRUE') ? $sql .= "', calc_boil_volume='Y" : $sql .= "', calc_boil_volume='N";
+		($equipment->CALC_BOIL_VOLUME == 'TRUE') ? $sql .= "', calc_boil_volume='1" : $sql .= "', calc_boil_volume='0";
 		$sql .= "', lauter_deadspace='" . $equipment->LAUTER_DEADSPACE;
 		$sql .= "', top_up_kettle='" . $equipment->TOP_UP_KETTLE;
 		$sql .= "', hop_utilization='" . $equipment->HOP_UTILIZATION;
@@ -408,7 +407,7 @@
 			$sql .= "', tun_weight='" . $mash->TUN_WEIGHT;
 		if ($mash->TUN_SPECIFIX_HEAT)
 			$sql .= "', tun_specific_heat='" . $mash->TUN_SPECIFIC_HEAT;
-		($mash->EQUIP_ADJUST == 'TRUE') ? $sql .= "', equip_adjust='Y" : $sql .= "', equip_adjust='N";
+		($mash->EQUIP_ADJUST == 'TRUE') ? $sql .= "', equip_adjust='1" : $sql .= "', equip_adjust='0";
 		$sql .= "';";
 		/*
 		 * Store the record and get the record number that is created.
@@ -454,9 +453,9 @@
 
 //do_fermentables();
 //do_hops();
-do_yeasts();
-//do_waters();
+//do_yeasts();
 //do_miscs();
+do_waters();
 //do_equipments();
 //do_styles();
 //do_mash();
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/www/includes/db_inventory_miscs.php	Fri Aug 17 15:20:56 2018 +0200
@@ -0,0 +1,93 @@
+<?php
+
+require($_SERVER['DOCUMENT_ROOT']."/config.php");
+require($_SERVER['DOCUMENT_ROOT']."/version.php");
+
+#Connect to the database
+$connect = mysqli_connect(DBASE_HOST, DBASE_USER, DBASE_PASS, DBASE_NAME);
+if (! $connect) {
+	die('Connect Error (' . mysqli_connect_errno() . ') ' . mysqli_connect_error());
+}
+
+// get data and store in a json array
+$query = "SELECT * FROM inventory_miscs";
+if (isset($_GET['insert'])) {
+	// INSERT COMMAND
+	$sql  = "INSERT INTO `inventory_miscs` SET name='" . mysqli_real_escape_string($connect, $_GET['name']);
+	$sql .= "', type='" . $_GET['type'];
+	$sql .= "', use_use='" . $_GET['use_use'];
+	$sql .= "', time='" . $_GET['time'];
+	($_GET['amount_is_weight'] == 'true') ? $sql .= "', amount_is_weight='1" : $sql .= "', amount_is_weight='0";
+	$sql .= "', use_for='" . mysqli_real_escape_string($connect, $_GET['use_for']);
+	$sql .= "', notes='" . mysqli_real_escape_string($connect, $_GET['notes']);
+	($_GET['always_on_stock'] == 'true') ? $sql .= "', always_on_stock='1" : $sql .= "', always_on_stock='0";
+	$sql .= "', inventory='" . $_GET['inventory'];
+	$sql .= "', cost='" . $_GET['cost'];
+	$sql .= "', production_date='" . $_GET['production_date'];
+	$sql .= "', tht_date='" . $_GET['tht_date'];
+	$sql .= "';";
+	$result = mysqli_query($connect, $sql);
+	if (! $result) {
+		syslog(LOG_NOTICE, "db_inventory_miscs: ".$sql." result: ".mysqli_error($connect));
+	} else {
+		syslog(LOG_NOTICE, "db_inventory_miscs: inserted ".$_GET['name']);
+	}
+	echo $result;
+
+} else if (isset($_GET['update'])) {
+	// UPDATE COMMAND
+	$sql  = "UPDATE `inventory_miscs` SET name='" . mysqli_real_escape_string($connect, $_GET['name']);
+	$sql .= "', type='" . $_GET['type'];
+	$sql .= "', use_use='" . $_GET['use_use'];
+	$sql .= "', time='" . $_GET['time'];
+	($_GET['amount_is_weight'] == 'true') ? $sql .= "', amount_is_weight='1" : $sql .= "', amount_is_weight='0";
+	$sql .= "', use_for='" . mysqli_real_escape_string($connect, $_GET['use_for']);
+	$sql .= "', notes='" . mysqli_real_escape_string($connect, $_GET['notes']);
+	($_GET['always_on_stock'] == 'true') ? $sql .= "', always_on_stock='1" : $sql .= "', always_on_stock='0";
+	$sql .= "', inventory='" . $_GET['inventory'];
+	$sql .= "', cost='" . $_GET['cost'];
+	$sql .= "', production_date='" . $_GET['production_date'];
+	$sql .= "', tht_date='" . $_GET['tht_date'];
+	$sql .= "' WHERE record='" . $_GET['record'] . "';";
+	$result = mysqli_query($connect, $sql);
+	if (! $result) {
+		syslog(LOG_NOTICE, "db_inventory_miscs: ".$sql." result: ".mysqli_error($connect));
+	} else {
+		syslog(LOG_NOTICE, "db_inventory_miscs: updated record ".$_GET['record']);
+	}
+	echo $result;
+
+} else if (isset($_GET['delete'])) {
+	// DELETE COMMAND
+	$sql = "DELETE FROM `inventory_miscs` WHERE record='".$_GET['record']."';";
+	$result = mysqli_query($connect, $sql);
+	if (! $result) {
+		syslog(LOG_NOTICE, "db_inventory_miscs: ".$sql." result: ".mysqli_error($connect));
+	} else {
+		syslog(LOG_NOTICE, "db_inventory_miscs: deleted record ".$_GET['record']);
+	}
+	echo $result;
+
+} else {
+	// SELECT COMMAND
+	$result = mysqli_query($connect, $query) or die("SQL Error 1: " . mysqli_error($connect));
+	while ($row = mysqli_fetch_array($result, MYSQLI_ASSOC)) {
+		$miscs[] = array(
+			'record' => $row['record'],
+			'name' => $row['name'],
+			'type' => $row['type'],
+			'use_use' => $row['use_use'],
+			'time' => $row['time'],
+			'amount_is_weight' => $row['amount_is_weight'],
+			'use_for' => $row['use_for'],
+			'notes' => $row['notes'],
+			'always_on_stock' => $row['always_on_stock'],
+			'inventory' => $row['inventory'],
+			'cost' => $row['cost'],
+			'production_date' => $row['production_date'],
+			'tht_date' => $row['tht_date']
+		);
+	}
+	echo json_encode($miscs);
+}
+?>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/www/includes/db_inventory_water_sources.php	Fri Aug 17 15:20:56 2018 +0200
@@ -0,0 +1,123 @@
+<?php
+
+require($_SERVER['DOCUMENT_ROOT']."/config.php");
+require($_SERVER['DOCUMENT_ROOT']."/version.php");
+
+#Connect to the database
+$connect = mysqli_connect(DBASE_HOST, DBASE_USER, DBASE_PASS, DBASE_NAME);
+if (! $connect) {
+	die('Connect Error (' . mysqli_connect_errno() . ') ' . mysqli_connect_error());
+}
+
+/*
+ * If a new default will be set, clear the old default.
+ */
+function clear_default() {
+	global	$connect;
+
+	$usql = "UPDATE inventory_water_sources SET default_water='0' WHERE (default_water = '1');";
+	$result = mysqli_query($connect, $usql);
+	if (! $result) {
+		syslog(LOG_NOTICE, "db_inventory_water_sources: " . $usql . "  result: ".mysqli_error($connect));
+	}
+}
+
+
+// get data and store in a json array
+$query = "SELECT * FROM inventory_water_sources";
+if (isset($_GET['insert'])) {
+	// INSERT COMMAND
+	$sql  = "INSERT INTO `inventory_water_sources` SET name='" . mysqli_real_escape_string($connect, $_GET['name']);
+	($_GET['always_on_stock'] == 'true') ? $sql .= "', always_on_stock='1" : $sql .= "', always_on_stock='0";
+	$sql .= "', calcium='" . $_GET['calcium'];
+	$sql .= "', bicarbonate='" . $_GET['bicarbonate'];
+	$sql .= "', sulfate='" . $_GET['sulfate'];
+	$sql .= "', chloride='" . $_GET['chloride'];
+	$sql .= "', sodium='" . $_GET['sodium'];
+	$sql .= "', magnesium='" . $_GET['magnesium'];
+	$sql .= "', ph='" . $_GET['ph'];
+	$sql .= "', notes='" . mysqli_real_escape_string($connect, $_GET['notes']);
+	$sql .= "', total_alkalinity='" . $_GET['total_alkalinity'];
+	if ($_GET['default_water'] == 'true') {
+		clear_default();
+		$sql .= "', default_water='1";
+	} else {
+		$sql .= "', default_water='0";
+	}
+	$sql .= "', inventory='" . $_GET['inventory'];
+	$sql .= "', cost='" . $_GET['cost'];
+	$sql .= "';";
+	$result = mysqli_query($connect, $sql);
+	if (! $result) {
+		syslog(LOG_NOTICE, "db_inventory_water_sources: ".$sql." result: ".mysqli_error($connect));
+	} else {
+		syslog(LOG_NOTICE, "db_inventory_water_sources: inserted ".$_GET['name']);
+	}
+	echo $result;
+
+} else if (isset($_GET['update'])) {
+	// UPDATE COMMAND
+	$sql  = "UPDATE `inventory_water_sources` SET name='" . mysqli_real_escape_string($connect, $_GET['name']);
+	($_GET['always_on_stock'] == 'true') ? $sql .= "', always_on_stock='1" : $sql .= "', always_on_stock='0";
+	$sql .= "', calcium='" . $_GET['calcium'];
+	$sql .= "', bicarbonate='" . $_GET['bicarbonate'];
+	$sql .= "', sulfate='" . $_GET['sulfate'];
+	$sql .= "', chloride='" . $_GET['chloride'];
+	$sql .= "', sodium='" . $_GET['sodium'];
+	$sql .= "', magnesium='" . $_GET['magnesium'];
+	$sql .= "', ph='" . $_GET['ph'];
+	$sql .= "', notes='" . mysqli_real_escape_string($connect, $_GET['notes']);
+	$sql .= "', total_alkalinity='" . $_GET['total_alkalinity'];
+	if ($_GET['default_water'] == 'true') {
+		clear_default();
+		$sql .= "', default_water='1";
+	} else {
+		$sql .= "', default_water='0";
+	}
+	$sql .= "', inventory='" . $_GET['inventory'];
+	$sql .= "', cost='" . $_GET['cost'];
+	$sql .= "' WHERE record='" . $_GET['record'] . "';";
+	$result = mysqli_query($connect, $sql);
+	if (! $result) {
+		syslog(LOG_NOTICE, "db_inventory_water_sources: ".$sql." result: ".mysqli_error($connect));
+	} else {
+		syslog(LOG_NOTICE, "db_inventory_water_sources: updated record ".$_GET['record']);
+	}
+	echo $result;
+
+} else if (isset($_GET['delete'])) {
+	// DELETE COMMAND
+	$sql = "DELETE FROM `inventory_water_sources` WHERE record='".$_GET['record']."';";
+	$result = mysqli_query($connect, $sql);
+	if (! $result) {
+		syslog(LOG_NOTICE, "db_inventory_water_sources: ".$sql." result: ".mysqli_error($connect));
+	} else {
+		syslog(LOG_NOTICE, "db_inventory_water_sources: deleted record ".$_GET['record']);
+	}
+	echo $result;
+
+} else {
+	// SELECT COMMAND
+	$result = mysqli_query($connect, $query) or die("SQL Error 1: " . mysqli_error($connect));
+	while ($row = mysqli_fetch_array($result, MYSQLI_ASSOC)) {
+		$waters[] = array(
+			'record' => $row['record'],
+			'name' => $row['name'],
+			'always_on_stock' => $row['always_on_stock'],
+			'calcium' => $row['calcium'],
+			'bicarbonate' => $row['bicarbonate'],
+			'sulfate' => $row['sulfate'],
+			'chloride' => $row['chloride'],
+			'sodium' => $row['sodium'],
+			'magnesium' => $row['magnesium'],
+			'ph' => $row['ph'],
+			'notes' => $row['notes'],
+			'total_alkalinity' => $row['total_alkalinity'],
+			'default_water' => $row['default_water'],
+			'inventory' => $row['inventory'],
+			'cost' => $row['cost']
+		);
+	}
+	echo json_encode($waters);
+}
+?>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/www/inv_miscs.php	Fri Aug 17 15:20:56 2018 +0200
@@ -0,0 +1,73 @@
+<?php
+require_once($_SERVER['DOCUMENT_ROOT'].'/includes/global.inc.php');
+page_header('Diverse ingredienten', 'inv_miscs');
+?>
+
+   <div id="jqxgrid"></div>
+   <div style="margin-top: 30px;">
+    <div id="cellbegineditevent"></div>
+    <div style="margin-top: 10px;" id="cellendeditevent"></div>
+   </div>
+
+   <!-- Popup editor window. -->
+   <div id="popupWindow">
+    <div>Wijzig ingredient.</div>
+    <div style="overflow: hidden;">
+     <table>
+      <tr>
+       <td align="right" style="vertical-align: top;">Ingredient naam:</td>
+       <td align="left" colspan="3" style="vertical-align: top;"><input id="name" /></td>
+      </tr>
+      <tr>
+       <td align="right" style="vertical-align: top;">Soort:</td>
+       <td align="left"><div id="type" /></div></td>
+       <td align="right" style="vertical-align: top;">Gebruik tijdens:</td>
+       <td align="left"><div id="use_use" /></div></td>
+      </tr>
+      <tr>
+       <td align="right" style="vertical-align: top;">Gebruik tijd:</td>
+       <td align="left" style="vertical-align: top;"><input id="time" /></td>
+       <td align="right" style="vertical-align: top;">Hoeveelheid is gewicht:</td>
+       <td align="left"><div id="amount_is_weight"></div></td>
+      </tr>
+      <tr>
+       <td align="right" style="vertical-align: top;">Toepassing:</td>
+       <td align="left" colspan="3"><textarea id="use_for"></textarea></td>
+      </tr>
+      <tr>
+       <td align="right" style="vertical-align: top;">Opmerkingen:</td>
+       <td align="left" colspan="3"><textarea id="notes"></textarea></td>
+      </tr>
+      <tr>
+       <td align="right" style="vertical-align: top;">Altijd op voorraad::</td>
+       <td align="left" colspan="3"><div id="always_on_stock"></div></td>
+      </tr>
+      <tr>
+       <td align="right" style="vertical-align: top;">Voorraad:</td>
+       <td align="left"><div id="inventory"></div></td>
+       <td align="right" style="vertical-align: top;">Prijs:</td>
+       <td align="left"><div id="cost"></div></td>
+      </tr>
+      <tr>
+       <td align="right" style="vertical-align: top;">Productie datum:</td>
+       <td align="left" style="vertical-align: top;"><div id="production_date"></div></td>
+       <td align="right" style="vertical-align: top;">Gebruik voor datum:</td>
+       <td align="left" style="vertical-align: top;"><div id="tht_date"></div></td>
+      </tr>
+      <tr>
+       <td style="padding-top: 10px;" align="right"><input type="button" id="Delete" value="Delete" /></td>
+       <td align="right"></td>
+       <td align="right"></td>
+       <td style="padding-top: 10px;" align="right">
+        <input style="margin-right: 5px;" type="button" id="Save" value="Save" />
+        <input id="Cancel" type="button" value="Cancel" />
+       </td>
+      </tr>
+     </table>
+    </div>
+   </div>
+
+<?php
+confirm_delete();
+page_footer();
+?>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/www/inv_water_sources.php	Fri Aug 17 15:20:56 2018 +0200
@@ -0,0 +1,77 @@
+<?php
+require_once($_SERVER['DOCUMENT_ROOT'].'/includes/global.inc.php');
+page_header('Water sources', 'inv_water_sources');
+?>
+
+   <div id="jqxgrid"></div>
+   <div style="margin-top: 30px;">
+    <div id="cellbegineditevent"></div>
+    <div style="margin-top: 10px;" id="cellendeditevent"></div>
+   </div>
+
+   <!-- Popup editor window. -->
+   <div id="popupWindow">
+    <div>Wijzig brouwwater bron.</div>
+    <div style="overflow: hidden;">
+     <table>
+      <tr>
+       <td align="right" style="vertical-align: top;">Water naam:</td>
+       <td align="left" colspan="3" style="vertical-align: top;"><input id="name" /></td>
+      </tr>
+      <tr>
+       <td align="right" style="vertical-align: top;">Calcium (Ca) mg/l:</td>
+       <td align="left" style="vertical-align: top;"><input id="calcium" /></td>
+      <td align="right" style="vertical-align: top;">Magnesium (Mg) mg/l:</td>
+       <td align="left" style="vertical-align: top;"><input id="magnesium" /></td>
+      </tr>
+      <tr>
+       <td align="right" style="vertical-align: top;">Natrium (Na) mg/l:</td>
+       <td align="left" style="vertical-align: top;"><input id="sodium" /></td>
+       <td align="right" style="vertical-align: top;">Chloride (Cl) mg/l:</td>
+       <td align="left" style="vertical-align: top;"><input id="chloride" /></td>
+      </tr>
+      <tr>
+       <td align="right" style="vertical-align: top;">Sulfaat (CaSO4) mg/l:</td>
+       <td align="left" style="vertical-align: top;"><input id="sulfate" /></td>
+       <td align="right" style="vertical-align: top;">Zuurgraad (pH):</td>
+       <td align="left" style="vertical-align: top;"><input id="ph" /></td>
+      </tr>
+      <tr>
+       <td align="right" style="vertical-align: top;">Bicarbonaat (HCO3) mg/l:</td> <!-- Input for total_alkalinity -->
+       <td align="left" style="vertical-align: top;"><input id="bicarbonate" /></td>
+       <td align="right" style="vertical-align: top;">Totale alkaliteit (CaCO3) mg/l:</td>
+       <td align="left" style="vertical-align: top;"><input id="total_alkalinity" /></td>
+      </tr>
+      <tr>
+       <td align="right" style="vertical-align: top;">Opmerkingen:</td>
+       <td align="left" colspan="3"><textarea id="notes"></textarea></td>
+      </tr>
+      <tr>
+       <td align="right" style="vertical-align: top;">Altijd op voorraad:</td>
+       <td align="left"><div id="always_on_stock"></div></td>
+       <td align="right" style="vertical-align: top;">Standaard water:</td>
+       <td align="left"><div id="default_water"></div></td>
+      </tr>
+      <tr>
+       <td align="right" style="vertical-align: top;">Voorraad:</td>
+       <td align="left"><div id="inventory"></div></td>
+       <td align="right" style="vertical-align: top;">Prijs:</td>
+       <td align="left"><div id="cost"></div></td>
+      </tr>
+      <tr>
+       <td style="padding-top: 10px;" align="right"><input type="button" id="Delete" value="Delete" /></td>
+       <td align="right"></td>
+       <td align="right"></td>
+       <td style="padding-top: 10px;" align="right">
+        <input style="margin-right: 5px;" type="button" id="Save" value="Save" />
+        <input id="Cancel" type="button" value="Cancel" />
+       </td>
+      </tr>
+     </table>
+    </div>
+   </div>
+
+<?php
+confirm_delete();
+page_footer();
+?>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/www/js/inv_miscs.js	Fri Aug 17 15:20:56 2018 +0200
@@ -0,0 +1,268 @@
+/*****************************************************************************
+ * Copyright (C) 2014-2018
+ *
+ * Michiel Broek <mbroek at mbse dot eu>
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2, or (at your option) any
+ * later version.
+ *
+ * BrewCloud is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with ThermFerm; see the file COPYING.  If not, write to the Free
+ * Software Foundation, 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ *****************************************************************************/
+
+
+function createDelElements() {
+	$('#eventWindow').jqxWindow({
+		theme: theme,
+		position: { x: 490, y: 210 },
+		width: 300,
+		height: 145,
+		resizable: false,
+		isModal: true,
+		modalOpacity: 0.4,
+		okButton: $('#delOk'),
+		cancelButton: $('#delCancel'),
+		initContent: function () {
+			$('#delOk').jqxButton({ width: '65px', theme: theme });
+			$('#delCancel').jqxButton({ width: '65px', theme: theme });
+			$('#delCancel').focus();
+		}
+	});
+	$('#eventWindow').jqxWindow('hide');
+}
+
+
+$(document).ready(function () {
+	var url = "includes/db_inventory_miscs.php";
+	// prepare the data
+	var source = {
+		datatype: "json",
+		cache: false,
+		datafields: [
+			{ name: 'record', type: 'number' },
+			{ name: 'name', type: 'string' },
+			{ name: 'type', type: 'string' },
+			{ name: 'use_use', type: 'string' },
+			{ name: 'time', type: 'float' },
+			{ name: 'amount', type: 'float' },
+			{ name: 'amount_is_weight', type: 'bool' },
+			{ name: 'use_for', type: 'string' },
+			{ name: 'notes', type: 'string' },
+			{ name: 'always_on_stock', type: 'bool' },
+			{ name: 'inventory', type: 'float' },
+			{ name: 'cost', type: 'float' },
+			{ name: 'production_date', type: 'string' },
+			{ name: 'tht_date', type: 'string' }
+		],
+		id: 'record',
+		url: url,
+		deleterow: function (rowid, commit) {
+			// synchronize with the server - send delete command
+			var data = "delete=true&" + $.param({ record: rowid });
+			$.ajax({
+				dataType: 'json',
+				url: url,
+				cache: false,
+				data: data,
+				success: function (data, status, xhr) {
+					// delete command is executed.
+					commit(true);
+				},
+				error: function (jqXHR, textStatus, errorThrown) {
+					commit(false);
+				}
+			});
+		},
+		addrow: function (rowid, rowdata, position, commit) {
+			var data = "insert=true&" + $.param(rowdata);
+			$.ajax({
+				dataType: 'json',
+				url: url,
+				cache: false,
+				data: data,
+				success: function (data, status, xhr) {
+					commit(true);
+				},
+				error: function(jqXHR, textStatus, errorThrown) {
+                                        commit(false);
+                                }
+                        });
+                },
+		updaterow: function (rowid, rowdata, commit) {
+			var data = "update=true&" + $.param(rowdata);
+			$.ajax({
+				dataType: 'json',
+				url: url,
+				cache: false,
+				data: data,
+				success: function (data, status, xhr) {
+					// update command is executed.
+					commit(true);
+				},
+				error: function(jqXHR, textStatus, errorThrown) {
+					commit(false);
+				}
+			});
+		}
+	};
+	var srcType = [ "Spice", "Fining", "Water Agent", "Herb", "Flavor", "Other" ];
+	var srcUse = [ "Boil", "Mash", "Primary", "Secondary", "Bottling" ];
+	// initialize the input fields.
+	$("#name").jqxInput({ theme: theme, width: 250, height: 23 });
+	$("#type").jqxDropDownList({ theme: theme, source: srcType, width: 130, height: 23, dropDownHeight: 188 });
+	$("#use_use").jqxDropDownList({ theme: theme, source: srcUse, width: 90, height: 23, dropDownHeight: 156 });
+	$("#time").jqxNumberInput({ inputMode: 'simple', spinMode: 'simple', theme: theme, width: 70, height: 23, min: 0, decimalDigits: 2, spinButtons: true });
+	$("#amount_is_weight").jqxCheckBox({ theme: theme, width: 120, height: 23 });
+	$("#use_for").jqxInput({ theme: theme, width: 640, height: 48 });
+	$("#notes").jqxInput({ theme: theme, width: 640, height: 100 });
+	$("#always_on_stock").jqxCheckBox({ theme: theme, width: 120, height: 23 });
+	$("#inventory").jqxNumberInput({ inputMode: 'simple', spinMode: 'simple', theme: theme, width: 70, height: 23, min: 0, decimalDigits: 1, spinButtons: true });
+	$("#production_date").jqxDateTimeInput({ theme: theme, width: 100, height: 23, formatString: 'yyyy-MM-dd' });
+	$("#cost").jqxNumberInput({ inputMode: 'simple', spinMode: 'simple', theme: theme, width: 70, height: 23, min: 0, decimalDigits: 2, spinButtons: true });
+	$("#tht_date").jqxDateTimeInput({ theme: theme, width: 100, height: 23, formatString: 'yyyy-MM-dd' });
+
+	var dataAdapter = new $.jqx.dataAdapter(source);
+	var editrow = -1;
+	// initialize jqxGrid
+	$("#jqxgrid").jqxGrid({
+		width: 1280,
+		height: 630,
+		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;'>Add</span></div>");
+			container.append(addButton);
+			statusbar.append(container);
+			addButton.jqxButton({  width: 60, height: 20 });
+			// add new row.
+			addButton.click(function (event) {
+				editrow = -1;
+				$("#popupWindow").jqxWindow({ position: { x: 230, y: 30 } });
+				$("#name").val('');
+				$("#type").val('');
+				$("#use_use").val('');
+				$("#time").val('');
+				$("#amount_is_weight").val('');
+				$("#use_for").val('');
+				$("#notes").val('');
+				$("#always_on_stock").val('');
+				$("#inventory").val('');
+				$("#cost").val('');
+				$("#production_date").val('');
+				$("#tht_date").val('');
+				$("#popupWindow").jqxWindow('open');
+			});
+		},
+		filterable: true,
+		filtermode: 'excel',
+		columns: [
+			{ text: 'Ingredient naam', datafield: 'name', width: 250 },
+			{ text: 'Soort', datafield: 'type', width: 90 },
+			{ text: 'Gebruik', datafield: 'use_use', width: 90 },
+			{ text: 'Tijd', datafield: 'time', width: 90, cellsalign: 'right', cellsformat: 'f2' },
+			{ text: 'Voorraad.', datafield: 'inventory', width: 70, cellsalign: 'right' },
+			{ text: 'Prijs', datafield: 'cost', width: 70, cellsalign: 'right', cellsformat: 'c2' },
+			{ text: 'THT datum', datafield: 'tht_date', width: 100 },
+			{ text: 'Edit', datafield: 'Edit', columntype: 'button', cellsrenderer: function () {
+				return "Edit";
+				}, buttonclick: function (row) {
+					// open the popup window when the user clicks a button.
+					editrow = row;
+					$("#popupWindow").jqxWindow({ position: { x: 230, y: 30 } });
+					// get the clicked row's data and initialize the input fields.
+					var dataRecord = $("#jqxgrid").jqxGrid('getrowdata', editrow);
+					$("#name").val(dataRecord.name);
+					$("#type").val(dataRecord.type);
+					$("#use_use").val(dataRecord.use_use);
+					$("#time").val(dataRecord.time);
+					$("#amount_is_weight").val(dataRecord.amount_is_weight);
+					$("#use_for").val(dataRecord.use_for);
+					$("#notes").val(dataRecord.notes);
+					$("#always_on_stock").val(dataRecord.always_on_stock);
+					$("#inventory").val(dataRecord.inventory);
+					$("#cost").val(dataRecord.cost);
+					$("#production_date").val(dataRecord.production_date);
+					$("#tht_date").val(dataRecord.tht_date);
+					// show the popup window.
+					$("#popupWindow").jqxWindow('open');
+				}
+			}
+		]
+	});
+	// initialize the popup window and buttons.
+	$("#popupWindow").jqxWindow({
+		width: 860, resizable: false, theme: theme, isModal: true, autoOpen: false, cancelButton: $("#Cancel"), modalOpacity: 0.40
+	});
+	$("#popupWindow").on('open', function () {
+		$("#name").jqxInput('selectAll');
+	});
+	$("#Delete").jqxButton({ theme: theme });
+	$("#Delete").click(function () {
+		if (editrow >= 0) {
+			// Open a popup to confirm this action.
+			$('#eventWindow').jqxWindow('open');
+			$("#delOk").click(function () {
+				var rowID = $('#jqxgrid').jqxGrid('getrowid', editrow);
+				$("#jqxgrid").jqxGrid('deleterow', rowID);
+			});
+		}
+		$("#popupWindow").jqxWindow('hide');
+	});
+	$("#Cancel").jqxButton({ theme: theme });
+	$("#Save").jqxButton({ theme: theme });
+	// update the edited row when the user clicks the 'Save' button.
+	$("#Save").click(function () {
+		if (editrow >= 0) {
+			var rowID = $('#jqxgrid').jqxGrid('getrowid', editrow);
+			var row = {
+				record: rowID,
+				name: $("#name").val(),
+				type: $("#type").val(),
+				use_use: $("#use_use").val(),
+				time: parseFloat($("#time").jqxNumberInput('decimal')),
+				amount_is_weight: $("#amount_is_weight").val(),
+				use_for: $("#use_for").val(),
+				notes: $("#notes").val(),
+				always_on_stock: $("#always_on_stock").val(),
+				inventory: parseFloat($("#inventory").jqxNumberInput('decimal')),
+				cost: parseFloat($("#cost").jqxNumberInput('decimal')),
+		                production_date: $("#production_date").val(),
+		                tht_date: $("#tht_date").val()
+			};
+			$('#jqxgrid').jqxGrid('updaterow', rowID, row);
+			$("#popupWindow").jqxWindow('hide');
+		} else {
+			// Insert a record
+			var newrow = {
+				record: -1,
+				name: $("#name").val(),
+				type: $("#type").val(),
+				use_use: $("#use_use").val(),
+				time: parseFloat($("#time").jqxNumberInput('decimal')),
+				amount_is_weight: $("#amount_is_weight").val(),
+				use_for: $("#use_for").val(),
+				notes: $("#notes").val(),
+				always_on_stock: $("#always_on_stock").val(),
+				inventory: parseFloat($("#inventory").jqxNumberInput('decimal')),
+				cost: parseFloat($("#cost").jqxNumberInput('decimal')),
+				production_date: $("#production_date").val(),
+				tht_date: $("#tht_date").val()
+			};
+			$('#jqxgrid').jqxGrid('addrow', null, newrow);
+			$("#popupWindow").jqxWindow('hide');
+		}
+	});
+	createDelElements();
+});
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/www/js/inv_water_sources.js	Fri Aug 17 15:20:56 2018 +0200
@@ -0,0 +1,275 @@
+/*****************************************************************************
+ * Copyright (C) 2014-2018
+ *
+ * Michiel Broek <mbroek at mbse dot eu>
+ *
+ * This file is part of BrewCloud
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2, or (at your option) any
+ * later version.
+ *
+ * BrewCloud is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with ThermFerm; see the file COPYING.  If not, write to the Free
+ * Software Foundation, 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ *****************************************************************************/
+
+
+function createDelElements() {
+	$('#eventWindow').jqxWindow({
+		theme: theme,
+		position: { x: 490, y: 210 },
+		width: 300,
+		height: 145,
+		resizable: false,
+		isModal: true,
+		modalOpacity: 0.4,
+		okButton: $('#delOk'),
+		cancelButton: $('#delCancel'),
+		initContent: function () {
+			$('#delOk').jqxButton({ width: '65px', theme: theme });
+			$('#delCancel').jqxButton({ width: '65px', theme: theme });
+			$('#delCancel').focus();
+		}
+	});
+	$('#eventWindow').jqxWindow('hide');
+}
+
+
+$(document).ready(function () {
+	var url = "includes/db_inventory_water_sources.php";
+	// prepare the data
+	var source = {
+		datatype: "json",
+		cache: false,
+		datafields: [
+			{ name: 'record', type: 'number' },
+			{ name: 'name', type: 'string' },
+			{ name: 'always_on_stock', type: 'bool' },
+			{ name: 'calcium', type: 'float' },
+			{ name: 'bicarbonate', type: 'float' },
+			{ name: 'sulfate', type: 'float' },
+			{ name: 'chloride', type: 'float' },
+			{ name: 'sodium', type: 'float' },
+			{ name: 'magnesium', type: 'float' },
+			{ name: 'ph', type: 'float' },
+			{ name: 'notes', type: 'string' },
+			{ name: 'total_alkalinity', type: 'float' },
+			{ name: 'default_water', type: 'bool' },
+			{ name: 'inventory', type: 'string' },
+			{ name: 'cost', type: 'float' }
+		],
+		id: 'record',
+		url: url,
+		deleterow: function (rowid, commit) {
+			// synchronize with the server - send delete command
+			var data = "delete=true&" + $.param({ record: rowid });
+			$.ajax({
+				dataType: 'json',
+				url: url,
+				cache: false,
+				data: data,
+				success: function (data, status, xhr) {
+					// delete command is executed.
+					commit(true);
+				},
+				error: function (jqXHR, textStatus, errorThrown) {
+					commit(false);
+				}
+			});
+		},
+		addrow: function (rowid, rowdata, position, commit) {
+			var data = "insert=true&" + $.param(rowdata);
+			$.ajax({
+				dataType: 'json',
+				url: url,
+				cache: false,
+				data: data,
+				success: function (data, status, xhr) {
+					commit(true);
+				},
+				error: function(jqXHR, textStatus, errorThrown) {
+                                        commit(false);
+                                }
+                        });
+                },
+		updaterow: function (rowid, rowdata, commit) {
+			var data = "update=true&" + $.param(rowdata);
+			$.ajax({
+				dataType: 'json',
+				url: url,
+				cache: false,
+				data: data,
+				success: function (data, status, xhr) {
+					// update command is executed.
+					commit(true);
+				},
+				error: function(jqXHR, textStatus, errorThrown) {
+					commit(false);
+				}
+			});
+		}
+	};
+	// initialize the input fields.
+	$("#name").jqxInput({ theme: theme, width: 250, height: 23 });
+	$("#always_on_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 });
+	$("#chloride").jqxNumberInput({ inputMode: 'simple', spinMode: 'simple', theme: theme, width: 70, height: 23, min: 0, decimalDigits: 1, spinButtons: true });
+	$("#sodium").jqxNumberInput({ inputMode: 'simple', spinMode: 'simple', theme: theme, width: 70, height: 23, min: 0, decimalDigits: 1, spinButtons: true });
+	$("#magnesium").jqxNumberInput({ inputMode: 'simple', spinMode: 'simple', theme: theme, width: 70, height: 23, min: 0, decimalDigits: 1, spinButtons: true });
+	$("#ph").jqxNumberInput({ inputMode: 'simple', spinMode: 'simple', theme: theme, width: 70, height: 23, min: 0, decimalDigits: 1, spinButtons: true });
+
+	$("#notes").jqxInput({ theme: theme, width: 640, height: 100 });
+	$("#total_alkalinity").jqxNumberInput({ inputMode: 'simple', spinMode: 'simple', theme: theme, width: 70, height: 23, min: 0, decimalDigits: 1, spinButtons: true });
+	$("#default_water").jqxCheckBox({ theme: theme, width: 120, height: 23 });
+	$("#inventory").jqxNumberInput({ inputMode: 'simple', spinMode: 'simple', theme: theme, width: 70, height: 23, min: 0, decimalDigits: 1, spinButtons: true });
+	$("#cost").jqxNumberInput({ inputMode: 'simple', spinMode: 'simple', theme: theme, width: 70, height: 23, min: 0, decimalDigits: 2, spinButtons: true });
+	var dataAdapter = new $.jqx.dataAdapter(source);
+	var editrow = -1;
+	// initialize jqxGrid
+	$("#jqxgrid").jqxGrid({
+		width: 1280,
+		height: 630,
+		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;'>Add</span></div>");
+			container.append(addButton);
+			statusbar.append(container);
+			addButton.jqxButton({  width: 60, height: 20 });
+			// add new row.
+			addButton.click(function (event) {
+				editrow = -1;
+				$("#popupWindow").jqxWindow({ position: { x: 230, y: 30 } });
+				$("#name").val('');
+				$("#always_on_stock").val('');
+				$("#calcium").val('');
+				$("#bicarbonate").val('');
+				$("#sulfate").val('');
+				$("#chloride").val('');
+				$("#sodium").val('');
+				$("#magnesium").val('');
+				$("#ph").val('');
+				$("#notes").val('');
+				$("#total_alkalinity").val('');
+				$("#default_water").val('');
+				$("#inventory").val('');
+				$("#cost").val('');
+				$("#popupWindow").jqxWindow('open');
+			});
+		},
+		filterable: true,
+		filtermode: 'excel',
+		columns: [
+			{ text: 'Water Profile', datafield: 'name', width: 250 },
+			{ text: 'Notes', datafield: 'notes', width: 850 },
+			{ text: 'Standaard', datafield: 'default_water', columntype: 'checkbox', width: 80 },
+			{ text: 'Edit', datafield: 'Edit', columntype: 'button', cellsrenderer: function () {
+				return "Edit";
+				}, buttonclick: function (row) {
+					// open the popup window when the user clicks a button.
+					editrow = row;
+					$("#popupWindow").jqxWindow({ position: { x: 230, y: 30 } });
+					// 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);
+					$("#calcium").val(dataRecord.calcium);
+					$("#bicarbonate").val(dataRecord.bicarbonate);
+					$("#sulfate").val(dataRecord.sulfate);
+					$("#chloride").val(dataRecord.chloride);
+					$("#sodium").val(dataRecord.sodium);
+					$("#magnesium").val(dataRecord.magnesium);
+					$("#ph").val(dataRecord.ph);
+					$("#notes").val(dataRecord.notes);
+					$("#total_alkalinity").val(dataRecord.total_alkalinity);
+					$("#default_water").val(dataRecord.default_water);
+					$("#inventory").val(dataRecord.inventory);
+					$("#cost").val(dataRecord.cost);
+					// show the popup window.
+					$("#popupWindow").jqxWindow('open');
+				}
+			}
+		]
+	});
+	// initialize the popup window and buttons.
+	$("#popupWindow").jqxWindow({
+		width: 860, resizable: false, theme: theme, isModal: true, autoOpen: false, cancelButton: $("#Cancel"), modalOpacity: 0.40
+	});
+	$("#popupWindow").on('open', function () {
+		$("#name").jqxInput('selectAll');
+	});
+	$("#Delete").jqxButton({ theme: theme });
+	$("#Delete").click(function () {
+		if (editrow >= 0) {
+			// Open a popup to confirm this action.
+			$('#eventWindow').jqxWindow('open');
+			$("#delOk").click(function () {
+				var rowID = $('#jqxgrid').jqxGrid('getrowid', editrow);
+				$("#jqxgrid").jqxGrid('deleterow', rowID);
+			});
+		}
+		$("#popupWindow").jqxWindow('hide');
+	});
+	$("#Cancel").jqxButton({ theme: theme });
+	$("#Save").jqxButton({ theme: theme });
+	// update the edited row when the user clicks the 'Save' button.
+	$("#Save").click(function () {
+		if (editrow >= 0) {
+			var rowID = $('#jqxgrid').jqxGrid('getrowid', editrow);
+			var row = {
+				record: rowID,
+				name: $("#name").val(),
+				always_on_stock: $("#always_on_stock").val(),
+				calcium: parseFloat($("#calcium").jqxNumberInput('decimal')),
+				bicarbonate: parseFloat($("#bicarbonate").jqxNumberInput('decimal')),
+				sulfate: parseFloat($("#sulfate").jqxNumberInput('decimal')),
+				chloride: parseFloat($("#chloride").jqxNumberInput('decimal')),
+				sodium: parseFloat($("#sodium").jqxNumberInput('decimal')),
+				magnesium: parseFloat($("#magnesium").jqxNumberInput('decimal')),
+				ph: parseFloat($("#ph").jqxNumberInput('decimal')),
+				notes: $("#notes").val(),
+				total_alkalinity: parseFloat($("#total_alkalinity").jqxNumberInput('decimal')),
+				default_water: $("#default_water").val(),
+				inventory: parseFloat($("#inventory").jqxNumberInput('decimal')),
+				cost: parseFloat($("#cost").jqxNumberInput('decimal'))
+			};
+			$('#jqxgrid').jqxGrid('updaterow', rowID, row);
+			$("#popupWindow").jqxWindow('hide');
+		} else {
+			// Insert a record
+			var newrow = {
+				record: -1,
+				name: $("#name").val(),
+				always_on_stock: $("#always_on_stock").val(),
+				calcium: parseFloat($("#calcium").jqxNumberInput('decimal')),
+				bicarbonate: parseFloat($("#bicarbonate").jqxNumberInput('decimal')),
+				sulfate: parseFloat($("#sulfate").jqxNumberInput('decimal')),
+				chloride: parseFloat($("#chloride").jqxNumberInput('decimal')),
+				sodium: parseFloat($("#sodium").jqxNumberInput('decimal')),
+				magnesium: parseFloat($("#magnesium").jqxNumberInput('decimal')),
+				ph: parseFloat($("#ph").jqxNumberInput('decimal')),
+				notes: $("#notes").val(),
+				total_alkalinity: parseFloat($("#total_alkalinity").jqxNumberInput('decimal')),
+				default_water: $("#default_water").val(),
+				inventory: parseFloat($("#inventory").jqxNumberInput('decimal')),
+				cost: parseFloat($("#cost").jqxNumberInput('decimal'))
+			};
+			$('#jqxgrid').jqxGrid('addrow', null, newrow);
+			$("#popupWindow").jqxWindow('hide');
+		}
+	});
+	createDelElements();
+});
+

Mercurial Repository: bms

mercurial