# HG changeset patch # User Michiel Broek # Date 1534020584 -7200 # Node ID 606b4af8f9187526b9a18d44e505f568e720d166 # Parent 5b384299cc5340b2baa69e1082504cb64c5e95ff Start of the merge with another unfinished project diff -r 5b384299cc53 -r 606b4af8f918 www/Makefile --- a/www/Makefile Sat Aug 11 19:16:51 2018 +0200 +++ b/www/Makefile Sat Aug 11 22:49:44 2018 +0200 @@ -3,10 +3,12 @@ include ../Makefile.global -SRC = index.php getfermenter.php getfermenters.php \ - getnode.php getnodes.php config.php.dist +SRC = monitor.php getfermenter.php getfermenters.php \ + getnode.php getnodes.php config.php.dist \ + inv_suppliers.php SUB = version.php.in images/* css/* jqwidgets/* jqwidgets/styles/* \ - jqwidgets/styles/images/* jqwidgets/globalization/* js/* + jqwidgets/styles/images/* jqwidgets/globalization/* js/* \ + includes/* OTHER = Makefile ############################################################################# diff -r 5b384299cc53 -r 606b4af8f918 www/images/add.png Binary file www/images/add.png has changed diff -r 5b384299cc53 -r 606b4af8f918 www/images/help.png Binary file www/images/help.png has changed diff -r 5b384299cc53 -r 606b4af8f918 www/images/search.png Binary file www/images/search.png has changed diff -r 5b384299cc53 -r 606b4af8f918 www/includes/db_inventory_suppliers.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/www/includes/db_inventory_suppliers.php Sat Aug 11 22:49:44 2018 +0200 @@ -0,0 +1,76 @@ + $row['record'], + 'name' => $row['name'], + 'address' => $row['address'], + 'city' => $row['city'], + 'zip' => $row['zip'], + 'country' => $row['country'], + 'website' => $row['website'], + 'email' => $row['email'], + 'phone' => $row['phone'], + 'notes' => $row['notes'] + ); + } + echo json_encode($suppliers); +} +?> diff -r 5b384299cc53 -r 606b4af8f918 www/includes/global.inc.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/www/includes/global.inc.php Sat Aug 11 22:49:44 2018 +0200 @@ -0,0 +1,136 @@ + + * + * This file is part of Brewery Management System + * + * 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. + *****************************************************************************/ + +/* + * Look for the style names in the jqwidgets/styles directory. + * + * energyblue of ui-redmond + */ +#$my_style = 'mbse-dark'; +$my_style = 'ui-redmond'; +$my_style = 'android'; + +require_once($_SERVER['DOCUMENT_ROOT'].'/config.php'); +require_once($_SERVER['DOCUMENT_ROOT'].'/version.php'); + + +function page_header($title, $loadjs) { + global $my_style; + + $outstr = ''.PHP_EOL; + $outstr .= ''.PHP_EOL; + $outstr .= ' '.PHP_EOL; + $outstr .= ' '.PHP_EOL; + $outstr .= ' BMS v'.$my_version.' - ' . $title . ''.PHP_EOL; + $outstr .= ' '.PHP_EOL; + $outstr .= ' '.PHP_EOL; + $outstr .= ' '.PHP_EOL; + $outstr .= ' '.PHP_EOL; + $outstr .= ' '.PHP_EOL; + $outstr .= ' '.PHP_EOL; + $outstr .= ' '.PHP_EOL; + $outstr .= ' '.PHP_EOL; + $outstr .= ' '.PHP_EOL; + $outstr .= ' '.PHP_EOL; + $outstr .= ' '.PHP_EOL; + $outstr .= ' '.PHP_EOL; + $outstr .= ' '.PHP_EOL; + $outstr .= ' '.PHP_EOL; + $outstr .= ' '.PHP_EOL; + $outstr .= ' '.PHP_EOL; + $outstr .= ' '.PHP_EOL; + $outstr .= ' '.PHP_EOL; + $outstr .= ' '.PHP_EOL; + $outstr .= ' '.PHP_EOL; + $outstr .= ' '.PHP_EOL; + $outstr .= ' '.PHP_EOL; + $outstr .= ' '.PHP_EOL; + $outstr .= ' '.PHP_EOL; + $outstr .= ' '.PHP_EOL; + $outstr .= ' '.PHP_EOL; + $outstr .= ' '.PHP_EOL; + $outstr .= ' '.PHP_EOL; + $outstr .= ' '.PHP_EOL; + if (strlen($loadjs)) + $outstr .= ' '.PHP_EOL; + $outstr .= ' '.PHP_EOL; + $outstr .= ' '.PHP_EOL; + $outstr .= '
'.PHP_EOL; + + /* + * Menu + */ + $outstr .= '
'.PHP_EOL; + $outstr .= '
    '.PHP_EOL; + $outstr .= '
  • Home
    • '.PHP_EOL; + $outstr .= '
  • Monitoren'.PHP_EOL; + $outstr .= '
      '.PHP_EOL; + $outstr .= '
    • Probeersel
      • '.PHP_EOL; + $outstr .= '
    '.PHP_EOL; + $outstr .= '
    • '.PHP_EOL; // Monitoren + $outstr .= '
  • Inventaris'.PHP_EOL; + $outstr .= ' '.PHP_EOL; + $outstr .= '
    • '.PHP_EOL; // Inventaris + $outstr .= '
  • About'.PHP_EOL; + $outstr .= '
      '.PHP_EOL; + $outstr .= '
    • Informatie
      • '.PHP_EOL; + $outstr .= '
    '.PHP_EOL; + $outstr .= '
    • '.PHP_EOL; + $outstr .= '
