salfter/brewblogger
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added a 'hopPelletFactor' field to the 'preferences' table.

Browse Source 
Added ability for admin to set the hopPelletFactor in the Preferences form.
Added sanity checking to the new field.
The bitterness library pulls the pelletFactor value from the preferences
table now.
This commit is contained in:
Kevin Masaryk
2010-07-23 22:34:02 +00:00
parent 6b2d853614
commit 20cd4c88e3
8 changed files with 196 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
admin/admin_sections/add-edit/preferences.add-edit.php
View File

@@ -11,6 +11,7 @@
<td class="data"><span class="data_icon"><img src="<?php echo $imageSrc; ?>add.png" border="0" align="absbottom" alt="Add Themes?" title="Add Themes?"></span><span class="data"><a href="index.php?action=add&dbTable=brewingcss">Add Themes?</a></span></td>
</tr>
</table>
<div id="headerContentAdmin">Edition</div>
<table class="dataTable">
<tr>
@@ -22,6 +23,7 @@
</td>
</tr>
</table>
<div id="headerContentAdmin">Home Page</div>
<table class="dataTable">
<tr>
@@ -41,6 +43,7 @@
<td class="data">* Be sure to choose your edition and click "Edit" BEFORE choosing your home page.</td>
</tr>
</table>
<div id="headerContentAdmin">General</div>
<table>
<tr>
@@ -121,7 +124,13 @@
</select> </td>
<td class="data">IBU is the more recognized standard.</td>
</tr>
<tr>
<td class="dataLabelLeft">Pellet Factor:</td>
<td class="data"><input name="pelletFactor" type="text" value="<?php echo $row_log['hopPelletFactor']; ?>" size="5" /></td>
<td class="data">Represents increased utilization vs. whole or plug hops. A value of 1.06 is recommended as this reflects a 6% increase over whole hops.</td>
</tr>
</table>
<div id="headerContentAdmin">Water and Mash Profiles</div>
<table>
<tr>
@@ -141,6 +150,7 @@
<td class="data">"Yes" indicates that you would like to use BrewBlogger's mash profiles database. You can add your own mash profiles to the database and reuse any one for a BrewBlog.</td>
</tr>
</table>
<div id="headerContentAdmin">Menu Link Text</div>
<table>
<tr>

2
admin/admin_sections/add.admin.php
View File

@@ -71,7 +71,7 @@ elseif (($dbTable == "recipes") && ($action == "importRecipe")) echo "<a href=\"
else echo $breadcrumb;
?>
</div>
<form action="process.php?<?php echo "action=".$action."&dbTable=".$dbTable; if ($action == "edit") echo "&id=".$id; if (($dbTable == "users") && ($action == "edit")) echo "&filter=".$row_log['user_name']."&section=".$section; if (($dbTable == "awards") && ($action == "add")) echo "&assoc=".$assoc; ?>" method="POST" name="form1" <?php if ($dbTable != "preferences") echo "onSubmit=\"return CheckRequiredFields()\""; ?>>
<form action="process.php?<?php echo "action=".$action."&dbTable=".$dbTable; if ($action == "edit") echo "&id=".$id; if (($dbTable == "users") && ($action == "edit")) echo "&filter=".$row_log['user_name']."&section=".$section; if (($dbTable == "awards") && ($action == "add")) echo "&assoc=".$assoc; ?>" method="POST" name="form1" onSubmit="return CheckRequiredFields()">
<table class="dataTable">
<tr>
<td>

163
admin/includes/formCheck.inc.php
View File

