arman/science-ation
1
1
Fork 0
forked from science-ation/science-ation
Code Pull Requests Activity

Add salutation, switch to optiongroups.

Browse Source
This commit is contained in:
dave 2010-05-07 07:10:11 +00:00
parent 05be59f62b
commit 250b717db6
1 changed files with 47 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
admin/reports_fundraising.inc.php
View File

@ -37,11 +37,20 @@ function report_fundraisings_languages(&$report, $field, $text)
* just adds an 's' to find the fields and the functions. */ * just adds an 's' to find the fields and the functions. */
$report_fundraisings_fields = array( $report_fundraisings_fields = array(
'fundraising_campaigns_id' => array( 'fundraising_campaigns_id' => array(
'start_option_group' => 'Campaign ID',
'name' => 'Fundraising Campaign numerical ID', 'name' => 'Fundraising Campaign numerical ID',
'header' => 'ID', 'header' => 'ID',
'width' => 0.25, 'width' => 0.25,
'table' => "fundraising_campaigns.id"), 'table' => "fundraising_campaigns.id"),
'salutation' => array(
'start_option_group' => 'Contact Information',
'name' => 'Contact -- Salutation (Mr., Mrs., etc.)',
'header' => 'Sal',
'width' => 0.5,
'table' => "users.salutation",
'components' => array('users') ),
'namefl' => array( 'namefl' => array(
'name' => 'Contact -- Full Name (first last)', 'name' => 'Contact -- Full Name (first last)',
'header' => 'Name', 'header' => 'Name',
@ -57,41 +66,6 @@ $report_fundraisings_fields = array(
'table' => 'users.email', 'table' => 'users.email',
'components' => array('users') ), 'components' => array('users') ),
'address' => array(
'name' => 'Contact Address -- Street',
'header' => 'Address',
'width' => 2.0,
'table' => "CONCAT(users.address, ' ', users.address2)",
'components' => array('users') ),
'city' => array(
'name' => 'Contact Address -- City',
'header' => 'City',
'width' => 1.5,
'table' => 'users.city',
'components' => array('users') ),
'province' => array(
'name' => 'Contact Address -- '.$config['provincestate'],
'header' => $config['provincestate'],
'width' => 0.75,
'table' => 'users.province',
'components' => array('users') ),
'postal' => array(
'name' => 'Contact -- Address '.$config['postalzip'],
'header' => $config['postalzip'],
'width' => 0.75,
'table' => 'users.postalcode' ,
'components' => array('users') ),
'city_prov' => array(
'name' => 'Contact Address -- City, '.$config['provincestate'].' (for mailing)',
'header' => 'City',
'width' => 1.5,
'table' => "CONCAT(users.city, ', ', users.province)",
'components' => array('users') ),
'phone_home' => array( 'phone_home' => array(
'name' => 'Contact -- Phone (Home)', 'name' => 'Contact -- Phone (Home)',
'header' => 'Phone(Home)', 'header' => 'Phone(Home)',
@ -113,7 +87,44 @@ $report_fundraisings_fields = array(
'table' => 'users.organization', 'table' => 'users.organization',
'components' => array('users') ), 'components' => array('users') ),
'address' => array(
'start_option_group' => 'Contact Address',
'name' => 'Contact Address -- Street',
'header' => 'Address',
'width' => 2.0,
'table' => "CONCAT(users.address, ' ', users.address2)",
'components' => array('users') ),
'city' => array(
'name' => 'Contact Address -- City',
'header' => 'City',
'width' => 1.5,
'table' => 'users.city',
'components' => array('users') ),
'province' => array(
'name' => 'Contact Address -- '.$config['provincestate'],
'header' => $config['provincestate'],
'width' => 0.75,
'table' => 'users.province',
'components' => array('users') ),
'postal' => array(
'name' => 'Contact Address -- '.$config['postalzip'],
'header' => $config['postalzip'],
'width' => 0.75,
'table' => 'users.postalcode' ,
'components' => array('users') ),
'city_prov' => array(
'name' => 'Contact Address -- City, '.$config['provincestate'].' (for mailing)',
'header' => 'City',
'width' => 1.5,
'table' => "CONCAT(users.city, ', ', users.province)",
'components' => array('users') ),
'year' => array( 'year' => array(
'start_option_group' => 'Miscellaneous',
'name' => 'Contact -- Year', 'name' => 'Contact -- Year',
'header' => 'Year', 'header' => 'Year',
'width' => 0.5, 'width' => 0.5,