Mon, 13 Aug 2018 16:10:27 +0200
Added yeast inventory screens
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/www/includes/db_inventory_yeasts.php Mon Aug 13 16:10:27 2018 +0200 @@ -0,0 +1,108 @@ +<?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_yeasts"; +if (isset($_GET['insert'])) { + // INSERT COMMAND + $sql = "INSERT INTO `inventory_yeasts` SET name='" . mysqli_real_escape_string($connect, $_GET['name']); + $sql .= "', type='" . $_GET['type']; + $sql .= "', form='" . $_GET['form']; + $sql .= "', amount='" . $_GET['amount']; + ($_GET['amount_is_weight'] == 'true') ? $sql .= "', amount_is_weight='1" : $sql .= "', amount_is_weight='0"; + $sql .= "', laboratory='" . mysqli_real_escape_string($connect, $_GET['laboratory']); + $sql .= "', product_id='" . mysqli_real_escape_string($connect, $_GET['product_id']); + $sql .= "', min_temperature='" . $_GET['min_temperature']; + $sql .= "', max_temperature='" . $_GET['max_temperature']; + $sql .= "', flocculation='" . $_GET['flocculation']; + $sql .= "', attenuation='" . $_GET['attenuation']; + $sql .= "', notes='" . mysqli_real_escape_string($connect, $_GET['notes']); + $sql .= "', best_for='" . mysqli_real_escape_string($connect, $_GET['best_for']); + $sql .= "', times_cultured='" . $_GET['times_cultured']; + $sql .= "', max_reuse='" . $_GET['max_reuse']; + ($_GET['add_to_secondary'] == 'true') ? $sql .= "', add_to_secondary='1" : $sql .= "', add_to_secondary='0"; + $sql .= "', inventory='" . $_GET['inventory']; + $sql .= "', cost='" . $_GET['cost']; + $sql .= "', production_date='" . $_GET['production_date']; + $sql .= "', tht_date='" . $_GET['tht_date']; + $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_yeasts` SET name='" . mysqli_real_escape_string($connect, $_GET['name']); + $sql .= "', type='" . $_GET['type']; + $sql .= "', form='" . $_GET['form']; + $sql .= "', amount='" . $_GET['amount']; + ($_GET['amount_is_weight'] == 'true') ? $sql .= "', amount_is_weight='1" : $sql .= "', amount_is_weight='0"; + $sql .= "', laboratory='" . mysqli_real_escape_string($connect, $_GET['laboratory']); + $sql .= "', product_id='" . mysqli_real_escape_string($connect, $_GET['product_id']); + $sql .= "', min_temperature='" . $_GET['min_temperature']; + $sql .= "', max_temperature='" . $_GET['max_temperature']; + $sql .= "', flocculation='" . $_GET['flocculation']; + $sql .= "', attenuation='" . $_GET['attenuation']; + $sql .= "', notes='" . mysqli_real_escape_string($connect, $_GET['notes']); + $sql .= "', best_for='" . mysqli_real_escape_string($connect, $_GET['best_for']); + $sql .= "', times_cultured='" . $_GET['times_cultured']; + $sql .= "', max_reuse='" . $_GET['max_reuse']; + ($_GET['add_to_secondary'] == 'true') ? $sql .= "', add_to_secondary='1" : $sql .= "', add_to_secondary='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'] . "';"; + 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_yeasts` 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)) { + $yeasts[] = array( + 'record' => $row['record'], + 'name' => $row['name'], + 'type' => $row['type'], + 'form' => $row['form'], + 'amount' => $row['amount'], + 'amount_is_weight' => $row['amount_is_weight'], + 'laboratory' => $row['laboratory'], + 'product_id' => $row['product_id'], + 'min_temperature' => $row['min_temperature'], + 'max_temperature' => $row['max_temperature'], + 'flocculation' => $row['flocculation'], + 'attenuation' => $row['attenuation'], + 'notes' => $row['notes'], + 'best_for' => $row['best_for'], + 'times_cultured' => $row['times_cultured'], + 'max_reuse' => $row['max_reuse'], + 'add_to_secondary' => $row['add_to_secondary'], + 'inventory' => $row['inventory'], + 'cost' => $row['cost'], + 'production_date' => $row['production_date'], + 'tht_date' => $row['tht_date'] + ); + } + echo json_encode($yeasts); +} +?>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/www/inv_yeasts.php Mon Aug 13 16:10:27 2018 +0200 @@ -0,0 +1,92 @@ +<?php +require_once($_SERVER['DOCUMENT_ROOT'].'/includes/global.inc.php'); +page_header('Gist inventaris', 'inv_yeasts'); +?> + + <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 gist</div> + <div style="overflow: hidden;"> + <table> + <tr> + <td align="right" style="vertical-align: top;">Gist naam:</td> + <td align="left" style="vertical-align: top;"><input id="name" /></td> + <td align="right" style="vertical-align: top;">Minimum temperatuur:</td> + <td align="left"><div id="min_temperature"></div></td> + </tr> + <tr> + <td align="right" style="vertical-align: top;">Laboratorium:</td> + <td align="left" style="vertical-align: top;"><input id="laboratory" /></td> + <td align="right" style="vertical-align: top;">Maximum temperatuur:</td> + <td align="left"><div id="max_temperature"></div></td> + </tr> + <tr> + <td align="right" style="vertical-align: top;">Productcode:</td> + <td align="left" style="vertical-align: top;"><input id="product_id" /></td> + <td align="right" style="vertical-align: top;">Flocculatie:</td> + <td align="left"><div id="flocculation"></div></td> + </tr> + <tr> + <td align="right" style="vertical-align: top;">Type:</td> + <td align="left"><div id="type"></div></td> + <td align="right" style="vertical-align: top;">Vergistingsgraad:</td> + <td align="left"><div id="attenuation"></div></td> + </tr> + <tr> + <td align="right" style="vertical-align: top;">Gist vorm:</td> + <td align="left"><div id="form"></div></td> +<!-- <td align="right" style="vertical-align: top;">Maximum hergebruik:</td> + <td align="left"><div id="times_cultured"></div></td> + </tr> + <tr> + <td align="right" style="vertical-align: top;">Amount:</td> + <td align="left"><div id="amount"></div></td> --> + <td align="right" style="vertical-align: top;">Maximum Hergebruik:</td> + <td align="left"><div id="max_reuse"></div></td> + </tr> +<!-- <tr> + <td align="right" style="vertical-align: top;">Amount is Weight:</td> + <td align="left"><div id="amount_is_weight"></div></td> + <td align="right" style="vertical-align: top;">Add to Secondary:</td> + <td align="left"><div id="add_to_secondary"></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;">Geschikt voor:</td> + <td align="left" colspan="3"><input id="best_for" /></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 per gram:</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;">THT 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(); +echo $outstr; +?>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/www/js/inv_yeasts.js Mon Aug 13 16:10:27 2018 +0200 @@ -0,0 +1,321 @@ +/***************************************************************************** + * 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_yeasts.php"; + // prepare the data + var source = { + datatype: "json", + cache: false, + datafields: [ + { name: 'record', type: 'number' }, + { name: 'name', type: 'string' }, + { name: 'type', type: 'string' }, + { name: 'form', type: 'string' }, + { name: 'amount', type: 'float' }, + { name: 'amount_is_weight', type: 'bool' }, + { name: 'laboratory', type: 'string' }, + { name: 'product_id', type: 'string' }, + { name: 'min_temperature', type: 'number' }, + { name: 'max_temperature', type: 'number' }, + { name: 'flocculation', type: 'string' }, + { name: 'attenuation', type: 'float' }, + { name: 'notes', type: 'string' }, + { name: 'best_for', type: 'string' }, + { name: 'times_cultured', type: 'number' }, + { name: 'max_reuse', type: 'number' }, + { name: 'add_to_secondary', 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 = [ "Ale", "Lager", "Wheat", "Wine", "Champagne" ]; + var srcForm = [ "Liquid", "Dry", "Slant", "Culture", "Bottle", "Frozen" ]; + var srcFlocculation = [ "Low", "Medium", "High", "Very High" ]; + // initialize the input fields. + $("#name").jqxInput({ theme: theme, width: 250, height: 23 }); + $("#laboratory").jqxInput({ theme: theme, width: 150, height: 23 }); + $("#product_id").jqxInput({ theme: theme, width: 120, height: 23 }); + $("#type").jqxDropDownList({ theme: theme, source: srcType, width: 90, height: 23, dropDownHeight: 170 }); + $("#form").jqxDropDownList({ theme: theme, source: srcForm, selectedIndex: 0, width: 90, height: 23, dropDownHeight: 195 }); + //$("#amount").jqxNumberInput({ inputMode: 'simple', spinMode: 'simple', theme: theme, width: 70, height: 23, min: 0, decimalDigits: 1, spinButtons: true }); + //$("#amount_is_weight").jqxCheckBox({ theme: theme, width: 120, height: 23 }); + + $("#notes").jqxInput({ theme: theme, width: 640, height: 120 }); + $("#best_for").jqxInput({ theme: theme, width: 640, 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' }); + + $("#min_temperature").jqxNumberInput({ inputMode: 'simple', spinMode: 'simple', theme: theme, width: 70, height: 23, min: 0, max: 35, decimalDigits: 0, spinButtons: true }); + $("#max_temperature").jqxNumberInput({ inputMode: 'simple', spinMode: 'simple', theme: theme, width: 70, height: 23, min: 0, max: 35, decimalDigits: 0, spinButtons: true }); + $("#flocculation").jqxDropDownList({ theme: theme, source: srcFlocculation, width: 90, height: 23, dropDownHeight: 130 }); + $("#attenuation").jqxNumberInput({ inputMode: 'simple', spinMode: 'simple', theme: theme, width: 70, height: 23, min: 50, max: 100, decimalDigits: 1, spinButtons: true }); + + //$("#times_cultured").jqxNumberInput({ inputMode: 'simple', spinMode: 'simple', theme: theme, width: 70, height: 23, min: 0, max: 10, decimalDigits: 0, spinButtons: true }); + $("#max_reuse").jqxNumberInput({ inputMode: 'simple', spinMode: 'simple', theme: theme, width: 70, height: 23, min: 0, max: 10, decimalDigits: 0, spinButtons: true }); + //$("#add_to_secondary").jqxCheckBox({ theme: theme, width: 120, height: 23 }); + $("#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(''); + $("#laboratory").val(''); + $("#product_id").val(''); + $("#type").val('Ale'); + $("#form").val('Liquid'); + $("#amount").val('0.0'); + $("#amount_is_weight").val('false'); + $("#min_temperature").val(''); + $("#max_temperature").val(''); + $("#flocculation").val('Low'); + $("#attenuation").val('75.0'); + $("#notes").val(''); + $("#best_for").val(''); + $("#times_cultured").val(''); + $("#max_reuse").val(''); + $("#add_to_secondary").val('false'); + $("#inventory").val(''); + $("#cost").val(''); + $("#production_date").val(''); + $("#tht_date").val(''); + $("#popupWindow").jqxWindow('open'); + }); + }, + filterable: true, + filtermode: 'excel', + columns: [ + { text: 'Gist naam', datafield: 'name', width: 250 }, + { text: 'Laboratorium', datafield: 'laboratory', width: 150 }, + { text: 'Product ID', datafield: 'product_id', width: 120 }, + { text: 'Type', datafield: 'type', width: 90 }, + { text: 'Vorm', datafield: 'form', width: 90 }, + { text: 'Voorraad', datafield: 'inventory', width: 70, cellsalign: 'right' }, + { text: 'Prijs', 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: 230, y: 30 } }); + // get the clicked row's data and initialize the input fields. + var dataRecord = $("#jqxgrid").jqxGrid('getrowdata', editrow); + $("#name").val(dataRecord.name); + $("#laboratory").val(dataRecord.laboratory); + $("#product_id").val(dataRecord.product_id); + $("#type").val(dataRecord.type); + $("#form").val(dataRecord.form); + $("#amount").val(dataRecord.amount); + $("#amount_is_weight").val(dataRecord.amount_is_weight); + $("#min_temperature").val(dataRecord.min_temperature); + $("#max_temperature").val(dataRecord.max_temperature); + $("#flocculation").val(dataRecord.flocculation); + $("#attenuation").val(dataRecord.attenuation); + $("#notes").val(dataRecord.notes); + $("#best_for").val(dataRecord.best_for); + $("#times_cultured").val(dataRecord.times_cultured); + $("#max_reuse").val(dataRecord.max_reuse); + $("#add_to_secondary").val(dataRecord.add_to_secondary); + $("#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(), + form: $("#form").val(), + amount: parseFloat($("#amount").jqxNumberInput('decimal')), + amount_is_weight: $("#amount_is_weight").val(), + laboratory: $("#laboratory").val(), + product_id: $("#product_id").val(), + min_temperature: parseInt($("#min_temperature").jqxNumberInput('decimal')), + max_temperature: parseInt($("#max_temperature").jqxNumberInput('decimal')), + flocculation: $("#flocculation").val(), + attenuation: parseFloat($("#attenuation").jqxNumberInput('decimal')), + notes: $("#notes").val(), + best_for: $("#best_for").val(), + times_recultured: parseInt($("#times_cultured").jqxNumberInput('decimal')), + max_reuse: parseInt($("#max_reuse").jqxNumberInput('decimal')), + add_to_secondary: $("#add_to_secondary").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(), + form: $("#form").val(), + amount: parseFloat($("#amount").jqxNumberInput('decimal')), + amount_is_weight: $("#amount_is_weight").val(), + laboratory: $("#laboratory").val(), + product_id: $("#product_id").val(), + min_temperature: parseInt($("#min_temperature").jqxNumberInput('decimal')), + max_temperature: parseInt($("#max_temperature").jqxNumberInput('decimal')), + flocculation: $("#flocculation").val(), + attenuation: parseFloat($("#attenuation").jqxNumberInput('decimal')), + notes: $("#notes").val(), + best_for: $("#best_for").val(), + times_recultured: parseInt($("#times_cultured").jqxNumberInput('decimal')), + max_reuse: parseInt($("#max_reuse").jqxNumberInput('decimal')), + add_to_secondary: $("#add_to_secondary").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(); +}); +