Mercurial > bms / changeset

changeset

Added first part of mash profiles. Steps are in the database but not in the web ui.

Sat, 18 Aug 2018 17:31:11 +0200

author
Michiel Broek <mbroek@mbse.eu>
date
Sat, 18 Aug 2018 17:31:11 +0200
changeset 23
4b157d7a1cee
parent 22
99c02fa797f9
child 24
754c56e785c6

Added first part of mash profiles. Steps are in the database but not in the web ui.

README.design file | annotate | diff | comparison | revisions
www/Makefile file | annotate | diff | comparison | revisions
www/import/from_brouwhulp.php file | annotate | diff | comparison | revisions
www/includes/db_inventory_mash_profiles.php file | annotate | diff | comparison | revisions
www/includes/global.inc.php file | annotate | diff | comparison | revisions
www/inv_mash_profiles.php file | annotate | diff | comparison | revisions
www/js/inv_mash_profiles.js file | annotate | diff | comparison | revisions 
--- a/README.design	Sat Aug 18 14:21:21 2018 +0200
+++ b/README.design	Sat Aug 18 17:31:11 2018 +0200
@@ -32,8 +32,7 @@
 inventory_equipments
 inventory_fermentables		Ok.
 inventory_hops			Ok.
-inventory_mash_profiles
-inventory_mash_steps
+inventory_mash_profiles		Ok zonder de steps.
 inventory_miscs			Ok.
 inventory_styles
 inventory_suppliers		Ok.
--- a/www/Makefile	Sat Aug 18 14:21:21 2018 +0200
+++ b/www/Makefile	Sat Aug 18 17:31:11 2018 +0200
@@ -5,7 +5,9 @@
 
 SRC		= getfermenter.php  getfermenters.php  \
 		  getnode.php getnodes.php config.php.dist index.php \
-		  inv_suppliers.php inv_fermentables.php inv_hops.php inv_yeasts.php \
+		  inv_fermentables.php  inv_hops.php  inv_mash_profiles.php  \
+		  inv_miscs.php  inv_suppliers.php  inv_water_profiles.php  \
+		  inv_water_sources.php  inv_yeasts.php \
 		  mon_brewer.php mon_fermenter.php mon_node.php
 SUB		= version.php.in images/* css/* jqwidgets/* jqwidgets/styles/* \
 		  jqwidgets/styles/images/* jqwidgets/globalization/* js/* \
--- a/www/import/from_brouwhulp.php	Sat Aug 18 14:21:21 2018 +0200
+++ b/www/import/from_brouwhulp.php	Sat Aug 18 17:31:11 2018 +0200
@@ -380,10 +380,6 @@
 	global $brouwhulp, $db;
 
 	echo "  Start adding mash profiles to the database\n";
-	$sql = "TRUNCATE TABLE inventory_mash_steps;";
-	if (! $result = mysqli_query($db, $sql)) {
-		printf("Error: %s\n", mysqli_error($db));
-	}
 	$sql = "TRUNCATE TABLE inventory_mash_profiles;";
 	if (! $result = mysqli_query($db, $sql)) {
 		printf("Error: %s\n", mysqli_error($db));
@@ -408,43 +404,42 @@
 		if ($mash->TUN_SPECIFIX_HEAT)
 			$sql .= "', tun_specific_heat='" . $mash->TUN_SPECIFIC_HEAT;
 		($mash->EQUIP_ADJUST == 'TRUE') ? $sql .= "', equip_adjust='1" : $sql .= "', equip_adjust='0";
-		$sql .= "';";
-		/*
-		 * Store the record and get the record number that is created.
-		 * Store that as a reference in the steps.
-		 */
-		if (! $result = mysqli_query($db, $sql)) {
-			printf("Error: %s\n", mysqli_error($db));
-		}
-		$record = mysqli_insert_id($db);
 
 		/*
-		 * Put the steps in a different table with a reference to the profile.
+		 * Put the steps in a json array
 		 */
 		if ($mash->MASH_STEPS) {
+			$steps = "[";
+			$comma = FALSE;
 			foreach ($mash->MASH_STEPS->MASH_STEP as $step) {
 
-				$sql  = "INSERT INTO inventory_mash_steps SET name='" . mysqli_real_escape_string($db, $step->NAME);
-				$sql .= "', rec_mash_profile='" . $record;
-				if ($step->TYPE)
-					$sql .= "', type='" . $step->TYPE;
-				if ($step->INFUSE_AMOUNT)
-					$sql .= "', infuse_amount='" . $step->INFUSE_AMOUNT;
-				if ($step->STEP_TEMP)
-					$sql .= "', step_temp='" . $step->STEP_TEMP;
-				if ($step->STEP_TIME)
-					$sql .= "', step_time='" . $step->STEP_TIME;
-				if ($step->RAMP_TIME)
-					$sql .= "', ramp_time='" . $step->RAMP_TIME;
-				if ($step->END_TEMP)
-					$sql .= "', end_temp='" . $step->END_TEMP;
-				if ($step->DESCRIPTION)
-					$sql .= "', description='" . mysqli_real_escape_string($db, $step->DESCRIPTION);
-				$sql .= "';";
-				if (! $result = mysqli_query($db, $sql)) {
-					printf("Error: %s\n", mysqli_error($db));
+				if ($comma)
+					$steps .= ',';
+				$comma = TRUE;
+				$steps .= '{"name":"' . mysqli_real_escape_string($db, $step->NAME) . '"';
+				if ($step->TYPE) {
+					$steps .= ',"type":"' . $step->TYPE . '"';
+				}
+				if ($step->STEP_TEMP) {
+					$steps .= ',"step_temp":"' . $step->STEP_TEMP . '"';
+				}
+				if ($step->STEP_TIME) {
+					$steps .= ',"step_time":"' . $step->STEP_TIME . '"';
 				}
+				if ($step->RAMP_TIME) {
+					$steps .= ',"ramp_time":"' . $step->RAMP_TIME . '"';
+				}
+				if ($step->END_TEMP) {
+					$steps .= ',"end_temp":"' . $step->END_TEMP . '"';
+				}
+				$steps .= "}";
 			}
+			$steps .= ']';
+			$sql .= "', steps='" . $steps;
+		}
+                $sql .= "';";
+		if (! $result = mysqli_query($db, $sql)) {
+			printf("Error: %s\n", mysqli_error($db));
 		}
 	}
 }
