Sun, 01 Mar 2020 12:48:09 +0100
Added est_og3 field in the products database so that the checklist can use it.
--- a/README.design Sun Mar 01 11:23:22 2020 +0100 +++ b/README.design Sun Mar 01 12:48:09 2020 +0100 @@ -12,10 +12,6 @@ van de vergisting. Gaat vooral fout met de Saison. NOOT: experimentele wijziging is toegevoegd op 5-dec-2019. New Cubic van seanterrill. - Eind SG na koken klopt niet als er suiker in de vergisting toegevoegd wordt. - In de js code is dit est_og3 en niet est_og, maar est_og3 is niet beschikbaar - in de php code. - Wish: Giststarter bereken gist viability. Viability zelf wordt al gebruikt. Giststarter automatisch aantal regels aanpassen bij wijzigen van de hoeveelheden.
--- a/www/includes/db_divides.php Sun Mar 01 11:23:22 2020 +0100 +++ b/www/includes/db_divides.php Sun Mar 01 12:48:09 2020 +0100 @@ -246,6 +246,7 @@ $sql .= "', boil_time='" . $row['boil_time']; $sql .= "', efficiency='" . $row['efficiency']; $sql .= "', est_og='" . $row['est_og']; + $sql .= "', est_og3='" . $row['est_og3']; $sql .= "', est_fg='" . $row['est_fg']; $sql .= "', est_abv='" . $row['est_abv']; $sql .= "', est_carb='" . $row['est_carb'];
--- a/www/includes/db_product.php Sun Mar 01 11:23:22 2020 +0100 +++ b/www/includes/db_product.php Sun Mar 01 12:48:09 2020 +0100 @@ -187,6 +187,7 @@ $sql .= "', boil_time='" . $_POST['boil_time']; $sql .= "', efficiency='" . $_POST['efficiency']; $sql .= "', est_og='" . $_POST['est_og']; + $sql .= "', est_og3='" . $_POST['est_og3']; $sql .= "', est_fg='" . $_POST['est_fg']; $sql .= "', est_abv='" . $_POST['est_abv']; $sql .= "', est_carb='" . $_POST['est_carb']; @@ -808,6 +809,7 @@ $brew .= ',"boil_time":' . floatval($row['boil_time']); $brew .= ',"efficiency":' . floatval($row['efficiency']); $brew .= ',"est_og":' . floatval($row['est_og']); + $brew .= ',"est_og3":' . floatval($row['est_og3']); $brew .= ',"est_fg":' . floatval($row['est_fg']); $brew .= ',"est_abv":' . floatval($row['est_abv']); $brew .= ',"est_carb":' . floatval($row['est_carb']);
--- a/www/js/prod_edit.js Sun Mar 01 11:23:22 2020 +0100 +++ b/www/js/prod_edit.js Sun Mar 01 12:48:09 2020 +0100 @@ -240,6 +240,7 @@ { name: 'boil_time', type: 'float' }, { name: 'efficiency', type: 'float' }, { name: 'est_og', type: 'float' }, + { name: 'est_og3', type: 'float' }, { name: 'est_fg', type: 'float' }, { name: 'est_abv', type: 'float' }, { name: 'est_color', type: 'float' }, @@ -465,7 +466,7 @@ $('#efficiency').val(dataRecord.efficiency); $('#est_og').val(dataRecord.est_og); $('#est_og2').val(dataRecord.est_og); - $('#est_og3').val(0); + $('#est_og3').val(dataRecord.est_og3); $('#est_fg').val(dataRecord.est_fg); $('#est_fg2').val(dataRecord.est_fg); $('#est_fg3').val(dataRecord.est_fg); @@ -4375,6 +4376,7 @@ boil_time: parseFloat($('#boil_time').jqxNumberInput('decimal')), efficiency: parseFloat($('#efficiency').jqxNumberInput('decimal')), est_og: parseFloat($('#est_og').jqxNumberInput('decimal')), + est_og3: parseFloat($('#est_og3').jqxNumberInput('decimal')), est_fg: parseFloat($('#est_fg').jqxNumberInput('decimal')), est_abv: parseFloat($('#est_abv').jqxNumberInput('decimal')), est_color: parseFloat($('#est_color').jqxNumberInput('decimal')), @@ -5761,7 +5763,7 @@ calcFermentables(); calcIBUs(); }); - $('#est_og3').jqxTooltip({ content: 'Het gewenste SG in de kookketel na het koken.' }); + $('#est_og3').jqxTooltip({ content: 'Het gewenste SG in de kookketel na het koken zonder eventuele suikers die tijdens de vergisting toegevoegd worden.' }); $('#est_mash_sg,#est_pre_sg,#est_og3').jqxNumberInput(Show3wat); $('#brew_mash_efficiency').jqxTooltip({ content: 'Het behaalde maisch rendement.' }); $('#brew_mash_efficiency').jqxNumberInput(Show1dec);
--- a/www/prod_checklist.php Sun Mar 01 11:23:22 2020 +0100 +++ b/www/prod_checklist.php Sun Mar 01 12:48:09 2020 +0100 @@ -288,7 +288,7 @@ $s .= sprintf("%.1f",kettle_cm($row['batch_size']*$factor*1.04,$row['eq_kettle_volume'],$row['eq_kettle_height'])); $s .= ' cm onder de rand)'; $this->Checkline($s); - $this->Checkline('doel SG einde koken: '.density_str($row['est_og'])); + $this->Checkline('doel SG einde koken: '.density_str($row['est_og3'])); if ($this->Checksplit(2, $row)) $factor = 1; if ($this->GetY() > 200)
--- a/www/rec_toproduct.php Sun Mar 01 11:23:22 2020 +0100 +++ b/www/rec_toproduct.php Sun Mar 01 12:48:09 2020 +0100 @@ -97,6 +97,7 @@ $sql .= "', boil_time='" . $row['boil_time']; $sql .= "', efficiency='" . $row['efficiency']; $sql .= "', est_og='0.000"; +$sql .= "', est_og3='0.000"; $sql .= "', est_fg='0.000"; $sql .= "', est_abv='0.0"; $sql .= "', est_carb='0";