# HG changeset patch # User Michiel Broek # Date 1571942816 -7200 # Node ID ada10cabf2173b9e023d53c2361f46202f1d5fa6 # Parent 1f0059cfb6fe7ee4ae2f1c293daf2c1933dcddaf Updated design notes. Added missing fields to rec_toproduct. diff -r 1f0059cfb6fe -r ada10cabf217 README.design --- a/README.design Wed Oct 23 21:35:16 2019 +0200 +++ b/README.design Thu Oct 24 20:46:56 2019 +0200 @@ -45,29 +45,24 @@ Add dry-hop toevoegen moment. 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 cooling 4:after primary 5:after secondary 6:after tertiary divide_size amount in liters of this part. -divide_factor factor size of this part. +divide_factor factor size of this part or 1.0 divide_parts hoeveel afsplitsingen. divide_part 0=hoofdbatch. Via Export module dialoog maken, keuze aantal afsplitsels en grootte per stuk. 10 stuks. -Procedure: Genereer afsplitsels in db_product. Pas volumes aan na splitspunt. +Procedure: Genereer afsplitsels in db_product. Pas alle volumes aan. Afsplitsels naam aanpassen, code en -n volgnummer toevoegen. -Daarna, markeer master en reduceer volume na splitspunt. +Daarna, markeer master en reduceer volume. +Tot zover werkt het. Probleem, wijzig iets aan ingredienten voor het splitspunt. Alle +batches moeten dan ook bijgewerkt worden. Een trigger meegeven aan db_product tijdens save? View - master alleen wijzigen voor splitspunt. - splitsingen alleen wijzigen na splitspunt. -NOTE: prod_duplicate alleen op master record, ingesplitst. - prod_export beerxml alleen op master. - prod_print, prod_forum, prod_checklist - toevoegen splitsels. +NOTE: prod_forum - toevoegen splitsels. diff -r 1f0059cfb6fe -r ada10cabf217 www/rec_toproduct.php --- a/www/rec_toproduct.php Wed Oct 23 21:35:16 2019 +0200 +++ b/www/rec_toproduct.php Thu Oct 24 20:46:56 2019 +0200 @@ -46,8 +46,8 @@ $sql .= "', eq_kettle_height='20', eq_mash_volume='18', eq_mash_max='6', eq_efficiency='75"; // brewdate $sql .= "', brew_date_start=NULL, brew_mash_ph='0.0', brew_mash_sg='1.000"; -$sql .= "', brew_sparge_ph='0.0"; -$sql .= "', brew_preboil_volume='0', brew_preboil_sg='0', brew_preboil_ph='0.0"; +$sql .= "', brew_mash_efficiency='0.0', brew_sparge_ph='0.0', brew_sparge_temperature='85.0"; +$sql .= "', brew_preboil_volume='0', brew_preboil_sg='0', brew_preboil_ph='0.0', brew_preboil_efficiency='0"; $sql .= "', brew_aboil_volume='0', brew_aboil_sg='0', brew_aboil_ph='0.0', brew_aboil_efficiency='0"; $sql .= "', brew_cooling_method='0', brew_cooling_time='0', brew_cooling_to='20"; $sql .= "', brew_whirlpool9='0', brew_whirlpool7='0', brew_whirlpool6='0', brew_whirlpool2='0"; @@ -134,12 +134,28 @@ $sql .= "', w2_total_alkalinity='" . $row['w2_total_alkalinity']; $sql .= "', w2_ph='" . $row['w2_ph']; $sql .= "', w2_cost='" . $row['w2_cost']; +$sql .= "', wg_amount='" . $row['wg_amount']; +$sql .= "', wg_calcium='" . $row['wg_calcium']; +$sql .= "', wg_sulfate='" . $row['wg_sulfate']; +$sql .= "', wg_chloride='" . $row['wg_chloride']; +$sql .= "', wg_sodium='" . $row['wg_sodium']; +$sql .= "', wg_magnesium='" . $row['wg_magnesium']; +$sql .= "', wg_total_alkalinity='" . $row['wg_total_alkalinity']; +$sql .= "', wg_ph='" . $row['wg_ph']; +$sql .= "', wb_calcium='" . $row['wb_calcium']; +$sql .= "', wb_sulfate='" . $row['wb_sulfate']; +$sql .= "', wb_chloride='" . $row['wb_chloride']; +$sql .= "', wb_sodium='" . $row['wb_sodium']; +$sql .= "', wb_magnesium='" . $row['wb_magnesium']; +$sql .= "', wb_total_alkalinity='" . $row['wb_total_alkalinity']; +$sql .= "', wb_ph='" . $row['wb_ph']; $sql .= "', wa_acid_name='" . $row['wa_acid_name']; $sql .= "', wa_acid_perc='" . $row['wa_acid_perc']; $sql .= "', wa_base_name='" . $row['wa_base_name']; $sql .= "', starter_enable='0', starter_type='0', starter_sg='1.037', starter_viability='97"; $sql .= "', prop1_type='0', prop1_volume='0', prop2_type='0', prop2_volume='0"; $sql .= "', prop3_type='0', prop3_volume='0', prop4_type='0', prop4_volume='0"; +$sql .= "', divide_type='0', divide_parts='0', divide_part='0', divide_size='0', divide_factor='1.0"; $sql .= "', json_fermentables='" . str_replace($rescapers,$rreplacements,$row['json_fermentables']); $sql .= "', json_hops='" . str_replace($rescapers,$rreplacements,$row['json_hops']); $sql .= "', json_miscs='" . str_replace($rescapers,$rreplacements,$row['json_miscs']);