# HG changeset patch # User Michiel Broek # Date 1568810434 -7200 # Node ID 0fe366d953aba7980c05c3cac241617aac1e4e50 # Parent 2465dbc90ea4c4c208055a064b117e408148260d Prepare screens for product divide batch. diff -r 2465dbc90ea4 -r 0fe366d953ab README.design --- a/README.design Mon Sep 16 17:26:38 2019 +0200 +++ b/README.design Wed Sep 18 14:40:34 2019 +0200 @@ -47,7 +47,22 @@ Add dry-hop toevoegen moment. -Split batch. +Split batch: + 1. After sparge, before boil. + 2. After boil, before primary. + 3. After primary + 4. After secondary (several dry-hops) + 5. After lagering (separated packaging) + +Split fields: +divide_type 0:none 1:after mash 2:after boil 3:after primary 4:after secondary 5:after tertiary +divide_size amount in liters of this part. +divide_parts hoeveel afsplitsingen. +divide_from uuid +Via Export module dialoog maken, keuze aantal afsplitsels en grootte per stuk. 10 stuks. +Procedure: Genereer afsplitsels met uniek uuid en moeder uuid. Pas volumes aan na splitspunt. +Afsplitsels naam aanpassen, code een -n volgnummer toevoegen. +Daarna, markeer master en reduceer volume na splitspunt. Miscs type: add wood. diff -r 2465dbc90ea4 -r 0fe366d953ab www/includes/db_product.php --- a/www/includes/db_product.php Mon Sep 16 17:26:38 2019 +0200 +++ b/www/includes/db_product.php Wed Sep 18 14:40:34 2019 +0200 @@ -262,6 +262,10 @@ $sql .= "', prop4_type='" . $_POST['prop4_type']; $sql .= "', prop4_volume='" . $_POST['prop4_volume']; } + $sql .= "', divide_type='" . $_POST['divide_type']; + $sql .= "', divide_size='" . $_POST['divide_size']; + $sql .= "', divide_parts='" . $_POST['divide_parts']; + $sql .= "', divide_from='" . $_POST['divide_from']; // syslog(LOG_NOTICE, $sql); $fermentables = '['; @@ -836,6 +840,11 @@ $brew .= ',"prop4_type":' . $row['prop4_type']; $brew .= ',"prop4_volume":' . $row['prop4_volume']; + $brew .= ',"divide_type":' . $row['divide_type']; + $brew .= ',"divide_size":' . floatval($row['divide_size']); + $brew .= ',"divide_parts":' . $row['divide_parts']; + $brew .= ',"divide_from":"' . str_replace($escapers, $replacements, $row['divide_from']) . '"'; + if (isset($_GET['record'])) { // Append stock information. $fermentables = json_decode($row['json_fermentables'], true); diff -r 2465dbc90ea4 -r 0fe366d953ab www/includes/global.inc.php --- a/www/includes/global.inc.php Mon Sep 16 17:26:38 2019 +0200 +++ b/www/includes/global.inc.php Wed Sep 18 14:40:34 2019 +0200 @@ -54,6 +54,10 @@ $my_select = $_GET['select']; else $my_select = ''; +if (isset($_GET['split'])) + $my_split = $_GET['split']; +else + $my_split = 0; $escapers = array("\\", "/", "\"", "\n", "\r", "\t", "\x08", "\x0c"); $replacements = array("\\\\", "\\/", "\\\"", "\\n", "\\r", "\\t", "\\f", "\\b"); @@ -99,6 +103,7 @@ global $my_name; global $my_code; global $my_select; + global $my_split; global $my_brewery_name; global $my_factor_mashhop; global $my_factor_fwh; @@ -124,7 +129,7 @@