'.PHP_EOL; + $outstr .= '
'.PHP_EOL; + + $outstr .= '
'.PHP_EOL; + $outstr .= '
'.PHP_EOL; + $outstr .= ' About BrewCloud'.PHP_EOL; + $outstr .= '
'.PHP_EOL; + $outstr .= '
'.PHP_EOL; + $outstr .= ' The about text comes here'.PHP_EOL; + $outstr .= '
'.PHP_EOL; + $outstr .= '
'.PHP_EOL; + + return $outstr; +} + + +function page_footer() { + + $outstr = '
'.PHP_EOL; + $outstr .= ' '.PHP_EOL; + $outstr .= ''.PHP_EOL; + + return $outstr; +} + + diff -r 5b384299cc53 -r 606b4af8f918 www/index.php --- a/www/index.php Sat Aug 11 19:16:51 2018 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,356 +0,0 @@ - - - - ' - - Brewery Managment System v<?php echo $my_version; ?> - - - - - - - - - - - - - - - - - - - - - - - -
- -
-
- -
-
-
-
-
-
-
-
-
-
-
-
- - diff -r 5b384299cc53 -r 606b4af8f918 www/js/inv_suppliers.js --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/www/js/inv_suppliers.js Sat Aug 11 22:49:44 2018 +0200 @@ -0,0 +1,243 @@ +/***************************************************************************** + * Copyright (C) 2014-2018 + * + * Michiel Broek + * + * This file is part of Brewery Management System + * + * 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: 355, y: 210 }, + width: 270, + 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_suppliers.php"; + // prepare the data + var source = { + datatype: "json", + cache: false, + datafields: [ + { name: 'record', type: 'number' }, + { name: 'name', type: 'string' }, + { name: 'address', type: 'string' }, + { name: 'city', type: 'string' }, + { name: 'zip', type: 'string' }, + { name: 'country', type: 'string' }, + { name: 'website', type: 'string' }, + { name: 'email', type: 'string' }, + { name: 'phone', type: 'string' }, + { name: 'notes', 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 }); + $("#address").jqxInput({ theme: theme, width: 250, height: 23 }); + $("#zip").jqxInput({ theme: theme, width: 120, height: 23 }); + $("#city").jqxInput({ theme: theme, width: 250, height: 23 }); + $("#country").jqxInput({ theme: theme, width: 250, height: 23 }); + $("#website").jqxInput({ theme: theme, width: 250, height: 23 }); + $("#email").jqxInput({ theme: theme, width: 250, height: 23 }); + $("#phone").jqxInput({ theme: theme, width: 120, height: 23 }); + $("#notes").jqxInput({ theme: theme, width: 640, height: 48 }); + + var dataAdapter = new $.jqx.dataAdapter(source); + var editrow = -1; + // initialize jqxGrid + $("#jqxgrid").jqxGrid({ + width: 980, + source: dataAdapter, + theme: theme, + showstatusbar: true, + renderstatusbar: function (statusbar) { + var container = $("
"); + var addButton = $("
Add
"); + 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(''); + $("#address").val(''); + $("#city").val(''); + $("#zip").val(''); + $("#country").val(''); + $("#website").val(''); + $("#email").val(''); + $("#phone").val(''); + $("#notes").val(''); + $("#popupWindow").jqxWindow('open'); + }); + }, + filterable: true, + filtermode: 'excel', + columns: [ + { text: 'Supplier Name', datafield: 'name', width: 250 }, + { text: 'City', datafield: 'city', width: 250 }, + { text: 'Country', datafield: 'country', width: 250 }, + { text: 'Phone', datafield: 'phone', 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: 80, y: 10 } }); + // get the clicked row's data and initialize the input fields. + var dataRecord = $("#jqxgrid").jqxGrid('getrowdata', editrow); + $("#name").val(dataRecord.name); + $("#address").val(dataRecord.address); + $("#city").val(dataRecord.city); + $("#zip").val(dataRecord.zip); + $("#country").val(dataRecord.country); + $("#website").val(dataRecord.website); + $("#email").val(dataRecord.email); + $("#phone").val(dataRecord.phone); + $("#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(), + address: $("#address").val(), + city: $("#city").val(), + zip: $("#zip").val(), + country: $("#country").val(), + website: $("#website").val(), + email: $("#email").val(), + phone: $("#phone").val(), + notes: $("#notes").val() + }; + $('#jqxgrid').jqxGrid('updaterow', rowID, row); + $("#popupWindow").jqxWindow('hide'); + } else { + // Insert a record + var newrow = { + record: -1, + name: $("#name").val(), + address: $("#address").val(), + city: $("#city").val(), + zip: $("#zip").val(), + country: $("#country").val(), + website: $("#website").val(), + email: $("#email").val(), + phone: $("#phone").val(), + notes: $("#notes").val() + }; + $('#jqxgrid').jqxGrid('addrow', null, newrow); + $("#popupWindow").jqxWindow('hide'); + } + }); + createDelElements(); +}); + diff -r 5b384299cc53 -r 606b4af8f918 www/monitor.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/www/monitor.php Sat Aug 11 22:49:44 2018 +0200 @@ -0,0 +1,356 @@ + + + + ' + + Brewery Managment System v<?php echo $my_version; ?> + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+
+ +
+
+
+
+
+
+
+
+
+
+
+
+ +