forked from science-ation/science-ation
show cat/div preference names instead of their ID's
fix address1 to address
This commit is contained in:
parent
c8149a40d5
commit
392dcf94dc
@ -60,9 +60,9 @@ $table['header']=array( i18n("ID"),
|
||||
i18n("City"),
|
||||
i18n("Province"),
|
||||
i18n("Postal Code"),
|
||||
i18n("Cat Pref"),
|
||||
i18n("Div Pref"),
|
||||
i18n("Highest PSD"),
|
||||
i18n("Category Pref"),
|
||||
i18n("Division Pref"),
|
||||
i18n("Highest PostSecDeg"),
|
||||
i18n("Professional Quals"),
|
||||
i18n("Years School"),
|
||||
i18n("Years Regional"),
|
||||
@ -75,7 +75,24 @@ $table['header']=array( i18n("ID"),
|
||||
$table['widths']=array();
|
||||
$table['dataalign']=array();
|
||||
|
||||
$q=mysql_query("SELECT judges.* FROM judges,judges_years WHERE judges.complete='yes' AND judges_years.year='".$config['FAIRYEAR']."' AND judges.id=judges_years.judges_id ORDER BY lastname,firstname");
|
||||
$q=mysql_query("SELECT
|
||||
judges.*,
|
||||
projectcategories.category AS catpref_name,
|
||||
projectdivisions.division AS divpref_name
|
||||
FROM
|
||||
judges,
|
||||
judges_years,
|
||||
projectcategories,
|
||||
projectdivisions
|
||||
WHERE
|
||||
judges.catpref=projectcategories.id AND
|
||||
judges.divpref=projectdivisions.id AND
|
||||
judges.complete='yes' AND
|
||||
judges_years.year='".$config['FAIRYEAR']."' AND
|
||||
judges.id=judges_years.judges_id
|
||||
ORDER BY
|
||||
lastname,
|
||||
firstname");
|
||||
while($r=mysql_fetch_object($q))
|
||||
{
|
||||
$table['data'][]=array(
|
||||
@ -88,13 +105,13 @@ while($r=mysql_fetch_object($q))
|
||||
$r->phoneworkext,
|
||||
$r->phonecell,
|
||||
$r->organization,
|
||||
$r->address1,
|
||||
$r->address,
|
||||
$r->address2,
|
||||
$r->city,
|
||||
$r->province,
|
||||
$r->postalcode,
|
||||
$r->catpref,
|
||||
$r->divpref,
|
||||
$r->catpref_name,
|
||||
$r->divpref_name,
|
||||
$r->highest_psd,
|
||||
$r->professional_quals,
|
||||
$r->years_school,
|
||||
|
Loading…
Reference in New Issue
Block a user