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

age category options should work properly again now

Browse Source
This commit is contained in:
justin 2010-04-14 14:59:17 +00:00
parent a890fa299d
commit afc353bdb9
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
admin/reports_acscript.php
View File

@ -24,11 +24,7 @@
if(is_array($_GET['show_category'])) { if(is_array($_GET['show_category'])) {
$show_category = array(); $show_category = array();
foreach($_GET['show_category'] as $id=>$val) { foreach($_GET['show_category'] as $id=>$val) {
$show_category[] = "projects.projectcategories_id='$id'"; $show_category[] = "award_awards_projectcategories.projectcategories_id='$id'";
}
if($show_unawarded_prizes=="yes")
{
$show_category[] = "projects.projectcategories_id IS NULL";
} }
$and_categories = join(' OR ', $show_category); $and_categories = join(' OR ', $show_category);
} else { } else {
@ -68,14 +64,18 @@ if(!$scriptformat) $scriptformat="default";
FROM FROM
award_awards, award_awards,
award_types, award_types,
sponsors sponsors,
award_awards_projectcategories
WHERE WHERE
award_awards.year='$foryear' award_awards.year='$foryear'
AND award_types.year='$foryear' AND award_types.year='$foryear'
AND award_awards.award_types_id=award_types.id AND award_awards.award_types_id=award_types.id
AND award_awards.sponsors_id=sponsors.id AND award_awards.sponsors_id=sponsors.id
AND award_awards.id=award_awards_projectcategories.award_awards_id
AND award_awards.excludefromac='0' AND award_awards.excludefromac='0'
AND ($and_categories)
$awardtype $awardtype
GROUP BY award_awards.id
ORDER BY awards_order"); ORDER BY awards_order");
echo mysql_error(); echo mysql_error();
@ -107,7 +107,6 @@ if(!$scriptformat) $scriptformat="default";
award_awards_id='{$r->id}' award_awards_id='{$r->id}'
AND award_prizes.year='$foryear' AND award_prizes.year='$foryear'
AND award_prizes.excludefromac='0' AND award_prizes.excludefromac='0'
AND ($and_categories)
ORDER BY ORDER BY
`order`, `order`,
projects.projectnumber"); projects.projectnumber");