# HG changeset patch # User Michiel Broek # Date 1603306465 -7200 # Node ID c4457e10d96833707bbb4025fa5b434a79c8ed0a # Parent 4d7394ced1c383c172b25b2b783e2c35e2bbc232 Fix db error when splitting a batch. Removed the minimum 10% divide volume in the room calculation. diff -r 4d7394ced1c3 -r c4457e10d968 README.design --- a/README.design Sat Sep 19 21:25:11 2020 +0200 +++ b/README.design Wed Oct 21 20:54:25 2020 +0200 @@ -43,6 +43,7 @@ batches moeten dan ook bijgewerkt worden. Logic: in db_product.php test stage tegen divide_type. Zolang we wijzigen en het splitspunt is nog niet bereikt, de overige records bijwerken met de data tot het splitspunt. Dus check voorgaande stage in geval die ophoogt na edit. +Ook tijdens divide alleen de relevante data verdelen over de batches. View - master alleen wijzigen voor splitspunt. - splitsingen alleen wijzigen na splitspunt. diff -r 4d7394ced1c3 -r c4457e10d968 www/includes/db_divides.php --- a/www/includes/db_divides.php Sat Sep 19 21:25:11 2020 +0200 +++ b/www/includes/db_divides.php Wed Oct 21 20:54:25 2020 +0200 @@ -57,8 +57,7 @@ * Update the main record */ $sql = "UPDATE `products` SET "; - $sql .= "brew_sparge_volume='" . sprintf("%.1f", $row['brew_sparge_volume'] * $factor); - $sql .= "', brew_sparge_est='" . sprintf("%.1f", $row['brew_sparge_est'] * $factor); + $sql .= " brew_sparge_est='" . sprintf("%.1f", $row['brew_sparge_est'] * $factor); $sql .= "', brew_preboil_volume='" . sprintf("%.1f", $row['brew_preboil_volume'] * $factor); $sql .= "', brew_aboil_volume='" . sprintf("%.1f", $row['brew_aboil_volume'] * $factor); $sql .= "', brew_fermenter_volume='" . sprintf("%.1f", $row['brew_fermenter_volume'] * $factor); @@ -139,8 +138,6 @@ $sql .= ", brew_mash_ph='" . $row['brew_mash_ph']; $sql .= "', brew_mash_sg='" . $row['brew_mash_sg']; $sql .= "', brew_mash_efficiency='" . $row['brew_mash_efficiency']; - $sql .= "', brew_sparge_temperature='" . $row['brew_sparge_temperature']; - $sql .= "', brew_sparge_volume='" . sprintf("%.1f", $row['brew_sparge_volume'] * $factor); $sql .= "', brew_sparge_est='" . sprintf("%.1f", $row['brew_sparge_est'] * $factor); $sql .= "', brew_sparge_ph='" . $row['brew_sparge_ph']; $sql .= "', brew_preboil_volume='" . sprintf("%.1f", $row['brew_preboil_volume'] * $factor); @@ -320,7 +317,7 @@ $sql .= "', divide_part='" . $index; $sql .= "', divide_size='" . floatval($split['size']); $sql .= "', divide_factor='". $factor; - syslog(LOG_NOTICE, "db_divide: index " . $index . " " . $sql); +// syslog(LOG_NOTICE, "db_divide: index " . $index . " " . $sql); } $fermentables = json_decode($row['json_fermentables'], true); @@ -355,7 +352,7 @@ for ($i = 0; $i < count($mashs); $i++) { $mashs[$i]['step_infuse_amount'] = sprintf("%.5f", $mashs[$i]['step_infuse_amount'] * $factor); } - syslog(LOG_NOTICE, "db_divide: " . str_replace($rescapers,$rreplacements,json_encode($mashs, JSON_UNESCAPED_UNICODE))); + // syslog(LOG_NOTICE, "db_divide: " . str_replace($rescapers,$rreplacements,json_encode($mashs, JSON_UNESCAPED_UNICODE))); $sql .= "', json_mashs='" . str_replace($rescapers,$rreplacements,json_encode($mashs, JSON_UNESCAPED_UNICODE)); if ($index == 0) { diff -r 4d7394ced1c3 -r c4457e10d968 www/js/prod_divide.js --- a/www/js/prod_divide.js Sat Sep 19 21:25:11 2020 +0200 +++ b/www/js/prod_divide.js Wed Oct 21 20:54:25 2020 +0200 @@ -417,7 +417,6 @@ $('#divide_type').val(0); $('#divide_type').on('select', function(event) { var index = event.args.index; - console.log('divide_type:' + index); dataRecord.divide_type = index; switch (index) { case 0: @@ -441,7 +440,8 @@ break; } leftover = available; - minvolume = Round(0.1 * available, 1); +// minvolume = Round(0.1 * available, 1); /* What was the use for this ?? */ + console.log('divide_type:' + index + ' available:' + available); $('#available').val(available); $('#leftover').val(leftover); if (index != 0) {