@@ -455,10 +450,10 @@
 //do_hops();
 //do_yeasts();
 //do_miscs();
-do_waters();
+//do_waters();
 //do_equipments();
 //do_styles();
-//do_mash();
+do_mash();
 
 mysqli_close($db);
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/www/includes/db_inventory_mash_profiles.php	Sat Aug 18 17:31:11 2018 +0200
@@ -0,0 +1,87 @@
+<?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_mash_profiles";
+if (isset($_GET['insert'])) {
+	// INSERT COMMAND
+	$sql  = "INSERT INTO `inventory_mash_profiles` SET name='" . mysqli_real_escape_string($connect, $_GET['name']);
+	$sql .= "', grain_temp='" . $_GET['grain_temp'];
+	$sql .= "', notes='" . mysqli_real_escape_string($connect, $_GET['notes']);
+	$sql .= "', tun_temp='" . $_GET['tun_temp'];
+	$sql .= "', sparge_temp='" . $_GET['sparge_temp'];
+	$sql .= "', ph='" . $_GET['ph'];
+	$sql .= "', tun_weight='" . $_GET['tun_weight'];
+	$sql .= "', tun_specific_heat='" . $_GET['tun_specific_heat'];
+	($_GET['equip_adjust'] == 'true') ? $sql .= "', equip_adjust='1" : $sql .= "', equip_adjust='0";
+	$sql .= "', steps='" . mysqli_real_escape_string($connect, $_GET['steos']);
+	$sql .= "';";
+	$result = mysqli_query($connect, $sql);
+	if (! $result) {
+		syslog(LOG_NOTICE, "db_inventory_mash_profiles: ".$sql." result: ".mysqli_error($connect));
+	} else {
+		syslog(LOG_NOTICE, "db_inventory_mash_profiles: inserted ".$_GET['name']);
+	}
+	echo $result;
+
+} else if (isset($_GET['update'])) {
+	// UPDATE COMMAND
+	$sql  = "UPDATE `inventory_mash_profiles` SET name='" . mysqli_real_escape_string($connect, $_GET['name']);
+	$sql .= "', grain_temp='" . $_GET['grain_temp'];
+	$sql .= "', notes='" . mysqli_real_escape_string($connect, $_GET['notes']);
+	$sql .= "', tun_temp='" . $_GET['tun_temp'];
+	$sql .= "', sparge_temp='" . $_GET['sparge_temp'];
+	$sql .= "', ph='" . $_GET['ph'];
+	$sql .= "', tun_weight='" . $_GET['tun_weight'];
+	$sql .= "', tun_specific_heat='" . $_GET['tun_specific_heat'];
+	($_GET['equip_adjust'] == 'true') ? $sql .= "', equip_adjust='1" : $sql .= "', equip_adjust='0";
+	$sql .= "', steps='" . mysqli_real_escape_string($connect, $_GET['steos']);
+	$sql .= "' WHERE record='" . $_GET['record'] . "';";
+	$result = mysqli_query($connect, $sql);
+	if (! $result) {
+		syslog(LOG_NOTICE, "db_inventory_mash_profiles: ".$sql." result: ".mysqli_error($connect));
+	} else {
+		syslog(LOG_NOTICE, "db_inventory_mash_profiles: updated record ".$_GET['record']);
+	}
+	echo $result;
+
+} else if (isset($_GET['delete'])) {
+	// DELETE COMMAND
+	$sql = "DELETE FROM `inventory_mash_profiles` WHERE record='".$_GET['record']."';";
+	$result = mysqli_query($connect, $sql);
+	if (! $result) {
+		syslog(LOG_NOTICE, "db_inventory_mash_profiles: ".$sql." result: ".mysqli_error($connect));
+	} else {
+		syslog(LOG_NOTICE, "db_inventory_mash_profiles: 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)) {
+		$suppliers[] = array(
+			'record' => $row['record'],
+			'name' => $row['name'],
+			'grain_temp' => $row['grain_temp'],
+			'tun_temp' => $row['tun_temp'],
+			'sparge_temp' => $row['sparge_temp'],
+			'ph' => $row['ph'],
+			'tun_weight' => $row['tun_weight'],
+			'tun_specific_heat' => $row['tun_specific_heat'],
+			'equip_adjust' => $row['equip_adjust'],
+			'notes' => $row['notes'],
+			'steps' => $row['steps']
+		);
+	}
+	echo json_encode($suppliers);
+}
+?>
--- a/www/includes/global.inc.php	Sat Aug 18 14:21:21 2018 +0200
+++ b/www/includes/global.inc.php	Sat Aug 18 17:31:11 2018 +0200
@@ -130,7 +130,7 @@
        <li><a href="inv_miscs.php">Overige ingredienten</a></li>
        <li><a href="inv_water_sources.php">Water bronnen</a></li>
        <li><a href="inv_water_profiles.php">Water profielen</a></li>
-       <li><a href="inv_mashs.php">Maisch schemas</a></li>
+       <li><a href="inv_mash_profiles.php">Maisch schemas</a></li>
        <li><a href="inv_equipments.php">Brouw apparatuur</a></li>
        <li><a href="inv_styles.php">Bierstijlen</a></li>
       </ul>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/www/inv_mash_profiles.php	Sat Aug 18 17:31:11 2018 +0200
@@ -0,0 +1,63 @@
+<?php
+require_once($_SERVER['DOCUMENT_ROOT'].'/includes/global.inc.php');
+page_header('Maisch schemas', 'inv_mash_profiles');
+?>
+
+   <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 maisch schema.</div>
+    <div style="overflow: hidden;">
+     <table>
+      <tr>
+       <td align="right" style="vertical-align: top;">Schema naam:</td>
+       <td align="left" colspan="3" style="vertical-align: top;"><input id="name" /></td>
+      </tr>
+      <tr>
+       <td align="right" style="vertical-align: top;">Graan temperatuur:</td>
+       <td align="left" style="vertical-align: top;"><input id="grain_temp" /></td>
+      <td align="right" style="vertical-align: top;">TUN temperatuur:</td>
+       <td align="left" style="vertical-align: top;"><input id="tun_temp" /></td>
+      </tr>
+      <tr>
+       <td align="right" style="vertical-align: top;">Spoelwater temperatuur:</td>
+       <td align="left" style="vertical-align: top;"><input id="sparge_temp" /></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;">Maisch pan gewicht:</td>
+       <td align="left" style="vertical-align: top;"><input id="tun_weight" /></td>
+       <td align="right" style="vertical-align: top;">Maischpan specifix heat:</td>
+       <td align="left" style="vertical-align: top;"><input id="tun_specific_heat" /></td>
+      </tr>
+      <tr>
+       <td align="right" style="vertical-align: top;">Equipment adjust:</td>
+       <td align="left" colspan="3"><div id="equip_adjust"></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 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_mash_profiles.js	Sat Aug 18 17:31:11 2018 +0200
@@ -0,0 +1,245 @@
+/*****************************************************************************
+ * 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_mash_profiles.php";
+	// prepare the data
+	var source = {
+		datatype: "json",
+		cache: false,
+		datafields: [
+			{ name: 'record', type: 'number' },
+			{ name: 'name', type: 'string' },
+			{ name: 'grain_temp', type: 'float' },
+			{ name: 'tun_temp', type: 'float' },
+			{ name: 'sparge_temp', type: 'float' },
+			{ name: 'ph', type: 'float' },
+			{ name: 'tun_weight', type: 'float' },
+			{ name: 'tun_specific_heat', type: 'float' },
+			{ name: 'notes', type: 'string' },
+			{ name: 'equip_adjust', type: 'bool' },
+			{ name: 'steps', 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);
+				}
+			});
+		}
+	};
+	// initialize the input fields.
+	$("#name").jqxInput({ theme: theme, width: 250, height: 23 });
+	$("#grain_temp").jqxNumberInput({ inputMode: 'simple', spinMode: 'simple', theme: theme, width: 70, height: 23, min: 0, decimalDigits: 1, spinButtons: true });
+	$("#tun_temp").jqxNumberInput({ inputMode: 'simple', spinMode: 'simple', theme: theme, width: 70, height: 23, min: 0, decimalDigits: 1, spinButtons: true });
+	$("#sparge_temp").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 });
+	$("#tun_weight").jqxNumberInput({ inputMode: 'simple', spinMode: 'simple', theme: theme, width: 70, height: 23, min: 0, decimalDigits: 1, spinButtons: true });
+	$("#tun_specific_heat").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 });
+	$("#equip_adjust").jqxCheckBox({ theme: theme, width: 120, height: 23 });
+	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('');
+				$("#grain_temp").val('');
+				$("#tun_temp").val('');
+				$("#sparge_temp").val('');
+				$("#ph").val('');
+				$("#tun_weight").val('');
+				$("#tun_specific_heat").val('');
+				$("#equip_adjust").val('');
+				$("#notes").val('');
+				$("#popupWindow").jqxWindow('open');
+			});
+		},
+		filterable: true,
+		filtermode: 'excel',
+		columns: [
+			{ text: 'Maish schema', datafield: 'name', width: 250 },
+			{ text: 'Notes', datafield: 'notes', width: 450 },
+			{ 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);
+					$("#grain_temp").val(dataRecord.grain_temp);
+					$("#tun_temp").val(dataRecord.tun_temp);
+					$("#sparge_temp").val(dataRecord.sparge_temp);
+					$("#ph").val(dataRecord.ph);
+					$("#tun_weight").val(dataRecord.tun_weight);
+					$("#tun_specific_heat").val(dataRecord.tun_specific_heat);
+					$("#equip_adjust").val(dataRecord.equip_adjust);
+					$("#notes").val(dataRecord.notes);
+					// 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(),
+				grain_temp: parseFloat($("#grain_temp").jqxNumberInput('decimal')),
+				tun_temp: parseFloat($("#tun_temp").jqxNumberInput('decimal')),
+				sparge_temp: parseFloat($("#sparge_temp").jqxNumberInput('decimal')),
+				ph: parseFloat($("#ph").jqxNumberInput('decimal')),
+				tun_weight: parseFloat($("#tun_weight").jqxNumberInput('decimal')),
+				tun_specific_heat: parseFloat($("#tun_specific_heat").jqxNumberInput('decimal')),
+				equip_adjust: $("equip_adjust").val(),
+				notes: $("#notes").val()
+			};
+			$('#jqxgrid').jqxGrid('updaterow', rowID, row);
+			$("#popupWindow").jqxWindow('hide');
+		} else {
+			// Insert a record
+			var newrow = {
+				record: -1,
+				name: $("#name").val(),
+				grain_temp: parseFloat($("#grain_temp").jqxNumberInput('decimal')),
+				tun_temp: parseFloat($("#tun_temp").jqxNumberInput('decimal')),
+				sparge_temp: parseFloat($("#sparge_temp").jqxNumberInput('decimal')),
+				ph: parseFloat($("#ph").jqxNumberInput('decimal')),
+				tun_weight: parseFloat($("#tun_weight").jqxNumberInput('decimal')),
+				tun_specific_heat: parseFloat($("#tun_specific_heat").jqxNumberInput('decimal')),
+				equip_adjust: $("equip_adjust").val(),
+				notes: $("#notes").val()
+			};
+			$('#jqxgrid').jqxGrid('addrow', null, newrow);
+			$("#popupWindow").jqxWindow('hide');
+		}
+	});
+	createDelElements();
+});
+

Mercurial Repository: bms

mercurial