From e6b7b3beb044a5a77d1e76312700c2f757e2c660 Mon Sep 17 00:00:00 2001 From: dave Date: Sat, 8 Dec 2007 00:00:26 +0000 Subject: [PATCH] - Add the fields for the school access report - Change the report generator to accept an 'sid' (system report id) - Use the sid, not the report id, for the custom reports that aren't custom reports anymore. - Use the generator's school access report, not the custom one. --- admin/reports.php | 62 +++++++++++++---------------------- admin/reports_gen.php | 8 +++++ admin/reports_schools.inc.php | 16 +++++++-- 3 files changed, 44 insertions(+), 42 deletions(-) diff --git a/admin/reports.php b/admin/reports.php index 5763587..b77b22a 100644 --- a/admin/reports.php +++ b/admin/reports.php @@ -82,53 +82,40 @@ while($catr=mysql_fetch_object($catq)) echo "
"; echo "
"; echo i18n("School Access Codes").": "; - echo "PDF   "; - echo "CSV   "; + echo "PDF   "; + echo "CSV   "; +// echo "PDF   "; +// echo "CSV   "; echo "
"; echo i18n("Student Emergency Contact Names/Numbers").": "; - echo "PDF   "; - echo "CSV   "; -// echo "PDF   "; -// echo "CSV   "; + echo "PDF   "; + echo "CSV   "; echo "
"; echo i18n("Students/Projects From Each School").": "; - echo "PDF   "; - echo "CSV   "; -//cho "PDF   "; -//cho "CSV   "; + echo "PDF   "; + echo "CSV   "; echo "
"; echo i18n("Project Logistical Requirements (tables, electricity)").": "; - echo "PDF   "; - echo "CSV   "; -// echo "PDF   "; -// echo "CSV   "; + echo "PDF   "; + echo "CSV   "; echo "
"; echo i18n("Project Table Labels").": "; - echo "PDF   "; -//echo "PDF   "; + echo "PDF   "; echo "
"; echo i18n("Project Summary Details").": "; echo "PDF   "; echo "
"; echo i18n("Nametags").": "; - echo "Students PDF   "; - echo "Students CSV   "; - echo "Judges PDF   "; - echo "Judges CSV   "; - echo "Committee PDF   "; - echo "Committee CSV   "; - -// echo "Students PDF   "; -// echo "Students CSV   "; -// echo "Judges PDF   "; -// echo "Judges CSV   "; -// echo "Committee PDF   "; -// echo "Committee CSV   "; - + echo "Students PDF   "; + echo "Students CSV   "; + echo "Judges PDF   "; + echo "Judges CSV   "; + echo "Committee PDF   "; + echo "Committee CSV   "; echo "
"; echo "
"; @@ -137,14 +124,10 @@ while($catr=mysql_fetch_object($catq)) echo "
"; echo i18n("Judging Teams").": "; - echo "List (CSV)   "; - echo "List (PDF)   "; - echo "Team Awards (CSV)   "; - echo "Team Awards (PDF)   "; -//cho "List (CSV)   "; -//cho "List (PDF)   "; -// echo "Team View (CSV)   "; -// echo "Team View (PDF)   "; + echo "List (CSV)   "; + echo "List (PDF)   "; + echo "Team Awards (CSV)   "; + echo "Team Awards (PDF)   "; echo "
"; echo i18n("Judging Teams Project Assignments").": "; @@ -158,8 +141,7 @@ while($catr=mysql_fetch_object($catq)) echo "
"; echo i18n("Project Identification Labels (for judging sheets)").": "; - echo "PDF   "; -// echo "PDF   "; + echo "PDF   "; echo "
"; echo "
"; diff --git a/admin/reports_gen.php b/admin/reports_gen.php index 8c6ac60..3c26d0b 100644 --- a/admin/reports_gen.php +++ b/admin/reports_gen.php @@ -30,10 +30,18 @@ require_once('reports.inc.php'); $id = intval($_GET['id']); + $sid = intval($_GET['sid']); $format = stripslashes($_GET['type']); $year = intval($_GET['year']); if($year < 1000) $year = $config['FAIRYEAR']; + /* If it's a system report, turn that into the actual report id */ + if($sid > 0) { + $q = mysql_query("SELECT id FROM reports WHERE system_report_id='$sid'"); + $r = mysql_fetch_assoc($q); + $id = $r['id']; + } + if($format == '') $format = NULL; if($id && $year) diff --git a/admin/reports_schools.inc.php b/admin/reports_schools.inc.php index 81382f4..7079a84 100644 --- a/admin/reports_schools.inc.php +++ b/admin/reports_schools.inc.php @@ -84,8 +84,8 @@ $report_schools_fields = array( 'school_board' => array( 'name' => 'School -- Board ID', - 'header' => 'Board', - 'width' => 0.75, + 'header' => 'School Board', + 'width' => 1.0, 'table' => 'schools.board' ), 'school_principal' => array( @@ -133,6 +133,18 @@ $report_schools_fields = array( 'table' => "IF(schools.phone='',schools.scienceheademail,schools.schoolemail)", 'table_sort' => 'schools.schoolemail' ), + 'school_accesscode' => array( + 'name' => 'School -- Access Code', + 'header' => 'Access Code', + 'width' => 1.1, + 'table' => 'schools.accesscode' ), + + 'school_registration_password' => array( + 'name' => 'School -- Registration Password', + 'header' => 'Reg Pass', + 'width' => 0.75, + 'table' => 'schools.registration_password' ), + ); function report_schools_fromwhere($report, $components)