From c22b3fa86bda5dbd3014297ad802f25f31fff15c Mon Sep 17 00:00:00 2001
From: james <james>
Date: Thu, 22 Mar 2007 14:55:24 +0000
Subject: [PATCH] Add some extra fields to the awards report

---
 admin/reports.php            |  3 ++-
 admin/reports_awards.inc.php | 18 ++++++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/admin/reports.php b/admin/reports.php
index f92375e..9241521 100644
--- a/admin/reports.php
+++ b/admin/reports.php
@@ -51,9 +51,11 @@
 			   
  echo "<h4>".i18n("Custom Reports")."</h4>";
 
+/*
  echo i18n("Day of Fair Registration/Checkin Forms (All Categories)").": ";
  echo "<a href=\"reports_gen.php?id=9&type=pdf\">PDF</a> &nbsp; ";
  echo "<a href=\"reports_gen.php?id=9&type=csv\">CSV</a> &nbsp; ";
+ */
 
 //lets split this up by age category, 
 /*
@@ -68,7 +70,6 @@ while($catr=mysql_fetch_object($catq))
 }
 */
 
- echo "<br />";
  echo "<br />";
  echo i18n("Mailing Labels").": ";
  echo "<a href=\"reports_mailinglabels.php\">".i18n("Mailing Label Generator")."</a>";
diff --git a/admin/reports_awards.inc.php b/admin/reports_awards.inc.php
index 0b9556c..1c82f16 100644
--- a/admin/reports_awards.inc.php
+++ b/admin/reports_awards.inc.php
@@ -28,6 +28,24 @@ $report_awards_fields = array(
 		'width' => 3.0,
 		'table' => 'award_awards.name' ),
 
+	'criteria' =>  array(
+		'name' => 'Award -- Criteria',
+		'header' => 'Award Criteria',
+		'width' => 3.0,
+		'table' => 'award_awards.criteria' ),
+
+	'presenter' =>  array(
+		'name' => 'Award -- Presenter',
+		'header' => 'Award Presenter',
+		'width' => 1.5,
+		'table' => 'award_awards.presenter' ),
+
+	'order' =>  array(
+		'name' => 'Award -- Order',
+		'header' => 'Award Order',
+		'width' => 0.5,
+		'table' => 'award_awards.order' ),
+
 	'cwsfaward' =>  array(
 		'name' => 'Award -- CWSF Award',
 		'header' => 'CWSF',