# HG changeset patch # User Michiel Broek # Date 1566732120 -7200 # Node ID 47b592993dd506b59e5e0e7f63e5a2af3bcfebcc # Parent b9055393b802399785eb1d9f2ed37a73e1646894 Version 0.3.15. Implemented final pH during packaging. Updated prod_new, prod_duplicate, prod_edit, rec_toproduct for this new field and several other fields added in previous versions. diff -r b9055393b802 -r 47b592993dd5 README.design --- a/README.design Sat Aug 24 21:52:46 2019 +0200 +++ b/README.design Sun Aug 25 13:22:00 2019 +0200 @@ -16,7 +16,7 @@ van de vergisting. Gaat vooral fout met de Saison. Wish: - Giststarter bereken gist viability. + Giststarter bereken gist viability. Viability zelf wordt al gebruikt. Giststarter automatisch aantal regels aanpassen bij wijzigen van de hoeveelheden. Extra: @@ -43,8 +43,6 @@ -Recept/Product: toevoegen final pH. - Toevoegen Barrel/Oak aging vergisting stap. Wort souring stap. Add dry-hop toevoegen moment. diff -r b9055393b802 -r 47b592993dd5 config.status --- a/config.status Sat Aug 24 21:52:46 2019 +0200 +++ b/config.status Sun Aug 25 13:22:00 2019 +0200 @@ -621,7 +621,7 @@ S["CC"]="gcc" S["CYEARS"]="2016-2019" S["COPYRIGHT"]="Copyright (C) 2016-2019 Michiel Broek, All Rights Reserved" -S["VERSION"]="0.3.14" +S["VERSION"]="0.3.15" S["PACKAGE"]="bms" S["SUBDIRS"]="bmsd doc script tools www" S["target_alias"]="" @@ -710,7 +710,7 @@ D["PACKAGE_STRING"]=" \"\"" D["PACKAGE_BUGREPORT"]=" \"\"" D["PACKAGE_URL"]=" \"\"" -D["VERSION"]=" \"0.3.14\"" +D["VERSION"]=" \"0.3.15\"" D["COPYRIGHT"]=" \"Copyright (C) 2016-2019 Michiel Broek, All Rights Reserved\"" D["STDC_HEADERS"]=" 1" D["HAVE_SYS_TYPES_H"]=" 1" diff -r b9055393b802 -r 47b592993dd5 configure --- a/configure Sat Aug 24 21:52:46 2019 +0200 +++ b/configure Sun Aug 25 13:22:00 2019 +0200 @@ -2043,7 +2043,7 @@ PACKAGE="bms" -VERSION="0.3.14" +VERSION="0.3.15" COPYRIGHT="Copyright (C) 2016-2019 Michiel Broek, All Rights Reserved" CYEARS="2016-2019" diff -r b9055393b802 -r 47b592993dd5 configure.ac --- a/configure.ac Sat Aug 24 21:52:46 2019 +0200 +++ b/configure.ac Sun Aug 25 13:22:00 2019 +0200 @@ -8,7 +8,7 @@ dnl General settings dnl After changeing the version number, run autoconf! PACKAGE="bms" -VERSION="0.3.14" +VERSION="0.3.15" COPYRIGHT="Copyright (C) 2016-2019 Michiel Broek, All Rights Reserved" CYEARS="2016-2019" AC_SUBST(PACKAGE) diff -r b9055393b802 -r 47b592993dd5 www/includes/db_product.php --- a/www/includes/db_product.php Sat Aug 24 21:52:46 2019 +0200 +++ b/www/includes/db_product.php Sun Aug 25 13:22:00 2019 +0200 @@ -130,6 +130,7 @@ $sql .= "', package_infuse_abv='" . $_POST['package_infuse_abv']; $sql .= "', package_infuse_notes='" . mysqli_real_escape_string($connect, $_POST['package_infuse_notes']); $sql .= "', package_abv='" . $_POST['package_abv']; + $sql .= "', package_ph='" . $_POST['package_ph']; $sql .= "', bottle_amount='" . $_POST['bottle_amount']; $sql .= "', bottle_carbonation='" . $_POST['bottle_carbonation']; $sql .= "', bottle_priming_water='" . $_POST['bottle_priming_water']; @@ -718,6 +719,7 @@ $brew .= ',"package_infuse_abv":' . floatval($row['package_infuse_abv']); $brew .= ',"package_infuse_notes":"' . $row['package_infuse_notes']; $brew .= '","package_abv":' . floatval($row['package_abv']); + $brew .= ',"package_ph":' . floatval($row['package_ph']); $brew .= ',"bottle_amount":' . floatval($row['bottle_amount']); $brew .= ',"bottle_carbonation":' . floatval($row['bottle_carbonation']); $brew .= ',"bottle_priming_water":' . floatval($row['bottle_priming_water']); diff -r b9055393b802 -r 47b592993dd5 www/js/prod_edit.js --- a/www/js/prod_edit.js Sat Aug 24 21:52:46 2019 +0200 +++ b/www/js/prod_edit.js Sun Aug 25 13:22:00 2019 +0200 @@ -2062,6 +2062,7 @@ $("#package_infuse_amount").jqxNumberInput({ spinButtons: false, readOnly: true, width: 90 }); $("#package_infuse_abv").jqxNumberInput({ spinButtons: false, readOnly: true, width: 90 }); $("#package_infuse_notes").jqxInput({ disabled: true }); + $("#package_ph").jqxNumberInput({ spinButtons: false, readOnly: true, width: 90 }); $("#bottle_amount").jqxNumberInput({ spinButtons: false, readOnly: true, width: 90 }); $("#bottle_priming_water").jqxNumberInput({ spinButtons: false, readOnly: true, width: 90 }); $("#keg_priming_water").jqxNumberInput({ spinButtons: false, readOnly: true, width: 90 }); @@ -2746,6 +2747,7 @@ package_infuse_abv: parseFloat($("#package_infuse_abv").jqxNumberInput('decimal')), package_infuse_notes: $("#package_infuse_notes").val(), package_abv: parseFloat($("#package_abv").jqxNumberInput('decimal')), + package_ph: parseFloat($("#package_ph").jqxNumberInput('decimal')), bottle_amount: parseFloat($("#bottle_amount").jqxNumberInput('decimal')), bottle_carbonation: parseFloat($("#bottle_carbonation").jqxNumberInput('decimal')), bottle_priming_water: parseFloat($("#bottle_priming_water").jqxNumberInput('decimal')), @@ -2973,6 +2975,7 @@ { name: 'package_infuse_abv', type: 'float' }, { name: 'package_infuse_notes', type: 'string' }, { name: 'package_abv', type: 'float' }, + { name: 'package_ph', type: 'float' }, { name: 'bottle_amount', type: 'float' }, { name: 'bottle_carbonation', type: 'float' }, { name: 'bottle_priming_water', type: 'float' }, @@ -3183,6 +3186,7 @@ $("#package_infuse_abv").val(dataRecord.package_infuse_abv); $("#package_infuse_notes").val(dataRecord.package_infuse_notes); $("#package_abv").val(dataRecord.package_abv); + $("#package_ph").val(dataRecord.package_ph); $("#bottle_amount").val(dataRecord.bottle_amount); $("#bottle_carbonation").val(dataRecord.bottle_carbonation); $("#bottle_priming_water").val(dataRecord.bottle_priming_water); @@ -5803,6 +5807,8 @@ $('#package_infuse_notes').jqxInput({ theme: theme, width: 640, height: 23 }); $('#package_abv').jqxTooltip({ content: 'De uiteindelijke hoeveelheid alcohol volume %.' }); $('#package_abv').jqxNumberInput( Show1dec ); + $('#package_ph').jqxTooltip({ content: 'De gemeten pH vlak voor het verpakken.' }); + $('#package_ph').jqxNumberInput( SpinpH ); $("#st_carb_min2").jqxTooltip({ content: 'Het minimum aanbevolen koolzuur volume voor deze bierstijl.'}); $("#st_carb_min2").jqxNumberInput(Smal1dec); $("#st_carb_max2").jqxTooltip({ content: 'Het maximum aamnevolen koolzuur volume voor deze bierstijl.'}); diff -r b9055393b802 -r 47b592993dd5 www/js/prod_new.js --- a/www/js/prod_new.js Sat Aug 24 21:52:46 2019 +0200 +++ b/www/js/prod_new.js Sun Aug 25 13:22:00 2019 +0200 @@ -324,14 +324,20 @@ secondary_end_date: '', tertiary_temp: 0, package_date: '', + package_volume: 0, + package_infuse_amount: 0, + package_infuse_abv: 0, + package_infuse_notes: '', + package_abv: 0, + package_ph: 0, bottle_amount: 0, bottle_carbonation: 0, - bottle_priming_sugar: 0, + bottle_priming_water: 0, bottle_priming_amount: 0, bottle_carbonation_temp: 23, keg_amount: 0, keg_carbonation: 0, - keg_priming_sugar: 0, + keg_priming_water: 0, keg_priming_amount: 0, keg_carbonation_temp: 23, keg_forced_carb: false, diff -r b9055393b802 -r 47b592993dd5 www/prod_duplicate.php --- a/www/prod_duplicate.php Sat Aug 24 21:52:46 2019 +0200 +++ b/www/prod_duplicate.php Sun Aug 25 13:22:00 2019 +0200 @@ -100,14 +100,20 @@ $sql .= "', secondary_end_date=NULL"; $sql .= ", tertiary_temp='0"; $sql .= "', package_date=NULL"; -$sql .= ", bottle_amount='0"; +$sql .= ", package_volume='" . $row['package_volume']; +$sql .= "', package_infuse_amount='" . $row['package_infuse_amount']; +$sql .= "', package_infuse_abv='" . $row['package_infuse_abv']; +$sql .= "', package_infuse_notes='" . mysqli_real_escape_string($link, $row['package_infuse_notes']); +$sql .= "', package_abv='0"; +$sql .= "', package_ph='0"; +$sql .= "', bottle_amount='0"; $sql .= "', bottle_carbonation='" . $row['bottle_carbonation']; -$sql .= "', bottle_priming_sugar='" . $row['bottle_priming_sugar']; +$sql .= "', bottle_priming_water='" . $row['bottle_priming_water']; $sql .= "', bottle_priming_amount='0"; $sql .= "', bottle_carbonation_temp='" . $row['bottle_carbonation_temp']; $sql .= "', keg_amount='0"; $sql .= "', keg_carbonation='" . $row['keg_carbonation']; -$sql .= "', keg_priming_sugar='" . $row['keg_priming_sugar']; +$sql .= "', keg_priming_water='" . $row['keg_priming_water']; $sql .= "', keg_priming_amount='0"; $sql .= "', keg_carbonation_temp='" . $row['keg_carbonation_temp']; $sql .= "', keg_forced_carb='" . $row['keg_forced_carb']; @@ -190,6 +196,7 @@ $sql .= "', starter_enable='" . $row['starter_enable']; $sql .= "', starter_type='" . $row['starter_type']; $sql .= "', starter_sg='" . $row['starter_sg']; +$sql .= "', starter_viability='97"; $sql .= "', prop1_type='" . $row['prop1_type']; $sql .= "', prop1_volume='" . $row['prop1_volume']; $sql .= "', prop2_type='" . $row['prop2_type']; diff -r b9055393b802 -r 47b592993dd5 www/prod_edit.php --- a/www/prod_edit.php Sat Aug 24 21:52:46 2019 +0200 +++ b/www/prod_edit.php Sun Aug 25 13:22:00 2019 +0200 @@ -753,7 +753,9 @@ Alcoholgehalte vol.%: -
+
+ Bij verpakken pH: +
diff -r b9055393b802 -r 47b592993dd5 www/rec_toproduct.php --- a/www/rec_toproduct.php Sat Aug 24 21:52:46 2019 +0200 +++ b/www/rec_toproduct.php Sun Aug 25 13:22:00 2019 +0200 @@ -57,9 +57,10 @@ $sql .= "', brew_fermenter_ibu='0', brew_fermenter_color='0', brew_date_end=NULL, og='0', fg='0"; $sql .= "', primary_start_temp='0', primary_max_temp='0', primary_end_temp='0', primary_end_date=NULL, primary_end_sg='0"; $sql .= "', secondary_temp='0', secondary_end_date=NULL, tertiary_temp='0"; -$sql .= "', package_date=NULL"; -$sql .= ", bottle_amount='0', bottle_carbonation='0', bottle_priming_sugar='0', bottle_priming_amount='0', bottle_carbonation_temp='23"; -$sql .= "', keg_amount='0', keg_carbonation='0', keg_priming_sugar='0', keg_priming_amount='0', keg_carbonation_temp='23"; +$sql .= "', package_date=NULL, package_volume='0', package_infuse_amount='0', package_infuse_abv='0', package_infuse_notes='"; +$sql .= "', package_abv='0', package_ph='0"; +$sql .= "', bottle_amount='0', bottle_carbonation='0', bottle_priming_water='0', bottle_priming_amount='0', bottle_carbonation_temp='23"; +$sql .= "', keg_amount='0', keg_carbonation='0', keg_priming_water='0', keg_priming_amount='0', keg_carbonation_temp='23"; $sql .= "', keg_forced_carb='0', keg_pressure='0"; $sql .= "', taste_notes='"; $sql .= "', taste_rate='0"; @@ -136,6 +137,9 @@ $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.040', 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 .= "', 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']);