From d209b0648f48082069286f9e3dd44dfa1b4de0cf Mon Sep 17 00:00:00 2001 From: james Date: Wed, 28 Mar 2007 22:32:57 +0000 Subject: [PATCH] Add new CUSTOM report: Program Awards List (used for ORSF printed program) Add award criteria to getJudgingTeams() result Modify CUSTOM report judges teams proejcts, to show each award and the criteria/eligibility for each award that the team is assigned to judge. More ease of use cleanups to awards interface Add new field award order to student report generator --- admin/award_awards.php | 4 +- admin/judges.inc.php | 2 + admin/judges_teams_projects.php | 5 +- admin/reports.php | 6 +- admin/reports_judges_teams_projects.php | 34 +++++++ admin/reports_program_awards.php | 114 ++++++++++++++++++++++++ admin/reports_students.inc.php | 8 ++ 7 files changed, 167 insertions(+), 6 deletions(-) create mode 100644 admin/reports_program_awards.php diff --git a/admin/award_awards.php b/admin/award_awards.php index 7f84fe7f..49c7a57f 100644 --- a/admin/award_awards.php +++ b/admin/award_awards.php @@ -221,7 +221,7 @@ echo mysql_error(); if($_GET['action']=="edit") echo "\n"; - echo "\n"; + echo "
\n"; echo "\n"; echo "\n"; echo "
".i18n("Name")."
".i18n("Order")."(".i18n("presentation order").")
".i18n("Sponsor").""; @@ -394,7 +394,7 @@ echo mysql_error(); echo "
"; echo ""; - echo ""; + echo "
"; echo ""; echo " "; echo " "; diff --git a/admin/judges.inc.php b/admin/judges.inc.php index 102a7dd9..b9c786e4 100644 --- a/admin/judges.inc.php +++ b/admin/judges.inc.php @@ -59,6 +59,7 @@ function getJudgingTeams() //get the awards for this team $aq=mysql_query("SELECT award_awards.id, award_awards.name, + award_awards.criteria, award_awards.award_types_id, award_types.type AS award_type FROM @@ -78,6 +79,7 @@ function getJudgingTeams() $teams[$r->id]['awards'][]=array( "id"=>$ar->id, "name"=>$ar->name, + "criteria"=>$ar->criteria, "award_types_id"=>$ar->award_types_id, "award_type"=>$ar->award_type ); diff --git a/admin/judges_teams_projects.php b/admin/judges_teams_projects.php index 4795dd82..89a1bbf8 100644 --- a/admin/judges_teams_projects.php +++ b/admin/judges_teams_projects.php @@ -317,6 +317,7 @@ if( ($action=="edit" || $action=="assign" ) && $edit) } echo "id]\" type=\"button\" onclick=\"assign('$r->id')\" value=\"Assign\">"; + echo ""; } echo "
".i18n("Order")."".i18n("Sponsor")."
"; @@ -383,11 +384,11 @@ if( ($action=="edit" || $action=="assign" ) && $edit) echo "Edit team project assignments"; - echo ""; + echo "
"; while($r=mysql_fetch_object($q)) { - echo ""; } */ - echo "
"; echo i18n("Mailing Labels").": "; echo "".i18n("Mailing Label Generator").""; @@ -156,10 +155,13 @@ while($catr=mysql_fetch_object($catq)) echo "PDF   "; // echo "PDF   "; echo "
"; + echo "
"; + echo i18n("Awards list for Program").": "; + echo "CSV   "; + - echo "
"; echo "
"; echo i18n("Award Ceremony Script").": "; echo "PDF   "; diff --git a/admin/reports_judges_teams_projects.php b/admin/reports_judges_teams_projects.php index 0fa523cc..b5ded41e 100644 --- a/admin/reports_judges_teams_projects.php +++ b/admin/reports_judges_teams_projects.php @@ -81,6 +81,40 @@ } $rep->addText($memberlist); + if(count($team['awards'])) + { + $rep->heading(i18n("Awards that this team judges").":"); + foreach($team['awards'] AS $award) + { + $rep->addText($award['name']); + $rep->addText(i18n("Criteria").": ".$award['criteria']); + + //get category eligibility + $q=mysql_query("SELECT projectcategories.category FROM projectcategories, award_awards_projectcategories WHERE award_awards_projectcategories.projectcategories_id=projectcategories.id AND award_awards_projectcategories.award_awards_id='{$award['id']}' AND award_awards_projectcategories.year='{$config['FAIRYEAR']}' AND projectcategories.year='{$config['FAIRYEAR']}' ORDER BY category"); + echo mysql_error(); + $cats=""; + while($r=mysql_fetch_object($q)) + { + if($cats) $cats.=", ".i18n($r->category); + else $cats=i18n($r->category); + } + $rep->addText(i18n("Categories").": $cats"); + + + //get division eligibility + $q=mysql_query("SELECT projectdivisions.division_shortform FROM projectdivisions, award_awards_projectdivisions WHERE award_awards_projectdivisions.projectdivisions_id=projectdivisions.id AND award_awards_projectdivisions.award_awards_id='{$award['id']}' AND award_awards_projectdivisions.year='{$config['FAIRYEAR']}' AND projectdivisions.year='{$config['FAIRYEAR']}' ORDER BY division_shortform"); + echo mysql_error(); + $divs=""; + while($r=mysql_fetch_object($q)) + { + if($divs) $divs.=", ".i18n($r->division_shortform); + else $divs=i18n($r->division_shortform); + } + $rep->addText(i18n("Divisions").": $divs"); + } + + } + $rep->nextLine(); //get the timeslots that this team has. diff --git a/admin/reports_program_awards.php b/admin/reports_program_awards.php new file mode 100644 index 00000000..1e8ea175 --- /dev/null +++ b/admin/reports_program_awards.php @@ -0,0 +1,114 @@ +newPage(); + $rep->setFontSize(11); + } + else if($type=="csv") + { + $rep=new lcsv(i18n("Program Awards")); + } + $q=mysql_query("SELECT + award_awards.id, + award_awards.name, + award_awards.criteria, + award_awards.presenter, + award_awards.order AS awards_order, + award_types.type + FROM + award_awards, + award_types + WHERE + award_awards.year='".$config['FAIRYEAR']."' + AND award_types.year='".$config['FAIRYEAR']."' + AND award_awards.award_types_id=award_types.id + AND award_awards.excludefromac='0' + AND (award_types.type='special' OR award_types.type='grand') + ORDER BY awards_order"); + + echo mysql_error(); + + if(mysql_num_rows($q)) + { + while($r=mysql_fetch_object($q)) + { + $rep->heading(i18n($r->name)); + + //get teh age categories + $acq=mysql_query("SELECT projectcategories.category FROM projectcategories, award_awards_projectcategories WHERE projectcategories.year='".$config['FAIRYEAR']."' AND award_awards_projectcategories.year='".$config['FAIRYEAR']."' AND award_awards_projectcategories.award_awards_id='$r->id' AND award_awards_projectcategories.projectcategories_id=projectcategories.id ORDER BY projectcategories.id"); + echo mysql_error(); + $cats=""; + while($acr=mysql_fetch_object($acq)) + { + $cats.=i18n($acr->category).", "; + } + $cats=substr($cats,0,-2); + $rep->addText("$cats: ".i18n($r->criteria)); + + $pq=mysql_query("SELECT + award_prizes.prize, + award_prizes.number, + award_prizes.id, + award_prizes.cash, + award_prizes.scholarship + FROM + award_prizes + WHERE + award_awards_id='$r->id' + AND award_prizes.year='".$config['FAIRYEAR']."' + AND award_prizes.excludefromac='0' + ORDER BY + `order`"); + echo mysql_error(); + $prevprizeid=-1; + while($pr=mysql_fetch_object($pq)) + { + if($prevprizeid!=$pr->id) + { + $prizetext=""; + if($pr->number>1) + $prizetext.=i18n("%1 prizes of",array($pr->number))." "; + + if($pr->prize) + $prizetext.=i18n($pr->prize); + + if($pr->cash || $pr->scholarship) + { + if($pr->prize) + $prizetext.=" ("; + if($pr->cash && $pr->scholarship) + $prizetext.="\$$pr->cash / \$$pr->scholarship ".i18n("scholarship"); + else if($pr->cash) + $prizetext.= "\$$pr->cash"; + else if($pr->scholarship) + $prizetext.= "\$$pr->scholarship ".i18n("scholarship"); + + if($pr->prize) + $prizetext.= ")"; + + + } + $rep->addText($prizetext); + + $prevprizeid=$pr->id; + } + } + $rep->nextLine(); + } + } + $rep->output(); +?> diff --git a/admin/reports_students.inc.php b/admin/reports_students.inc.php index 439e23b7..27fddf1b 100644 --- a/admin/reports_students.inc.php +++ b/admin/reports_students.inc.php @@ -247,6 +247,14 @@ $report_students_fields = array( 'table_sort' => 'award_awards.order', 'components' => array('awards')), + 'order' => array( + 'name' => 'Award -- Order', + 'header' => 'Award Order', + 'width' => 0.5, + 'table' => 'award_awards.order', + 'table_sort' => 'award_awards.order', + 'components' => array('awards')), + 'pn_awards' => array( 'name' => 'Project Num + Award (will be unique)', 'header' => 'Award Name',
"; + echo "
"; echo ""; if($show_date) diff --git a/admin/reports.php b/admin/reports.php index dcadc9d6..621f4c8b 100644 --- a/admin/reports.php +++ b/admin/reports.php @@ -69,7 +69,6 @@ while($catr=mysql_fetch_object($catq)) echo "