forked from science-ation/science-ation
fix a few reports to make sure we dont duplicate results for multiple years
This commit is contained in:
parent
5bd24e3f8d
commit
3f50a343af
@ -61,7 +61,9 @@
|
|||||||
|
|
||||||
WHERE
|
WHERE
|
||||||
projects.year='".$config['FAIRYEAR']."'
|
projects.year='".$config['FAIRYEAR']."'
|
||||||
AND registrations.status='complete'
|
AND projectdivisions.year='".$config['FAIRYEAR']."'
|
||||||
|
AND projectcategories.year='".$config['FAIRYEAR']."'
|
||||||
|
AND ( registrations.status='complete' OR registrations.status='paymentpending' )
|
||||||
ORDER BY
|
ORDER BY
|
||||||
projects.projectnumber
|
projects.projectnumber
|
||||||
");
|
");
|
||||||
|
@ -73,7 +73,10 @@
|
|||||||
|
|
||||||
WHERE
|
WHERE
|
||||||
projects.year='".$config['FAIRYEAR']."'
|
projects.year='".$config['FAIRYEAR']."'
|
||||||
AND registrations.status='complete'
|
AND projectdivisions.year='".$config['FAIRYEAR']."'
|
||||||
|
AND projectcategories.year='".$config['FAIRYEAR']."'
|
||||||
|
AND ( registrations.status='complete'
|
||||||
|
OR registrations.status='paymentpending' )
|
||||||
ORDER BY
|
ORDER BY
|
||||||
projects.projectnumber
|
projects.projectnumber
|
||||||
");
|
");
|
||||||
@ -112,8 +115,6 @@
|
|||||||
|
|
||||||
$table['dataalign']=array("center","left");
|
$table['dataalign']=array("center","left");
|
||||||
|
|
||||||
//FIXME: this is where i left off, this query is not modified yet to pull the timeslots for the PROJECT
|
|
||||||
|
|
||||||
//get the timeslots that this project has assigned to been judged.
|
//get the timeslots that this project has assigned to been judged.
|
||||||
$q=mysql_query("SELECT
|
$q=mysql_query("SELECT
|
||||||
judges_timeslots.date,
|
judges_timeslots.date,
|
||||||
|
Loading…
x
Reference in New Issue
Block a user