changeset
Added uuid field in inventory equipments, fermentables, hops, miscs, suppliers, water and yeasts. Added uuid field in profiles mash, styles and water.
Thu, 10 Feb 2022 22:15:10 +0100
- author
- Michiel Broek <mbroek@mbse.eu>
- date
- Thu, 10 Feb 2022 22:15:10 +0100
- changeset 785
- aa79acfdf8a9
- parent 784
- d51b05838ac4
- child 786
- c2cf34d3184a
Added uuid field in inventory equipments, fermentables, hops, miscs, suppliers, water and yeasts. Added uuid field in profiles mash, styles and water.
--- a/www/includes/db_inventory_equipments.php Sun Feb 06 20:06:46 2022 +0100 +++ b/www/includes/db_inventory_equipments.php Thu Feb 10 22:15:10 2022 +0100 @@ -23,7 +23,14 @@ // UPDATE COMMAND $sql = "UPDATE `inventory_equipments` SET "; } - $sql .= "name='" . mysqli_real_escape_string($connect, $_POST['name']); + + if (isset($_POST['uuid']) && (strlen($_POST['uuid']) == 36)) { + $sql .= "uuid='" . $_POST['uuid']; + } else { + $uuid = str_replace("\n", "", file_get_contents('/proc/sys/kernel/random/uuid')); + $sql .= "uuid='" . $uuid; + } + $sql .= "', name='" . mysqli_real_escape_string($connect, $_POST['name']); $sql .= "', boil_size='" . $_POST['boil_size']; $sql .= "', batch_size='" . $_POST['batch_size']; $sql .= "', tun_volume='" . $_POST['tun_volume']; @@ -99,6 +106,7 @@ $equipments[] = array( 'record' => $row['record'], 'name' => $row['name'], + 'uuid' => $row['uuid'], 'boil_size' => $row['boil_size'], 'batch_size' => $row['batch_size'], 'tun_volume' => $row['tun_volume'],
--- a/www/includes/db_inventory_fermentables.php Sun Feb 06 20:06:46 2022 +0100 +++ b/www/includes/db_inventory_fermentables.php Thu Feb 10 22:15:10 2022 +0100 @@ -26,7 +26,13 @@ $sql = "UPDATE `inventory_fermentables` SET "; } - $sql .= "name='" . mysqli_real_escape_string($connect, $_POST['name']); + if (isset($_POST['uuid']) && (strlen($_POST['uuid']) == 36)) { + $sql .= "uuid='" . $_POST['uuid']; + } else { + $uuid = str_replace("\n", "", file_get_contents('/proc/sys/kernel/random/uuid')); + $sql .= "uuid='" . $uuid; + } + $sql .= "', name='" . mysqli_real_escape_string($connect, $_POST['name']); $sql .= "', type='" . array_search($_POST['type'], $fermentabletype); $sql .= "', yield='" . $_POST['yield']; $sql .= "', color='" . $_POST['color']; @@ -89,6 +95,7 @@ $fermentables[] = array( 'record' => $row['record'], 'name' => $row['name'], + 'uuid' => $row['uuid'], 'type' => $fermentabletype[$row['type']], 'yield' => $row['yield'], 'color' => $row['color'],
--- a/www/includes/db_inventory_hops.php Sun Feb 06 20:06:46 2022 +0100 +++ b/www/includes/db_inventory_hops.php Thu Feb 10 22:15:10 2022 +0100 @@ -24,8 +24,14 @@ if (isset($_POST['update'])) { $sql = "UPDATE `inventory_hops` SET "; } - - $sql .= "name='" . mysqli_real_escape_string($connect, $_POST['name']); + + if (isset($_POST['uuid']) && (strlen($_POST['uuid']) == 36)) { + $sql .= "uuid='" . $_POST['uuid']; + } else { + $uuid = str_replace("\n", "", file_get_contents('/proc/sys/kernel/random/uuid')); + $sql .= "uuid='" . $uuid; + } + $sql .= "', name='" . mysqli_real_escape_string($connect, $_POST['name']); $sql .= "', alpha='" . $_POST['alpha']; $sql .= "', beta='" . $_POST['beta']; $sql .= "', humulene='" . $_POST['humulene']; @@ -83,6 +89,7 @@ $hops[] = array( 'record' => $row['record'], 'name' => $row['name'], + 'uuid' => $row['uuid'], 'alpha' => $row['alpha'], 'beta' => $row['beta'], 'humulene' => $row['humulene'],
--- a/www/includes/db_inventory_miscs.php Sun Feb 06 20:06:46 2022 +0100 +++ b/www/includes/db_inventory_miscs.php Thu Feb 10 22:15:10 2022 +0100 @@ -24,7 +24,13 @@ $sql = "UPDATE `inventory_miscs` SET "; } - $sql .= "name='" . mysqli_real_escape_string($connect, $_POST['name']); + if (isset($_POST['uuid']) && (strlen($_POST['uuid']) == 36)) { + $sql .= "uuid='" . $_POST['uuid']; + } else { + $uuid = str_replace("\n", "", file_get_contents('/proc/sys/kernel/random/uuid')); + $sql .= "uuid='" . $uuid; + } + $sql .= "', name='" . mysqli_real_escape_string($connect, $_POST['name']); $sql .= "', type='" . array_search($_POST['type'], $misctype); $sql .= "', use_use='" . array_search($_POST['use_use'], $miscuse); $sql .= "', time='" . $_POST['time']; @@ -76,6 +82,7 @@ $miscs[] = array( 'record' => $row['record'], 'name' => $row['name'], + 'uuid' => $row['uuid'], 'type' => $misctype[$row['type']], 'use_use' => $miscuse[$row['use_use']], 'time' => $row['time'],
--- a/www/includes/db_inventory_suppliers.php Sun Feb 06 20:06:46 2022 +0100 +++ b/www/includes/db_inventory_suppliers.php Thu Feb 10 22:15:10 2022 +0100 @@ -19,7 +19,14 @@ $query = "SELECT * FROM inventory_suppliers ORDER BY name"; if (isset($_POST['insert'])) { // INSERT COMMAND - $sql = "INSERT INTO `inventory_suppliers` SET name='" . mysqli_real_escape_string($connect, $_POST['name']); + $sql = "INSERT INTO `inventory_suppliers` SET "; + if (isset($_POST['uuid']) && (strlen($_POST['uuid']) == 36)) { + $sql .= "uuid='" . $_POST['uuid']; + } else { + $uuid = str_replace("\n", "", file_get_contents('/proc/sys/kernel/random/uuid')); + $sql .= "uuid='" . $uuid; + } + $sql .= "', name='" . mysqli_real_escape_string($connect, $_POST['name']); $sql .= "', address='" . mysqli_real_escape_string($connect, $_POST['address']); $sql .= "', city='" . mysqli_real_escape_string($connect, $_POST['city']); $sql .= "', zip='" . mysqli_real_escape_string($connect, $_POST['zip']); @@ -39,7 +46,8 @@ } else if (isset($_POST['update'])) { // UPDATE COMMAND - $sql = "UPDATE `inventory_suppliers` SET name='" . mysqli_real_escape_string($connect, $_POST['name']); + $sql = "UPDATE `inventory_suppliers` SET uuid='" . $_POST['uuid']; + $sql .= "', name='" . mysqli_real_escape_string($connect, $_POST['name']); $sql .= "', address='" . mysqli_real_escape_string($connect, $_POST['address']); $sql .= "', city='" . mysqli_real_escape_string($connect, $_POST['city']); $sql .= "', zip='" . mysqli_real_escape_string($connect, $_POST['zip']); @@ -74,6 +82,7 @@ while ($row = mysqli_fetch_array($result, MYSQLI_ASSOC)) { $suppliers[] = array( 'record' => $row['record'], + 'uuid' => $row['uuid'], 'name' => $row['name'], 'address' => $row['address'], 'city' => $row['city'],
--- a/www/includes/db_inventory_water.php Sun Feb 06 20:06:46 2022 +0100 +++ b/www/includes/db_inventory_water.php Thu Feb 10 22:15:10 2022 +0100 @@ -23,7 +23,13 @@ $sql = "UPDATE `inventory_waters` SET "; } - $sql .= "name='" . mysqli_real_escape_string($connect, $_POST['name']); + if (isset($_POST['uuid']) && (strlen($_POST['uuid']) == 36)) { + $sql .= "uuid='" . $_POST['uuid']; + } else { + $uuid = str_replace("\n", "", file_get_contents('/proc/sys/kernel/random/uuid')); + $sql .= "uuid='" . $uuid; + } + $sql .= "', name='" . mysqli_real_escape_string($connect, $_POST['name']); ($_POST['unlimited_stock'] == 'true') ? $sql .= "', unlimited_stock='1" : $sql .= "', unlimited_stock='0"; $sql .= "', calcium='" . $_POST['calcium']; $sql .= "', bicarbonate='" . $_POST['bicarbonate']; @@ -69,6 +75,7 @@ $waters[] = array( 'record' => $row['record'], 'name' => $row['name'], + 'uuid' => $row['uuid'], 'unlimited_stock' => $row['unlimited_stock'], 'calcium' => $row['calcium'], 'bicarbonate' => $row['bicarbonate'],
--- a/www/includes/db_inventory_yeasts.php Sun Feb 06 20:06:46 2022 +0100 +++ b/www/includes/db_inventory_yeasts.php Thu Feb 10 22:15:10 2022 +0100 @@ -25,7 +25,13 @@ $sql = "UPDATE `inventory_yeasts` SET "; } - $sql .= "name='" . mysqli_real_escape_string($connect, $_POST['name']); + if (isset($_POST['uuid']) && (strlen($_POST['uuid']) == 36)) { + $sql .= "uuid='" . $_POST['uuid']; + } else { + $uuid = str_replace("\n", "", file_get_contents('/proc/sys/kernel/random/uuid')); + $sql .= "uuid='" . $uuid; + } + $sql .= "', name='" . mysqli_real_escape_string($connect, $_POST['name']); $sql .= "', type='" . array_search($_POST['type'], $yeasttype); $sql .= "', form='" . array_search($_POST['form'], $yeastform); $sql .= "', laboratory='" . mysqli_real_escape_string($connect, $_POST['laboratory']); @@ -94,6 +100,7 @@ $yeasts[] = array( 'record' => $row['record'], 'name' => $row['name'], + 'uuid' => $row['uuid'], 'type' => $yeasttype[$row['type']], 'form' => $yeastform[$row['form']], 'laboratory' => $row['laboratory'],
--- a/www/includes/db_profile_mash.php Sun Feb 06 20:06:46 2022 +0100 +++ b/www/includes/db_profile_mash.php Thu Feb 10 22:15:10 2022 +0100 @@ -25,7 +25,14 @@ if (isset($_POST['update'])) { $sql = "UPDATE"; } - $sql .= " `profile_mash` SET name='" . mysqli_real_escape_string($connect, $_POST['name']); + $sql .= " `profile_mash` SET "; + if (isset($_POST['uuid']) && (strlen($_POST['uuid']) == 36)) { + $sql .= "uuid='" . $_POST['uuid']; + } else { + $uuid = str_replace("\n", "", file_get_contents('/proc/sys/kernel/random/uuid')); + $sql .= "uuid='" . $uuid; + } + $sql .= "', name='" . mysqli_real_escape_string($connect, $_POST['name']); $sql .= "', notes='" . mysqli_real_escape_string($connect, $_POST['notes']); $array = $_POST['steps']; $comma = FALSE; @@ -74,7 +81,7 @@ } else { // SELECT COMMAND - $query = "SELECT record,JSON_QUOTE(name),JSON_QUOTE(notes),steps FROM profile_mash ORDER BY name"; + $query = "SELECT record,JSON_QUOTE(name),JSON_QUOTE(notes),steps,JSON_QUOTE(uuid) FROM profile_mash ORDER BY name"; $result = mysqli_query($connect, $query) or die("SQL Error 1: " . mysqli_error($connect)); $mashprofiles = '['; $comma = FALSE; @@ -87,7 +94,8 @@ $mashprofile = '{"record":' . $row['record']; $mashprofile .= ',"name":' . $row['JSON_QUOTE(name)']; $mashprofile .= ',"notes":' . $row['JSON_QUOTE(notes)']; - $mashprofile .= ',"steps":' . $row['steps'] . '}'; + $mashprofile .= ',"steps":' . $row['steps']; + $mashprofile .= ',"uuid":' . $row['JSON_QUOTE(uuid)'] . '}'; $mashprofiles .= $mashprofile; } $mashprofiles .= ']';
--- a/www/includes/db_profile_styles.php Sun Feb 06 20:06:46 2022 +0100 +++ b/www/includes/db_profile_styles.php Thu Feb 10 22:15:10 2022 +0100 @@ -22,8 +22,13 @@ if (isset($_POST['update'])) { $sql = "UPDATE `profile_styles` SET "; } - - $sql .= "name='" . mysqli_real_escape_string($connect, $_POST['name']); + if (isset($_POST['uuid']) && (strlen($_POST['uuid']) == 36)) { + $sql .= "uuid='" . $_POST['uuid']; + } else { + $uuid = str_replace("\n", "", file_get_contents('/proc/sys/kernel/random/uuid')); + $sql .= "uuid='" . $uuid; + } + $sql .= "', name='" . mysqli_real_escape_string($connect, $_POST['name']); $sql .= "', category='" . mysqli_real_escape_string($connect, $_POST['category']); $sql .= "', category_number='" . $_POST['category_number']; $sql .= "', style_letter='" . mysqli_real_escape_string($connect, $_POST['style_letter']); @@ -77,6 +82,7 @@ while ($row = mysqli_fetch_array($result, MYSQLI_ASSOC)) { $styles[] = array( 'record' => $row['record'], + 'uuid' => $row['uuid'], 'name' => $row['name'], 'category' => $row['category'], 'category_number' => $row['category_number'],
--- a/www/includes/db_profile_water.php Sun Feb 06 20:06:46 2022 +0100 +++ b/www/includes/db_profile_water.php Thu Feb 10 22:15:10 2022 +0100 @@ -23,7 +23,13 @@ $sql = "UPDATE `profile_water` SET "; } - $sql .= "name='" . mysqli_real_escape_string($connect, $_POST['name']); + if (isset($_POST['uuid']) && (strlen($_POST['uuid']) == 36)) { + $sql .= "uuid='" . $_POST['uuid']; + } else { + $uuid = str_replace("\n", "", file_get_contents('/proc/sys/kernel/random/uuid')); + $sql .= "uuid='" . $uuid; + } + $sql .= "', name='" . mysqli_real_escape_string($connect, $_POST['name']); $sql .= "', calcium='" . $_POST['calcium']; $sql .= "', bicarbonate='" . $_POST['bicarbonate']; $sql .= "', sulfate='" . $_POST['sulfate']; @@ -65,6 +71,7 @@ while ($row = mysqli_fetch_array($result, MYSQLI_ASSOC)) { $waters[] = array( 'record' => $row['record'], + 'uuid' => $row['uuid'], 'name' => $row['name'], 'calcium' => $row['calcium'], 'bicarbonate' => $row['bicarbonate'],
--- a/www/js/inv_equipments.js Sun Feb 06 20:06:46 2022 +0100 +++ b/www/js/inv_equipments.js Thu Feb 10 22:15:10 2022 +0100 @@ -1,5 +1,5 @@ /***************************************************************************** - * Copyright (C) 2014-2021 + * Copyright (C) 2014-2022 * * Michiel Broek <mbroek at mbse dot eu> * @@ -92,6 +92,7 @@ cache: false, datafields: [ { name: 'record', type: 'number' }, + { name: 'uuid', type: 'string' }, { name: 'name', type: 'string' }, { name: 'boil_size', type: 'float' }, { name: 'batch_size', type: 'float' }, @@ -255,6 +256,7 @@ editrow = -1; $('#popupWindow').jqxWindow({ position: { x: 110, y: 30 } }); $('#name').val('Nieuwe brouwset'); + dataRecord.uuid = ''; $('#boil_size').val(18); $('#batch_size').val(15.3); $('#vol_fermenter').val(14.2); @@ -374,6 +376,7 @@ var row = { record: -1, name: $('#name').val() + ' kopie', + uuid: '', boil_size: parseFloat($('#boil_size').jqxNumberInput('decimal')), batch_size: parseFloat($('#batch_size').jqxNumberInput('decimal')), tun_volume: parseFloat($('#tun_volume').jqxNumberInput('decimal')), @@ -411,6 +414,7 @@ row = { record: rowID, name: $('#name').val(), + uuid: dataRecord.uuid, boil_size: parseFloat($('#boil_size').jqxNumberInput('decimal')), batch_size: parseFloat($('#batch_size').jqxNumberInput('decimal')), tun_volume: parseFloat($('#tun_volume').jqxNumberInput('decimal')),
--- a/www/js/inv_fermentables.js Sun Feb 06 20:06:46 2022 +0100 +++ b/www/js/inv_fermentables.js Thu Feb 10 22:15:10 2022 +0100 @@ -1,5 +1,5 @@ /***************************************************************************** - * Copyright (C) 2014-2021 + * Copyright (C) 2014-2022 * * Michiel Broek <mbroek at mbse dot eu> * @@ -55,6 +55,7 @@ cache: false, datafields: [ { name: 'record', type: 'number' }, + { name: 'uuid', type: 'string' }, { name: 'name', type: 'string' }, { name: 'type', type: 'string' }, { name: 'yield', type: 'float' }, @@ -230,6 +231,7 @@ editrow = -1; $('#popupWindow').jqxWindow({ position: { x: 110, y: 30 } }); $('#name').val('Nieuw product'); + dataRecord.uuid = ''; $('#type').val('Mout'); $('#origin').val(''); $('#supplier').val(''); @@ -369,6 +371,7 @@ var row = { record: -1, name: $('#name').val() + ' kopie', + uuid: '', type: $('#type').val(), yield: parseFloat($('#yield').jqxNumberInput('decimal')), color: parseFloat($('#color').jqxNumberInput('decimal')), @@ -406,6 +409,7 @@ row = { record: rowID, name: $('#name').val(), + uuid: dataRecord.uuid, type: $('#type').val(), yield: parseFloat($('#yield').jqxNumberInput('decimal')), color: parseFloat($('#color').jqxNumberInput('decimal')),
--- a/www/js/inv_hops.js Sun Feb 06 20:06:46 2022 +0100 +++ b/www/js/inv_hops.js Thu Feb 10 22:15:10 2022 +0100 @@ -1,5 +1,5 @@ /***************************************************************************** - * Copyright (C) 2014-2021 + * Copyright (C) 2014-2022 * * Michiel Broek <mbroek at mbse dot eu> * @@ -56,6 +56,7 @@ datafields: [ { name: 'record', type: 'number' }, { name: 'name', type: 'string' }, + { name: 'uuid', type: 'string' }, { name: 'alpha', type: 'float' }, { name: 'beta', type: 'float' }, { name: 'humulene', type: 'float' }, @@ -213,6 +214,7 @@ editrow = -1; $('#popupWindow').jqxWindow({ position: { x: 110, y: 30 } }); $('#name').val('Nieuwe hop'); + dataRecord.uuid = ''; $('#alpha').val(0); $('#beta').val(0); $('#humulene').val(0); @@ -344,6 +346,7 @@ var row = { record: -1, name: $('#name').val() + ' kopie', + uuid: '', alpha: parseFloat($('#alpha').jqxNumberInput('decimal')), beta: parseFloat($('#beta').jqxNumberInput('decimal')), humulene: parseFloat($('#humulene').jqxNumberInput('decimal')), @@ -376,6 +379,7 @@ row = { record: rowID, name: $('#name').val(), + uuid: dataRecord.uuid, alpha: parseFloat($('#alpha').jqxNumberInput('decimal')), beta: parseFloat($('#beta').jqxNumberInput('decimal')), humulene: parseFloat($('#humulene').jqxNumberInput('decimal')),
--- a/www/js/inv_miscs.js Sun Feb 06 20:06:46 2022 +0100 +++ b/www/js/inv_miscs.js Thu Feb 10 22:15:10 2022 +0100 @@ -1,5 +1,5 @@ /***************************************************************************** - * Copyright (C) 2014-2021 + * Copyright (C) 2014-2022 * * Michiel Broek <mbroek at mbse dot eu> * @@ -69,6 +69,7 @@ datafields: [ { name: 'record', type: 'number' }, { name: 'name', type: 'string' }, + { name: 'uuid', type: 'string' }, { name: 'type', type: 'string' }, { name: 'use_use', type: 'string' }, { name: 'time', type: 'int' }, @@ -212,6 +213,7 @@ editrow = -1; $('#popupWindow').jqxWindow({ position: { x: 110, y: 30 } }); $('#name').val(''); + dataRecord.uuid = ''; $('#type').val('Specerij'); $('#use_use').val('Starter'); $('#time').val(0); @@ -353,6 +355,7 @@ var row = { record: -1, name: $('#name').val() + ' kopie', + uuid: '', type: $('#type').val(), use_use: $('#use_use').val(), time: parseFloat($('#time').jqxNumberInput('decimal')), @@ -378,6 +381,7 @@ row = { record: rowID, name: $('#name').val(), + uuid: dataRecord.uuid, type: $('#type').val(), use_use: $('#use_use').val(), time: parseFloat($('#time').jqxNumberInput('decimal')),
--- a/www/js/inv_suppliers.js Sun Feb 06 20:06:46 2022 +0100 +++ b/www/js/inv_suppliers.js Thu Feb 10 22:15:10 2022 +0100 @@ -1,5 +1,5 @@ /***************************************************************************** - * Copyright (C) 2014-2021 + * Copyright (C) 2014-2022 * * Michiel Broek <mbroek at mbse dot eu> * @@ -57,12 +57,14 @@ $('#phone').jqxTooltip({ content: 'Het telefoon nummer.' }); $('#notes').jqxTooltip({ content: 'Opmerkingen over deze leverancier.' }); - var url = 'includes/db_inventory_suppliers.php', + var dataRecord = {}, + url = 'includes/db_inventory_suppliers.php', source = { datatype: 'json', cache: false, datafields: [ { name: 'record', type: 'number' }, + { name: 'uuid', type: 'string' }, { name: 'name', type: 'string' }, { name: 'address', type: 'string' }, { name: 'city', type: 'string' }, @@ -182,6 +184,7 @@ editrow = -1; $('#popupWindow').jqxWindow({ position: { x: 110, y: 30 } }); $('#name').val('Nieuwe leverancier'); + dataRecord.uuid = ''; $('#address').val(''); $('#city').val(''); $('#zip').val(''); @@ -211,7 +214,7 @@ editrow = row; $('#popupWindow').jqxWindow({ position: { x: 110, y: 30 } }); // get the clicked row's data and initialize the input fields. - var dataRecord = $('#jqxgrid').jqxGrid('getrowdata', editrow); + dataRecord = $('#jqxgrid').jqxGrid('getrowdata', editrow); $('#name').val(dataRecord.name); $('#address').val(dataRecord.address); $('#city').val(dataRecord.city); @@ -264,6 +267,7 @@ row = { record: rowID, name: $('#name').val(), + uuid: dataRecord.uuid, address: $('#address').val(), city: $('#city').val(), zip: $('#zip').val(),
--- a/www/js/inv_waters.js Sun Feb 06 20:06:46 2022 +0100 +++ b/www/js/inv_waters.js Thu Feb 10 22:15:10 2022 +0100 @@ -1,5 +1,5 @@ /***************************************************************************** - * Copyright (C) 2014-2021 + * Copyright (C) 2014-2022 * * Michiel Broek <mbroek at mbse dot eu> * @@ -68,6 +68,7 @@ cache: false, datafields: [ { name: 'record', type: 'number' }, + { name: 'uuid', type: 'string' }, { name: 'name', type: 'string' }, { name: 'unlimited_stock', type: 'int' }, { name: 'calcium', type: 'float' }, @@ -190,6 +191,7 @@ editrow = -1; $('#popupWindow').jqxWindow({ position: { x: 110, y: 30 } }); $('#name').val('Nieuw brouwwater'); + dataRecord.uuid = ''; $('#unlimited_stock').val(0); $('#calcium').val(0); $('#bicarbonate').val(0); @@ -334,6 +336,7 @@ row = { record: rowID, name: $('#name').val(), + uuid: dataRecord.uuid, unlimited_stock: $('#unlimited_stock').val(), calcium: parseFloat($('#calcium').jqxNumberInput('decimal')), bicarbonate: parseFloat($('#bicarbonate').jqxNumberInput('decimal')),
--- a/www/js/inv_yeasts.js Sun Feb 06 20:06:46 2022 +0100 +++ b/www/js/inv_yeasts.js Thu Feb 10 22:15:10 2022 +0100 @@ -1,5 +1,5 @@ /***************************************************************************** - * Copyright (C) 2014-2021 + * Copyright (C) 2014-2022 * * Michiel Broek <mbroek at mbse dot eu> * @@ -72,6 +72,7 @@ cache: false, datafields: [ { name: 'record', type: 'number' }, + { name: 'uuid', type: 'string' }, { name: 'name', type: 'string' }, { name: 'type', type: 'string' }, { name: 'form', type: 'string' }, @@ -297,6 +298,7 @@ editrow = -1; $('#popupWindow').jqxWindow({ position: { x: 110, y: 30 } }); $('#name').val(''); + dataRecord.uuid = ''; $('#laboratory').val(''); $('#short_desc').val(''); $('#product_id').val(''); @@ -521,6 +523,7 @@ var row = { record: -1, name: $('#name').val() + ' kopie', + uuid: '', type: $('#type').val(), form: $('#form').val(), laboratory: $('#laboratory').val(), @@ -567,6 +570,7 @@ row = { record: rowID, name: $('#name').val(), + uuid: dataRecord.uuid, type: $('#type').val(), form: $('#form').val(), laboratory: $('#laboratory').val(),
--- a/www/js/profile_mash.js Sun Feb 06 20:06:46 2022 +0100 +++ b/www/js/profile_mash.js Thu Feb 10 22:15:10 2022 +0100 @@ -1,5 +1,5 @@ /***************************************************************************** - * Copyright (C) 2014-2021 + * Copyright (C) 2014-2022 * * Michiel Broek <mbroek at mbse dot eu> * @@ -59,7 +59,8 @@ { name: 'record', type: 'number' }, { name: 'name', type: 'string' }, { name: 'notes', type: 'string' }, - { name: 'steps', type: 'array' } + { name: 'steps', type: 'array' }, + { name: 'uuid', type: 'string' } ], id: 'record', url: url, @@ -301,6 +302,7 @@ editrow = -1; $('#name').val('Nieuw maisch schema'); $('#notes').val(''); + dataRecord.uuid = ''; editsteps(''); $('#popupWindow').jqxWindow('open'); }); @@ -395,6 +397,7 @@ } row = { record: rowID, + uuid: dataRecord.uuid, name: $('#name').val(), notes: $('#notes').val(), steps: steprows
--- a/www/js/profile_styles.js Sun Feb 06 20:06:46 2022 +0100 +++ b/www/js/profile_styles.js Thu Feb 10 22:15:10 2022 +0100 @@ -1,5 +1,5 @@ /***************************************************************************** - * Copyright (C) 2014-2021 + * Copyright (C) 2014-2022 * * Michiel Broek <mbroek at mbse dot eu> * @@ -51,6 +51,7 @@ cache: false, datafields: [ { name: 'record', type: 'number' }, + { name: 'uuid', type: 'string' }, { name: 'name', type: 'string' }, { name: 'category', type: 'string' }, { name: 'category_number', type: 'number' }, @@ -213,6 +214,7 @@ addButton.click(function(event) { editrow = -1; $('#name').val('Nieuwe stijl'); + dataRecord.uuid = ''; $('#category').val(''); $('#category_number').val(''); $('#style_letter').val(''); @@ -335,6 +337,7 @@ } row = { record: rowID, + uuid: dataRecord.uuid, name: $('#name').val(), category: $('#category').val(), category_number: parseFloat($('#category_number').jqxNumberInput('decimal')),
--- a/www/js/profile_water.js Sun Feb 06 20:06:46 2022 +0100 +++ b/www/js/profile_water.js Thu Feb 10 22:15:10 2022 +0100 @@ -1,5 +1,5 @@ /***************************************************************************** - * Copyright (C) 2014-2021 + * Copyright (C) 2014-2022 * * Michiel Broek <mbroek at mbse dot eu> * @@ -51,6 +51,7 @@ cache: false, datafields: [ { name: 'record', type: 'number' }, + { name: 'uuid', type: 'string' }, { name: 'name', type: 'string' }, { name: 'calcium', type: 'float' }, { name: 'bicarbonate', type: 'float' }, @@ -175,6 +176,7 @@ addButton.click(function(event) { editrow = -1; $('#popupWindow').jqxWindow({ position: { x: 110, y: 30 } }); + dataRecord.uuid = ''; $('#name').val(''); $('#calcium').val(0); $('#bicarbonate').val(0); @@ -309,6 +311,7 @@ } row = { record: rowID, + uuid: dataRecord.uuid, name: $('#name').val(), calcium: parseFloat($('#calcium').jqxNumberInput('decimal')), bicarbonate: parseFloat($('#bicarbonate').jqxNumberInput('decimal')),
--- a/www/upl_fermentables.php Sun Feb 06 20:06:46 2022 +0100 +++ b/www/upl_fermentables.php Thu Feb 10 22:15:10 2022 +0100 @@ -52,7 +52,10 @@ foreach ($myfermentables->FERMENTABLE as $fermentable) { - $sql = "INSERT INTO inventory_fermentables SET name='" . mysqli_real_escape_string($db, $fermentable->NAME); + $uuid = str_replace("\n", "", file_get_contents('/proc/sys/kernel/random/uuid')); + $sql = "INSERT INTO inventory_fermentables SET uuid='" . $uuid; + + $sql .= "', name='" . mysqli_real_escape_string($db, $fermentable->NAME); if ($fermentable->TYPE == 'Grain') $sql .= "', type='0"; else if ($fermentable->TYPE == 'Sugar')
--- a/www/upl_hops.php Sun Feb 06 20:06:46 2022 +0100 +++ b/www/upl_hops.php Thu Feb 10 22:15:10 2022 +0100 @@ -52,7 +52,9 @@ foreach ($hops->HOP as $hop) { - $sql = "INSERT INTO inventory_hops SET name='" . mysqli_real_escape_string($db, $hop->NAME); + $uuid = str_replace("\n", "", file_get_contents('/proc/sys/kernel/random/uuid')); + $sql = "INSERT INTO inventory_hops SET uuid='" . $uuid; + $sql .= "', name='" . mysqli_real_escape_string($db, $hop->NAME); if ($hop->ALPHA) $sql .= "', alpha='" . floatval($hop->ALPHA); if ($hop->BETA)
--- a/www/upl_miscs.php Sun Feb 06 20:06:46 2022 +0100 +++ b/www/upl_miscs.php Thu Feb 10 22:15:10 2022 +0100 @@ -51,7 +51,9 @@ foreach ($miscs->MISC as $misc) { - $sql = "INSERT INTO inventory_miscs SET name='" . mysqli_real_escape_string($db, $misc->NAME); + $uuid = str_replace("\n", "", file_get_contents('/proc/sys/kernel/random/uuid')); + $sql = "INSERT INTO inventory_miscs SET uuid='" . $uuid; + $sql .= "', name='" . mysqli_real_escape_string($db, $misc->NAME); if ($misc->NOTES) $sql .= "', notes='" . mysqli_real_escape_string($db, $misc->NOTES);
--- a/www/upl_styles.php Sun Feb 06 20:06:46 2022 +0100 +++ b/www/upl_styles.php Thu Feb 10 22:15:10 2022 +0100 @@ -51,7 +51,9 @@ foreach ($styles->STYLE as $style) { - $sql = "INSERT INTO profile_styles SET name='" . mysqli_real_escape_string($db, $style->NAME); + $uuid = str_replace("\n", "", file_get_contents('/proc/sys/kernel/random/uuid')); + $sql = "INSERT INTO profile_styles SET uuid='" . $uuid; + $sql .= "',name='" . mysqli_real_escape_string($db, $style->NAME); if ($style->NOTES) $sql .= "', notes='" . mysqli_real_escape_string($db, $style->NOTES); if ($style->CATEGORY)
--- a/www/upl_yeasts.php Sun Feb 06 20:06:46 2022 +0100 +++ b/www/upl_yeasts.php Thu Feb 10 22:15:10 2022 +0100 @@ -51,8 +51,9 @@ foreach ($yeasts->YEAST as $yeast) { - $sql = "INSERT INTO inventory_yeasts SET name='" . mysqli_real_escape_string($db, $yeast->NAME); - + $uuid = str_replace("\n", "", file_get_contents('/proc/sys/kernel/random/uuid')); + $sql = "INSERT INTO inventory_yeasts SET uuid='" . $uuid; + $sql .= "', name='" . mysqli_real_escape_string($db, $yeast->NAME); if ($yeast->TYPE == 'Lager') $sql .= "', type='0"; else if ($yeast->TYPE == 'Ale')
