# HG changeset patch # User Michiel Broek # Date 1558896301 -7200 # Node ID 6e80a5515dd3b5a220fd0b9204705377c87a17d8 # Parent a14a31bfc73b5703b9e001f1c57ccf87d7c8ab01# Parent 1de1623e1760b1c2ef78de26b5e2026b1fb6eac6 Version 0.4.0 merged with default branch. diff -r a14a31bfc73b -r 6e80a5515dd3 README.design --- a/README.design Sun May 12 19:41:18 2019 +0200 +++ b/README.design Sun May 26 20:45:01 2019 +0200 @@ -1,3 +1,6 @@ + +MIT licentie? + Main table: products. In Progress: view logs. @@ -14,3 +17,7 @@ Gisten diastaticus bit toevoegen. Gist typen: kveik en brett? Apart of niet. +Popups is de editors met rekenhulpjes. + +Beerxml cool tot temp toevoegen. + diff -r a14a31bfc73b -r 6e80a5515dd3 config.status --- a/config.status Sun May 12 19:41:18 2019 +0200 +++ b/config.status Sun May 26 20:45:01 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.2.0" +S["VERSION"]="0.4.0" 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.2.0\"" +D["VERSION"]=" \"0.4.0\"" D["COPYRIGHT"]=" \"Copyright (C) 2016-2019 Michiel Broek, All Rights Reserved\"" D["STDC_HEADERS"]=" 1" D["HAVE_SYS_TYPES_H"]=" 1" diff -r a14a31bfc73b -r 6e80a5515dd3 configure --- a/configure Sun May 12 19:41:18 2019 +0200 +++ b/configure Sun May 26 20:45:01 2019 +0200 @@ -2043,7 +2043,7 @@ PACKAGE="bms" -VERSION="0.2.0" +VERSION="0.4.0" COPYRIGHT="Copyright (C) 2016-2019 Michiel Broek, All Rights Reserved" CYEARS="2016-2019" diff -r a14a31bfc73b -r 6e80a5515dd3 configure.ac --- a/configure.ac Sun May 12 19:41:18 2019 +0200 +++ b/configure.ac Sun May 26 20:45:01 2019 +0200 @@ -8,7 +8,7 @@ dnl General settings dnl After changeing the version number, run autoconf! PACKAGE="bms" -VERSION="0.2.0" +VERSION="0.4.0" COPYRIGHT="Copyright (C) 2016-2019 Michiel Broek, All Rights Reserved" CYEARS="2016-2019" AC_SUBST(PACKAGE) diff -r a14a31bfc73b -r 6e80a5515dd3 www/gen_about.php --- a/www/gen_about.php Sun May 12 19:41:18 2019 +0200 +++ b/www/gen_about.php Sun May 26 20:45:01 2019 +0200 @@ -10,6 +10,9 @@ Over BMS Versie: + Geschreven door:M. Broek + Diverse berekeningen:A. Otte, H. Halberstadt + Widgets en stijl:jQWidgets diff -r a14a31bfc73b -r 6e80a5515dd3 www/includes/db_product.php --- a/www/includes/db_product.php Sun May 12 19:41:18 2019 +0200 +++ b/www/includes/db_product.php Sun May 26 20:45:01 2019 +0200 @@ -223,17 +223,23 @@ $sql .= "', wa_acid_name='" . $_POST['wa_acid_name']; $sql .= "', wa_acid_perc='" . $_POST['wa_acid_perc']; $sql .= "', wa_base_name='" . $_POST['wa_base_name']; - $sql .= "', starter_enable='" . $_POST['starter_enable']; - $sql .= "', starter_type='" . $_POST['starter_type']; - $sql .= "', starter_sg='" . $_POST['starter_sg']; - $sql .= "', prop1_type='" . $_POST['prop1_type']; - $sql .= "', prop1_volume='" . $_POST['prop1_volume']; - $sql .= "', prop2_type='" . $_POST['prop2_type']; - $sql .= "', prop2_volume='" . $_POST['prop2_volume']; - $sql .= "', prop3_type='" . $_POST['prop3_type']; - $sql .= "', prop3_volume='" . $_POST['prop3_volume']; - $sql .= "', prop4_type='" . $_POST['prop4_type']; - $sql .= "', prop4_volume='" . $_POST['prop4_volume']; + if ($_POST['starter_enable'] == 0) { + $sql .= "', starter_enable='0', starter_type='0', starter_sg='1.040"; + $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"; + } else { + $sql .= "', starter_enable='1"; + $sql .= "', starter_type='" . $_POST['starter_type']; + $sql .= "', starter_sg='" . $_POST['starter_sg']; + $sql .= "', prop1_type='" . $_POST['prop1_type']; + $sql .= "', prop1_volume='" . $_POST['prop1_volume']; + $sql .= "', prop2_type='" . $_POST['prop2_type']; + $sql .= "', prop2_volume='" . $_POST['prop2_volume']; + $sql .= "', prop3_type='" . $_POST['prop3_type']; + $sql .= "', prop3_volume='" . $_POST['prop3_volume']; + $sql .= "', prop4_type='" . $_POST['prop4_type']; + $sql .= "', prop4_volume='" . $_POST['prop4_volume']; + } syslog(LOG_NOTICE, $sql); $fermentables = '['; diff -r a14a31bfc73b -r 6e80a5515dd3 www/includes/global.inc.php --- a/www/includes/global.inc.php Sun May 12 19:41:18 2019 +0200 +++ b/www/includes/global.inc.php Sun May 26 20:45:01 2019 +0200 @@ -118,7 +118,7 @@ - +