@@ -1,4 +1,3 @@
<?php if ($dbTable != "preferences") { ?>
<script type="text/javascript" language="JavaScript">
<!-- Copyright 2003 Bontrager Connection, LLC
// Code obtained from http://WillMaster.com/
@@ -15,8 +14,7 @@ if(errormessage.length > 2) {
}
return true;
} // end of function CheckRequiredFields()
<?php } ?>
<?php if (($dbTable == "users") && ($action == "add")) { ?>
<?php } elseif (($dbTable == "users") && ($action == "add")) { ?>
function CheckRequiredFields() {
var errormessage = new String();
// Put field checks below this point.
@@ -35,8 +33,7 @@ if(errormessage.length > 2) {
}
return true;
} // end of function CheckRequiredFields()
<?php } ?>
<?php if (($dbTable == "users") && ($action == "edit")) { ?>
<?php } elseif (($dbTable == "users") && ($action == "edit")) { ?>
function CheckRequiredFields() {
var errormessage = new String();
// Put field checks below this point.
@@ -51,8 +48,7 @@ if(errormessage.length > 2) {
}
return true;
} // end of function CheckRequiredFields()
<?php } ?>
<?php if (($dbTable == "brewer") && ($row_pref['mode'] == "1")) { ?>
<?php } elseif (($dbTable == "brewer") && ($row_pref['mode'] == "1")) { ?>
function CheckRequiredFields() {
var errormessage = new String();
// Put field checks below this point.
@@ -67,8 +63,7 @@ if(errormessage.length > 2) {
}
return true;
} // end of function CheckRequiredFields()
<?php } ?>
<?php if (($dbTable == "brewer") && ($row_pref['mode'] == "2")) { ?>
<?php } elseif (($dbTable == "brewer") && ($row_pref['mode'] == "2")) { ?>
function CheckRequiredFields() {
var errormessage = new String();
// Put field checks below this point.
@@ -83,8 +78,7 @@ if(errormessage.length > 2) {
}
return true;
} // end of function CheckRequiredFields()
<?php } ?>
<?php if ($dbTable == "malt") { ?>
<?php } elseif ($dbTable == "malt") { ?>
function CheckRequiredFields() {
var errormessage = new String();
// Put field checks below this point.
@@ -101,8 +95,7 @@ if(errormessage.length > 2) {
}
return true;
} // end of function CheckRequiredFields()
<?php } ?>
<?php if ($dbTable == "extract") { ?>
<?php } elseif ($dbTable == "extract") { ?>
function CheckRequiredFields() {
var errormessage = new String();
// Put field checks below this point.
@@ -119,8 +112,7 @@ if(errormessage.length > 2) {
}
return true;
} // end of function CheckRequiredFields()
<?php } ?>
<?php if ($dbTable == "adjuncts") { ?>
<?php } elseif ($dbTable == "adjuncts") { ?>
function CheckRequiredFields() {
var errormessage = new String();
// Put field checks below this point.
@@ -137,8 +129,7 @@ if(errormessage.length > 2) {
}
return true;
} // end of function CheckRequiredFields()
<?php } ?>
<?php if ($dbTable == "hops") { ?>
<?php } elseif ($dbTable == "hops") { ?>
function CheckRequiredFields() {
var errormessage = new String();
// Put field checks below this point.
@@ -159,9 +150,7 @@ if(errormessage.length > 2) {
}
return true;
} // end of function CheckRequiredFields()
<?php } ?>
<?php if ($dbTable == "misc") { ?>
<?php } elseif ($dbTable == "misc") { ?>
function CheckRequiredFields() {
var errormessage = new String();
// Put field checks below this point.
@@ -174,9 +163,7 @@ if(errormessage.length > 2) {
}
return true;
} // end of function CheckRequiredFields()
<?php } ?>
<?php if ($dbTable == "equip_profiles") { ?>
<?php } elseif ($dbTable == "equip_profiles") { ?>
function CheckRequiredFields() {
var errormessage = new String();
// Put field checks below this point.
@@ -189,9 +176,7 @@ if(errormessage.length > 2) {
}
return true;
} // end of function CheckRequiredFields()
<?php } ?>
<?php if ($dbTable == "water_profiles") { ?>
<?php } elseif ($dbTable == "water_profiles") { ?>
function CheckRequiredFields() {
var errormessage = new String();
// Put field checks below this point.
@@ -204,9 +189,7 @@ if(errormessage.length > 2) {
}
return true;
} // end of function CheckRequiredFields()
<?php } ?>
<?php if ($dbTable == "yeast_profiles") { ?>
<?php } elseif ($dbTable == "yeast_profiles") { ?>
/* function CheckRequiredFields() {
var errormessage = new String();
// Put field checks below this point.
@@ -224,9 +207,7 @@ if(errormessage.length > 2) {
return true;
} // end of function CheckRequiredFields()
*/
<?php } ?>
<?php if ($dbTable == "brewerlinks") { ?>
<?php } elseif ($dbTable == "brewerlinks") { ?>
function CheckRequiredFields() {
var errormessage = new String();
// Put field checks below this point.
@@ -241,8 +222,7 @@ if(errormessage.length > 2) {
}
return true;
} // end of function CheckRequiredFields()
<?php } ?>
<?php if ($dbTable == "upcoming") { ?>
<?php } elseif ($dbTable == "upcoming") { ?>
function CheckRequiredFields() {
var errormessage = new String();
// Put field checks below this point.
@@ -259,8 +239,7 @@ if(errormessage.length > 2) {
}
return true;
} // end of function CheckRequiredFields()
<?php } ?>
<?php if ($dbTable == "styles") { ?>
<?php } elseif ($dbTable == "styles") { ?>
function CheckRequiredFields() {
var errormessage = new String();
// Put field checks below this point.
@@ -297,32 +276,21 @@ if(errormessage.length > 2) {
}
return true;
} // end of function CheckRequiredFields()
<?php } ?>
<?php if ($page == "reviews") { ?>
function CheckRequiredFields() {
var errormessage = new String();
// Put field checks below this point.
if(WithoutContent(document.form1.brewScoredBy.value))
{ errormessage += "\nScored By"; }
if(WithoutContent(document.form1.brewAromaScore.value))
{ errormessage += "\nAroma Score"; }
if(WithoutContent(document.form1.brewAppearanceScore.value))
{ errormessage += "\nAppearance Score"; }
if(WithoutContent(document.form1.brewFlavorScore.value))
{ errormessage += "\nFlavor Score"; }
if(WithoutContent(document.form1.brewMouthfeelScore.value))
{ errormessage += "\nMouthfeel Score"; }
if(WithoutContent(document.form1.brewOverallScore.value))
{ errormessage += "\nOverall Score"; }
// Put field checks above this point.
if(errormessage.length > 2) {
alert('To process, the following fields cannot be empty:\n' + errormessage);
return false;
}
return true;
} // end of function CheckRequiredFields()
<?php } ?>
<?php if ($dbTable == "brewingcss") { ?>
<?php } elseif (($dbTable == "reviews") || ($page == "reviews")) { ?>
function CheckRequiredFields() {
var errormessage = new String();
// Put field checks below this point.
if(WithoutContent(document.form1.brewScoredBy.value))
{ errormessage += "\nScored By"; }
// Should probably check brew score date too.
// Put field checks above this point.
if(errormessage.length > 2) {
alert('To process, the following fields cannot be empty:\n' + errormessage);
return false;
}
return true;
} // end of function CheckRequiredFields()
<?php } elseif ($dbTable == "brewingcss") { ?>
function CheckRequiredFields() {
var errormessage = new String();
// Put field checks below this point.
@@ -341,8 +309,23 @@ if(errormessage.length > 2) {
}
return true;
} // end of function CheckRequiredFields()
<?php } ?>
<?php if (($action == "calculate") && ($results != "verify")) { ?>
<?php } elseif ($dbTable == "preferences") { ?>
function CheckRequiredFields() {
var errormessage = new String();
if ((WithoutContent(document.form1.pelletFactor.value)) || (NotFloat(document.form1.pelletFactor.value))) {
errormessage = "The Pellet Factor field requires a numerical value";
}
if (TooLong(document.form1.pelletFactor.value, 6)) {
errormessage = "Please limit the Pellet Factor value to 5 digits or less.";
}
if (errormessage.length > 2) {
alert(errormessage);
return false;
}
return true;
}
// Hard to tell who's calling this next one.
<?php } elseif (($action == "calculate") && ($results != "verify")) { ?>
function CheckRequiredFields() {
var errormessage = new String();
// Put field checks below this point.
@@ -358,38 +341,52 @@ return true;
<?php } ?>
function WithoutContent(ss) {
if(ss.length > 0) { return false; }
return true;
if(ss.length > 0) { return false; }
return true;
}
function NoneWithContent(ss) {
for(var i = 0; i < ss.length; i++) {
if(ss[i].value.length > 0) { return false; }
}
return true;
for(var i = 0; i < ss.length; i++) {
if(ss[i].value.length > 0) { return false; }
}
return true;
}
function NoneWithCheck(ss) {
for(var i = 0; i < ss.length; i++) {
if(ss[i].checked) { return false; }
}
return true;
for(var i = 0; i < ss.length; i++) {
if(ss[i].checked) { return false; }
}
return true;
}
function WithoutCheck(ss) {
if(ss.checked) { return false; }
return true;
if(ss.checked) { return false; }
return true;
}
function WithoutSelectionValue(ss) {
for(var i = 0; i < ss.length; i++) {
if(ss[i].selected) {
if(ss[i].value.length) { return false; }
}
}
return true;
for(var i = 0; i < ss.length; i++) {
if(ss[i].selected) {
if(ss[i].value.length) { return false; }
}
}
return true;
}
function NotFloat(x) {
if (!isNaN(parseFloat(x))) { return false; }
return true;
}
function TooLong(x, maxLength) {
if (x.length <= maxLength) { return false; }
return true;
}
//-->
</script>
<?php } ?>

