From 6e955082e9185ae81b9aba1e0bd06cb3e6bd1676 Mon Sep 17 00:00:00 2001 From: james Date: Fri, 19 Nov 2010 15:34:23 +0000 Subject: [PATCH] Re-Add some report fields that were added in 2077 (after the 2072 branch) --- admin/reports_awards.inc.php | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/admin/reports_awards.inc.php b/admin/reports_awards.inc.php index 64924dc..4983f1c 100644 --- a/admin/reports_awards.inc.php +++ b/admin/reports_awards.inc.php @@ -197,6 +197,36 @@ $report_awards_fields = array( 'width' => 3, 'table' => 'PRIMARYCONTACT.notes' ), + 'pcontact_address' => array( + 'name' => 'Primary Contact Address -- Street', + 'header' => 'Address', + 'width' => 2.0, + 'table' => "CONCAT(PRIMARYCONTACTUSER.address, ' ', PRIMARYCONTACTUSER.address2)"), + + 'pcontact_city' => array( + 'name' => 'Primary Contact Address -- City', + 'header' => 'City', + 'width' => 1.5, + 'table' => 'PRIMARYCONTACTUSER.city'), + + 'pcontact_province' => array( + 'name' => 'Primary Contact Address -- '.$config['provincestate'], + 'header' => $config['provincestate'], + 'width' => 0.75, + 'table' => 'PRIMARYCONTACTUSER.province'), + + 'pcontact_postal' => array( + 'name' => 'Primary Contact Address -- '.$config['postalzip'], + 'header' => $config['postalzip'], + 'width' => 0.75, + 'table' => 'PRIMARYCONTACTUSER.postalcode' ), + + 'pcontact_city_prov' => array( + 'name' => 'Primary Contact Address -- City, '.$config['provincestate'].' (for mailing)', + 'header' => 'City', + 'width' => 1.5, + 'table' => "CONCAT(PRIMARYCONTACTUSER.city, ', ', PRIMARYCONTACTUSER.province)"), + 'judgeteamname' => array( 'start_option_group' => 'Judging Team', 'components' => array('judgingteam'),