Mercurial > bms / changeset

--- a/www/Makefile	Thu Jan 10 20:22:06 2019 +0100
+++ b/www/Makefile	Fri Jan 11 22:34:19 2019 +0100
@@ -10,6 +10,7 @@
 		  inv_miscs.php inv_suppliers.php inv_waters.php inv_yeasts.php \
 		  log_fermentation.php mon_brewer.php mon_fermenter.php mon_node.php \
 		  prod_edit.php prod_export.php prod_inprod.php prod_new.php prod_print.php \
+		  profile_fermentation.php \
 		  profile_mash.php profile_setup.php profile_styles.php profile_water.php \
 		  rec_edit.php rec_export.php rec_main.php rec_new.php rec_print.php \
 		  version.php

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/www/includes/db_profile_fermentation.php	Fri Jan 11 22:34:19 2019 +0100
@@ -0,0 +1,114 @@
+<?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());
+}
+mysqli_set_charset($connect, "utf8" );
+
+$escapers = array("\\", "/", "\"", "\n", "\r", "\t", "\x08", "\x0c");
+$replacements = array("\\\\", "\\/", "\\\"", "\\n", "\\r", "\\t", "\\f", "\\b");
+$rescapers = array("'");
+$rreplacements = array("\\'");
+$disallowed = array('visibleindex','uniqueid','boundindex','uid','undefined');
+
+if (isset($_GET['insert']) || isset($_GET['update'])) {
+	if (isset($_GET['insert'])) {
+		$sql  = "INSERT INTO `profile_fermentation` SET ";
+	}
+	if (isset($_GET['update'])) {
+		$sql  = "UPDATE `profile_fermentation` SET ";
+	}
+
+	if (isset($_GET['uuid']) && (strlen($_GET['uuid']) == 36)) {
+		$sql .= "uuid='" . $_GET['uuid'];
+//		syslog(LOG_NOTICE, 'Keep uuid ');
+	} else {
+		$uuid = str_replace("\n", "", file_get_contents('/proc/sys/kernel/random/uuid'));
+		$sql .= "uuid='" . $uuid;
+//		syslog(LOG_NOTICE, 'New uuid ');
+	}
+
+	$sql .= "', name='" . mysqli_real_escape_string($connect, $_GET['name']);
+	$sql .= "', inittemp_lo='" . floatval($_GET['inittemp_lo']);
+	$sql .= "', inittemp_hi='" . floatval($_GET['inittemp_hi']);
+	($_GET['fridgemode'] == 'true') ? $sql .= "', fridgemode='1" : $sql .= "', fridgemode='0";
+	$array = $_GET['steps'];
+	// Don't believe given duration and number of steps, recalculate.
+	$duration = 0;
+	$totalsteps = 0;
+	foreach($array as $key => $item) {
+		$totalsteps++;
+		$duration += $item['steptime'] + $item['resttime'];
+		foreach ($disallowed as $disallowed_key) {
+			unset($array[$key]["$disallowed_key"]);
+		}
+	}
+	$sql .= "', totalsteps='" . $totalsteps;
+	$sql .= "', duration='" . $duration;
+//	syslog(LOG_NOTICE, "steps=: ". str_replace($rescapers,$rreplacements,json_encode($array)));
+	$sql .= "', steps='" . str_replace($rescapers,$rreplacements,json_encode($array));
+	if (isset($_GET['insert'])) {
+		$sql .= "';";
+	}
+	if (isset($_GET['update'])) {
+		$sql .= "' WHERE record='" . $_GET['record'] . "';";
+	}
+	syslog(LOG_NOTICE, $sql);
+	$result = mysqli_query($connect, $sql);
+	if (! $result) {
+		syslog(LOG_NOTICE, "db_profile_fermentation: ".$sql." result: ".mysqli_error($connect));
+	} else {
+		if (isset($_GET['update'])) {
+			syslog(LOG_NOTICE, "db_profile_fermentation: updated record ".$_GET['record']);
+		} else {
+			$lastid = mysqli_insert_id($connect);
+			syslog(LOG_NOTICE, "db_profile_fermentation: inserted record ".$lastid);
+		}
+	}
+	echo $result;
+
+} else if (isset($_GET['delete'])) {
+	// DELETE COMMAND
+	$sql = "DELETE FROM `profile_fermentation` WHERE record='".$_GET['record']."';";
+	$result = mysqli_query($connect, $sql);
+	if (! $result) {
+		syslog(LOG_NOTICE, "db_profile_fermentation: ".$sql." result: ".mysqli_error($connect));
+	} else {
+		syslog(LOG_NOTICE, "db_profile_fermentation: deleted record ".$_GET['record']);
+	}
+	echo $result;
+
+} else {
+	// SELECT COMMAND
+	$query = "SELECT * FROM profile_fermentation ORDER BY name;";
+	$result = mysqli_query($connect, $query) or die("SQL Error 1: " . mysqli_error($connect));
+	$profiles = '[';
+	$comma = FALSE;
+	while ($row = mysqli_fetch_array($result, MYSQLI_ASSOC)) {
+		// Manual encode to JSON.
+		if ($comma) {
+			$profiles .= ',';
+		}
+		$comma = TRUE;
+		$profiles .= '{"record":' . $row['record'];
+		$profiles .= ',"uuid":"' . $row['uuid'];
+		$profiles .= '","name":"'  . str_replace($escapers, $replacements, $row['name']);
+		$profiles .= '","inittemp_lo":' . $row['inittemp_lo'];
+		$profiles .= ',"inittemp_hi":' . $row['inittemp_hi'];
+		$profiles .= ',"fridgemode":' . $row['fridgemode'];
+		$profiles .= ',"totalsteps":' . $row['totalsteps'];
+		$profiles .= ',"duration":' . $row['duration'];
+		$profiles .= ',"steps":' . $row['steps'];
+		$profiles .= '}';
+	}
+	$profiles .= ']';
+//	syslog(LOG_NOTICE, $profiles);
+	header("Content-type: application/json");
+	echo $profiles;
+}
+?>