3
admin/lib/bitterness.lib.php
View File

@@ -19,9 +19,8 @@
// Most modern data I've seen supports this range. The 15%
// delta value is a left-over from the old days and appears to
// have been based on speculation at that time.
// Anyways, this really should be a user var they can set in their prefs.
// - Kevin
$pelletFactor = 1.06;
$pelletFactor = $row_pref['hopPelletFactor'];
// --------------------------- Tinseth Method --------------------------- //
// Reference: Tinseth, Glenn. www.realbeer.com/hops, 1995-1999.

55
admin/process.php
View File

@@ -12,7 +12,10 @@ function GetSQLValueString($theValue, $theType, $theDefinedValue = "", $theNotDe
switch ($theType) {
case "text":
$theValue = ($theValue != "") ? "'" . $theValue . "'" : "NULL";
break;
break;
case "float":
$theValue = ($theValue != "") ? floatval($theValue) : "NULL";
break;
case "long":
case "int":
$theValue = ($theValue != "") ? intval($theValue) : "NULL";
@@ -2590,13 +2593,14 @@ if (($action == "edit") && ($dbTable == "preferences")) {
menuLogout=%s,
menuMembers=%s,
mashDisplayMethod=%s,
waterDisplayMethod=%s
waterDisplayMethod=%s,
hopPelletFactor=%f
WHERE $dbTable.id='%s'",
GetSQLValueString($_POST['measFluid1'], "text"),
GetSQLValueString($_POST['measFluid2'], "text"),
GetSQLValueString($_POST['measWeight1'], "text"),
GetSQLValueString($_POST['measWeight2'], "text"),
GetSQLValueString($_POST['measWaterGrainRatio'], "text"),
GetSQLValueString($_POST['measWaterGrainRatio'], "text"),
GetSQLValueString($_POST['measTemp'], "text"),
GetSQLValueString($_POST['measColor'], "text"),
GetSQLValueString($_POST['measBitter'], "text"),
@@ -2616,28 +2620,29 @@ if (($action == "edit") && ($dbTable == "preferences")) {
GetSQLValueString($_POST['allowFermentation'], "text"),
GetSQLValueString($_POST['allowLabel'], "text"),
GetSQLValueString($_POST['allowRelated'], "text"),
GetSQLValueString($_POST['allowStatus'], "text"),
GetSQLValueString($_POST['allowUpcoming'], "text"),
GetSQLValueString($_POST['allowAwards'], "text"),
GetSQLValueString($_POST['allowCalendar'], "text"),
GetSQLValueString($_POST['allowNews'], "text"),
GetSQLValueString($_POST['allowProfile'], "text"),
GetSQLValueString($_POST['theme'], "text"),
GetSQLValueString($_POST['mode'], "text"),
GetSQLValueString($_POST['home'], "text"),
GetSQLValueString($_POST['menuHome'], "scrubbed"),
GetSQLValueString($_POST['menuBrewBlogs'], "scrubbed"),
GetSQLValueString($_POST['menuRecipes'], "scrubbed"),
GetSQLValueString($_POST['menuAwards'], "scrubbed"),
GetSQLValueString($_POST['menuAbout'], "scrubbed"),
GetSQLValueString($_POST['menuReference'], "scrubbed"),
GetSQLValueString($_POST['menuCalculators'], "scrubbed"),
GetSQLValueString($_POST['menuCalendar'], "scrubbed"),
GetSQLValueString($_POST['menuLogin'], "scrubbed"),
GetSQLValueString($_POST['menuLogout'], "scrubbed"),
GetSQLValueString($_POST['menuMembers'], "scrubbed"),
GetSQLValueString($_POST['mashDisplayMethod'], "text"),
GetSQLValueString($_POST['waterDisplayMethod'], "text"),
GetSQLValueString($_POST['allowStatus'], "text"),
GetSQLValueString($_POST['allowUpcoming'], "text"),
GetSQLValueString($_POST['allowAwards'], "text"),
GetSQLValueString($_POST['allowCalendar'], "text"),
GetSQLValueString($_POST['allowNews'], "text"),
GetSQLValueString($_POST['allowProfile'], "text"),
GetSQLValueString($_POST['theme'], "text"),
GetSQLValueString($_POST['mode'], "text"),
GetSQLValueString($_POST['home'], "text"),
GetSQLValueString($_POST['menuHome'], "scrubbed"),
GetSQLValueString($_POST['menuBrewBlogs'], "scrubbed"),
GetSQLValueString($_POST['menuRecipes'], "scrubbed"),
GetSQLValueString($_POST['menuAwards'], "scrubbed"),
GetSQLValueString($_POST['menuAbout'], "scrubbed"),
GetSQLValueString($_POST['menuReference'], "scrubbed"),
GetSQLValueString($_POST['menuCalculators'], "scrubbed"),
GetSQLValueString($_POST['menuCalendar'], "scrubbed"),
GetSQLValueString($_POST['menuLogin'], "scrubbed"),
GetSQLValueString($_POST['menuLogout'], "scrubbed"),
GetSQLValueString($_POST['menuMembers'], "scrubbed"),
GetSQLValueString($_POST['mashDisplayMethod'], "text"),
GetSQLValueString($_POST['waterDisplayMethod'], "text"),
GetSQLValueString($_POST['pelletFactor'], "float"),
GetSQLValueString($id, "int"));
mysql_select_db($database_brewing, $brewing);

144
sections/add_review.inc.php
View File

@@ -111,21 +111,20 @@ include ('../includes/plug-ins.inc.php');
</tr>
<tr>
<td class="dataLabelLeft">Scorer Is:</td>
<td colspan="2" class="data">
<select class="text_area" name="brewScorerLevel">
<option value="The Brewer" <?php if (!(strcmp("The Brewer", $row_log['brewScorerLevel']))) {echo "SELECTED";} ?>>The Brewer</option>
<option value="Friend" <?php if (!(strcmp("Friend", $row_log['brewScorerLevel']))) {echo "SELECTED";} ?>>Friend</option>
<option value="Relative" <?php if (!(strcmp("Relative", $row_log['brewScorerLevel']))) {echo "SELECTED";} ?>>Relative</option>
<option value="Professional Brewer" <?php if (!(strcmp("Professional Brewer", $row_log['brewScorerLevel']))) {echo "SELECTED";} ?>>Professional Brewer</option>
<option value="Experienced Judge [non-BJCP]" <?php if (!(strcmp("Experienced Judge [non-BJCP]", $row_log['brewScorerLevel']))) {echo "SELECTED";} ?>>Experienced Judge [non-BJCP]</option>
<option value="BJCP Apprentice Judge" <?php if (!(strcmp("BJCP Apprentice Judge", $row_log['brewScorerLevel']))) {echo "SELECTED";} ?>>BJCP Apprentice Judge</option>
<option value="BJCP Recognized Judge" <?php if (!(strcmp("BJCP Recognized Judge", $row_log['brewScorerLevel']))) {echo "SELECTED";} ?>>BJCP Recognized Judge</option>
<option value="BJCP Certified Judge" <?php if (!(strcmp("BJCP Certified Judge", $row_log['brewScorerLevel']))) {echo "SELECTED";} ?>>BJCP Certified Judge</option>
<option value="BJCP National Judge" <?php if (!(strcmp("BJCP National Judge", $row_log['brewScorerLevel']))) {echo "SELECTED";} ?>>BJCP National Judge</option>
<option value="BJCP Grand Master Judge" <?php if (!(strcmp("BJCP Grand Master Judge", $row_log['brewScorerLevel']))) {echo "SELECTED";} ?>>BJCP Grand Master Judge</option>
<option value="BJCP Honarary Master Judge" <?php if (!(strcmp("BJCP Honarary Master Judge", $row_log['brewScorerLevel']))) {echo "SELECTED";} ?>>BJCP Honarary Master Judge</option>
<option value="BJCP Honarary Grand Master Judge" <?php if (!(strcmp("BJCP Honarary Grand Master Judge", $row_log['brewScorerLevel']))) {echo "SELECTED";} ?>>BJCP Honarary Grand Master Judge</option>
</select>
<td colspan="2" class="data"><select class="text_area" name="brewScorerLevel">
<option value="The Brewer" <?php if (!(strcmp("The Brewer", $row_log['brewScorerLevel']))) {echo "SELECTED";} ?>>The Brewer</option>
<option value="Friend" <?php if (!(strcmp("Friend", $row_log['brewScorerLevel']))) {echo "SELECTED";} ?>>Friend</option>
<option value="Relative" <?php if (!(strcmp("Relative", $row_log['brewScorerLevel']))) {echo "SELECTED";} ?>>Relative</option>
<option value="Professional Brewer" <?php if (!(strcmp("Professional Brewer", $row_log['brewScorerLevel']))) {echo "SELECTED";} ?>>Professional Brewer</option>
<option value="Experienced Judge [non-BJCP]" <?php if (!(strcmp("Experienced Judge [non-BJCP]", $row_log['brewScorerLevel']))) {echo "SELECTED";} ?>>Experienced Judge [non-BJCP]</option>
<option value="BJCP Apprentice Judge" <?php if (!(strcmp("BJCP Apprentice Judge", $row_log['brewScorerLevel']))) {echo "SELECTED";} ?>>BJCP Apprentice Judge</option>
<option value="BJCP Recognized Judge" <?php if (!(strcmp("BJCP Recognized Judge", $row_log['brewScorerLevel']))) {echo "SELECTED";} ?>>BJCP Recognized Judge</option>
<option value="BJCP Certified Judge" <?php if (!(strcmp("BJCP Certified Judge", $row_log['brewScorerLevel']))) {echo "SELECTED";} ?>>BJCP Certified Judge</option>
<option value="BJCP National Judge" <?php if (!(strcmp("BJCP National Judge", $row_log['brewScorerLevel']))) {echo "SELECTED";} ?>>BJCP National Judge</option>
<option value="BJCP Grand Master Judge" <?php if (!(strcmp("BJCP Grand Master Judge", $row_log['brewScorerLevel']))) {echo "SELECTED";} ?>>BJCP Grand Master Judge</option>
<option value="BJCP Honarary Master Judge" <?php if (!(strcmp("BJCP Honarary Master Judge", $row_log['brewScorerLevel']))) {echo "SELECTED";} ?>>BJCP Honarary Master Judge</option>
<option value="BJCP Honarary Grand Master Judge" <?php if (!(strcmp("BJCP Honarary Grand Master Judge", $row_log['brewScorerLevel']))) {echo "SELECTED";} ?>>BJCP Honarary Grand Master Judge</option>
</select>
</td>
</tr>
<?php if (((isset($_SESSION["loginUsername"])) && ($row_log['brewBrewerID'] == $loginUsername))) { ?>
@@ -137,20 +136,19 @@ include ('../includes/plug-ins.inc.php');
<tr class="bknd_ultra_lt">
<td class="dataLabelLeft">Aroma Score:</td>
<td colspan="2" class="data"><select class="text_area" name="brewAromaScore">
<option></option>
<option value="1">1</option>
<option value="2">2</option>
<option value="3">3</option>
<option value="4">4</option>
<option value="5">5</option>
<option value="6">6</option>
<option value="7">7</option>
<option value="8">8</option>
<option value="9">9</option>
<option value="10">10</option>
<option value="11">11</option>
<option value="12">12</option>
</select>&nbsp;/ 12 </td>
<option value="1">1</option>
<option value="2">2</option>
<option value="3">3</option>
<option value="4">4</option>
<option value="5">5</option>
<option value="6">6</option>
<option value="7">7</option>
<option value="8">8</option>
<option value="9">9</option>
<option value="10">10</option>
<option value="11">11</option>
<option value="12">12</option>
</select>&nbsp;/ 12 </td>
</tr>
<tr class="bknd_ultra_lt">
@@ -162,11 +160,10 @@ include ('../includes/plug-ins.inc.php');
<tr>
<td class="dataLabelLeft">Appearance Score:</td>
<td colspan="2" class="data"><select class="text_area" name="brewAppearanceScore">
<option></option>
<option value="1">1</option>
<option value="2">2</option>
<option value="3">3</option>
</select>&nbsp;/ 3 </td>
<option value="1">1</option>
<option value="2">2</option>
<option value="3">3</option>
</select>&nbsp;/ 3 </td>
</tr>
<tr>
@@ -178,28 +175,27 @@ include ('../includes/plug-ins.inc.php');
<tr class="bknd_ultra_lt">
<td class="dataLabelLeft">Flavor Score:</td>
<td colspan="2" class="data"><select class="text_area" name="brewFlavorScore">
<option></option>
<option value="1">1</option>
<option value="2">2</option>
<option value="3">3</option>
<option value="4">4</option>
<option value="5">5</option>
<option value="6">6</option>
<option value="7">7</option>
<option value="8">8</option>
<option value="9">9</option>
<option value="10">10</option>
<option value="11">11</option>
<option value="12">12</option>
<option value="13">13</option>
<option value="14">14</option>
<option value="15">15</option>
<option value="16">16</option>
<option value="17">17</option>
<option value="18">18</option>
<option value="19">19</option>
<option value="20">20</option>
</select>&nbsp;/ 20 </td>
<option value="1">1</option>
<option value="2">2</option>
<option value="3">3</option>
<option value="4">4</option>
<option value="5">5</option>
<option value="6">6</option>
<option value="7">7</option>
<option value="8">8</option>
<option value="9">9</option>
<option value="10">10</option>
<option value="11">11</option>
<option value="12">12</option>
<option value="13">13</option>
<option value="14">14</option>
<option value="15">15</option>
<option value="16">16</option>
<option value="17">17</option>
<option value="18">18</option>
<option value="19">19</option>
<option value="20">20</option>
</select>&nbsp;/ 20</td>
</tr>
<tr class="bknd_ultra_lt">
<td class="dataLabelLeft">Flavor Comments:</td>
@@ -210,13 +206,12 @@ include ('../includes/plug-ins.inc.php');
<tr>
<td class="dataLabelLeft">Mouthfeel Score:</td>
<td colspan="2" class="data"><select class="text_area" name="brewMouthfeelScore">
<option></option>
<option value="1">1</option>
<option value="2">2</option>
<option value="3">3</option>
<option value="4">4</option>
<option value="5">5</option>
</select>&nbsp;/ 5 </td>
<option value="1">1</option>
<option value="2">2</option>
<option value="3">3</option>
<option value="4">4</option>
<option value="5">5</option>
</select>&nbsp;/ 5</td>
</tr>
<tr>
@@ -228,18 +223,17 @@ include ('../includes/plug-ins.inc.php');
<tr class="bknd_ultra_lt">
<td class="dataLabelLeft">Overall Impression:</td>
<td colspan="2" class="data"><select class="text_area" name="brewOverallScore">
<option></option>
<option value="1">1</option>
<option value="2">2</option>
<option value="3">3</option>
<option value="4">4</option>
<option value="5">5</option>
<option value="6">6</option>
<option value="7">7</option>
<option value="8">8</option>
<option value="9">9</option>
<option value="10">10</option>
</select>&nbsp;/ 10 </td>
<option value="1">1</option>
<option value="2">2</option>
<option value="3">3</option>
<option value="4">4</option>
<option value="5">5</option>
<option value="6">6</option>
<option value="7">7</option>
<option value="8">8</option>
<option value="9">9</option>
<option value="10">10</option>
</select>&nbsp;/ 10</td>
</tr>
<tr class="bknd_ultra_lt">

2
sql/2.3.2_new_install.sql
View File

@@ -1892,3 +1892,5 @@ ADD `brewHops15Use` varchar(25) NULL AFTER `brewHops15Time`,
ADD `brewHops15Type` varchar(25) NULL AFTER `brewHops15Use`,
ADD `brewHops15Form` varchar(25) NULL AFTER `brewHops15Type`;
ALTER TABLE `preferences`
ADD `hopPelletFactor` FLOAT NOT NULL DEFAULT '1.06' COMMENT 'Pellet factor compared to whole/plug';

3
sql/2.3.2_sql_upgrade.txt
View File

@@ -127,3 +127,6 @@ ADD `brewHops15Time` varchar(25) NULL AFTER `brewHops15IBU`,
ADD `brewHops15Use` varchar(25) NULL AFTER `brewHops15Time`,
ADD `brewHops15Type` varchar(25) NULL AFTER `brewHops15Use`,
ADD `brewHops15Form` varchar(25) NULL AFTER `brewHops15Type`;
ALTER TABLE `preferences`
ADD `hopPelletFactor` FLOAT NOT NULL DEFAULT '1.06' COMMENT 'Pellet factor compared to whole/plug';