From ac0bf922ff81d098b45fea9cd28b2f1047b4402d Mon Sep 17 00:00:00 2001 From: geoffhumphrey <507357@den-e88543m.la.frd.directv.com> Date: Tue, 28 Jun 2016 07:45:11 -0600 Subject: [PATCH] Fix for Issue #632 --- admin/competition_info.admin.php | 2 +- sql/bcoem_baseline_2.1.X.sql | 2 +- templates/bjcp-entry-label-only.html | 8 ++++---- templates/bjcp-entry.html | 8 ++++---- templates/simple-metric-entry-barcode.html | 12 ++++++++++++ templates/simple-metric-entry.html | 12 ++++++++++++ templates/simple-us-entry-barcode.html | 12 ++++++++++++ templates/simple-us-entry.html | 12 ++++++++++++ 8 files changed, 58 insertions(+), 10 deletions(-) diff --git a/admin/competition_info.admin.php b/admin/competition_info.admin.php index 59eaf450..6c99102f 100644 --- a/admin/competition_info.admin.php +++ b/admin/competition_info.admin.php @@ -292,7 +292,7 @@

Each entry will consist of 12 to 22 ounce capped bottles or corked bottles that are void of all identifying information, including labels and embossing. Printed caps are allowed, but must be blacked out completely.

12oz brown glass bottles are preferred; however, green and clear glass will be accepted. Swing top bottles will likewise be accepted as well as corked bottles.

Bottles will not be returned to contest entrants.

-

Completed entry forms and recipe sheets must be submitted with all entries, and can be printed directly from this website. Entry forms should be attached to bottles with a rubber band only; glue and/or tape are unacceptable.

+

Completed entry forms and recipe sheets must be submitted with all entries, and can be printed directly from this website. Entry forms should be attached to bottle labels by the method specified on the bottle label.

Please fill out the entry forms completely. Be meticulous about noting any special ingredients that must be specified. Failure to note such ingredients may impact the judges' scoring of your entry.

Brewers are not limited to one entry in each category but may only enter each subcategory once.

