--- a/www/includes/db_product.php Fri Nov 30 22:11:47 2018 +0100
+++ b/www/includes/db_product.php Sat Dec 01 22:24:46 2018 +0100
@@ -22,32 +22,23 @@
$sql = "UPDATE `prod_main` SET ";
}
// Basic settings
- $sql .= "uuid='" . $_POST['uuid'];
- $sql .= "', name='" . mysqli_real_escape_string($connect, $_POST['name']);
+ $sql .= "puuid='" . $_POST['puuid'];
+ $sql .= "', pname='" . mysqli_real_escape_string($connect, $_POST['pname']);
$sql .= "', birth='" . $_POST['birth'];
$sql .= "', stage='" . $_POST['stage'];
- $sql .= "', notes='" . mysqli_real_escape_string($connect, $_POST['notes']);
+ $sql .= "', pnotes='" . mysqli_real_escape_string($connect, $_POST['pnotes']);
($_POST['log_brew'] == 'true') ? $sql .= "', log_brew='1" : $sql .= "', log_brew='0";
($_POST['log_fermentation'] == 'true') ? $sql .= "', log_fermentation='1" : $sql .= "', log_fermentation='0";
($_POST['inventory_reduced'] == 'true') ? $sql .= "', inventory_reduced='1" : $sql .= "', inventory_reduced='0";
- ($_POST['locked'] == 'true') ? $sql .= "', locked='1" : $sql .= "', locked='0";
+ ($_POST['plocked'] == 'true') ? $sql .= "', plocked='1" : $sql .= "', plocked='0";
// Equipment
$sql .= "', eq_name='" . mysqli_real_escape_string($connect, $_POST['eq_name']);
$sql .= "', eq_boil_size='" . $_POST['eq_boil_size'];
$sql .= "', eq_batch_size='" . $_POST['eq_batch_size'];
$sql .= "', eq_tun_volume='" . $_POST['eq_tun_volume'];
$sql .= "', eq_tun_weight='" . $_POST['eq_tun_weight'];
- $material = mysqli_real_escape_string($connect, $_GET['tun_material']);
- $sql .= "', eq_tun_material='" . $material;
- if ($material == "RVS") {
- $sql .= "', eq_tun_specific_heat='0.11";
- } else if ($material == "Aluminium") {
- $sql .= "', eq_tun_specific_heat='0.22";
- } else if ($material == "Kunststof") {
- $sql .= "', eq_tun_specific_heat='0.46";
- } else if ($material == "Koper") {
- $sql .= "', eq_tun_specific_heat='0.092";
- }
+ $sql .= "', eq_tun_specific_heat='" . $_POST['eq_tun_specific_heat'];
+ $sql .= "', eq_tun_material='" . mysqli_real_escape_string($connect, $_POST['eq_tun_material']);
$sql .= "', eq_tun_height='" . $_POST['eq_tun_height'];
$sql .= "', eq_top_up_water='" . $_POST['eq_top_up_water'];
$sql .= "', eq_trub_chiller_loss='" . $_POST['eq_trub_chiller_loss'];
@@ -56,6 +47,7 @@
$sql .= "', eq_calc_boil_volume='" . $_POST['eq_calc_boil_volume'];
$sql .= "', eq_top_up_kettle='" . $_POST['eq_top_up_kettle'];
$sql .= "', eq_hop_utilization='" . $_POST['eq_hop_utilization'];
+ $sql .= "', eq_notes='" . mysqli_real_escape_string($connect, $_POST['eq_notes']);
$sql .= "', eq_lauter_volume='" . $_POST['eq_lauter_volume'];
$sql .= "', eq_lauter_height='" . $_POST['eq_lauter_height'];
$sql .= "', eq_lauter_deadspace='" . $_POST['eq_lauter_deadspace'];
@@ -63,7 +55,6 @@
$sql .= "', eq_kettle_height='" . $_POST['eq_kettle_height'];
$sql .= "', eq_mash_volume='" . $_POST['eq_mash_volume'];
$sql .= "', eq_efficiency='" . $_POST['eq_efficiency'];
- $sql .= "', eq_top_up_water='" . $_POST['eq_top_up_water'];
syslog(LOG_NOTICE, $sql);
if (isset($_POST['insert'])) {
@@ -76,7 +67,9 @@
// $result = mysqli_query($connect, $sql);
// if (! $result) {
-// syslog(LOG_NOTICE, "db_product: result: ".mysqli_error($connect));
+ // syslog(LOG_NOTICE, "db_product: result: ".mysqli_error($connect));
+ // echo $result;
+ // return;
// } else {
// if (isset($_POST['update'])) {
// syslog(LOG_NOTICE, "db_product: updated record ".$_POST['record']);
@@ -88,30 +81,37 @@
// echo $result;
} else if (isset($_POST['delete'])) {
- // DELETE COMMAND
- $sql = "DELETE FROM `prod_main` WHERE record='".$_POST['record']."';";
- syslog(LOG_NOTICE, $sql);
-// $result = mysqli_query($connect, $sql);
-// if (! $result) {
-// syslog(LOG_NOTICE, "db_product: result: ".mysqli_error($connect));
-// } else {
-// syslog(LOG_NOTICE, "db_product: deleted record ".$_POST['record']);
-// }
-// echo $result;
+ /*
+ * DELETE command, first delete the recipe and then the product.
+ */
+ $sql = "DELETE FROM `prod_recipes` WHERE uuid='".$_POST['uuid']."';";
+ $result = mysqli_query($connect, $sql);
+ if (! $result) {
+ syslog(LOG_NOTICE, "db_product: ".$sql." result: ".mysqli_error($connect));
+ } else {
+ syslog(LOG_NOTICE, "db_product: deleted recipe uuid ".$_POST['uuid']);
+ }
+
+ $sql = "DELETE FROM `prod_main` WHERE puuid='".$_POST['uuid']."';";
+ $result = mysqli_query($connect, $sql);
+ if (! $result) {
+ syslog(LOG_NOTICE, "db_product: ".$sql." result: ".mysqli_error($connect));
+ } else {
+ syslog(LOG_NOTICE, "db_product: deleted product uuid ".$_POST['uuid']);
+ }
+ echo $result;
} else {
-// syslog(LOG_NOTICE, "db_product: select");
-// if (isset($_GET['select'])) {
-// syslog(LOG_NOTICE, "db_product: select isset ".$_GET['select']);
-// }
- // SELECT COMMAND
+ /*
+ * SELECT, produce a list of products that are not yet Closed.
+ */
if (isset($_GET['select']) && ($_GET['select'] == "inprod")) {
- $query = "SELECT record,name,code,birth,stage FROM prod_main WHERE stage != 'Closed' ORDER BY birth,code;";
+ $query = "SELECT record,pname,code,birth,stage FROM prod_main WHERE stage != 'Closed' ORDER BY birth,code;";
$result = mysqli_query($connect, $query) or die("SQL Error 1: " . mysqli_error($connect));
while ($row = mysqli_fetch_array($result, MYSQLI_ASSOC)) {
$brews[] = array(
'record' => $row['record'],
- 'name' => $row['name'],
+ 'pname' => $row['pname'],
'code' => $row['code'],
'birth' => $row['birth'],
'stage' => $row['stage']
@@ -122,16 +122,14 @@
}
/*
- * Default, select all
+ * Default, select all or a given record.
*/
if (isset($_GET['record'])) {
- syslog(LOG_NOTICE, "Request record GET " . $_GET['record']);
- } else if (isset($_POST['record'])) {
- syslog(LOG_NOTICE, "Request record POST " . $_POST['record']);
+ $query = "SELECT * FROM prod_main LEFT JOIN prod_recipes ON puuid = uuid WHERE prod_main.record='";
+ $query .= $_GET['record'] . "';";
} else {
- syslog(LOG_NOTICE, "No record requested");
+ $query = "SELECT * FROM prod_main LEFT JOIN prod_recipes ON puuid = uuid ORDER BY birth,code;";
}
- $query = "SELECT * FROM prod_main LEFT JOIN prod_recipes ON prod_main.uuid = prod_recipes.uuid ORDER BY birth,code;";
$result = mysqli_query($connect, $query) or die("SQL Error 1: " . mysqli_error($connect));
$brews = '[';
$comma = FALSE;
@@ -141,16 +139,16 @@
$brews .= ',';
$comma = TRUE;
$brew = '{"record":' . $row['record'];
- $brew .= ',"uuid":"' . str_replace($escapers, $replacements, $row['uuid']);
- $brew .= '","name":"' . str_replace($escapers, $replacements, $row['name']);
+ $brew .= ',"puuid":"' . str_replace($escapers, $replacements, $row['puuid']);
+ $brew .= '","pname":"' . str_replace($escapers, $replacements, $row['pname']);
$brew .= '","code":"' . str_replace($escapers, $replacements, $row['code']);
$brew .= '","birth":"' . str_replace($escapers, $replacements, $row['birth']);
$brew .= '","stage":"' . str_replace($escapers, $replacements, $row['stage']);
- $brew .= '","notes":"' . str_replace($escapers, $replacements, $row['notes']);
+ $brew .= '","pnotes":"' . str_replace($escapers, $replacements, $row['pnotes']);
$brew .= '","log_brew":' . $row['log_brew'];
$brew .= ',"log_fermentation":' . $row['log_fermentation'];
$brew .= ',"inventory_reduced":' . $row['inventory_reduced'];
- $brew .= ',"locked":' . $row['locked'];
+ $brew .= ',"plocked":' . $row['plocked'];
$brew .= ',"eq_name":"' . str_replace($escapers, $replacements, $row['eq_name']);
$brew .= '","eq_notes":"' . str_replace($escapers, $replacements, $row['eq_notes']);
$brew .= '","eq_boil_size":' . floatval($row['eq_boil_size']);
@@ -199,8 +197,8 @@
$brew .= ',"brew_fermenter_extrawater":' . floatval($row['brew_fermenter_extrawater']);
$brew .= ',"brew_aeration_time":' . floatval($row['brew_aeration_time']);
$brew .= ',"brew_aeration_speed":' . floatval($row['brew_aeration_speed']);
- $brew .= ',"brew_aeration_type":' . floatval($row['brew_aeration_type']);
- $brew .= ',"brew_fermenter_sg":' . floatval($row['brew_fermenter_sg']);
+ $brew .= ',"brew_aeration_type":"' . $row['brew_aeration_type'];
+ $brew .= '","brew_fermenter_sg":' . floatval($row['brew_fermenter_sg']);
$brew .= ',"brew_fermenter_ibu":' . floatval($row['brew_fermenter_ibu']);
$brew .= ',"brew_date_end":"' . $row['brew_date_end'];
$brew .= '","brew_log_available":' . $row['brew_log_available'];
@@ -254,7 +252,7 @@
$brew .= ',"st_carb_max":' . floatval($row['st_carb_max']);
$brew .= ',"st_abv_min":' . floatval($row['st_abv_min']);
$brew .= ',"st_abv_max":' . floatval($row['st_abv_max']);
- $brew .= ',"r_notes":"' . str_replace($escapers, $replacements, $row['notes']);
+ $brew .= ',"notes":"' . str_replace($escapers, $replacements, $row['notes']);
$brew .= '","type":"' . $row['type'];
$brew .= '","batch_size":' . floatval($row['batch_size']);
$brew .= ',"boil_size":' . floatval($row['boil_size']);
@@ -278,12 +276,9 @@
$brew .= ',"waters":' . $row['json_waters'];
$brew .= ',"mashs":' . $row['json_mashs'];
$brew .= '}';
-// syslog(LOG_NOTICE, $brew);
$brews .= $brew;
-// syslog(LOG_NOTICE, 'Size: '.strlen($brews).PHP_EOL);
}
$brews .= ']';
-// syslog(LOG_NOTICE, $brews);
header("Content-type: application/json");
echo $brews;
}