--- a/www/includes/global.inc.php	Thu Jan 10 20:22:06 2019 +0100
+++ b/www/includes/global.inc.php	Fri Jan 11 22:34:19 2019 +0100
@@ -251,6 +251,7 @@
        <li><a href="profile_water.php">Water profielen</a></li>
        <li><a href="profile_mash.php">Maisch schemas</a></li>
        <li><a href="profile_styles.php">Bierstijlen</a></li>
+       <li><a href="profile_fermentation.php">Vergisting profielen</a></li>
        <li><a href="profile_setup.php">Instellingen</a></li>
       </ul>
      </li>

--- a/www/js/global.js	Thu Jan 10 20:22:06 2019 +0100
+++ b/www/js/global.js	Fri Jan 11 22:34:19 2019 +0100
@@ -367,6 +367,8 @@
 	$("#jqxMenu").jqxMenu({
 		width: 1280,
 		height: '30px',
+		autoOpen: false,
+		clickToOpen: true,
 		theme: theme
 	});
 	$("#jqxWidget").css('visibility', 'visible');

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/www/js/profile_fermentation.js	Fri Jan 11 22:34:19 2019 +0100
@@ -0,0 +1,360 @@
+/*****************************************************************************
+ * Copyright (C) 2019
+ *
+ * Michiel Broek <mbroek at mbse dot eu>
+ *
+ * This file is part of BMS
+ *
+ * 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.
+ *
+ * Brewery Management System 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: 175,
+		resizable: false,
+		isModal: true,
+		modalOpacity: 0.4,
+		okButton: $('#delOk'),
+		cancelButton: $('#delCancel'),
+		initContent: function () {
+			$('#delOk').jqxButton({ template: "danger", width: '65px', theme: theme });
+			$('#delCancel').jqxButton({ template: "success", width: '65px', theme: theme });
+			$('#delCancel').focus();
+		}
+	});
+	$('#eventWindow').jqxWindow('hide');
+}
+
+
+$(document).ready(function () {
+
+	var dataRecord = {};
+	var url = "includes/db_profile_fermentation.php";
+	// tooltips
+	$("#name").jqxTooltip({ content: 'De naam voor dit vergisting profiel.' });
+	$("#inittemp_lo").jqxTooltip({ content: 'De minimale begin temperatuur van dit profiel.' });
+	$("#inittemp_hi").jqxTooltip({ content: 'De maximale begin temperatuur van dit profiel.' });
+//	$("#fridgemode").jqxTooltip({ content: 'Wanneer deze actief is dan wordt geregeld als koelkast op de lucht temperatuur sensor in plaats van op de bier sensor.' });
+	$("#grid").jqxTooltip({ content: 'De maisch stappen in dit profiel.'});
+	// prepare the data
+	var source = {
+		datatype: "json",
+		cache: false,
+		datafields: [
+			{ name: 'record', type: 'number' },
+			{ name: 'uuid', type: 'string' },
+			{ name: 'name', type: 'string' },
+			{ name: 'inittemp_lo', type: 'float' },
+			{ name: 'inittemp_hi', type: 'float' },
+			{ name: 'fridgemode', type: 'bool' },
+			{ name: 'totalsteps', type: 'int' },
+			{ name: 'duration', type: 'int' },
+			{ name: 'steps', type: 'array' }
+		],
+		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 dataAdapter = new $.jqx.dataAdapter(source);
+
+	// Inline steps editor
+	var editsteps = function (data) {
+		var generaterow = function () {
+			var row = {};
+			row["name"] = "Stap 1";
+			row['steptime'] = 12;
+			row['resttime'] = 24;
+			row['target_lo'] = 22.0;
+			row['target_hi'] = 23.0;
+			row['fridgemode'] = 0;
+			return row;
+		}
+		var stepSource = {
+			localdata: data.steps,
+			datatype: "local",
+			datafields: [
+				{ name: 'name', type: 'string' },
+				{ name: 'steptime', type: 'float' },
+				{ name: 'resttime', type: 'float' },
+				{ name: 'target_lo', type: 'float' },
+				{ name: 'target_hi', type: 'float' },
+				{ name: 'fridgemode', type: 'int' }
+			],
+			addrow: function (rowid, rowdata, position, commit) {
+				commit(true);
+			},
+			deleterow: function (rowid, commit) {
+				commit(true);
+			}
+		};
+		var stepAdapter = new $.jqx.dataAdapter(stepSource);
+		$("#grid").jqxGrid({
+			width: 800,
+			height: 330,
+			source: stepAdapter,
+			theme: theme,
+			selectionmode: 'singlerow',
+			editmode: 'selectedcell',
+			editable: true,
+			showtoolbar: true,
+			rendertoolbar: function (toolbar) {
+				var me = this;
+				var container = $("<div style='margin: 5px;'></div>");
+				toolbar.append(container);
+				container.append('<input style="margin-left: 100px;" id="addrowbutton" type="button" value="Nieuwe stap" />');
+				container.append('<input style="margin-left: 290px;" id="deleterowbutton" type="button" value="Verwijder stap" />');
+				$("#addrowbutton").jqxButton({ theme: theme, width: 150 });
+				$("#deleterowbutton").jqxButton({ theme: theme, width: 150 });
+				// create new row.
+				$("#addrowbutton").on('click', function () {
+					var datarow = generaterow();
+					var commit = $("#grid").jqxGrid('addrow', null, datarow);
+				});
+				// delete row.
+				$("#deleterowbutton").on('click', function () {
+					var selectedrowindex = $("#grid").jqxGrid('getselectedrowindex');
+					var rowscount = $("#grid").jqxGrid('getdatainformation').rowscount;
+					if (selectedrowindex >= 0 && selectedrowindex < rowscount) {
+						var id = $("#grid").jqxGrid('getrowid', selectedrowindex);
+						var commit = $("#grid").jqxGrid('deleterow', id);
+					}
+				});
+			},
+			columns: [
+				{ text: 'Stap naam', datafield: 'name' },
+				{ text: 'Min temperatuur', datafield: 'target_lo', width: 100, align: 'right', cellsalign: 'right', cellsformat: 'f1',
+				  validation: function (cell, value) {
+					if (value < 0 || value > 40) {
+						return { result: false, message: "De temperatuur moet tussen 0 en 40 zijn." };
+					}
+					return true;
+				  }
+			       	},
+				{ text: 'Max temperatuur', datafield: 'target_hi', width: 100, align: 'right', cellsalign: 'right', cellsformat: 'f1',
+				  validation: function (cell, value) {
+					if (value < 0 || value > 40) {
+						return { result: false, message: "De temperatuur moet tussen 0 en 40 zijn." };
+					}
+					return true;
+				  }
+				},
+				{ text: 'Koelkast', datafield: 'fridgemode', columntype: 'checkbox', width: 80 },
+				{ text: 'Stap tijd', datafield: 'steptime', width: 80, align: 'right', cellsalign: 'right',
+				  validation: function (cell, value) {
+				  	if (value < 0 || value > 14400) {
+						return { result: false, message: "De tijd moet tussen 0 en 14400 zijn." };
+					}
+					return true;
+				  }
+			       	},
+				{ text: 'Rust tijd', datafield: 'resttime', width: 80, align: 'right', cellsalign: 'right',
+				  validation: function (cell, value) {
+					if (value < 0 || value > 14400) {
+						return { result: false, message: "De tijd moet tussen 0 en 14400 zijn." };
+					}
+					return true;
+				  }
+			       	}
+			]
+		});
+//		$("#grid").on('cellendedit', function (event) {
+//			$('#grid').jqxGrid('sortby', 'step_temp', 'asc');
+//		});
+	};
+
+	// initialize the input fields.
+	$("#name").jqxInput({ theme: theme, width: 640, height: 23 });
+	$("#inittemp_lo").jqxNumberInput({ inputMode: 'simple', spinMode: 'simple', theme: theme, width: 110, height: 23, min: 0, max: 40, decimalDigits: 1, spinButtons: true, spinButtonsStep: 0.1 });
+	$("#inittemp_hi").jqxNumberInput({ inputMode: 'simple', spinMode: 'simple', theme: theme, width: 110, height: 23, min: 0, max: 40, decimalDigits: 1, spinButtons: true, spinButtonsStep: 0.1 });
+	$("#fridgemode").jqxCheckBox({ theme: theme, height: 23, enableContainerClick: false });
+
+	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;'>Nieuw</span></div>");
+			container.append(addButton);
+			statusbar.append(container);
+			addButton.jqxButton({ theme: theme, width: 120, height: 20 });
+			// add new row.
+			addButton.click(function (event) {
+				editrow = -1;
+				$("#popupWindow").jqxWindow({ position: { x: 110, y: 40 } });
+				$("#name").val('');
+				dataRecord.uuid = '';
+				$("#inittemp_lo").val('20.0');
+				$("#inittemp_hi").val('20.0');
+				$("#fridgemode").val('0');
+				dataRecord.totalsteps = 0;
+				dataRecord.duration = 0;
+				editsteps('');
+				$("#popupWindow").jqxWindow('open');
+			});
+		},
+		filterable: true,
+		filtermode: 'excel',
+		columns: [
+			{ text: 'Vergisting profiel', datafield: 'name' },
+			{ text: 'Min. temperatuur', datafield: 'inittemp_lo', width: 150, align: 'right', cellsalign: 'right', cellsformat: 'f1' },
+			{ text: 'Max. temperatuur', datafield: 'inittemp_hi', width: 150, align: 'right', cellsalign: 'right', cellsformat: 'f1' },
+			{ text: 'Stappen', datafield: 'totalsteps', width: 80, align: 'right', cellsalign: 'right' },
+			{ text: 'Tijdsduur', datafield: 'duration', width: 150, align: 'right', cellsalign: 'right',
+			  cellsrenderer:  function (row, columnfield, value, defaulthtml, columnproperties) {
+				//var rowData = $("#fermentableGrid").jqxGrid('getrowdata', row);
+				if (value < 24) {
+					var show = value+" uur";
+				} else {
+					var days = Math.floor(value / 24);
+					var hours = value % 24;
+					if (days == 1)
+						var show = days+" dag, "+hours+" uur";
+					else
+						var show = days+" dagen, "+hours+" uur";
+				}
+				return "<span style='margin: 3px; margin-top: 6px; float: "+columnproperties.cellsalign+"'>"+show+"</span>";
+			  }
+		       	},
+			{ text: 'Wijzig', datafield: 'Edit', width: 120, align: 'center', columntype: 'button', cellsrenderer: function () {
+				return "Wijzig";
+				}, buttonclick: function (row) {
+					// open the popup window when the user clicks a button.
+					editrow = row;
+					$("#popupWindow").jqxWindow({ position: { x: 110, y: 40 } });
+					// get the clicked row's data and initialize the input fields.
+					dataRecord = $("#jqxgrid").jqxGrid('getrowdata', editrow);
+					$("#name").val(dataRecord.name);
+					$("#inittemp_lo").val(parseFloat(dataRecord.inittemp_lo));
+					$("#inittemp_hi").val(parseFloat(dataRecord.inittemp_hi));
+					$("#fridgemode").val(parseFloat(dataRecord.fridgemode));
+					editsteps(dataRecord);
+					// show the popup window.
+					$("#popupWindow").jqxWindow('open');
+				}
+			}
+		]
+	});
+	// initialize the popup window and buttons.
+	$("#popupWindow").jqxWindow({
+		width: 1050,
+		height: 550,
+		resizable: false,
+		theme: theme,
+		isModal: true,
+		autoOpen: false,
+		cancelButton: $("#Cancel"),
+		modalOpacity: 0.40
+	});
+	$("#popupWindow").on('open', function () {
+		$("#name").jqxInput('selectAll');
+	});
+	$("#Delete").jqxButton({ template: "danger", width: '90px', 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({ template: "primary", width: '90px', theme: theme });
+	$("#Save").jqxButton({ template: "success", width: '90px', theme: theme });
+	// update the edited row when the user clicks the 'Save' button.
+	$("#Save").click(function () {
+		var steprows = $('#grid').jqxGrid('getrows');
+		var rowID = -1;
+		if (editrow >= 0) {
+			var rowID = $('#jqxgrid').jqxGrid('getrowid', editrow);
+		}
+		var row = {
+			record: rowID,
+			uuid: dataRecord.uuid,
+			name: $("#name").val(),
+			inittemp_lo: parseFloat($("#inittemp_lo").jqxNumberInput('decimal')),
+			inittemp_hi: parseFloat($("#inittemp_hi").jqxNumberInput('decimal')),
+			fridgemode: $("#fridgemode").val(),
+			steps: steprows
+		};
+		if (editrow >= 0) {
+			$('#jqxgrid').jqxGrid('updaterow', rowID, row);
+		} else {
+			$('#jqxgrid').jqxGrid('addrow', null, row);
+		}
+		$("#popupWindow").jqxWindow('hide');
+		location.reload( true );	// reload ourself.
+	});
+	createDelElements();
+});
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/www/profile_fermentation.php	Fri Jan 11 22:34:19 2019 +0100
@@ -0,0 +1,51 @@
+<?php
+require_once($_SERVER['DOCUMENT_ROOT'].'/includes/global.inc.php');
+page_header('Vergisting profielen', 'profile_fermentation');
+?>
+
+   <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 vergisting profiel.</div>
+    <div style="overflow: hidden;">
+     <table>
+      <tr>
+       <td align="right" style="vertical-align: top;">Profiel naam:</td>
+       <td align="left" colspan="3" style="vertical-align: top;"><input id="name" /></td>
+      </tr>
+      <tr>
+       <td align="right" style="vertical-align: top;">Begin temperatuur laag:</td>
+       <td align="left"><div id="inittemp_lo"></div></td>
+       <td align="right" style="vertical-align: top;">Begin temperatuur hoog:</td>
+       <td align="left"><div id="inittemp_hi"></div></td>
+      </tr>
+      <tr>
+       <td align="right" style="vertical-align: top;">Koelkast of bier:</td>
+       <td align="left" colspan="3"><div id="fridgemode"></div></td>
+      </tr>
+      <tr>
+       <td align="right" style="vertical-align: top;">Stappen:</td>
+       <td align="left" colspan="3"><div id="grid">Graat</div></td>
+      </tr>
+      <tr>
+       <td style="padding-top: 40px;" align="right"><input type="button" id="Delete" value="Delete" /></td>
+       <td align="right"></td>
+       <td align="right"></td>
+       <td style="padding-top: 40px;" 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();
+?>