diff --git a/sql/bcoem_baseline_2.1.X.sql b/sql/bcoem_baseline_2.1.X.sql index a35320ec..f5152ddf 100644 --- a/sql/bcoem_baseline_2.1.X.sql +++ b/sql/bcoem_baseline_2.1.X.sql @@ -560,7 +560,7 @@ CREATE TABLE IF NOT EXISTS `baseline_contest_info` ( -- INSERT INTO `baseline_contest_info` (`id`, `contestName`, `contestHost`, `contestHostWebsite`, `contestHostLocation`, `contestRegistrationOpen`, `contestRegistrationDeadline`, `contestEntryOpen`, `contestEntryDeadline`, `contestJudgeOpen`, `contestJudgeDeadline`, `contestRules`, `contestAwardsLocation`, `contestAwardsLocName`, `contestAwardsLocDate`, `contestAwardsLocTime`, `contestShippingOpen`, `contestShippingDeadline`, `contestEntryFee`, `contestEntryFee2`, `contestEntryFeeDiscount`, `contestEntryFeeDiscountNum`, `contestDropoffOpen`, `contestBottles`, `contestShippingAddress`, `contestShippingName`, `contestAwards`, `contestLogo`, `contestBOSAward`, `contestDropoffDeadline`, `contestEntryCap`, `contestEntryFeePassword`, `contestEntryFeePasswordNum`, `contestID`, `contestCircuit`, `contestVolunteers`, `contestCheckInPassword`) VALUES -(1, 'Baseline Data', 'Baseline', 'http://www.brewcompetition.com', 'Denver, CO', '1438322400', '1483253940', '1438322400', '1483253940', '1438322400', '1483253940', '

This competition is AHA sanctioned and open to any amateur homebrewer age 21 or older.

\r\n

All mailed entries must received at the mailing location by the entry deadline - please allow for shipping time.

\r\n

All entries will be picked up from drop-off locations the day of the entry deadline.

\r\n

All entries must be handcrafted products, containing ingredients available to the general public, and made using private equipment by hobbyist brewers (i.e., no use of commercial facilities or Brew on Premises operations, supplies, etc.).

\r\n

The competition organizers are not responsible for mis-categorized entries, mailed entries that are not received by the entry deadline, or entries that arrived damaged.

\r\n

The competition organizers reserve the right to combine styles for judging and to restructure awards as needed depending upon the quantity and quality of entries.

\r\n

Qualified judging of all entries is the primary goal of our event. Judges will evaluate and score each entry. The average of the scores will rank each entry in its category. Each flight will have at least one BJCP judge.

\r\n

Brewers are not limited to one entry in each category but may only enter each subcategory once.

\r\n

The competition committee reserves the right to combine categories based on number of entries. All possible effort will be made to combine similar styles. All brews in combined categories will be judged according to the style they were originally entered in.

\r\n

The Best of Show judging will be determined by a Best of Show panel based on a second judging of the top winners.

\r\n

Bottles will not be returned to entrants.

', '200 E Colfax Ave, Denver, CO 80203', 'Baseline Awards Location', NULL, '1483798980', '1438322400', '1483253940', 8, NULL, 'N', NULL, '1438322400', '

Each entry will consist of 12 to 22 ounce capped bottles or corked bottles that are void of all identifying information, including labels and embossing. Printed caps are allowed, but must be blacked out completely.

\r\n

12oz brown glass bottles are preferred; however, green and clear glass will be accepted. Swing top bottles will likewise be accepted as well as corked bottles.

\r\n

Bottles will not be returned to contest entrants.

\r\n

Completed entry forms and recipe sheets must be submitted with all entries, and can be printed directly from this website. Entry forms should be attached to bottles with a rubber band only; glue and/or tape are unacceptable.

\r\n

Please fill out the entry forms completely. Be meticulous about noting any special ingredients that must be specified. Failure to note such ingredients may impact the judges'' scoring of your entry.

\r\n

Brewers are not limited to one entry in each category but may only enter each subcategory once.

', '200 E Colfax Ave, Denver, CO 80203', 'Shipping Location', '

The awards ceremony will take place once judging is completed.

\r\n

Places will be awarded to 1st, 2nd, and 3rd place in each category/table.

\r\n

The 1st place entry in each category will advance to the Best of Show (BOS) round with a single, overall Best of Show beer selected.

\r\n

Additional prizes may be awarded to those winners present at the awards ceremony at the discretion of the competition organizers.

\r\n

Both score sheets and awards will be available for pick up that night after the ceremony concludes. Awards and score sheets not picked up will be mailed back to participants. Results will be posted to the competition web site after the ceremony concludes.

', NULL, NULL, '1483253940', NULL, NULL, NULL, '000000', NULL, '

Volunteer information coming soon!

', NULL); +(1, 'Baseline Data', 'Baseline', 'http://www.brewcompetition.com', 'Denver, CO', '1438322400', '1483253940', '1438322400', '1483253940', '1438322400', '1483253940', '

This competition is AHA sanctioned and open to any amateur homebrewer age 21 or older.

\r\n

All mailed entries must received at the mailing location by the entry deadline - please allow for shipping time.

\r\n

All entries will be picked up from drop-off locations the day of the entry deadline.

\r\n

All entries must be handcrafted products, containing ingredients available to the general public, and made using private equipment by hobbyist brewers (i.e., no use of commercial facilities or Brew on Premises operations, supplies, etc.).

\r\n

The competition organizers are not responsible for mis-categorized entries, mailed entries that are not received by the entry deadline, or entries that arrived damaged.

\r\n

The competition organizers reserve the right to combine styles for judging and to restructure awards as needed depending upon the quantity and quality of entries.

\r\n

Qualified judging of all entries is the primary goal of our event. Judges will evaluate and score each entry. The average of the scores will rank each entry in its category. Each flight will have at least one BJCP judge.

\r\n

Brewers are not limited to one entry in each category but may only enter each subcategory once.

\r\n

The competition committee reserves the right to combine categories based on number of entries. All possible effort will be made to combine similar styles. All brews in combined categories will be judged according to the style they were originally entered in.

\r\n

The Best of Show judging will be determined by a Best of Show panel based on a second judging of the top winners.

\r\n

Bottles will not be returned to entrants.

', '200 E Colfax Ave, Denver, CO 80203', 'Baseline Awards Location', NULL, '1483798980', '1438322400', '1483253940', 8, NULL, 'N', NULL, '1438322400', '

Each entry will consist of 12 to 22 ounce capped bottles or corked bottles that are void of all identifying information, including labels and embossing. Printed caps are allowed, but must be blacked out completely.

\r\n

12oz brown glass bottles are preferred; however, green and clear glass will be accepted. Swing top bottles will likewise be accepted as well as corked bottles.

\r\n

Bottles will not be returned to contest entrants.

\r\n

Completed entry forms and recipe sheets must be submitted with all entries, and can be printed directly from this website. Entry forms should be attached to bottle labels by the method specified on the bottle label.

\r\n

Please fill out the entry forms completely. Be meticulous about noting any special ingredients that must be specified. Failure to note such ingredients may impact the judges'' scoring of your entry.

\r\n

Brewers are not limited to one entry in each category but may only enter each subcategory once.

', '200 E Colfax Ave, Denver, CO 80203', 'Shipping Location', '

The awards ceremony will take place once judging is completed.

\r\n

Places will be awarded to 1st, 2nd, and 3rd place in each category/table.

\r\n

The 1st place entry in each category will advance to the Best of Show (BOS) round with a single, overall Best of Show beer selected.

\r\n

Additional prizes may be awarded to those winners present at the awards ceremony at the discretion of the competition organizers.

\r\n

Both score sheets and awards will be available for pick up that night after the ceremony concludes. Awards and score sheets not picked up will be mailed back to participants. Results will be posted to the competition web site after the ceremony concludes.

', NULL, NULL, '1483253940', NULL, NULL, NULL, '000000', NULL, '

Volunteer information coming soon!

', NULL); -- -------------------------------------------------------- diff --git a/templates/bjcp-entry-label-only.html b/templates/bjcp-entry-label-only.html index 14f632c3..9be88920 100644 --- a/templates/bjcp-entry-label-only.html +++ b/templates/bjcp-entry-label-only.html @@ -93,7 +93,7 @@ [onshow.brewer_info.brewerClubs] -
ATTACH ONE FORM TO EACH BOTTLE
+
ATTACH ONE FORM TO EACH BOTTLE w/ RUBBER BAND ONLY
@@ -149,7 +149,7 @@ [onshow.brewer_info.brewerClubs] -
ATTACH ONE FORM TO EACH BOTTLE
+
ATTACH ONE FORM TO EACH BOTTLE w/ RUBBER BAND ONLY
@@ -207,7 +207,7 @@ [onshow.brewer_info.brewerClubs] -
ATTACH ONE FORM TO EACH BOTTLE
+
ATTACH ONE FORM TO EACH BOTTLE w/ RUBBER BAND ONLY
@@ -263,7 +263,7 @@ [onshow.brewer_info.brewerClubs] -
ATTACH ONE FORM TO EACH BOTTLE
+
ATTACH ONE FORM TO EACH BOTTLE w/ RUBBER BAND ONLY
diff --git a/templates/bjcp-entry.html b/templates/bjcp-entry.html index 9ebc7868..e688cb8e 100644 --- a/templates/bjcp-entry.html +++ b/templates/bjcp-entry.html @@ -700,7 +700,7 @@ [onshow.brewer_info.brewerClubs] -
ATTACH ONE FORM TO EACH BOTTLE
+
ATTACH ONE FORM TO EACH BOTTLE w/ RUBBER BAND ONLY
@@ -756,7 +756,7 @@ [onshow.brewer_info.brewerClubs] -
ATTACH ONE FORM TO EACH BOTTLE
+
ATTACH ONE FORM TO EACH BOTTLE w/ RUBBER BAND ONLY
@@ -814,7 +814,7 @@ [onshow.brewer_info.brewerClubs] -
ATTACH ONE FORM TO EACH BOTTLE
+
ATTACH ONE FORM TO EACH BOTTLE w/ RUBBER BAND ONLY
@@ -870,7 +870,7 @@ [onshow.brewer_info.brewerClubs] -
ATTACH ONE FORM TO EACH BOTTLE
+
ATTACH ONE FORM TO EACH BOTTLE w/ RUBBER BAND ONLY
diff --git a/templates/simple-metric-entry-barcode.html b/templates/simple-metric-entry-barcode.html index f98266d1..fc110a02 100644 --- a/templates/simple-metric-entry-barcode.html +++ b/templates/simple-metric-entry-barcode.html @@ -154,6 +154,9 @@

Bottle Labels

+ + + @@ -214,6 +217,9 @@

Bottle Labels

ATTACH ONE FORM TO EACH BOTTLE w/ RUBBER BAND ONLY
Competition: [onshow.contest_info.contestName] + + + @@ -276,6 +282,9 @@

Bottle Labels

ATTACH ONE FORM TO EACH BOTTLE w/ RUBBER BAND ONLY
Competition: [onshow.contest_info.contestName]
+ + + @@ -336,6 +345,9 @@

Bottle Labels

ATTACH ONE FORM TO EACH BOTTLE w/ RUBBER BAND ONLY
Competition: [onshow.contest_info.contestName] + + + diff --git a/templates/simple-metric-entry.html b/templates/simple-metric-entry.html index 9bdc0bec..8ec07a78 100644 --- a/templates/simple-metric-entry.html +++ b/templates/simple-metric-entry.html @@ -154,6 +154,9 @@

Bottle Labels

ATTACH ONE FORM TO EACH BOTTLE w/ RUBBER BAND ONLY
Competition: [onshow.contest_info.contestName]
+ + + @@ -208,6 +211,9 @@

Bottle Labels

ATTACH ONE FORM TO EACH BOTTLE w/ RUBBER BAND ONLY
Competition: [onshow.contest_info.contestName] + + + @@ -264,6 +270,9 @@

Bottle Labels

ATTACH ONE FORM TO EACH BOTTLE w/ RUBBER BAND ONLY
Competition: [onshow.contest_info.contestName]
+ + + @@ -318,6 +327,9 @@

Bottle Labels

ATTACH ONE FORM TO EACH BOTTLE w/ RUBBER BAND ONLY
Competition: [onshow.contest_info.contestName] + + + diff --git a/templates/simple-us-entry-barcode.html b/templates/simple-us-entry-barcode.html index 2764629a..5bfd976b 100644 --- a/templates/simple-us-entry-barcode.html +++ b/templates/simple-us-entry-barcode.html @@ -153,6 +153,9 @@

Bottle Labels

ATTACH ONE FORM TO EACH BOTTLE w/ RUBBER BAND ONLY
Competition: [onshow.contest_info.contestName]
+ + + @@ -213,6 +216,9 @@

Bottle Labels

ATTACH ONE FORM TO EACH BOTTLE w/ RUBBER BAND ONLY
Competition: [onshow.contest_info.contestName] + + + @@ -275,6 +281,9 @@

Bottle Labels

ATTACH ONE FORM TO EACH BOTTLE w/ RUBBER BAND ONLY
Competition: [onshow.contest_info.contestName]
+ + + @@ -335,6 +344,9 @@

Bottle Labels

ATTACH ONE FORM TO EACH BOTTLE w/ RUBBER BAND ONLY
Competition: [onshow.contest_info.contestName] + + + diff --git a/templates/simple-us-entry.html b/templates/simple-us-entry.html index 61d783fe..c4438182 100644 --- a/templates/simple-us-entry.html +++ b/templates/simple-us-entry.html @@ -153,6 +153,9 @@

Bottle Labels

ATTACH ONE FORM TO EACH BOTTLE w/ RUBBER BAND ONLY
Competition: [onshow.contest_info.contestName]
+ + + @@ -207,6 +210,9 @@

Bottle Labels

ATTACH ONE FORM TO EACH BOTTLE w/ RUBBER BAND ONLY
Competition: [onshow.contest_info.contestName] + + + @@ -263,6 +269,9 @@

Bottle Labels

ATTACH ONE FORM TO EACH BOTTLE w/ RUBBER BAND ONLY
Competition: [onshow.contest_info.contestName]
+ + + @@ -317,6 +326,9 @@

Bottle Labels

ATTACH ONE FORM TO EACH BOTTLE w/ RUBBER BAND ONLY
Competition: [onshow.contest_info.contestName] + + +
ATTACH ONE FORM TO EACH BOTTLE w/ RUBBER BAND ONLY
Competition: [onshow.contest_info.contestName]