Continuing consolidation effort.
Eliminated efficiency.inc.php file - moved functionality to the functions.inc.php file and converted to a function. Called the function in the appropriate area in the recipe_mash.inc.php file.
This commit is contained in:
Geoff Humphrey
@@ -1,117 +0,0 @@
|
||||
<?php
|
||||
/**
|
||||
* Module: efficiency.inc.php
|
||||
* Description: This module provides the "PPG" number in the "Mash Profile" section of a blog.
|
||||
* The efficincy of the recipe is calculated here but should probably be
|
||||
* centralaized in a library.
|
||||
*/
|
||||
|
||||
/*
|
||||
$query_sugarPPG1 = sprintf("SELECT sugarPPG FROM sugar_type WHERE id='%s'", $row_malt1['maltYield']);
|
||||
$sugarPPG1 = mysql_query($query_sugarPPG1, $brewing) or die(mysql_error());
|
||||
$row_sugarPPG1 = mysql_fetch_assoc($sugarPPG1);
|
||||
|
||||
$query_sugarPPG15 = sprintf("SELECT sugarPPG FROM sugar_type WHERE id='%s'", $row_malt15['maltYield']);
|
||||
$sugarPPG15 = mysql_query($query_sugarPPG15, $brewing) or die(mysql_error());
|
||||
$row_sugarPPG15 = mysql_fetch_assoc($sugarPPG15);
|
||||
*/
|
||||
|
||||
$gravity = $row_log['brewMashGravity'];
|
||||
$wort = $row_log['brewPreBoilAmt'];
|
||||
$grain = $totalGrain;
|
||||
/*
|
||||
$grain1 = $row_sugarPPG1['sugarPPG'];
|
||||
$grain1amt = $row_log['brewGrain1Weight'];
|
||||
$grain15 = $row_sugarPPG15['sugarPPG'];
|
||||
$grain15amt = $row_log['brewGrain15Weight'];
|
||||
*/
|
||||
$units = $row_pref['measFluid2'];
|
||||
|
||||
$grainsPPG = array();
|
||||
for ($i = 0; $i < MAX_GRAINS; $i++) {
|
||||
$key = "brewGrain" . ($i + 1);
|
||||
$query = 'SELECT maltPPG FROM malt WHERE maltName="' . $row_log[$key] . '"';
|
||||
$grainsPPG[$i] = mysql_query($query, $brewing) or die(mysql_error());
|
||||
$key = "brewGrain" . ($i + 1) . "Weight";
|
||||
$grainsWeight[$i] = $row_log[$key];
|
||||
}
|
||||
|
||||
/*
|
||||
echo $gravity."<br>";
|
||||
echo $wort."<br>";
|
||||
echo $grain1." ".$grain1amt."<br>";
|
||||
echo $grain2." ".$grain2amt."<br>";
|
||||
echo $grain3." ".$grain3amt."<br>";
|
||||
echo $grain4." ".$grain4amt."<br>";
|
||||
echo $grain5." ".$grain5amt."<br>";
|
||||
echo $grain6." ".$grain6amt."<br>";
|
||||
echo $grain7." ".$grain7amt."<br>";
|
||||
echo $grain8." ".$grain8amt."<br>";
|
||||
echo $grain9." ".$grain9amt."<br>";;
|
||||
*/
|
||||
|
||||
$ogconvert = ($gravity - 1) * 1000;
|
||||
$ppg = ($ogconvert * $wort) / $grain;
|
||||
switch ($units) {
|
||||
case "gallons":
|
||||
$ppg_display = $ppg;
|
||||
break;
|
||||
case "liters":
|
||||
$ppg_display = ($ppg / 10);
|
||||
break;
|
||||
}
|
||||
|
||||
// Calculate Efficiency
|
||||
$efficiency_sum = 0;
|
||||
switch ($units) {
|
||||
case "gallons":
|
||||
for ($i = 0; $i < MAX_GRAINS; $i++) {
|
||||
$efficiency_sum += ($grainsPPG[$i] * $grainsWeight[$i]) / $wort;
|
||||
}
|
||||
/*
|
||||
$grain1calc = ($grain1 * $grain1amt)/$wort;
|
||||
$grain15calc = ($grain15 * $grain15amt)/$wort;
|
||||
*/
|
||||
break;
|
||||
case "liters":
|
||||
for ($i = 0; $i < MAX_GRAINS; $i++) {
|
||||
$efficiency_sum += ($grainsPPG[$i] * ($grainsWeight[$i] * 2.202)) / ($wort * .264);
|
||||
}
|
||||
/*
|
||||
$grain1calc = ($grain1 * ($grain1amt * 2.202))/($wort * .264);
|
||||
$grain15calc = ($grain15 * ($grain15amt * 2.202))/($wort * .264);
|
||||
*/
|
||||
break;
|
||||
}
|
||||
|
||||
/*
|
||||
$efficiency_sum = (
|
||||
$grain1calc +
|
||||
$grain2calc +
|
||||
$grain3calc +
|
||||
$grain4calc +
|
||||
$grain5calc +
|
||||
$grain6calc +
|
||||
$grain7calc +
|
||||
$grain8calc +
|
||||
$grain9calc +
|
||||
$grain10calc +
|
||||
$grain11calc +
|
||||
$grain12calc +
|
||||
$grain13calc +
|
||||
$grain14calc +
|
||||
$grain15calc
|
||||
);
|
||||
*/
|
||||
|
||||
if (($efficiency_sum != 0) && ($gravity != "")) {
|
||||
$efficiency = ($ogconvert / $efficiency_sum) * 100;
|
||||
}
|
||||
|
||||
/*
|
||||
echo $ogconvert."<br>";
|
||||
echo $efficiency_sum."<br>";
|
||||
echo $efficiency;
|
||||
*/
|
||||
?>
|
||||
|
||||
@@ -94,6 +94,74 @@ function calc_bugu($bitterness,$og) {
|
||||
return $calc;
|
||||
}
|
||||
|
||||
function calc_ppg($gravity,$wort,$grain,$units) {
|
||||
$ppg = (($gravity - 1) * 1000 * $wort) / $grain;
|
||||
switch ($units) {
|
||||
case "gallons":
|
||||
$ppg = $ppg;
|
||||
break;
|
||||
case "liters":
|
||||
$ppg = ($ppg / 10);
|
||||
break;
|
||||
}
|
||||
$ppg = round($ppg,0);
|
||||
return $ppg;
|
||||
}
|
||||
|
||||
function calc_efficiency($gravity,$wort,$grain,$units,$log_id) {
|
||||
include(CONFIG.'config.php');
|
||||
include(ADMIN_INCLUDES.'constants.inc.php');
|
||||
|
||||
$query_log = sprintf("SELECT * FROM brewing WHERE id='%s'",$log_id);
|
||||
$log = mysql_query($query_log, $brewing) or die(mysql_error());
|
||||
$row_log = mysql_fetch_assoc($log);
|
||||
|
||||
$grainsPPG = array();
|
||||
|
||||
$efficiency_sum = 0;
|
||||
switch ($units) {
|
||||
case "gallons":
|
||||
for ($i = 0; $i < MAX_GRAINS; $i++) {
|
||||
$key = "brewGrain" . ($i + 1);
|
||||
$query = 'SELECT maltPPG FROM malt WHERE maltName="' . $row_log[$key] . '"';
|
||||
$grainsPPG[$i] = mysql_query($query, $brewing) or die(mysql_error());
|
||||
$row_grainsPPG[$i]= mysql_fetch_assoc($grainsPPG[$i]);
|
||||
$key = "brewGrain" . ($i + 1) . "Weight";
|
||||
$grainsWeight[$i] = $row_log[$key];
|
||||
if ($grainsWeight[$i] > 0) {
|
||||
$ppg = array_sum($row_grainsPPG[$i]);
|
||||
$efficiency_sum = ($ppg * $grainsWeight[$i]) / $wort;
|
||||
$efficiency[] = $efficiency_sum;
|
||||
}
|
||||
}
|
||||
break;
|
||||
case "liters":
|
||||
for ($i = 0; $i < MAX_GRAINS; $i++) {
|
||||
$key = "brewGrain" . ($i + 1);
|
||||
$query = 'SELECT maltPPG FROM malt WHERE maltName="' . $row_log[$key] . '"';
|
||||
$grainsPPG[$i] = mysql_query($query, $brewing) or die(mysql_error());
|
||||
$row_grainsPPG[$i]= mysql_fetch_assoc($grainsPPG[$i]);
|
||||
$key = "brewGrain" . ($i + 1) . "Weight";
|
||||
$grainsWeight[$i] = $row_log[$key];
|
||||
if ($grainsWeight[$i] > 0) {
|
||||
$ppg = array_sum($row_grainsPPG[$i]);
|
||||
$efficiency_sum = ($ppg * ($grainsWeight[$i] * 2.202)) / ($wort * .264);
|
||||
$efficiency[] = $efficiency_sum;
|
||||
}
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
$efficiency_sum = array_sum($efficiency);
|
||||
|
||||
if (($efficiency_sum != 0) && ($gravity != "")) {
|
||||
$efficiency = round(((($gravity - 1) * 1000) / $efficiency_sum * 100),1)."%";
|
||||
}
|
||||
else $efficiency = '';
|
||||
|
||||
return $efficiency;
|
||||
}
|
||||
|
||||
// ---------------------------- Date Conversion -----------------------------------------
|
||||
// http://www.phpbuilder.com/annotate/message.php3?id=1031006
|
||||
function dateconvert($date,$func) {
|
||||
|
||||
@@ -1,7 +1,3 @@
|
||||
<?php
|
||||
if (($row_log['brewPreBoilAmt'] != "") && ($row_log['brewMashGravity'] !="") && (($page == "brewBlogCurrent") || ($page == "brewBlogDetail"))) { include (INCLUDES.'efficiency.inc.php'); }
|
||||
if (($row_log['brewPreBoilAmt'] != "") && ($row_log['brewMashGravity'] !="") && ($page == "logPrint")) { include (INCLUDES.'efficiency.inc.php'); } ?>
|
||||
|
||||
<?php if (($row_pref['mashDisplayMethod'] == "1") && ($row_log['brewMashProfile'] != "")) { // Use mash profiles DB ?>
|
||||
<div class="headerContent">Mash Profile</div>
|
||||
<div class="data-container">
|
||||
@@ -21,9 +17,9 @@ if (($row_log['brewPreBoilAmt'] != "") && ($row_log['brewMashGravity'] !="") &&
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="dataLabelLeft"><?php if (($row_log['brewMashGravity'] != "" ) && ($row_log['brewPreBoilAmt'] != "") && ($row_log['brewGrain1'] != "")) { if ($row_pref['measFluid2'] == "liters") echo "PPK:"; else echo "PPG:"; } elseif ($row_log['brewPPG'] != "") { if ($row_pref['measFluid2'] == "liters") echo "PPK:"; else echo "PPG:"; } else echo ""; ?></td>
|
||||
<td class="data"><?php if (($row_log['brewMashGravity'] != "" ) && ($row_log['brewPreBoilAmt'] != "") && ($row_log['brewGrain1'] != "")) echo round ($ppg_display, 1); ?></td>
|
||||
<td class="data"><?php if (($row_log['brewMashGravity'] != "" ) && ($row_log['brewPreBoilAmt'] != "") && ($row_log['brewGrain1'] != "")) echo calc_ppg($row_log['brewMashGravity'],$row_log['brewPreBoilAmt'],$totalGrain,$row_pref['measFluid2']); ?></td>
|
||||
<td class="dataLabel data"><?php if (($row_log['brewMashGravity'] != "" ) && ($row_log['brewPreBoilAmt'] != "") && ($row_log['brewGrain1'] != "")) echo "Efficiency:"; elseif ($row_log['brewEfficiency'] != "") echo "Efficiency:"; else echo ""; ?></td>
|
||||
<td class="data"><?php if (($row_log['brewMashGravity'] != "" ) && ($row_log['brewPreBoilAmt'] != "") && ($row_log['brewGrain1'] != "")) echo round ($efficiency, 1)."%"; ?></td>
|
||||
<td class="data"><?php if (($row_log['brewMashGravity'] != "" ) && ($row_log['brewPreBoilAmt'] != "") && ($row_log['brewGrain1'] != "")) echo calc_efficiency($row_log['brewMashGravity'],$row_log['brewPreBoilAmt'],$totalGrain,$row_pref['measFluid2'],$row_log['id']); ?></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="dataLabelLeft">Notes:</td>
|
||||
|
||||
Reference in New Issue
Block a user