From 3f50a343af1cf0b9528c5309ff844b5e12bab920 Mon Sep 17 00:00:00 2001 From: james Date: Thu, 8 Dec 2005 16:17:12 +0000 Subject: [PATCH] fix a few reports to make sure we dont duplicate results for multiple years --- admin/reports_nametags_students.php | 4 +++- admin/reports_projects_judges_teams.php | 7 ++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/admin/reports_nametags_students.php b/admin/reports_nametags_students.php index 07b7bf5e..009bd3ec 100644 --- a/admin/reports_nametags_students.php +++ b/admin/reports_nametags_students.php @@ -61,7 +61,9 @@ WHERE 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 projects.projectnumber "); diff --git a/admin/reports_projects_judges_teams.php b/admin/reports_projects_judges_teams.php index 834388df..5175cc5b 100644 --- a/admin/reports_projects_judges_teams.php +++ b/admin/reports_projects_judges_teams.php @@ -73,7 +73,10 @@ WHERE 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 projects.projectnumber "); @@ -112,8 +115,6 @@ $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. $q=mysql_query("SELECT judges_timeslots.date,