Added hops inventory

Sun, 12 Aug 2018 23:20:17 +0200

author
Michiel Broek <mbroek@mbse.eu>
date
Sun, 12 Aug 2018 23:20:17 +0200
changeset 12
c26af32428a4
parent 11
d341f0a91a91
child 13
b8c3ca152984

Added hops inventory

www/includes/db_inventory_hops.php file | annotate | diff | comparison | revisions
www/inv_hops.php file | annotate | diff | comparison | revisions
www/js/inv_hops.js file | annotate | diff | comparison | revisions
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/www/includes/db_inventory_hops.php	Sun Aug 12 23:20:17 2018 +0200
@@ -0,0 +1,105 @@
+<?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_hops";
+if (isset($_GET['insert'])) {
+	// INSERT COMMAND
+	$sql  = "INSERT INTO `inventory_hops` SET name='" . mysqli_real_escape_string($connect, $_GET['name']);
+	$sql .= "', alpha='" . $_GET['alpha'];
+	$sql .= "', beta='" . $_GET['beta'];
+	$sql .= "', humulene='" . $_GET['humulene'];
+	$sql .= "', caryophyllene='" . $_GET['caryophyllene'];
+	$sql .= "', cohumulone='" . $_GET['cohumulone'];
+	$sql .= "', myrcene='" . $_GET['myrcene'];
+	$sql .= "', useat='" . $_GET['useat'];
+	$sql .= "', type='" . $_GET['type'];
+	$sql .= "', form='" . $_GET['form'];
+	$sql .= "', notes='" . mysqli_real_escape_string($connect, $_GET['notes']);
+	$sql .= "', origin='" . mysqli_real_escape_string($connect, $_GET['origin']);
+	$sql .= "', substitutes='" . mysqli_real_escape_string($connect, $_GET['substitutes']);
+	($_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 .= "', supplier_rec='" . $_GET['supplier_rec'];
+	$sql .= "';";
+	error_log("\"$sql\"");
+	$result = mysqli_query($connect, $sql) or die("SQL Error 1: " . mysqli_error($connect));
+	error_log("result " . $result);
+	echo $result;
+
+} else if (isset($_GET['update'])) {
+	// UPDATE COMMAND
+	$sql  = "UPDATE `inventory_hops` SET name='" . mysqli_real_escape_string($connect, $_GET['name']);
+	$sql .= "', alpha='" . $_GET['alpha'];
+	$sql .= "', beta='" . $_GET['beta'];
+	$sql .= "', humulene='" . $_GET['humulene'];
+	$sql .= "', caryophyllene='" . $_GET['caryophyllene'];
+	$sql .= "', cohumulone='" . $_GET['cohumulone'];
+	$sql .= "', myrcene='" . $_GET['myrcene'];
+	$sql .= "', useat='" . $_GET['useat'];
+	$sql .= "', type='" . $_GET['type'];
+	$sql .= "', form='" . $_GET['form'];
+	$sql .= "', notes='" . mysqli_real_escape_string($connect, $_GET['notes']);
+	$sql .= "', origin='" . mysqli_real_escape_string($connect, $_GET['origin']);
+	$sql .= "', substitutes='" . mysqli_real_escape_string($connect, $_GET['substitutes']);
+	($_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 .= "', supplier_rec='" . $_GET['supplier_rec'];
+	$sql .= "' WHERE record='" . $_GET['record'] . "';";
+	error_log("\"$sql\"");
+	$result = mysqli_query($connect, $sql) or die("SQL Error 1: " . mysqli_error($connect));
+	error_log("result " . $result);
+	echo $result;
+
+} else if (isset($_GET['delete'])) {
+	// DELETE COMMAND
+	$sql = "DELETE FROM `inventory_hops` WHERE record='".$_GET['record']."';";
+	error_log("\"$sql\"");
+	$result = mysqli_query($connect, $sql) or die("SQL Error 1: " . mysqli_error($connect));
+	error_log("result " . $result);
+	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)) {
+		$hops[] = array(
+			'record' => $row['record'],
+			'name' => $row['name'],
+			'alpha' => $row['alpha'],
+			'beta' => $row['beta'],
+			'humulene' => $row['humulene'],
+			'caryophyllene' => $row['caryophyllene'],
+			'cohumulone' => $row['cohumulone'],
+			'myrcene' => $row['myrcene'],
+			'useat' => $row['useat'],
+			'type' => $row['type'],
+			'form' => $row['form'],
+			'notes' => $row['notes'],
+			'origin' => $row['origin'],
+			'substitutes' => $row['substitutes'],
+			'always_on_stock' => $row['always_on_stock'],
+			'inventory' => $row['inventory'],
+			'cost' => $row['cost'],
+			'production_date' => $row['production_date'],
+			'tht_date' => $row['tht_date'],
+			'supplier_rec' => $row['supplier_rec']
+		);
+	}
+	echo json_encode($hops);
+}
+?>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/www/inv_hops.php	Sun Aug 12 23:20:17 2018 +0200
@@ -0,0 +1,95 @@
+<?php
+require_once($_SERVER['DOCUMENT_ROOT'].'/includes/global.inc.php');
+page_header('Hoppen', 'inv_hops');
+?>
+
+   <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 hop.</div>
+    <div style="overflow: hidden;">
+     <table>
+      <tr>
+       <td align="right" style="vertical-align: top;">Hop naam:</td>
+       <td align="left" colspan="3" style="vertical-align: top;"><input id="name" /></td>
+      </tr>
+      <tr>
+       <td align="right" style="vertical-align: top;">Alpha:</td>
+       <td align="left" style="vertical-align: top;"><input id="alpha" /></td>
+       <td align="right" style="vertical-align: top;">Beta:</td>
+       <td align="left" style="vertical-align: top;"><input id="beta" /></td>
+      </tr>
+      <tr>
+       <td align="right" style="vertical-align: top;">Humulene:</td>
+       <td align="left" style="vertical-align: top;"><input id="humulene" /></td>
+       <td align="right" style="vertical-align: top;">Caryophyllene:</td>
+       <td align="left" style="vertical-align: top;"><input id="caryophyllene" /></td>
+      </tr>
+      <tr>
+       <td align="right" style="vertical-align: top;">cohumulone:</td>
+       <td align="left"  colspan="3" style="vertical-align: top;"><input id="cohumulone" /></td>
+      </tr>
+      <tr>
+       <td align="right" style="vertical-align: top;">myrcene:</td>
+       <td align="left" style="vertical-align: top;"><input id="myrcene" /></td>
+       <td align="right" style="vertical-align: top;">useat:</td>
+       <td align="left" style="vertical-align: top;"><input id="useat" /></td>
+      </tr>
+      <tr>
+       <td align="right" style="vertical-align: top;">type:</td>
+       <td align="left" style="vertical-align: top;"><input id="type" /></td>
+       <td align="right" style="vertical-align: top;">form:</td>
+       <td align="left" style="vertical-align: top;"><input id="form" /></td>
+      </tr>
+      <tr>
+       <td align="right" style="vertical-align: top;">origin:</td>
+       <td align="left" style="vertical-align: top;"><input id="origin" /></td>
+       <td align="right" style="vertical-align: top;">substitutes:</td>
+       <td align="left" style="vertical-align: top;"><input id="substitutes" /></td>
+      </tr>
+      <tr>
+       <td align="right" style="vertical-align: top;">supplier_rec:</td>
+       <td align="left" colspan="3"><div id="supplier_rec"></div></td>
+      </tr>
+      <tr>
+       <td align="right" style="vertical-align: top;">always_on_stock:</td>
+       <td align="left" colspan="3"><div id="always_on_stock"></div></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;">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/js/inv_hops.js	Sun Aug 12 23:20:17 2018 +0200
@@ -0,0 +1,310 @@
+/*****************************************************************************
+ * 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_hops.php";
+	// prepare the data
+	var source = {
+		datatype: "json",
+		cache: false,
+		datafields: [
+			{ name: 'record', type: 'number' },
+			{ name: 'name', type: 'string' },
+			{ name: 'alpha', type: 'float' },
+			{ name: 'beta', type: 'float' },
+			{ name: 'humulene', type: 'float' },
+			{ name: 'caryophyllene', type: 'float' },
+			{ name: 'cohumulone', type: 'float' },
+			{ name: 'myrcene', type: 'float' },
+			{ name: 'useat', type: 'string' },
+			{ name: 'type', type: 'string' },
+			{ name: 'form', type: 'string' },
+			{ name: 'notes', type: 'string' },
+			{ name: 'origin', type: 'string' },
+			{ name: 'substitutes', 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' },
+			{ name: 'supplier_rec', 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);
+				}
+			});
+		}
+	};
+	var srcUse = [ "Boil", "Dry Hop", "Mash", "First Wort", "Aroma" ];
+	var srcType = [ "Bittering", "Aroma", "Both" ];
+	var srcForm = [ "Pellet", "Plug", "Leaf" ];
+	// initialize the input fields.
+	$("#name").jqxInput({ theme: theme, width: 250, height: 23 });
+	$("#alpha").jqxNumberInput({ inputMode: 'simple', spinMode: 'simple', theme: theme, width: 70, height: 23, min: 0, decimalDigits: 1, spinButtons: true });
+	$("#beta").jqxNumberInput({ inputMode: 'simple', spinMode: 'simple', theme: theme, width: 70, height: 23, min: 0, decimalDigits: 1, spinButtons: true });
+	$("#humulene").jqxNumberInput({ inputMode: 'simple', spinMode: 'simple', theme: theme, width: 70, height: 23, min: 0, decimalDigits: 1, spinButtons: true });
+	$("#caryophyllene").jqxNumberInput({ inputMode: 'simple', spinMode: 'simple', theme: theme, width: 70, height: 23, min: 0, decimalDigits: 1, spinButtons: true });
+	$("#cohumulone").jqxNumberInput({ inputMode: 'simple', spinMode: 'simple', theme: theme, width: 70, height: 23, min: 0, decimalDigits: 1, spinButtons: true });
+	$("#myrcene").jqxNumberInput({ inputMode: 'simple', spinMode: 'simple', theme: theme, width: 70, height: 23, min: 0, decimalDigits: 1, spinButtons: true });
+
+	$("#useat").jqxDropDownList({ theme: theme, source: srcType, width: 90, height: 23, dropDownHeight: 130 });
+	$("#type").jqxDropDownList({ theme: theme, source: srcType, width: 90, height: 23, dropDownHeight: 130 });
+	$("#form").jqxDropDownList({ theme: theme, source: srcType, width: 90, height: 23, dropDownHeight: 130 });
+	$("#notes").jqxInput({ theme: theme, width: 640, height: 48 });
+	$("#origin").jqxInput({ theme: theme, width: 250, height: 23 });
+	$("#substitutes").jqxInput({ theme: theme, width: 250, height: 23 });
+	$("#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' });
+	$("#supplier_rec").jqxNumberInput({ inputMode: 'simple', spinMode: 'simple', theme: theme, width: 70, height: 23, min: 0, decimalDigits: 1, 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,
+		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: 80, y: 10 } });
+				$("#name").val('');
+				$("#alpha").val('');
+				$("#beta").val('');
+				$("#humulene").val('');
+				$("#caryophyllene").val('');
+				$("#cohumulone").val('');
+				$("#myrcene").val('');
+				$("#useat").val('Boil');
+				$("#type").val('Bittering');
+				$("#form").val('Pellet');
+				$("#notes").val('');
+				$("#origin").val('');
+				$("#substitutes").val('');
+				$("#always_on_stock").val('');
+				$("#inventory").val('');
+				$("#cost").val('');
+				$("#production_date").val('');
+				$("#tht_date").val('');
+				$("#supplier_rec").val('');
+				$("#popupWindow").jqxWindow('open');
+			});
+		},
+		filterable: true,
+		filtermode: 'excel',
+		columns: [
+			{ text: 'Hop Name', datafield: 'name', width: 250 },
+			{ text: 'Type', datafield: 'type', width: 90 },
+			{ text: 'Alpha', datafield: 'alpha', width: 70, cellsalign: 'right', cellsformat: 'c2' },
+			{ text: 'Origin', datafield: 'origin', width: 150 },
+			{ text: 'Inv.', datafield: 'inventory', width: 70, cellsalign: 'right' },
+			{ text: 'Cost', datafield: 'cost', width: 70, cellsalign: 'right', cellsformat: 'c2' },
+			{ 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: 80, y: 10 } });
+					// get the clicked row's data and initialize the input fields.
+					var dataRecord = $("#jqxgrid").jqxGrid('getrowdata', editrow);
+					$("#name").val(dataRecord.name);
+					$("#alpha").val(dataRecord.alpha);
+					$("#beta").val(dataRecord.beta);
+					$("#humulene").val(dataRecord.humulene);
+					$("#caryophyllene").val(dataRecord.caryophyllene);
+					$("#cohumulone").val(dataRecord.cohumulone);
+					$("#myrcene").val(dataRecord.myrcene);
+					$("#useat").val(dataRecord.useat);
+					$("#type").val(dataRecord.type);
+					$("#form").val(dataRecord.form);
+					$("#notes").val(dataRecord.notes);
+					$("#origin").val(dataRecord.origin);
+					$("#substitutes").val(dataRecord.substitutes);
+					$("#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);
+					$("#supplier_rec").val(dataRecord.supplier_rec);
+					// 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(),
+				alpha: parseFloat($("#alpha").jqxNumberInput('decimal')),
+				beta: parseFloat($("#beta").jqxNumberInput('decimal')),
+				humulene: parseFloat($("#humulene").jqxNumberInput('decimal')),
+				caryophyllene: parseFloat($("#caryophyllene").jqxNumberInput('decimal')),
+				cohumulone: parseFloat($("#cohumulone").jqxNumberInput('decimal')),
+				myrcene: parseFloat($("#myrcene").jqxNumberInput('decimal')),
+				useat: $("#useat").val(),
+				type: $("#type").val(),
+				form: $("#form").val(),
+				notes: $("#notes").val(),
+				origin: $("#origin").val(),
+				substitutes: $("#substitutes").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(),
+		                supplier_rec: parseFloat($("#supplier_rec").jqxNumberInput('decimal'))
+			};
+			$('#jqxgrid').jqxGrid('updaterow', rowID, row);
+			$("#popupWindow").jqxWindow('hide');
+		} else {
+			// Insert a record
+			var newrow = {
+				record: -1,
+				name: $("#name").val(),
+				alpha: parseFloat($("#alpha").jqxNumberInput('decimal')),
+				beta: parseFloat($("#beta").jqxNumberInput('decimal')),
+				humulene: parseFloat($("#humulene").jqxNumberInput('decimal')),
+				caryophyllene: parseFloat($("#caryophyllene").jqxNumberInput('decimal')),
+				cohumulone: parseFloat($("#cohumulone").jqxNumberInput('decimal')),
+				myrcene: parseFloat($("#myrcene").jqxNumberInput('decimal')),
+				useat: $("#useat").val(),
+				type: $("#type").val(),
+				form: $("#form").val(),
+				notes: $("#notes").val(),
+				origin: $("#origin").val(),
+				substitutes: $("#substitutes").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(),
+				supplier_rec: parseFloat($("#supplier_rec").jqxNumberInput('decimal'))
+			};
+			$('#jqxgrid').jqxGrid('addrow', null, newrow);
+			$("#popupWindow").jqxWindow('hide');
+		}
+	});
+	createDelElements();
+});
+

mercurial