diff --git a/admin/communication.inc.php b/admin/communication.inc.php index ffb2769d..cd767545 100644 --- a/admin/communication.inc.php +++ b/admin/communication.inc.php @@ -4,19 +4,19 @@ "SELECT firstname, lastname, organization, email FROM users WHERE types LIKE '%committee' AND deleted='no'"), "judges_all"=>array("name"=>"Judges from all years","query"=> - "SELECT firstname, lastname, email FROM judges ORDER BY email"), + "SELECT firstname, lastname, email FROM judges WHERE deleted!='no' ORDER BY email"), "judges_active_thisyear"=>array("name"=>"Judges active for this year", "query"=> - "SELECT DISTINCT(judges.id), firstname, lastname, email FROM judges,judges_years WHERE judges_years.year='".$config['FAIRYEAR']."' AND judges.id=judges_years.judges_id ORDER BY email"), + "SELECT DISTINCT(judges.id), firstname, lastname, email FROM judges,judges_years WHERE judges.deleted!='no' AND judges_years.year='".$config['FAIRYEAR']."' AND judges.id=judges_years.judges_id ORDER BY email"), "judges_inactive"=>array("name"=>"Judges not active for this year", "query"=> - "SELECT DISTINCT(judges.id), firstname, lastname, email FROM judges LEFT JOIN judges_years ON judges_years.judges_id=judges.id WHERE judges_years.year!='".$config['FAIRYEAR']."' ORDER BY email"), + "SELECT DISTINCT(judges.id), firstname, lastname, email FROM judges LEFT JOIN judges_years ON judges_years.judges_id=judges.id WHERE judges.deleted!='no' judges_years.year!='".$config['FAIRYEAR']."' ORDER BY email"), "judges_active_complete_thisyear"=>array("name"=>"Judges active for this year and complete", "query"=> - "SELECT DISTINCT(judges.id), firstname, lastname, email FROM judges,judges_years WHERE judges_years.year='".$config['FAIRYEAR']."' AND judges.id=judges_years.judges_id AND judges.complete='yes' ORDER BY email"), + "SELECT DISTINCT(judges.id), firstname, lastname, email FROM judges,judges_years WHERE judges.deleted!='no' AND judges_years.year='".$config['FAIRYEAR']."' AND judges.id=judges_years.judges_id AND judges.complete='yes' ORDER BY email"), "judges_active_incomplete_thisyear"=>array("name"=>"Judges active for this year but not complete", "query"=> - "SELECT DISTINCT(judges.id), firstname, lastname, email FROM judges,judges_years WHERE judges_years.year='".$config['FAIRYEAR']."' AND judges.id=judges_years.judges_id AND judges.complete!='yes' ORDER BY email"), + "SELECT DISTINCT(judges.id), firstname, lastname, email FROM judges,judges_years WHERE judges.deleted!='no' AND judges_years.year='".$config['FAIRYEAR']."' AND judges.id=judges_years.judges_id AND judges.complete!='yes' ORDER BY email"), "participants_complete_thisyear"=>array("name"=>"Participants complete this year","query"=> "SELECT firstname, lastname, students.email FROM students,registrations WHERE students.registrations_id=registrations.id AND registrations.year='".$config['FAIRYEAR']."' AND ( registrations.status='complete' OR registrations.status='paymentpending') ORDER BY students.email"),