"; - - echo "
".i18n("Personal Info")."
"; - echo "| ".i18n("First Name")." | $judgeinfo->firstname | \n"; - echo "".i18n("Last Name")." | $judgeinfo->lastname | \n"; - echo "
|---|---|---|---|
| ".i18n("Email Address")." | $judgeinfo->email | \n"; - echo "".i18n("City")." | $judgeinfo->city | \n"; - echo "
| ".i18n("Address 1")." | $judgeinfo->address | \n"; - echo "".i18n($config['provincestate'])." | $judgeinfo->province"; - echo " | \n"; - echo "
| ".i18n("Address 2")." | $judgeinfo->address2 | \n"; - echo "".i18n("Phone (Home)")." | $judgeinfo->phonehome | \n"; - echo "
| ".i18n($config['postalzip'])." | $judgeinfo->postalcode | \n"; - echo "".i18n("Phone (Work)")." | $judgeinfo->phonework ext $judgeinfo->phoneworkext | \n"; - echo "
| ".i18n("Organization")." | $judgeinfo->organization | \n"; - echo "".i18n("Phone (Cell)")." | $judgeinfo->phonecell | \n"; - echo "
| ".i18n("Age category preference")." | ";
-
-$q=mysql_query("SELECT judges_catpref.*,projectcategories.category FROM judges_catpref,projectcategories WHERE judges_id='{$_GET['id']}' AND judges_catpref.year='".$config['FAIRYEAR']."' AND projectcategories.year='".$config['FAIRYEAR']."' AND judges_catpref.projectcategories_id=projectcategories.id");
-echo mysql_error();
-while($r=mysql_fetch_object($q))
- echo i18n($r->category).": ".$preferencechoices[$r->rank]." "; - - echo " | \n";
- echo "||
| ".i18n("Highest post-secondary degree")." | "; - echo "$judgeinfo->highest_psd | \n"; - echo "||
| ".i18n("Other professional qualifications")." | "; - echo "$judgeinfo->professional_quals | \n"; - echo "||
| ".i18n("Languages")." | "; - echo "";
-
- $q=mysql_query("SELECT languages_lang FROM judges_languages WHERE judges_id='$judgeinfo->id'");
- while($r=mysql_fetch_object($q))
- {
- echo $r->languages_lang;
- echo " "; - } - - echo " | \n";
- echo "
"; - echo "
"; - echo "
Areas of Expertise
"; - echo "| ".i18n($divnames[$div])." | "; - echo "".$judge_divs[$div]."/5 | "; - - echo ""; - if(count($judge_subdivs[$div])) - { - $divdata=implode(", ",$judge_subdivs[$div]); - echo "$divdata"; - } - else - echo " "; - echo " | "; - echo "
|---|
"; + +echo "
".i18n("Personal Info")."
"; +echo "| ".i18n("First Name").": | {$judgeinfo['firstname']} | \n"; +echo "".i18n("Last Name").": | {$judgeinfo['lastname']} | \n"; +echo "
|---|---|---|---|
| ".i18n("Email Address").": | {$judgeinfo['email']} | \n"; +echo "".i18n("City").": | {$judgeinfo['city']} | \n"; +echo "
| ".i18n("Address 1").": | {$judgeinfo['address']} | \n"; +echo "".i18n($config['provincestate']).": | {$judgeinfo['province']} | \n"; +echo "
| ".i18n("Address 2").": | {$judgeinfo['address2']} | \n"; +echo "".i18n("Phone (Home)").": | {$judgeinfo['phonehome']} | \n"; +echo "
| ".i18n($config['postalzip']).": | {$judgeinfo['postalcode']} | \n"; +echo "".i18n("Phone (Work)").": | {$judgeinfo['phonework']} | \n"; +echo "
| ".i18n("Organization").": | {$judgeinfo['organization']} | \n"; +echo "".i18n("Phone (Cell)").": | {$judgeinfo['phonecell']} | \n"; +echo "
| ".i18n("Time Availability").": | ";
+$q = mysql_query("SELECT * FROM judges_availability WHERE users_id=\"{$judgeinfo['id']}\" ORDER BY `start`");
+$sel = array();
+while($r=mysql_fetch_object($q)) {
+ $st = substr($r->start, 0, 5);
+ $end = substr($r->end, 0, 5);
+ echo "$st - $end "; +} +echo " |
|---|---|
| ".i18n("Age category preference").": | ";
+
+$q=mysql_query("SELECT * FROM projectcategories
+ WHERE year='{$config['FAIRYEAR']}'");
+echo mysql_error();
+while($r=mysql_fetch_object($q)) {
+ $p = intval($judgeinfo['cat_prefs'][$r->id]);
+ echo i18n($r->category).": {$preferencechoices[$p]} "; +} + +echo " | \n";
+echo "
| ".i18n("Highest post-secondary degree").": | "; +echo "{$judgeinfo['highest_psd']} | \n"; +echo "
| ".i18n("Languages").": | "; +echo "".join(', ', $judgeinfo['languages']). " "; +echo " | \n";
+echo "
"; +echo "
"; +echo "
Areas of Expertise
"; +echo "| ".i18n($divnames[$div]).": | "; + echo "$p/5 | "; + + echo ""; + $subq=mysql_query("SELECT * FROM projectsubdivisions WHERE + projectdivisions_id='$div' AND year='{$config['FAIRYEAR']}' ORDER BY subdivision"); + $sd = array(); + while($subr=mysql_fetch_object($subq)) { + if($u['div_prefs_sub'][$subr->id] == 1) { + $sd[] = $subdivr->subdivision; + } + } + + /* Only show subdiv if main div >=3 */ + if($p >= 3) echo implode(", ",$sd); + else echo " "; + + echo " | "; + echo "
|---|---|---|
| ".i18n("Other").": | "; +echo "{$judgeinfo['expertise_other']} "; +echo " | \n";
+echo "
| ".i18n("Judge Name")." | "; - echo "".i18n("Email Address")." | "; - echo "".i18n("Complete")." | "; - echo "".i18n("Actions")." | "; - echo "|
|---|---|---|---|---|
| "; - echo "id)\">$r->firstname $r->lastname"; - echo " | "; - echo "$r->email | "; - - if($r->complete=="yes" && $r->year) - { - echo "".i18n("yes")." | "; - $completeyes++; - } - else - { - echo "".i18n("no")." | "; - $cl="error"; - $completeno++; - } - echo "";
- echo "id\">![](\"".$config['SFIABDIRECTORY']."/images/16/button_cancel.".$config['icon_extension']."\") ";
- echo " | ";
- echo "
"; - echo "
"; - echo i18n("There are %1 total active judges.",array($num),array("the number of judges")); - echo "
"; - echo i18n("There are %1 complete judges.",array($completeyes),array("the number of judges")); - echo "
"; - echo i18n("There are %1 incomplete judges.",array($completeno),array("the number of judges")); - echo "
"; - echo "
"; - echo "
"; - - send_footer(); -?> diff --git a/admin/judges_manager.php b/admin/judges_manager.php deleted file mode 100644 index 233fcd2..0000000 --- a/admin/judges_manager.php +++ /dev/null @@ -1,100 +0,0 @@ - - Copyright (C) 2005 James Grant
"; -echo i18n("When complete, a green bar will appear at the BOTTOM of this page -saying that everything has completed successfully. When complete, you can use -the following links to manage the Judging Teams and the Judges assigned to them -(clicking on these links now will stop the scheduler)."); -echo "
"; -echo "
"; -echo "".i18n("Manage Judge Teams").""; -echo "
"; -echo "".i18n("Manage Judge Members").""; -echo "
"; -echo "
"; -echo i18n("If you get an error like: \"Fatal error: Maximum execution time of -30 seconds exceeded...\" you will need to talk to your system admin and have -them adjust the \"max_execution_time\" variable in the \"php.ini\" file from -30(seconds) to something larger, like 900 (15 minutes). And then have them -restart the webserver for the change to take effect"); -echo "
"; -echo "
"; - -*/ - - //function TRACE() { } //function TRACE_R() { } function TRACE($str) { print($str); } @@ -131,10 +97,12 @@ function judges_cost_function($annealer, $bucket_id, $ids) // TRACE_R($ids); $cost = 0; - $have_chair = 0; + $have_chair = false; + $have_div2 = false; if($bucket_id == 0) { - /* This is the placeholder */ + /* This is the placeholder for all judges, there's a slight + * cost for not using a judge */ $cost = count($ids) * 5; // TRACE("Extra judge team cost=$cost\n"); return $cost; @@ -180,7 +148,7 @@ function judges_cost_function($annealer, $bucket_id, $ids) $cost += 2 * $dpref; /* See if the judge is willing to chair a team */ - if($j['willing_chair'] == 'yes') $have_chair = 1; + if($j['willing_chair'] == 'yes') $have_chair = true; /* For each lang the team needs that the judge doesn't have, * increase the cost */ @@ -188,10 +156,18 @@ function judges_cost_function($annealer, $bucket_id, $ids) $l = $t['langs'][$y]; if(!in_array($l, $j['languages'])) $cost += 25; } + + /* If divisional round2 is enabled, make sure there is a judge + * on the team for round2 */ + if($j['available_for_divisional2'] == true) $have_div2 = true; } /* Huge penalty for a team without a willing chair, but only if the min judges per team >1 */ if(!$have_chair && $config['min_judges_per_team']>1) $cost += 40; + + /* Huge penalty for not having a round2 person on the team */ + if($have_div2 == false) + $cost += 40; // TRACE("Team $bucket_id, cost is $cost\n"); @@ -238,6 +214,96 @@ function jdiv_compute_cost($annealer, $bucket_id, $ids) return $cost; } +/* Returns true if a judge time preference indicates they are available for the + * specified round. Always returns true if judge time availablility selection + * is off */ +function judge_available_for_round($j, $r) +{ + global $config; + if($config['judges_availability_enable'] == 'no') return true; + + foreach($j['availability'] as $a) { + if($a['start'] <= $r['starttime'] + && $a['end'] >= $r['endtime'] + && $a['date'] == $r['date'] ) { + return true; + } + } + return false; +} + +function judge_mark_for_round($j, $r) +{ + /* The judge has been assigned to round $r, modify their available to + * exclude any time that falls within this time + * TODO: modify the DB to store date/times in timestamps, so we don't + * have to deal with dates separately. */ + global $config; + global $judges; + if($config['judges_availability_enable'] == 'no') return true; + + /* Grab a pointer to the real judge, because we want to + * modify it, not a copy of it */ + $ju =& $judges[$j['id']]; + + foreach($ju['availability'] as $key=>&$a) { + if($r['starttime'] >= $a['start'] && $r['starttime'] <= $a['end']) { + /* Round starts in the middle of this availablity slot + * modify this availabilty so it doesn't overlap */ + /* This may cause $a['start'] == $a['end'], that's ok */ + $a['end'] = $r['starttime']; +// TRACE("adjust starttime\n"); + } + + if($r['endtime'] >= $a['start'] && $r['endtime'] <= $a['end']) { + /* Round ends in the middle of this availablity slot + * modify this availabilty so it doesn't overlap */ + /* This may cause $a['start'] == $a['end'], that's ok */ + $a['start'] = $r['endtime']; +// TRACE("adjust endtime\n"); + } + + if($a['start'] >= $a['end']) { + /* Delete the whole round */ + unset($ju['availability'][$key]); + } + } + +// print_r($ju['availability']); + +} + +/* UNUSED: should be moved to the timeslot manager to ensure rounds + * don't overlap. */ +function rounds_overlap($r1, $r2) { + $s1 = strtotime("{$r1['date']} {$r1['starttime']}"); + $e1 = strtotime("{$r1['date']} {$r1['endtime']}"); + $s2 = strtotime("{$r1['date']} {$r2['starttime']}"); + $e2 = strtotime("{$r1['date']} {$r2['endtime']}"); + + if($s1 <= $s2 && $e1 > $s1) return true; + if($s1 > $s2 && $s1 < $e2) return true; + return false; +} + +/* Print a judge */ +function pr_judge(&$jt, $jid) +{ + global $judges; + $j =& $judges[$jid]; + print(" - {$j['name']} (".join(' ', $j['languages']).')'); + print("("); + foreach($jt['cats'] as $c) + print("c{$c}={$j['cat_prefs'][$c]} "); + foreach($jt['divs'] as $d) + print("d{$d}={$j['div_prefs'][$d]} "); + + print(")"); + if($j['willing_chair'] == 'yes') print(" (chair) "); + + print("\n"); +} + set_status("Loading Data From Database..."); TRACE("\n\n"); @@ -267,6 +333,27 @@ while($r=mysql_fetch_object($q)) { TRACE(" {$r->lang} - {$r->langname}\n"); } +TRACE("Loading Judging Round time data...\n"); +$round_divisional1 = NULL; +$round_divisional2 = NULL; +$round_special_awards = array(); +$round = array(); +$q = mysql_query("SELECT * FROM judges_timeslots WHERE round_id='0' AND `year`='{$config['FAIRYEAR']}'"); +/* Loads judges_timeslots.id, .starttime, .endtime, .date, .name */ +while($r = mysql_fetch_assoc($q)) { + TRACE(" id:{$r['id']} type:{$r['type']} name:{$r['name']}\n"); + $round[] = $r; + + if($r['type'] == 'divisional1') $round_divisional1 = $r; + if($r['type'] == 'divisional2') $round_divisional2 = $r; + if($r['type'] == 'special') $round_special_awards[] = $r; +} + +if($round_divisional1 == NULL) { + echo "No divisional1 round defined! Aborting!\n"; + exit; +} + $jdiv = array(); TRACE("Loading Judging Division Configuration and Projects...\n"); $q=mysql_query("SELECT * FROM judges_jdiv"); @@ -280,8 +367,7 @@ while($r=mysql_fetch_object($q)) { } $keys = array_keys($jdiv); -for($k=0; $k
"; echo "
"; - $jq=mysql_query("SELECT COUNT(judges.id) AS num FROM judges,judges_years WHERE complete='yes' AND deleted='no' AND judges_years.year='{$config['FAIRYEAR']}' AND judges_years.judges_id=judges.id"); +/* $jq=mysql_query("SELECT COUNT(judges.id) AS num FROM judges,judges_years WHERE complete='yes' AND deleted='no' AND judges_years.year='{$config['FAIRYEAR']}' AND judges_years.judges_id=judges.id"); $jr=mysql_fetch_object($jq); - $currentjudges=$jr->num; + $currentjudges=$jr->num;*/ + /* FIXME: this his highly inefficient :), but won't be done very often */ + $judges = judges_load_all(); + $currentjudges = count($judges); echo "Current number of registered judges: $currentjudges"; echo ""; echo "
"; diff --git a/admin/judges_teams.php b/admin/judges_teams.php index ab6ba27..a9bbac8 100644 --- a/admin/judges_teams.php +++ b/admin/judges_teams.php @@ -27,23 +27,6 @@ user_auth_required('committee', 'admin'); include "judges.inc.php"; - send_header("Manage Judging Teams", - array('Committee Main' => 'committee_main.php', - 'Administration' => 'admin/index.php', - 'Judges' => 'admin/judges.php') - ); -?> - - -num) { $addaward=false; - echo error(i18n("Sorry, only one Special Award can be assigned to a judging team")); + message_push(error(i18n("Sorry, only one Special Award can be assigned to a judging team"))); } else { @@ -166,7 +149,7 @@ function addclicked() { //link up the award mysql_query("INSERT INTO judges_teams_awards_link (award_awards_id,judges_teams_id,year) VALUES ('".$_POST['award']."','$edit','".$config['FAIRYEAR']."')"); - echo happy(i18n("Award assigned to team")); + message_push(happy(i18n("Award assigned to team"))); } } @@ -179,7 +162,7 @@ function addclicked() $action="edit"; else { - echo happy(i18n("Team successfully saved")); + message_push(happy(i18n("Team successfully saved"))); unset($action); unset($edit); } @@ -189,7 +172,7 @@ function addclicked() if($action=="unassign") { mysql_query("DELETE FROM judges_teams_awards_link WHERE judges_teams_id='$edit' AND award_awards_id='".$_GET['unassign']."' AND year='".$config['FAIRYEAR']."'"); - echo happy(i18n("Award unassigned from judge team")); + message_push(happy(i18n("Award unassigned from judge team"))); //keep editing the same team $action="edit"; } @@ -201,7 +184,7 @@ function addclicked() $r=mysql_fetch_object($q); if($r->c) { - echo error(i18n("Cannot 'Create All' teams when any divisional teams currently exist. Try deleting all existing non-divisional teams first.")); + message_push(error(i18n("Cannot 'Create All' teams when any divisional teams currently exist. Try deleting all existing non-divisional teams first."))); } else { @@ -232,7 +215,7 @@ function addclicked() $team_id=mysql_insert_id(); //now link the new team to the award mysql_query("INSERT INTO judges_teams_awards_link (award_awards_id,judges_teams_id,year) VALUES ('$r->id','$team_id','".$config['FAIRYEAR']."')"); - echo happy(i18n("Created team #%1: %2",array($num,$name))); + message_push(happy(i18n("Created team #%1: %2",array($num,$name)))); $num++; } } @@ -248,8 +231,24 @@ function addclicked() if($action=="edit" && $edit) { - echo "<< ".i18n("Back to Judging Teams")."\n"; - echo "
"; + send_header("Edit Judging Team", + array('Committee Main' => 'committee_main.php', + 'Administration' => 'admin/index.php', + 'Judges' => 'admin/judges.php', + 'Manage Judging Teams' => 'admin/judges_teams.php')); +?> + + +"; $team=getJudgingTeam($edit); @@ -359,6 +358,10 @@ function addclicked() } else { + send_header("Manage Judging Teams", + array('Committee Main' => 'committee_main.php', + 'Administration' => 'admin/index.php', + 'Judges' => 'admin/judges.php')); echo "
"; $teams=getJudgingTeams(); diff --git a/admin/judges_teams_members.php b/admin/judges_teams_members.php index 6025343..bfab15b 100644 --- a/admin/judges_teams_members.php +++ b/admin/judges_teams_members.php @@ -22,10 +22,10 @@ */ ?> 'committee_main.php', @@ -98,7 +98,7 @@ function switchjudgeinfo() { //before we insert them, we need to make sure they dont already belong to this team. We can not have the same judge assigned to the same team multiple times. - $q=mysql_query("SELECT * FROM judges_teams_link WHERE judges_id='$selectedjudge' AND judges_teams_id='$team_id'"); + $q=mysql_query("SELECT * FROM judges_teams_link WHERE users_id='$selectedjudge' AND judges_teams_id='$team_id'"); if(mysql_num_rows($q)) { echo notice(i18n("Judge (%1) already belongs to judging team: %2",array($selectedjudge,$team_name))); @@ -107,7 +107,7 @@ function switchjudgeinfo() else { //lets make the first one we add a captain, the rest, non-captains :) - mysql_query("INSERT INTO judges_teams_link (judges_id,judges_teams_id,captain,year) VALUES ('$selectedjudge','$team_id','$captain','".$config['FAIRYEAR']."')"); + mysql_query("INSERT INTO judges_teams_link (users_id,judges_teams_id,captain,year) VALUES ('$selectedjudge','$team_id','$captain','".$config['FAIRYEAR']."')"); $added++; } //if this is alreayd no, then who cares, but if its the first one that is going into the new team, then @@ -122,9 +122,9 @@ function switchjudgeinfo() echo happy(i18n("%1 %2 added to team #%3 (%4)",array($added,$j,$_POST['team_num'],$team_name))); } - if($_GET['action']=="del" && $_GET['team_num'] && $_GET['team_id'] && $_GET['judges_id']) + if($_GET['action']=="del" && $_GET['team_num'] && $_GET['team_id'] && $_GET['users_id']) { - mysql_query("DELETE FROM judges_teams_link WHERE judges_id='".$_GET['judges_id']."' AND judges_teams_id='".$_GET['team_id']."' AND year='".$config['FAIRYEAR']."'"); + mysql_query("DELETE FROM judges_teams_link WHERE users_id='".$_GET['users_id']."' AND judges_teams_id='".$_GET['team_id']."' AND year='".$config['FAIRYEAR']."'"); echo happy(i18n("Removed judge from team #%1 (%2)",array($_GET['team_num'],$_GET['team_name']))); //if there is still members left in the team, make sure we have a captain still @@ -139,7 +139,7 @@ function switchjudgeinfo() { if($first) { - $firstjudge=$r->judges_id; + $firstjudge=$r->users_id; $first=false; } @@ -152,7 +152,7 @@ function switchjudgeinfo() if(!$gotcaptain) { //make the first judge the captain - mysql_query("UPDATE judges_teams_link SET captain='yes' WHERE judges_teams_id='".$_GET['team_id']."' AND judges_id='$firstjudge' AND year='".$config['FAIRYEAR']."'"); + mysql_query("UPDATE judges_teams_link SET captain='yes' WHERE judges_teams_id='".$_GET['team_id']."' AND users_id='$firstjudge' AND year='".$config['FAIRYEAR']."'"); echo notice(i18n("Team captain was removed. A new team captain has been automatically assigned")); } } @@ -181,7 +181,7 @@ function switchjudgeinfo() { //teams can have as many captains as they want, so just add it. - mysql_query("UPDATE judges_teams_link SET captain='yes' WHERE judges_teams_id='".$_GET['team_id']."' AND judges_id='".$_GET['judge_id']."'"); + mysql_query("UPDATE judges_teams_link SET captain='yes' WHERE judges_teams_id='".$_GET['team_id']."' AND users_id='".$_GET['judge_id']."'"); echo happy(i18n("Team captain assigned")); } @@ -195,7 +195,7 @@ function switchjudgeinfo() } else { - mysql_query("UPDATE judges_teams_link SET captain='no' WHERE judges_teams_id='".$_GET['team_id']."' AND judges_id='".$_GET['judge_id']."'"); + mysql_query("UPDATE judges_teams_link SET captain='no' WHERE judges_teams_id='".$_GET['team_id']."' AND users_id='".$_GET['judge_id']."'"); echo happy(i18n("Team captain removed")); } } @@ -211,7 +211,7 @@ function switchjudgeinfo() echo ""; echo ""; echo ""; - echo ""; + echo ""; echo "
| ".i18n("Judges List"); @@ -236,81 +236,46 @@ function switchjudgeinfo() echo " |
|---|
"; echo "
"; echo "
| ";
- echo "";
+ echo "";
echo " | "; if($member['captain']=="yes") { @@ -355,7 +320,10 @@ function switchjudgeinfo() } echo ""; echo $member['firstname']." ".$member['lastname']; - echo " (".$member['languages'].")"; + if(is_array($j['languages'])) + $l = is_array($j['languages']) ? join(' ',$j['languages']) : ''; + + echo " ($l)"; echo " |
"; - if($_POST['action']=="add" || $_POST['action']=="edit") - { - $err=0; - if($_POST['date_year'] && $_POST['date_month'] && $_POST['date_day']) - { - $date=$_POST['date_year'] ."-". $_POST['date_month'] ."-". $_POST['date_day']; - } - else - { - $err=1; - echo error(i18n("Date is required")); + $round_str = array('timeslot' => 'Judging Timeslot', + 'divisional1' => 'Divisional Round 1', + 'divisional2' => 'Divisional Round 2', + 'grand' => 'Grand Awards', + 'special' => 'Special Awards' ); + + if(array_key_exists('action',$_POST)) $action = $_POST['action']; + else if(array_key_exists('action',$_GET)) $action = $_GET['action']; + else $action = ''; + + if(array_key_exists('round_id',$_POST)) $round_id = intval($_POST['round_id']); + else if(array_key_exists('round_id',$_GET)) $round_id = intval($_GET['round_id']); + else $round_id = 0; + + if(array_key_exists('timeslot_id',$_POST)) $timeslot_id = intval($_POST['timeslot_id']); + else if(array_key_exists('timeslot_id',$_GET)) $timeslot_id = intval($_GET['timeslot_id']); + else $timeslot_id = 0; + + if($action == 'saveround') { + $save = true; + /* Sanity check all the values */ + $y = intval($_POST['date_year']); + $m = intval($_POST['date_month']); + $d = intval($_POST['date_day']); + if($y && $m && $d) $date = "$y-$m-$d"; + else { + $save = false; + message_push(error(i18n("Date is required"))); } - if($_POST['starttime_hour'] && $_POST['starttime_minute']) - { - $starttime=$_POST['starttime_hour'] .":". $_POST['starttime_minute'].":00"; - } - else - { - $err=1; - echo error(i18n("Start Time is required")); + if(array_key_exists('starttime_hour', $_POST) && array_key_exists('starttime_minute', $_POST)) { + $starttime = sprintf("%02d:%02d:00", intval($_POST['starttime_hour']), intval($_POST['starttime_minute'])); + } else { + $save = false; + message_push( error(i18n("Start Time is required"))); } - if($_POST['endtime_hour'] && $_POST['endtime_minute']) - { - $endtime=$_POST['endtime_hour'] .":". $_POST['endtime_minute'].":00"; - } - else - { - $err=1; - echo error(i18n("End Time is required")); + if(array_key_exists('endtime_hour', $_POST) && array_key_exists('endtime_minute', $_POST)) { + $endtime = sprintf("%02d:%02d:00", intval($_POST['endtime_hour']), intval($_POST['endtime_minute'])); + } else { + $save = false; + message_push( error(i18n("End Time is required"))); } - $allowdivisional=$_POST['allowdivisional']; - if(!$allowdivisional) $allowdivisional="no"; + $type = $_POST['type']; + if(!array_key_exists($type, $round_str)) { + $save = false; + message_push(error(i18n('Invalid type specified'))); + } - if(!$err) - { - if($_POST['action']=="add") - { - mysql_query("INSERT INTO judges_timeslots (date,starttime,endtime,year) VALUES ('$date','$starttime','$endtime','".$config['FAIRYEAR']."')"); - echo happy(i18n("New timeslot successfully added")); + $name = mysql_escape_string(stripslashes($_POST['name'])); + + if($save == true) { + if($round_id == 0) { + /* New entry */ + mysql_query("INSERT INTO judges_timeslots (round_id,year) VALUES('0','{$config['FAIRYEAR']}')"); + $round_id = mysql_insert_id(); } - if($_POST['action']=="edit") - { - mysql_query("UPDATE judges_timeslots SET `date`='$date', starttime='$starttime', endtime='$endtime', allowdivisional='$allowdivisional' WHERE id='".$_POST['edit']."'"); - echo mysql_error(); - echo happy(i18n("Timeslot successfully saved")); + + mysql_query("UPDATE judges_timeslots SET `date`='$date', + starttime='$starttime', endtime='$endtime', + `name`='$name', + `type`='$type' WHERE id='$round_id'"); + + echo mysql_error(); + message_push(happy(i18n("Round successfully saved"))); + $action = ''; + } + + } + + if($action == 'deleteround') { + mysql_query("DELETE FROM judges_timeslots WHERE id='$round_id'"); + /* Also delete all timeslots */ + mysql_query("DELETE FROM judges_timeslots WHERE round_id='$round_id'"); + message_push(happy(i18n("Round successfully removed"))); + $action = ''; + } + if($action == 'deletetimeslot') { + mysql_query("DELETE FROM judges_timeslots WHERE id='$timeslot_id'"); + message_push(happy(i18n("Timeslot successfully removed"))); + $action = ''; + } + + if($action == 'savetimeslot') { + $save = true; + + $q = mysql_query("SELECT * FROM judges_timeslots WHERE id='$round_id'"); + $round_data = mysql_fetch_assoc($q); + + $date = $round_data['date']; + + if(array_key_exists('starttime_hour', $_POST) && array_key_exists('starttime_minute', $_POST)) { + $starttime = sprintf("%02d:%02d:00", intval($_POST['starttime_hour']), intval($_POST['starttime_minute'])); + } else { + $save = false; + message_push( error(i18n("Start Time is required"))); + } + + if(array_key_exists('endtime_hour', $_POST) && array_key_exists('endtime_minute', $_POST)) { + $endtime = sprintf("%02d:%02d:00", intval($_POST['endtime_hour']), intval($_POST['endtime_minute'])); + } else { + $save = false; + message_push( error(i18n("End Time is required"))); + } + + if($save == true) { + if($timeslot_id == 0) { + /* New entry */ + mysql_query("INSERT INTO judges_timeslots (round_id,date,type,year) VALUES('$round_id', + '$date','timeslot','{$config['FAIRYEAR']}')"); + $timeslot_id = mysql_insert_id(); } + + mysql_query("UPDATE judges_timeslots SET starttime='$starttime', endtime='$endtime' + WHERE id='$timeslot_id'"); + + echo mysql_error(); + message_push(happy(i18n("Timeslot successfully saved"))); + $action = ''; } } - else if($_POST['action']=="addmultiple") - { - if($_POST['addnum'] && $_POST['date_day'] && $_POST['date_month'] && $_POST['date_year'] && $_POST['starttime_hour'] && $_POST['starttime_minute'] && $_POST['duration'] && $_POST['break']) - { - $date=$_POST['date_year']."-".$_POST['date_month']."-".$_POST['date_day']; - $hr=$_POST['starttime_hour']; - $min=$_POST['starttime_minute']; - $dur=$_POST['duration']; - $brk=$_POST['break']; - $tt=$dur+$brk; + + if($action=='savemultiple') { + $save = true; + + $addnum = intval($_POST['addnum']); + $duration = intval($_POST['duration'] ); + $break = intval($_POST['break']); - if($_POST['allowdivisional']=="yes") $ad="yes"; else $ad="no"; + if(array_key_exists('starttime_hour', $_POST) && array_key_exists('starttime_minute',$_POST) && $addnum && $duration) { + + $q = mysql_query("SELECT * FROM judges_timeslots WHERE id='$round_id'"); + $round_data = mysql_fetch_assoc($q); - for($x=0;$x<$_POST['addnum'];$x++) - { - $q=mysql_query("SELECT DATE_ADD('$date $hr:$min:00', INTERVAL $dur MINUTE) AS endtime, - DATE_ADD('$date $hr:$min:00', INTERVAL $tt MINUTE) AS startnext - "); - echo mysql_error(); + $date = $round_data['date']; + + $hr=intval($_POST['starttime_hour']); + $min=intval($_POST['starttime_minute']); + + $tt=$duration+$break; + + for($x=0;$x<$addnum;$x++) { + $q=mysql_query("SELECT DATE_ADD('$date $hr:$min:00', INTERVAL $duration MINUTE) AS endtime, + DATE_ADD('$date $hr:$min:00', INTERVAL $tt MINUTE) AS startnext "); + echo mysql_error(); $r=mysql_fetch_object($q); list($ed,$et)=split(" ",$r->endtime); list($nd,$nt)=split(" ",$r->startnext); - mysql_query("INSERT INTO judges_timeslots (date,starttime,endtime,allowdivisional,year) VALUES ( - '$date', - '$hr:$min:00', - '$et', - '$ad', - '".$config['FAIRYEAR']."')"); - echo mysql_Error(); + $starttime = sprintf("%02d:%02d:00", $hr, $min); + + mysql_query("INSERT INTO judges_timeslots (date,type,round_id,starttime,endtime,year) VALUES ( + '$date','timeslot','{$round_data['id']}', + '$starttime', '$et', + '{$config['FAIRYEAR']}')"); + echo mysql_error(); $date=$nd; list($s_h,$s_m,$s_s)=split(":",$nt); list($e_h,$e_m,$e_s)=split(":",$et); - echo happy(i18n("Adding timeslot: %1",array($date." ".$hr.":".$min." - ".$e_h.":".$e_m))); + message_push(happy(i18n("Adding timeslot: %1",array("$date $hr:$min - $e_h:$e_m")))); $hr=$s_h; $min=$s_m; } + $action = ''; + } else { + message_push(error(i18n("All fields are required to add multiple timeslots"))); } - else - echo error(i18n("All fields are required to add multiple timeslots")); + } + + + + if($action == '') { + send_header("Judging Rounds and Timeslots", + array('Committee Main' => 'committee_main.php', + 'Administration' => 'admin/index.php', + 'Judges' => 'admin/judges.php')); + } else { + send_header("Judging Rounds and Timeslots", + array('Committee Main' => 'committee_main.php', + 'Administration' => 'admin/index.php', + 'Judges' => 'admin/judges.php', + 'Judging Rounds and Timeslots' => 'admin/judges_timeslots.php')); + } + echo "
"; + + + if($action == 'addround' || $action == 'editround') { + echo ""; } - //FIXME: only delete if the timeslot is not in use!!! - if($_GET['action']=="delete" && $_GET['delete']) - { - mysql_query("DELETE FROM judges_timeslots WHERE id='".$_GET['delete']."'"); - echo happy(i18n("Timeslot successfully removed")); + if($action == 'addtimeslot' || $action == 'edittimeslot') { + echo ""; } - if($_GET['action']=="addmultiple") - { + if($action == 'addmultiple') { echo "
Add Multiple New Judging Timeslots
"; - echo "<< ".i18n("Back to Judging Timeslots")."\n"; - $q=mysql_query("SELECT * FROM judges_timeslots WHERE year='".$config['FAIRYEAR']."' ORDER BY date DESC LIMIT 1"); - if(mysql_num_rows($q)) - { - $r=mysql_fetch_object($q); - $date=$r->date; - } - else - { - $date=$config['dates']['fairdate']; - } - echo ""; + + if($sponsors_id) + { + if($_POST['save']=="edit" || $_POST['save']=="add") + { + $p = ($_POST['primary']=='yes')?'yes':'no'; + + if($_POST['save']=="add") { + $u=user_create("sponsor", $_POST['email']); + $id=$u['id']; + } + else { + $u=user_load($_POST['id']); + $id=intval($_POST['id']); + } + + if($p == 'no') { + /* Make sure this sponsor ($sponsors_id) has a primary */ + $q = mysql_query("SELECT users_id + FROM users_sponsor, users + WHERE + users_sponsor.users_id=users.id + AND sponsors_id='$sponsors_id' + AND `primary`='yes' + AND year='".$config['FAIRYEAR']."' + AND users_id!='$id'"); + if(mysql_num_rows($q) == 0) { + /* This must be the primary */ + $p = 'yes'; + } + } else { + /* Unset all other primaries */ + mysql_query("UPDATE users_sponsor SET `primary`='no' + WHERE sponsors_id='$sponsors_id'"); + } + + $u['primary']=$p; + $u['salutation']=$_POST['salutation']; + $u['firstname']=$_POST['firstname']; + $u['lastname']=$_POST['lastname']; + $u['position']=$_POST['position']; + $u['phonework']=$_POST['phonework']; + $u['phonecell']=$_POST['phonecell']; + $u['phonehome']=$_POST['phonehome']; + $u['fax']=$_POST['fax']; + $u['email']=$_POST['email']; + $u['notes']=$_POST['notes']; + $u['sponsors_id']=$sponsors_id; + user_save($u); + + if($_POST['save']=="add") + echo happy(i18n("Contact successfully added")); + else + echo happy(i18n("Successfully saved changes to contact")); + } + + if($_GET['action']=="delete" && $_GET['delete']) { + user_delete(intval($_GET['delete'])); + echo happy("Contact successfully deleted"); + } + + if($_GET['action']=="edit" || $_GET['action']=="add") + { + + echo "<< ".i18n("Back to %1 Contacts",array($sponsors_organization))."\n"; + if($_GET['action']=="edit") + { + echo "".i18n("Edit %1 Contact",array($sponsors_organization))."
\n"; + $buttontext="Save Contact"; +// $q=mysql_query("SELECT * FROM sponsor_contacts WHERE id='".$_GET['edit']."'"); +// $r=mysql_fetch_object($q); + $u=user_load(intval($_GET['edit'])); + } + else if($_GET['action']=="add") + { + echo "".i18n("Add %1 Contact",array($sponsors_organization))."
\n"; + $buttontext="Add Contact"; + } + $buttontext=i18n($buttontext); + + echo "\n"; + } + else + { + + echo ""; + echo "".i18n("Add New Contact to %1",array($sponsors_organization))."\n"; + echo "
"; + + $q=mysql_query("SELECT * FROM users LEFT JOIN users_sponsor ON users_sponsor.users_id=users.id + WHERE year='".$config['FAIRYEAR']."' + AND sponsors_id='$sponsors_id' + AND deleted='no' + ORDER BY lastname,firstname"); + echo mysql_Error(); + + if(mysql_num_rows($q)) + { + echo "
| ".i18n("Name")." | "; + echo "".i18n("Email")." | "; + echo "".i18n("Phone (Work)")." | "; + echo "".i18n("Phone (Cell)")." | "; + echo "".i18n("Primary")." | "; + echo "Actions | "; + echo "
|---|---|---|---|---|---|
| "; + if($r->salutation) echo $r->salutation." "; + echo "$r->firstname $r->lastname | \n"; + echo ""; + if($r->email) { + list($eb,$ea)=split("@",$r->email); + echo ""; + } + else + echo " "; + + echo " | "; + echo "$r->phonework | \n"; + echo "$r->phonecell | \n"; + $p = i18n(($r->primary=='yes')?'Yes':'No'); + echo "$p | \n"; + echo "";
+ //FIXME: should we just go to /user_personal.php here instead?
+ echo "id\">![](\"".$config['SFIABDIRECTORY']."/images/16/edit.".$config['icon_extension']."\") ";
+ echo " ";
+ echo "id\">";
+ echo " | \n";
+ echo "
".i18n("Edit Award Sponsor")."
\n"; + $buttontext="Save Sponsor"; + $q=mysql_query("SELECT * FROM sponsors WHERE id='".$_GET['edit']."'"); + $r=mysql_fetch_object($q); + } + else if($_GET['action']=="add") + { + echo "".i18n("Add New Award Sponsor")."
\n"; + $buttontext="Add Sponsor"; + } + $buttontext=i18n($buttontext); + + echo "\n"; + + + + } + else + { + echo "Add New Sponsor\n"; + echo ""; + echo "
| Organization | "; + echo "# of Sponsorships | "; + echo "# of Awards | "; + echo "# of Contacts | "; + echo "Action | "; + echo "
|---|---|---|---|---|
| $r->organization | \n"; + + $numq=mysql_query("SELECT COUNT(id) AS num FROM award_awards WHERE year='".$config['FAIRYEAR']."' AND sponsors_id='$r->id'"); + $numr=mysql_fetch_object($numq); + $numawards=$numr->num; + + $numq=mysql_query("SELECT COUNT(id) AS num FROM sponsorships WHERE year='".$config['FAIRYEAR']."' AND sponsors_id='$r->id'"); + $numr=mysql_fetch_object($numq); + $numsponsorships=$numr->num; + + $numq=mysql_query("SELECT COUNT(users_id) AS num FROM users_sponsor, users WHERE sponsors_id='$r->id' AND users_sponsor.users_id=users.id AND users.year='".$config['FAIRYEAR']."' and users.deleted='no'"); + $numr=mysql_fetch_object($numq); + $numcontacts=$numr->num; + + + echo "";
+ echo "$numsponsorships ";
+ echo "id\">![\"view\"](\"".$config['SFIABDIRECTORY']."/images/16/viewmag.".$config['icon_extension']."\") ";
+ echo " | ";
+
+ echo " ";
+ echo "$numawards ";
+ echo "id\">";
+ echo " | ";
+
+ echo " ";
+ echo "$numcontacts ";
+ echo "id\">";
+ echo " | ";
+ echo " ";
+ echo "id\">";
+ /* cannot delete sponsors, we need to be able to link to them from other years, etc... this could be turned back on as a soft delete eventually
+ echo " ";
+ echo "id\">";
+*/
+
+ echo " | \n";
+ echo "
- ';
+foreach($tabs as $k=>$t) {
+ /* Make sure the tab is enabled */
+ if($t['enabled'] == false) continue;
+ /* Make sure the user has the right type to see the tab */
+ $i = array_intersect($t['types'], $u['types']);
+ if(count($i) == 0) continue;
+ /* Show the tab */
+ $sel = ($selected == $k) ? 'htabs_sel' : '';
+ $href = "{$_SERVER['PHP_SELF']}?id=$id&tab=$k";
+ echo "
- ".i18n($t['label'])." "; +} +echo '
';
+include("{$t['file']}");
+echo '
';
+
+unset($_SESSION['embed']);
+unset($_SESSION['embed_edit_id']);
+unset($_SESSION['embed_submit_url']);
+
+$icon_path = $config['SFIABDIRECTORY']."/images/16/";
+$icon_exitension = $config['icon_extension'];
+
+
+ send_popup_footer();
+?>
diff --git a/admin/user_invite.php b/admin/user_invite.php
deleted file mode 100644
index 4c27d8c..0000000
--- a/admin/user_invite.php
+++ /dev/null
@@ -1,136 +0,0 @@
-
- Copyright (C) 2005 James Grant - ';
- foreach($types as $t) {
- echo '
- '.i18n($user_what[$t]).' '; - } - echo '
\n"; - echo "
\n"; - echo "\n"; - - send_footer(); -?> diff --git a/admin/user_list.php b/admin/user_list.php new file mode 100644 index 0000000..b001ea1 --- /dev/null +++ b/admin/user_list.php @@ -0,0 +1,291 @@ + + Copyright (C) 2005 James Grant
".i18n('Add New User').""; + echo ''; + echo "
"; + echo "
"; + + /* Grab a list of users */ + $w = array(); + foreach($show_types as $t) { + $w [] = "users.types LIKE '%$t%'"; + } + $where_types = "AND (".join(" OR ", $w).")"; + + $where_complete = ""; + if($show_complete == 'yes') { + foreach($show_types as $t) { + $where_complete .= "AND ({$t}_complete='yes' OR {$t}_complete IS NULL) "; + } + } + + if($show_year == 'current') + $where_year = "AND year={$config['FAIRYEAR']}"; + + echo "
| ".i18n("Name")." | "; + echo "".i18n("Email Address")." | "; + echo "".i18n("Year")." | "; + echo "".i18n("Type(s)")." | "; + echo "".i18n("Active")." | "; + echo "".i18n("Complete")." | "; + echo "".i18n("Actions")." | "; + echo "
|---|---|---|---|---|---|---|
| ";
+
+ $name = "{$r['firstname']} {$r['lastname']}";
+ if(in_array('fair', $types)) {
+ $qq = mysql_query("SELECT * FROM users_fair
+ LEFT JOIN fairs ON fairs.id=users_fair.fairs_id
+ WHERE users_id='{$r['id']}'");
+ $rr = mysql_fetch_assoc($qq);
+ $name = "{$rr['name']}".((trim($name)=='') ? '' : " ($name)"); + } + echo "$name"; + echo " | ";
+
+ echo "{$r['email']} | "; + + echo "{$r['year']} | "; + + $first = true; + foreach($types as $t) { + if(!$first) echo '||||
| {$user_what[$t]} | "; + + echo "";
+ if($r["{$t}_active"] == 'yes') {
+ echo " ".i18n("yes")." ";
+ } else {
+ echo "".i18n("no")." ";
+ }
+ echo " | ";
+
+ echo "";
+ if($r["{$t}_complete"] == 'yes') {
+ echo " ".i18n("yes")." ";
+ $completeyes++;
+ } else {
+ echo "".i18n("no")." ";
+ $completeno++;
+ }
+ echo " | ";
+
+ if($first) {
+ /* Finish off the the first line */
+ echo "";
+ echo "![](\"{$config['SFIABDIRECTORY']}/images/16/edit.{$config['icon_extension']}\") ";
+ echo "![](\"{$config['SFIABDIRECTORY']}/images/16/button_cancel.{$config['icon_extension']}\") ";
+ echo " | ";
+ }
+
+ $first = false;
+ }
+ echo '
"; + echo "
"; + echo "$num ".i18n("people listed."); + echo "
"; + echo "$completeyes ".i18n('complete'); + echo "
"; + echo "$completeno ".i18n('incomplete'); + echo "
"; + echo "
"; + echo "
"; + + send_footer(); +?> diff --git a/admin/volunteer_positions_manager.php b/admin/volunteer_positions_manager.php index 838b240..5c8f4ee 100644 --- a/admin/volunteer_positions_manager.php +++ b/admin/volunteer_positions_manager.php @@ -47,6 +47,7 @@ $editor->setPrimaryKey("id"); $editor->setDefaultSortField("start,name"); $editor->setRecordType("Volunteer Position"); + $editor->filterList('year',$config['FAIRYEAR']); $editor->execute(); send_footer(); diff --git a/admin/volunteers.php b/admin/volunteers.php index 83f2e9c..f44d9be 100644 --- a/admin/volunteers.php +++ b/admin/volunteers.php @@ -32,11 +32,9 @@ "volunteer_management" ); echo "
"; - if($config['volunteer_registration_type']=="invite") - { - echo "".i18n("Invite Volunteers")."
"; - } - echo "".i18n("Volunteer Position Management")."
"; + echo "".i18n("Volunteer Manager")."
"; + echo "".i18n("Volunteer Position Management")."
"; + echo "".i18n("Invite Volunteers")."
"; send_footer(); diff --git a/admin/winners.php b/admin/winners.php index 249dea6..cbce6c9 100644 --- a/admin/winners.php +++ b/admin/winners.php @@ -28,8 +28,8 @@ user_auth_required('committee', 'admin'); - if($_GET['award_sponsors_id']) $award_sponsors_id=$_GET['award_sponsors_id']; - else if($_POST['award_sponsors_id']) $award_sponsors_id=$_POST['award_sponsors_id']; + if($_GET['sponsors_id']) $sponsors_id=$_GET['sponsors_id']; + else if($_POST['sponsors_id']) $sponsors_id=$_POST['sponsors_id']; if($_GET['award_types_id']) $award_types_id=$_GET['award_types_id']; else if($_POST['award_types_id']) $award_types_id=$_POST['award_types_id']; @@ -274,16 +274,16 @@ else award_awards.name, award_awards.order AS awards_order, award_types.type, - award_sponsors.organization + sponsors.organization FROM award_awards, award_types, - award_sponsors + sponsors WHERE award_awards.year='".$config['FAIRYEAR']."' AND award_awards.award_types_id=award_types.id AND award_types.year='".$config['FAIRYEAR']."' - AND award_awards.award_sponsors_id=award_sponsors.id + AND award_awards.sponsors_id=sponsors.id ORDER BY awards_order"); echo mysql_error(); diff --git a/admin/ysfstats.php b/admin/ysfstats.php index 382b247..a99e6fe 100644 --- a/admin/ysfstats.php +++ b/admin/ysfstats.php @@ -46,7 +46,7 @@ curl_setopt ($ch, CURLOPT_POSTFIELDSIZE, 0); curl_setopt ($ch, CURLOPT_TIMEOUT, 360); curl_setopt ($ch, CURLOPT_SSLVERSION, 3); - curl_setopt ($ch, CURLOPT_SSL_VERIFYPEER, false); + curl_setopt ($ch, CURLOPT_SSL_VERIFYPEER, false); $datastream = curl_exec ($ch); /// execute the curl session and return the output to a variable $datastream $datastream = str_replace(" standalone=\"yes\"","",$datastream); // echo "curl close
"; @@ -234,14 +234,22 @@ $stats["proj910"]=$projs["910"]?$projs["910"]:0; $stats["proj11up"]=$projs["11up"]?$projs["11up"]:0; - $q=mysql_query("SELECT COUNT(id) AS num FROM users WHERE types LIKE '%committee%' AND deleted='no'"); + $q=mysql_query("SELECT COUNT(id) AS num FROM users + WHERE types LIKE '%committee%' + AND year='$year' + AND deleted='no'"); $r=mysql_fetch_object($q); $numcommittee=$r->num; - echo i18n("Committee Members: %1 (note: this is CURRENT number of active committee members as of right now! There is no way to extract committee member numbers from previous years)",array($r->num)); + echo i18n("Committee Members: %1 (note: this is number of committee members who logged in to SFIAB for the year, anyone who was active but didn't log in to SFIAB will NOT be counted)",array($r->num)); echo "
"; $stats["committee"]=$numcommittee; - $q=mysql_query("SELECT COUNT(id) AS num FROM judges,judges_years WHERE judges_years.judges_id=judges.id AND judges_years.year='$year' AND judges.complete='yes' AND judges.deleted='no'"); + $q=mysql_query("SELECT COUNT(id) AS num FROM users LEFT JOIN users_judge ON users_judge.users_id=users.id + WHERE users.year='$year' + AND users.types LIKE '%judge%' + AND users.deleted='no' + AND users_judge.judge_complete='yes' + AND users_judge.judge_active='yes'"); $r=mysql_fetch_object($q); $numjudges=$r->num; echo i18n("Judges: %1",array($r->num)); diff --git a/committee_main.php b/committee_main.php index 5ac06b9..a91bf8c 100644 --- a/committee_main.php +++ b/committee_main.php @@ -31,18 +31,6 @@ send_header("Committee Main", array()); - switch($_GET['notice']) { - case 'password_changed': - echo happy(i18n('Your password has been successfully updated')); - break; - case 'already_logged_in': - echo error(i18n('You are already logged in, please use the [Logout] link in the upper right to logout')); - break; - case 'no_auth': - echo error(i18n('You do not have permission to view that page')); - break; - } - //only display the named greeting if we have their name echo i18n("Hello %1",array($_SESSION['name'])); echo "
"; @@ -61,6 +49,7 @@ echo "
".i18n("Edit My Profile")."
".i18n("Change My Password")."
".i18n("Manage My Roles")."
$r->name
"; + echo "{$r->name}
"; echo ""; } +function display_messages() +{ + /* Dump any messages in the queue */ + if(is_array($_SESSION['messages'])) { + foreach($_SESSION['messages'] as $m) echo $m; + } + $_SESSION['messages'] = array(); +} + $HEADER_SENT=false; function send_header($title="", $nav=null, $icon=null, $titletranslated=false) { @@ -378,51 +383,9 @@ function send_header($title="", $nav=null, $icon=null, $titletranslated=false) - + + + [".i18n("Logout")."]"; - } else if(isset($_SESSION['registration_id'])) { + if(isset($_SESSION['registration_id'])) { echo i18n('Participant'); echo " {$_SESSION['email']}: "; echo "[".i18n("Logout")."]"; @@ -496,12 +455,14 @@ echo ""; ".i18n("Home Page").''; echo "
-
".i18n("My Profile").'';
+ echo "
- ".i18n("Committee Home").' '; if(committee_auth_has_access("admin")){ - echo "
- ".i18n("My Profile").' '; echo "
- ".i18n("Fair Administration").' '; } if(committee_auth_has_access("config")){ - echo "
- ".i18n("SFIAB Configuration").' '; + echo "
- ".i18n("Configuration").' '; } - - echo "
- ".i18n("Committee Logout").' '; + echo "
- ".i18n("Logout").' '; +} else if($_SESSION['users_type']=="judge") { + echo "
- ".i18n("My Profile").' '; + echo "
- ".i18n("Judge Home").' '; + echo "
- ".i18n("Logout").' '; +} else if($_SESSION['users_type']=="volunteer") { + echo "
- ".i18n("My Profile").' '; + echo "
- ".i18n("Volunteer Home").' '; + echo "
- ".i18n("Logout").' '; +} else if($_SESSION['users_type']=="sponsor") { + echo "
- ".i18n("My Profile").' '; + echo "
- ".i18n("Sponsor Home").' '; + echo "
- ".i18n("Logout").' '; +} else if($_SESSION['schoolid'] && $_SESSION['schoolaccesscode']) { + echo "
- ".i18n("School Home").' '; + echo "
- ".i18n("Logout").' '; +} +else if($_SESSION['registration_number'] && $_SESSION['registration_id']) { + echo "
- ".i18n("Participant Home").' '; + echo "
- ".i18n("Logout")." \n"; } else { - echo "
- ".i18n("Committee Login").' '; + echo "
- ".i18n("Login/Register").' '; } ?>
-
-
-".i18n("School Access").'';
- echo "
- ".i18n("School Logout").' '; -} else { - echo "
- ".i18n("School Login").' '; -} - -if($config['fairs_enable'] == 'yes' && $config['fairs_allow_login'] == 'yes') { - echo "
- ".i18n("{$config['fairs_name']} Fair Login").' '; -} -?>
- -
-
1)
-{
+if(count($config['languages'])>1) {
echo "
"; echo "
';
}
?>
@@ -632,7 +579,10 @@ if(substr(getcwd(),-6)=="/admin" || substr(getcwd(),-7)=="/config")
}
""; echo "
"; //award types $q=mysql_query("SELECT * FROM award_types WHERE year='$currentfairyear'"); @@ -303,18 +300,35 @@ echo i18n("Rolling registration fee items")."
"; //regfee items - $q=mysql_query("SELECT * FROM regfee_items WHERE year='$currentfairyear'"); - echo mysql_error(); - while($r=mysql_fetch_object($q)) - mysql_query("INSERT INTO regfee_items (`year`,`name`,`description`,`cost`,`per`) VALUES ( - '$newfairyear', - '".mysql_escape_string($r->name)."', - '".mysql_escape_string($r->description)."', - '".mysql_escape_string($r->cost)."', - '".mysql_escape_string($r->per)."')"); + roll($currentfairyear, $newfairyear, 'regfee_items', + array('name','description','cost','per')); - echo "
"; - echo "
"; + //volunteer positions + echo i18n('Rolling volunteer positions')."
"; + roll($currentfairyear, $newfairyear, 'volunteer_positions', + array('name','desc','meet_place','start','end')); + + //timeslots and rounds + echo i18n('Rolling judging timeslots and rounds')."
"; + $q=mysql_query("SELECT * FROM judges_timeslots WHERE year='$currentfairyear' AND round_id='0'"); + echo mysql_error(); + while($r=mysql_fetch_assoc($q)) { + $d = $newfairyear - $currentfairyear; + mysql_query("INSERT INTO judges_timeslots (`year`,`round_id`,`type`,`date`,`starttime`,`endtime`,`round_name`) + VALUES ('$newfairyear','0','{$r['type']}',DATE_ADD('{$r['date']}', INTERVAL $d YEAR), + '{$r['starttime']}','{$r['endtime']}','{$r['round_name']}')"); + echo mysql_error(); + $round_id = mysql_insert_id(); + $qq = mysql_query("SELECT * FROM judges_timeslots WHERE round_id='{$r['id']}'"); + echo mysql_error(); + while($rr=mysql_fetch_assoc($qq)) { + mysql_query("INSERT INTO judges_timeslots (`year`,`round_id`,`type`,`date`,`starttime`,`endtime`) + VALUES ('$newfairyear','$round_id','timeslot',DATE_ADD('{$rr['date']}', INTERVAL $d YEAR), + '{$rr['starttime']}','{$rr['endtime']}')"); + } + } + + echo "
"; mysql_query("UPDATE config SET val='$newfairyear' WHERE var='FAIRYEAR' AND year=0"); echo happy(i18n("Fair year has been rolled over from %1 to %2",array($currentfairyear,$newfairyear))); send_footer(); diff --git a/config/variables.php b/config/variables.php index f662eca..3347244 100644 --- a/config/variables.php +++ b/config/variables.php @@ -26,11 +26,6 @@ require_once("../user.inc.php"); require_once("../config_editor.inc.php"); user_auth_required('committee', 'config'); - send_header("Configuration Variables", - array('Committee Main' => 'committee_main.php', - 'SFIAB Configuration' => 'config/index.php') - ,"configuration_variables" - ); $q=mysql_query("SELECT * FROM config WHERE year='-1'"); while($r=mysql_fetch_object($q)) @@ -56,7 +51,7 @@ mysql_query("UPDATE config SET val='".mysql_escape_string(stripslashes($val))."' WHERE year='0' AND var='$key'"); } } - echo happy(i18n("Configuration successfully saved")); + message_push(happy(i18n("Configuration successfully saved"))); } //get the category, and if nothing is chosen, default to Global @@ -64,6 +59,19 @@ else if($_POST['category']) $category=$_POST['category']; else $category="Global"; + $action = config_editor_handle_actions($category, $config['FAIRYEAR'], "var"); + if($action == 'update') { + header("Location: variables.php?category=$category"); + exit; + } + + send_header("Configuration Variables", + array('Committee Main' => 'committee_main.php', + 'SFIAB Configuration' => 'config/index.php') + ,"configuration_variables" + ); + + $q=mysql_query("SELECT DISTINCT(category) AS cat FROM config ORDER BY cat"); echo "\n
");
print("
| ||||
"; echo "Creating superuser account..."; - $u = user_create('committee'); + $u = user_create('committee',$_POST['email']); if($_POST['firstname'] && $_POST['lastname']) { $u['firstname']=mysql_escape_string(stripslashes($_POST['firstname'])); $u['lastname']=mysql_escape_string(stripslashes($_POST['lastname'])); diff --git a/judge.class.php b/judge.class.php deleted file mode 100644 index 4b937fa..0000000 --- a/judge.class.php +++ /dev/null @@ -1,392 +0,0 @@ - 'First Name', - 'lastname' => 'Last Name', - 'email' => 'Email Address', - 'password' => 'Password', - 'passwordexpiry' => 'Password Expiry', - 'phonehome' => 'Phone (Home)', - 'phonecell' => 'Phone (Cell)', - 'phonework' => 'Phone (Work)', - 'phoneworkext' => 'Phone Ext. (Work)', - 'organization' => 'Organization', -// 'created' => 'Created', -// 'lastlogin' => 'Last Login', - 'address' =>"Address 1", - 'address2' =>"Address 2", - 'city' => 'City', - 'province' => $config['provincestate'], - 'postalcode' => $config['postalzip'], -// 'deleted' => 'Deleted', -// 'deleteddatetime' => 'Deleted Date/Time', - 'expertise_other' => 'Other Expertise/Notes', - 'typepref' => 'Type Request', - 'complete' => "Complete"); - - /* Setup the table editor with the fields we want to display - * when displaying a list of judges, and also the type of each - * field where required */ -$judges_table_fields = array( 'id' => 'ID', - 'firstname' => 'First Name', - 'lastname' => 'Last Name', - 'email' => 'Email Address', - 'complete' => 'Complete', -// 'year' => 'Year', - ); - - -class person { - var $id; - -function person($person_id=NULL) -{ - if($person_id == NULL) { -// print("Empty constructor called\n"); - $this->id = FALSE; - } else { -// print("ID $person_id construction called\n"); - $this->id = $person_id; - } -} -}; - - -class judge extends person /*implements TableEditorInterface*/ { - -/* Static members for the table editor */ -function tableEditorSetup($editor) -{ - global $judges_fields, $judges_table_fields; - global $config; - - $cat = array(); - $catf = array(); - $q=mysql_query("SELECT * FROM projectcategories WHERE year='".$config['FAIRYEAR']."' ORDER BY id"); - while($r=mysql_fetch_object($q)) { - $cat[$r->id]=$r->category; - $catf["catpref_{$r->id}"] = "Category Pref|{$r->category}:"; - } - - $div = array(); - $diff = array(); - $q=mysql_query("SELECT * FROM projectdivisions WHERE year='".$config['FAIRYEAR']."' ORDER BY id"); - while($r=mysql_fetch_object($q)) { -// $divshort[$r->id]=$r->division_shortform; - $div[$r->id]=$r->division; - /* yes, catf */ - $catf["divpref_{$r->id}"] = "Expertise|{$r->division}:"; - } - - $q = mysql_query("SELECT * FROM award_awards WHERE year='{$config['FAIRYEAR']}' - AND (award_types_id=2 OR award_types_id=5) ORDER BY id"); - while($r=mysql_fetch_object($q)) { -// $divshort[$r->id]=$r->division_shortform; - $sa[$r->id]=$r->name; - /* yes, catf */ - $catf["sa_{$r->id}"] = "Special Award|{$r->name}:"; - } - - - - - /* Most of these should be moved to the base class, as they - * will be the same for all person groups */ - $e = array_merge($judges_fields, - array( 'language' => 'Language(s)', - )); - $e = array_merge($e, $catf); - - $editor->setTable('judges'); - $editor->setRecordType('Judge'); - $editor->setListFields($judges_table_fields); - $editor->setEditFields($e); - - $editor->setFieldOptions('complete', array( - array('key' => 'yes', 'val' => 'Yes'), - array('key' => 'no', 'val' => 'No'))); - $editor->setFieldOptions('year', array( - array('key' => 'NULL', 'val' => 'Inactive'), - array('key' => $config['FAIRYEAR'], 'val' => $config['FAIRYEAR']))); - -// print_r($e); - print("
\n"); - /* Build an array of langauges that we support */ - $langs = array(); - $q=mysql_query("SELECT * FROM languages WHERE active='Y'"); - while($r=mysql_fetch_object($q)) { - $langs[$r->lang] = $r->langname; - } - $editor->setFieldOptions('language', $langs); - $editor->setFieldInputType('language', 'multicheck'); - - - /* Pulled these out of register_judges.inc.php */ - $preferencechoices=array( - array('key' => -2, 'val' => "Very Low"), - array('key' => -1, 'val' => "Low"), - array('key' => 0, 'val' => "Indifferent"), - array('key' => 1, 'val' => "Medium"), - array('key' => 2, 'val' => "High") ); - - foreach($cat as $cid=>$category) { - $editor->setFieldOptions("catpref_$cid", $preferencechoices); - $editor->setFieldInputType("catpref_$cid", 'select'); - } - $expertisechoices=array( - array('key' => 1, 'val' => "(1) Low"), - array('key' => 2, 'val' => "(2) Med-Low"), - array('key' => 3, 'val' => "(3) Medium"), - array('key' => 4, 'val' => "(4) Med-High"), - array('key' => 5, 'val' => "(5) High") ); - - foreach($div as $did=>$division) { - $editor->setFieldOptions("divpref_$did", $expertisechoices); - $editor->setFieldInputType("divpref_$did", 'select'); - } - - if(count($sa)) { - foreach($sa as $said=>$special_award) { - $editor->setFieldOptions("sa_$said", array( - array('key' => 'yes', 'val' => 'Would like to judge'), - array('key' => '', 'val' => ''))); - $editor->setFieldInputType("sa_$said", 'select'); - } - } - - $editor->setFieldOptions('typepref', array( - array('key' => 'speconly', 'val' => 'Special Award Judge Only'), - array('key' => '', 'val' => 'Regular Judge'))); - $editor->SetFieldInputType('typepref', 'select'); - - - $editor->createOption('judges_show_what'); -} - -/* STATIC */ -function tableEditorGetList($editor) -{ - //return $editor->defaultGetList(); - global $config; - global $judges_table_fields; - - $show_what = $editor->getOption('judges_show_what'); - - $sel = array_keys($judges_table_fields); - $from = array('judges'); - $where = array(); - - switch($show_what) { - case "all": -// $editor->additionalListTableLeftJoin("judges_years", "judges_years.judges_id=judges.id"); -// $editor->filterList("(judges_years.year={$config['FAIRYEAR']} OR judges_years.year IS NULL)"); - break; - case "current_year_active": - $from[] = "LEFT JOIN `judges_years` ON judges_years.judges_id=judges.id"; - $where[] = "judges_years.year={$config['FAIRYEAR']}"; - break; - case "current_year_complete": - $from[] = "LEFT JOIN `judges_years` ON judges_years.judges_id=judges.id"; - $where[] = "judges_years.judges_id=judges.id"; - $where[] = "judges_years.year={$config['FAIRYEAR']}"; - $where[] = "judges.complete='yes'"; - break; - } - //only show non-deleted judges - $where[] = "judges.deleted='no'"; - - return array($sel, $from, $where); -} - - - -/* Functions for $this */ - - -function judge($judge_id=NULL) -{ - global $judges_fields; - person::person($judge_id); -} - -function tableEditorLoad() -{ - global $config; - - $id = $this->id; - -// print("Loading Judge ID $id\n"); - - $q=mysql_query("SELECT judges.* - FROM judges - WHERE judges.id='$id'"); - echo mysql_error(); - - - /* We assume that the field names in the array we want to return - * are the same as those in the database, so we'll turn the entire - * query into a single associative array */ - $j = mysql_fetch_assoc($q); - - /* Now turn on the ones this judge has selected */ - $q=mysql_query("SELECT languages_lang - FROM judges_languages - WHERE judges_id='$id'"); - $j['language'] = array(); - if(mysql_num_rows($q)) { - while($r=mysql_fetch_object($q)) { - $j['language'][$r->languages_lang] = 1; - } - } - - $q=mysql_query("SELECT * - FROM judges_catpref - WHERE judges_id='$id' - AND year='{$config['FAIRYEAR']}'"); - if(mysql_num_rows($q)) { - while($r=mysql_fetch_object($q)) { - $j["catpref_{$r->projectcategories_id}"] = $r->rank; - } - } - $q=mysql_query("SELECT * - FROM judges_expertise - WHERE judges_id='$id' - AND year='{$config['FAIRYEAR']}'"); - if(mysql_num_rows($q)) { - while($r=mysql_fetch_object($q)) { - $j["divpref_{$r->projectdivisions_id}"] = $r->val; - } - } - - $q=mysql_query("SELECT * - FROM judges_specialaward_sel - WHERE judges_id='$id' - AND year='{$config['FAIRYEAR']}'"); - if(mysql_num_rows($q)) { - while($r=mysql_fetch_object($q)) { - $j["sa_{$r->award_awards_id}"] = 'yes'; - } - } - -// print_r($j); - - return $j; -} - -function tableEditorSave($data) -{ - /* If $this->id == false, then we need to INSERT a new record. - * if it's a number, then we want an UPDATE statement */ - global $judges_fields; - global $config; - - $query = ""; - - /* Construct an insert query if we have to */ - if($this->id == false) { - $query = "INSERT INTO judges (id) VALUES ('')"; - mysql_query($query); - $this->id = mysql_insert_id(); - } - - /* Now just update the record */ - $query="UPDATE `judges` SET "; - - foreach($judges_fields AS $f=>$n) { - $n = $data[$f]; - $query .= "`$f`=$n,"; - } - //rip off the last comma - $query=substr($query,0,-1); - - $query .= " WHERE id='{$this->id}'"; - -// echo $query; - mysql_query($query); - - - /* judges_languages */ - /* First delete all the languages, then insert the ones the judge - * has selected */ - $query = "DELETE FROM judges_languages WHERE judges_id='{$this->id}'"; - mysql_query($query); - -// print_r($data['language']); - $keys = array_keys($data['language']); - foreach($keys as $k) { - $query = "INSERT INTO - judges_languages (judges_id,languages_lang) - VALUES ('{$this->id}','$k')"; -// print("$query"); - mysql_query($query); - } - - /* judges_catpref */ - $query = "DELETE FROM judges_catpref WHERE judges_id='{$this->id}'"; -// print($query); - mysql_query($query); - - /* Find all the catpref_[number] keys */ - $keys = array_keys($data); - foreach($keys as $k) { - if(ereg("^catpref_([0-9]*)$", $k, $regs)) { - if($data[$k] == "''") continue; - $query = "INSERT INTO judges_catpref - (judges_id,projectcategories_id,rank,year) - values ('{$this->id}','{$regs[1]}',{$data[$k]},'{$config['FAIRYEAR']}')"; -// print($query."
\n"); - mysql_query($query); - - } - } - /* Find all the divpref_[number] keys */ - $query = "DELETE FROM judges_expertise WHERE judges_id='{$this->id}'"; -// print($query); - mysql_query($query); - $keys = array_keys($data); - foreach($keys as $k) { - if(ereg("^divpref_([0-9]*)$", $k, $regs)) { - if($data[$k] == "''") continue; - $query = "INSERT INTO judges_expertise - (judges_id,projectdivisions_id,val,year) - values ('{$this->id}','{$regs[1]}',{$data[$k]},'{$config['FAIRYEAR']}')"; -// print($query."
\n"); - mysql_query($query); - - } - } - - $query = "DELETE FROM judges_specialaward_sel WHERE judges_id='{$this->id}'"; - mysql_query($query); - $keys = array_keys($data); - foreach($keys as $k) { - if(ereg("^sa_([0-9]*)$", $k, $regs)) { - if($data[$k] == "''") continue; - $query = "INSERT INTO judges_specialaward_sel - (judges_id,award_awards_id,year) - values ('{$this->id}','{$regs[1]}','{$config['FAIRYEAR']}')"; -// print($query."
\n"); - mysql_query($query); - } - } -} - -function tableEditorDelete() -{ - global $config; - - $id = $this->id; - - mysql_query("DELETE FROM judges_teams_link WHERE judges_id='$id' AND year=".$config['FAIRYEAR']."'"); - mysql_query("DELETE FROM judges_years WHERE judges_id='$id' AND year='".$config['FAIRYEAR']."'"); - mysql_query("UPDATE judges SET deleted='yes', deleteddatetime=NOW() WHERE id='$id'"); - - echo happy(i18n("Successfully deleted the judge")); -} - - - - -}; - -?> diff --git a/judge.inc.php b/judge.inc.php new file mode 100644 index 0000000..47cdb3d --- /dev/null +++ b/judge.inc.php @@ -0,0 +1,135 @@ + + Copyright (C) 2005 James Grant
"; + display_messages(); + echo "
".i18n('Time Availability')."
"; + echo ""; +} else { + //send the header + send_header('Time Availability', + array('Judge Registration' => 'judge_main.php') + ); +} + +judge_status_update($u); + +if($_SESSION['embed'] != true) { + //output the current status + $newstatus=judge_status_availability($u); + if($newstatus!='complete') + echo error(i18n("Time Availability Preferences Incomplete")); + else + echo happy(i18n("Time Availability Preferences Complete")); +} + +$url = ($_SESSION['embed'] == true) ? $_SESSION['embed_submit_url'] : 'judge_availability.php'; +echo ""; + +if($_SESSION['embed'] != true) send_footer(); + +?> diff --git a/register_judges_expertise.php b/judge_expertise.php similarity index 50% rename from register_judges_expertise.php rename to judge_expertise.php index d992421..e7e5616 100644 --- a/register_judges_expertise.php +++ b/judge_expertise.php @@ -22,88 +22,87 @@ */ ?> << ".i18n("Back to Judges Registration Summary")."
"; - echo "
"; - if($_POST['action']=="save") { - //first delete all their old associations for this year.. - mysql_query("DELETE FROM judges_expertise WHERE judges_id='".$_SESSION['judges_id']."' AND year='".$config['FAIRYEAR']."'"); - if(!is_array($_POST['division'])) $_POST['division']=array(); if(!is_array($_POST['subdivision'])) $_POST['subdivision']=array(); + $u['div_prefs'] = array(); foreach($_POST['division'] AS $key=>$val) - { - mysql_query("INSERT INTO judges_expertise (judges_id, projectdivisions_id, val, year) VALUES ('".$_SESSION['judges_id']."','$key','$val','".$config['FAIRYEAR']."')"); - } + $u['div_prefs'][$key] = $val; + $u['div_prefs_sub'] = array(); foreach($_POST['subdivision'] AS $key=>$val) - { - mysql_query("INSERT INTO judges_expertise (judges_id, projectsubdivisions_id, val, year) VALUES ('".$_SESSION['judges_id']."','$key','$val','".$config['FAIRYEAR']."')"); - } + $u['div_prefs_sub'][$key] = $val; if($_POST['expertise_other']) - { - mysql_query("UPDATE judges SET expertise_other='".mysql_escape_string(stripslashes($_POST['expertise_other']))."' WHERE id='".$_SESSION['judges_id']."'"); + $u['expertise_other'] = stripslashes($_POST['expertise_other']); + else + $u['expertise_other'] = NULL; - } - else - { - mysql_query("UPDATE judges SET expertise_other=NULL WHERE id='".$_SESSION['judges_id']."'"); - } + $u['cat_prefs'] = array(); + if(is_array($_POST['catpref'])) { + foreach($_POST['catpref'] AS $k=>$v) { + if($v == '') continue; - mysql_query("DELETE FROM judges_catpref WHERE judges_id='".$_SESSION['judges_id']."'"); - - if(is_array($_POST['catpref'])) - { - foreach($_POST['catpref'] AS $k=>$v) - { - if($v!="") - mysql_query("INSERT INTO judges_catpref (judges_id,projectcategories_id,rank,year) values ('".$_SESSION['judges_id']."','$k','$v','".$config['FAIRYEAR']."')"); + $u['cat_prefs'][$k] = $v; } } - - echo notice(i18n("Preferences successfully saved")); + user_save($u); + message_push(notice(i18n("Preferences successfully saved"))); + $u = user_load($u['id']); } - $q=mysql_query("SELECT * FROM judges WHERE email='".$_SESSION['email']."' AND id='".$_SESSION['judges_id']."'"); - $judgeinfo=mysql_fetch_object($q); - updateJudgeCompleteStatus($judgeinfo); -//output the current status -$newstatus=expertiseStatus(); -if($newstatus!="complete") -{ - echo error(i18n("Divisional Judging Information Incomplete")); -} -else -{ - echo happy(i18n("Divisional Judging Information Complete")); + if($_SESSION['embed'] == true) { + echo "
"; + display_messages(); +// echo "
".i18n('Category and Division Preferences')."
"; + echo ""; + } else { + //send the header + send_header('Category and Division Preferences', + array('Judge Registration' => 'judge_main.php') + ); + } + +judge_status_update($u); + +if($_SESSION['embed'] != true) { + //output the current status + $newstatus=judge_status_expertise($u); + if($newstatus!="complete") + echo error(i18n("Divisional Judging Information Incomplete")); + else + echo happy(i18n("Divisional Judging Information Complete")); } - if($judgeinfo->typepref == "speconly") { + if($u['special_award_only'] == 'yes') { echo i18n("You have specified that you are a judge for a specific special award. Divisional Judging preferences have been disabled because they do not apply to you."); echo "
"; send_footer(); exit; } - echo "