diff -r ba607babc468 -r 60bb365fb48d www/includes/db_product.php --- a/www/includes/db_product.php Sat Oct 22 15:27:50 2022 +0200 +++ b/www/includes/db_product.php Sun Oct 30 16:46:03 2022 +0100 @@ -533,27 +533,6 @@ } echo json_encode($response); -} else if (isset($_POST['splitit'])) { - /* - * Update split batch details - */ - $sql = "UPDATE `products` SET "; - $sql .= "divide_type='" . $_POST['divide_type']; - $sql .= "', divide_size='" . $_POST['divide_size']; - $sql .= "', divide_parts='" . $_POST['divide_parts']; - $sql .= "' WHERE record='" . $_POST['record'] . "';"; - syslog(LOG_NOTICE, $sql); - - $result = mysqli_query($connect, $sql); - if (! $result) { - syslog(LOG_NOTICE, "db_product: result: ".mysqli_error($connect)); - $response['error'] = true; - $response['msg'] = "SQL update fout: ".mysqli_error($connect); - } else { - syslog(LOG_NOTICE, "db_product: updated (divide) record ".$_POST['record']); - } - echo json_encode($response); - } else if (isset($_POST['delete'])) { /* * DELETE command. @@ -723,11 +702,10 @@ $brew .= ',"eq_trub_chiller_loss":' . floatval($row['eq_trub_chiller_loss']); $brew .= ',"eq_evap_rate":' . floatval($row['eq_evap_rate']); $brew .= ',"eq_boil_time":' . floatval($row['eq_boil_time']); - $brew .= ',"eq_calc_boil_volume":' . $row['eq_calc_boil_volume']; - $brew .= ',"eq_calc_boil_volume":' . floatval($row['eq_calc_boil_volume']); + $brew .= ',"xeq_calc_boil_volume":' . floatval($row['eq_calc_boil_volume']); $brew .= ',"eq_top_up_kettle":' . floatval($row['eq_top_up_kettle']); - $brew .= ',"eq_lauter_volume":' . floatval($row['eq_lauter_volume']); - $brew .= ',"eq_lauter_height":' . floatval($row['eq_lauter_height']); + $brew .= ',"xeq_lauter_volume":' . floatval($row['eq_lauter_volume']); + $brew .= ',"xeq_lauter_height":' . floatval($row['eq_lauter_height']); $brew .= ',"eq_lauter_deadspace":' . floatval($row['eq_lauter_deadspace']); $brew .= ',"eq_kettle_volume":' . floatval($row['eq_kettle_volume']); $brew .= ',"eq_kettle_height":' . floatval($row['eq_kettle_height']); @@ -735,6 +713,11 @@ $brew .= ',"eq_mash_max":' . floatval($row['eq_mash_max']); $brew .= ',"eq_efficiency":' . floatval($row['eq_efficiency']); $brew .= ',"eq_top_up_water":' . floatval($row['eq_top_up_water']); + $brew .= ',"eq_chiller_type":' . $row['eq_chiller_type']; + $brew .= ',"eq_chiller_to79":' . floatval($row['eq_chiller_to79']); + $brew .= ',"eq_chiller_volume":' . floatval($row['eq_chiller_volume']); + $brew .= ',"eq_chiller_lpm":' . floatval($row['eq_chiller_lpm']); + $brew .= ',"eq_chiller_loss":' . floatval($row['eq_chiller_loss']); $brew .= ',"brew_date_start":"' . $row['brew_date_start']; $brew .= '","brew_mash_ph":' . floatval($row['brew_mash_ph']); $brew .= ',"brew_mash_sg":' . floatval($row['brew_mash_sg']);