[sfiab-commits] [svn] commit: r2377 - in /trunk: activities.inc.php activities.php db/db.code.version.txt db/db.update.214.sql judge.inc.php so_judge_other.php user_edit.php

[<in...@sf...>]

Author: jacob
Date: Thu Oct 14 11:26:47 2010
New Revision: 2377

Log:
Changed the scienceolympic judge settings to a generic activity selection tab (replacing so_judge_other.php with activities.php)
Altered use of schedule_users_availability_link.  It no longer distinguishes by role.

Added:
    trunk/activities.inc.php
    trunk/activities.php
    trunk/db/db.update.214.sql
Removed:
    trunk/so_judge_other.php
Modified:
    trunk/db/db.code.version.txt
    trunk/judge.inc.php
    trunk/user_edit.php

Modified: trunk/db/db.code.version.txt
==============================================================================
--- trunk/db/db.code.version.txt (original)
+++ trunk/db/db.code.version.txt Thu Oct 14 11:26:47 2010
@@ -1,1 +1,1 @@
-213
+214

Modified: trunk/judge.inc.php
==============================================================================
--- trunk/judge.inc.php (original)
+++ trunk/judge.inc.php Thu Oct 14 11:26:47 2010
@@ -74,16 +74,6 @@
 	return 'complete';
 }
 
-function so_judge_status_other(&$u)
-{
-	global $config;
-
-	/* They must select a language to judge in */
-	if(count($u['languages']) < 1) return 'incomplete';
-	return 'complete';
-}
-
-
 function judge_status_special_awards(&$u)
 {
 	global $config;

Modified: trunk/user_edit.php
==============================================================================
--- trunk/user_edit.php (original)
+++ trunk/user_edit.php Thu Oct 14 11:26:47 2010
@@ -27,6 +27,7 @@
 require_once('user_edit.inc.php');
 require_once('judge.inc.php');
 require_once('volunteer.inc.php');
+require_once('activities.inc.php');
 
 $edit_id = isset($_GET['users_id']) ? intval($_GET['users_id']) : $_SESSION['users_id'];
 if($edit_id != $_SESSION['users_id']) 
@@ -114,11 +115,11 @@
 			'status_func' => 'judge_status_other',
 			'conference_types' => array('sciencefair'),
 			),
-		'sojudge' => array(
-			'label' => 'Judge',
-			'types' => array('judge'),
-			'file' => 'so_judge_other.php',
-			'status_func' => 'so_judge_status_other',
+		'activities' => array(
+			'label' => 'Activities',
+			'types' => array('judge', 'volunteer'),
+			'file' => 'activities.php',
+			'status_func' => 'activities_status',
 			'conference_types' => array('scienceolympics'),
 			),
 		'judgeexpertise' => array(