diff --git a/functions.php b/functions.php index 7b7cc6c0..ca47985a 100644 --- a/functions.php +++ b/functions.php @@ -168,12 +168,12 @@ if ( !function_exists( 'sportspress_get_post_calculate' ) ) { $calculate = get_post_meta ( $post_id, 'sp_calculate', true ); if ( $calculate ): return str_replace( - array( 'sum', 'average' ), - array( __( 'Sum', 'sportspress' ), __( 'Average', 'sportspress' ) ), + array( 'total', 'average' ), + array( __( 'Total', 'sportspress' ), __( 'Average', 'sportspress' ) ), $calculate ); else: - return __( 'Sum', 'sportspress' ); + return __( 'Total', 'sportspress' ); endif; } } @@ -426,7 +426,7 @@ if ( !function_exists( 'sportspress_post_checklist' ) ) { if ( !function_exists( 'sportspress_calculate_selector' ) ) { function sportspress_calculate_selector( $postid, $selected = null ) { $options = array( - 'sum' => __( 'Sum', 'sportspress' ), + 'total' => __( 'Total', 'sportspress' ), 'average' => __( 'Average', 'sportspress' ), ); ?> @@ -867,7 +867,21 @@ if ( !function_exists( 'sportspress_edit_player_statistics_table' ) ) { ), ), ); - sportspress_dropdown_pages( $args ); + if ( ! sportspress_dropdown_pages( $args ) ): + $args = array( + 'post_type' => 'sp_team', + 'name' => 'sp_leagues[' . $league_id . '][' . $div_id . ']', + 'show_option_none' => __( '-- Not set --', 'sportspress' ), + 'sort_order' => 'ASC', + 'sort_column' => 'menu_order', + 'selected' => $value, + 'values' => 'ID', + 'include' => $teams, + ); + if ( ! sportspress_dropdown_pages( $args ) ): + echo '—'; + endif; + endif; ?> $label ): @@ -1997,7 +2011,7 @@ if ( !function_exists( 'sportspress_get_player_list_data' ) ) { if ( sportspress_array_value( $placeholders[ $player_id ], $statistic->post_name, '' ) == '' ): if ( $statistic->post_name == 'eventsplayed' ): - $calculate = 'sum'; + $calculate = 'total'; else: $calculate = get_post_meta( $statistic->ID, 'sp_calculate', true ); endif; @@ -2145,7 +2159,7 @@ if ( !function_exists( 'sportspress_get_player_statistics_data' ) ) { $statistics = get_posts( $args ); $statistic_labels = array(); - $equations = array( 'eventsplayed' => 'sum' ); + $equations = array( 'eventsplayed' => 'total' ); foreach ( $statistics as $statistic ): $statistic_labels[ $statistic->post_name ] = $statistic->post_title; $equations[ $statistic->post_name ] = get_post_meta( $statistic->ID, 'sp_calculate', true ); diff --git a/presets/sports/football.php b/presets/sports/football.php index 7eab5c26..6705abcb 100644 --- a/presets/sports/football.php +++ b/presets/sports/football.php @@ -189,7 +189,7 @@ $sportspress_sports['football'] = array( 'post_title' => 'Comp', 'post_name' => 'comp', 'meta' => array( - 'sp_calculate' => 'sum', + 'sp_calculate' => 'total', ), 'tax_input' => array( 'sp_position' => array( @@ -201,7 +201,7 @@ $sportspress_sports['football'] = array( 'post_title' => 'Att', 'post_name' => 'att', 'meta' => array( - 'sp_calculate' => 'sum', + 'sp_calculate' => 'total', ), 'tax_input' => array( 'sp_position' => array( @@ -227,7 +227,7 @@ $sportspress_sports['football'] = array( 'post_title' => 'Att/G', 'post_name' => 'attg', 'meta' => array( - 'sp_calculate' => 'sum', + 'sp_calculate' => 'total', ), 'tax_input' => array( 'sp_position' => array( @@ -240,7 +240,7 @@ $sportspress_sports['football'] = array( 'post_title' => 'Rec', 'post_name' => 'rec', 'meta' => array( - 'sp_calculate' => 'sum', + 'sp_calculate' => 'total', ), 'tax_input' => array( 'sp_position' => array( @@ -253,7 +253,7 @@ $sportspress_sports['football'] = array( 'post_title' => 'Comb', 'post_name' => 'comb', 'meta' => array( - 'sp_calculate' => 'sum', + 'sp_calculate' => 'total', ), 'tax_input' => array( 'sp_position' => array( @@ -267,7 +267,7 @@ $sportspress_sports['football'] = array( 'post_title' => 'Total', 'post_name' => 'total', 'meta' => array( - 'sp_calculate' => 'sum', + 'sp_calculate' => 'total', ), 'tax_input' => array( 'sp_position' => array( @@ -281,7 +281,7 @@ $sportspress_sports['football'] = array( 'post_title' => 'Ast', 'post_name' => 'ast', 'meta' => array( - 'sp_calculate' => 'sum', + 'sp_calculate' => 'total', ), 'tax_input' => array( 'sp_position' => array( @@ -295,7 +295,7 @@ $sportspress_sports['football'] = array( 'post_title' => 'Sck', 'post_name' => 'scktackles', 'meta' => array( - 'sp_calculate' => 'sum', + 'sp_calculate' => 'total', ), 'tax_input' => array( 'sp_position' => array( @@ -309,7 +309,7 @@ $sportspress_sports['football'] = array( 'post_title' => 'SFTY', 'post_name' => 'sfty', 'meta' => array( - 'sp_calculate' => 'sum', + 'sp_calculate' => 'total', ), 'tax_input' => array( 'sp_position' => array( @@ -323,7 +323,7 @@ $sportspress_sports['football'] = array( 'post_title' => 'PDef', 'post_name' => 'pdef', 'meta' => array( - 'sp_calculate' => 'sum', + 'sp_calculate' => 'total', ), 'tax_input' => array( 'sp_position' => array( @@ -337,7 +337,7 @@ $sportspress_sports['football'] = array( 'post_title' => 'TDs', 'post_name' => 'tds', 'meta' => array( - 'sp_calculate' => 'sum', + 'sp_calculate' => 'total', ), 'tax_input' => array( 'sp_position' => array( @@ -351,7 +351,7 @@ $sportspress_sports['football'] = array( 'post_title' => 'KO', 'post_name' => 'ko', 'meta' => array( - 'sp_calculate' => 'sum', + 'sp_calculate' => 'total', ), 'tax_input' => array( 'sp_position' => array( @@ -363,7 +363,7 @@ $sportspress_sports['football'] = array( 'post_title' => 'Ret', 'post_name' => 'ret', 'meta' => array( - 'sp_calculate' => 'sum', + 'sp_calculate' => 'total', ), 'tax_input' => array( 'sp_position' => array( @@ -376,7 +376,7 @@ $sportspress_sports['football'] = array( 'post_title' => 'Punts', 'post_name' => 'punts', 'meta' => array( - 'sp_calculate' => 'sum', + 'sp_calculate' => 'total', ), 'tax_input' => array( 'sp_position' => array( @@ -388,7 +388,7 @@ $sportspress_sports['football'] = array( 'post_title' => 'Yds', 'post_name' => 'yds', 'meta' => array( - 'sp_calculate' => 'sum', + 'sp_calculate' => 'total', ), 'tax_input' => array( 'sp_position' => array( @@ -410,7 +410,7 @@ $sportspress_sports['football'] = array( 'post_title' => 'Net Yds', 'post_name' => 'netyds', 'meta' => array( - 'sp_calculate' => 'sum', + 'sp_calculate' => 'total', ), 'tax_input' => array( 'sp_position' => array( @@ -453,7 +453,7 @@ $sportspress_sports['football'] = array( 'post_title' => 'Blk', 'post_name' => 'blk', 'meta' => array( - 'sp_calculate' => 'sum', + 'sp_calculate' => 'total', ), 'tax_input' => array( 'sp_position' => array( @@ -465,7 +465,7 @@ $sportspress_sports['football'] = array( 'post_title' => 'OOB', 'post_name' => 'oob', 'meta' => array( - 'sp_calculate' => 'sum', + 'sp_calculate' => 'total', ), 'tax_input' => array( 'sp_position' => array( @@ -478,7 +478,7 @@ $sportspress_sports['football'] = array( 'post_title' => 'Dn', 'post_name' => 'dn', 'meta' => array( - 'sp_calculate' => 'sum', + 'sp_calculate' => 'total', ), 'tax_input' => array( 'sp_position' => array( @@ -490,7 +490,7 @@ $sportspress_sports['football'] = array( 'post_title' => 'IN 20', 'post_name' => 'in20', 'meta' => array( - 'sp_calculate' => 'sum', + 'sp_calculate' => 'total', ), 'tax_input' => array( 'sp_position' => array( @@ -502,7 +502,7 @@ $sportspress_sports['football'] = array( 'post_title' => 'TB', 'post_name' => 'tb', 'meta' => array( - 'sp_calculate' => 'sum', + 'sp_calculate' => 'total', ), 'tax_input' => array( 'sp_position' => array( @@ -514,7 +514,7 @@ $sportspress_sports['football'] = array( 'post_title' => 'FC', 'post_name' => 'fc', 'meta' => array( - 'sp_calculate' => 'sum', + 'sp_calculate' => 'total', ), 'tax_input' => array( 'sp_position' => array( @@ -528,7 +528,7 @@ $sportspress_sports['football'] = array( 'post_title' => 'Ret', 'post_name' => 'retpunt', 'meta' => array( - 'sp_calculate' => 'sum', + 'sp_calculate' => 'total', ), 'tax_input' => array( 'sp_position' => array( @@ -543,7 +543,7 @@ $sportspress_sports['football'] = array( 'post_title' => 'RetY', 'post_name' => 'rety', 'meta' => array( - 'sp_calculate' => 'sum', + 'sp_calculate' => 'total', ), 'tax_input' => array( 'sp_position' => array( @@ -557,7 +557,7 @@ $sportspress_sports['football'] = array( 'post_title' => 'Yds/G', 'post_name' => 'ydsg', 'meta' => array( - 'sp_calculate' => 'sum', + 'sp_calculate' => 'total', ), 'tax_input' => array( 'sp_position' => array( @@ -572,7 +572,7 @@ $sportspress_sports['football'] = array( 'post_title' => 'TD', 'post_name' => 'TD', 'meta' => array( - 'sp_calculate' => 'sum', + 'sp_calculate' => 'total', ), 'tax_input' => array( 'sp_position' => array( @@ -592,7 +592,7 @@ $sportspress_sports['football'] = array( 'post_title' => 'Int', 'post_name' => 'int', 'meta' => array( - 'sp_calculate' => 'sum', + 'sp_calculate' => 'total', ), 'tax_input' => array( 'sp_position' => array( @@ -607,7 +607,7 @@ $sportspress_sports['football'] = array( 'post_title' => '1st', 'post_name' => 'first', 'meta' => array( - 'sp_calculate' => 'sum', + 'sp_calculate' => 'total', ), 'tax_input' => array( 'sp_position' => array( @@ -637,7 +637,7 @@ $sportspress_sports['football'] = array( 'post_title' => 'Lng', 'post_name' => 'lng', 'meta' => array( - 'sp_calculate' => 'sum', + 'sp_calculate' => 'total', ), 'tax_input' => array( 'sp_position' => array( @@ -658,7 +658,7 @@ $sportspress_sports['football'] = array( 'post_title' => '20+', 'post_name' => 'twentyplus', 'meta' => array( - 'sp_calculate' => 'sum', + 'sp_calculate' => 'total', ), 'tax_input' => array( 'sp_position' => array( @@ -675,7 +675,7 @@ $sportspress_sports['football'] = array( 'post_title' => '40+', 'post_name' => 'fourtyplus', 'meta' => array( - 'sp_calculate' => 'sum', + 'sp_calculate' => 'total', ), 'tax_input' => array( 'sp_position' => array( @@ -692,7 +692,7 @@ $sportspress_sports['football'] = array( 'post_title' => 'Sck', 'post_name' => 'sck', 'meta' => array( - 'sp_calculate' => 'sum', + 'sp_calculate' => 'total', ), 'tax_input' => array( 'sp_position' => array( @@ -704,7 +704,7 @@ $sportspress_sports['football'] = array( 'post_title' => 'Rate', 'post_name' => 'rate', 'meta' => array( - 'sp_calculate' => 'sum', + 'sp_calculate' => 'total', ), 'tax_input' => array( 'sp_position' => array( @@ -716,7 +716,7 @@ $sportspress_sports['football'] = array( 'post_title' => 'FUM', 'post_name' => 'fum', 'meta' => array( - 'sp_calculate' => 'sum', + 'sp_calculate' => 'total', ), 'tax_input' => array( 'sp_position' => array( @@ -732,7 +732,7 @@ $sportspress_sports['football'] = array( 'post_title' => 'FF', 'post_name' => 'ff', 'meta' => array( - 'sp_calculate' => 'sum', + 'sp_calculate' => 'total', ), 'tax_input' => array( 'sp_position' => array( @@ -746,7 +746,7 @@ $sportspress_sports['football'] = array( 'post_title' => 'Rec', 'post_name' => 'recfum', 'meta' => array( - 'sp_calculate' => 'sum', + 'sp_calculate' => 'total', ), 'tax_input' => array( 'sp_position' => array( @@ -760,7 +760,7 @@ $sportspress_sports['football'] = array( 'post_title' => 'TD', 'post_name' => 'tdfum', 'meta' => array( - 'sp_calculate' => 'sum', + 'sp_calculate' => 'total', ), 'tax_input' => array( 'sp_position' => array( @@ -786,7 +786,7 @@ $sportspress_sports['football'] = array( 'post_title' => 'Lng', 'post_name' => 'lngpunt', 'meta' => array( - 'sp_calculate' => 'sum', + 'sp_calculate' => 'total', ), 'tax_input' => array( 'sp_position' => array( @@ -799,7 +799,7 @@ $sportspress_sports['football'] = array( 'post_title' => 'TD', 'post_name' => 'tdpunt', 'meta' => array( - 'sp_calculate' => 'sum', + 'sp_calculate' => 'total', ), 'tax_input' => array( 'sp_position' => array( @@ -814,7 +814,7 @@ $sportspress_sports['football'] = array( 'post_title' => '20+', 'post_name' => 'twentypluspunt', 'meta' => array( - 'sp_calculate' => 'sum', + 'sp_calculate' => 'total', ), 'tax_input' => array( 'sp_position' => array( @@ -827,7 +827,7 @@ $sportspress_sports['football'] = array( 'post_title' => '40+', 'post_name' => 'fourtypluspunt', 'meta' => array( - 'sp_calculate' => 'sum', + 'sp_calculate' => 'total', ), 'tax_input' => array( 'sp_position' => array( @@ -840,7 +840,7 @@ $sportspress_sports['football'] = array( 'post_title' => 'FC', 'post_name' => 'fcpunt', 'meta' => array( - 'sp_calculate' => 'sum', + 'sp_calculate' => 'total', ), 'tax_input' => array( 'sp_position' => array( @@ -853,7 +853,7 @@ $sportspress_sports['football'] = array( 'post_title' => 'FUM', 'post_name' => 'fumpunt', 'meta' => array( - 'sp_calculate' => 'sum', + 'sp_calculate' => 'total', ), 'tax_input' => array( 'sp_position' => array( @@ -866,7 +866,7 @@ $sportspress_sports['football'] = array( 'post_title' => 'OSK', 'post_name' => 'osk', 'meta' => array( - 'sp_calculate' => 'sum', + 'sp_calculate' => 'total', ), 'tax_input' => array( 'sp_position' => array( @@ -878,7 +878,7 @@ $sportspress_sports['football'] = array( 'post_title' => 'OSKR', 'post_name' => 'oskr', 'meta' => array( - 'sp_calculate' => 'sum', + 'sp_calculate' => 'total', ), 'tax_input' => array( 'sp_position' => array( diff --git a/presets/sports/rugby.php b/presets/sports/rugby.php index 4fabc96d..139358c0 100644 --- a/presets/sports/rugby.php +++ b/presets/sports/rugby.php @@ -124,35 +124,35 @@ $sportspress_sports['rugby'] = array( 'post_title' => 'Points', 'post_name' => 'points', 'meta' => array( - 'sp_calculate' => 'sum', + 'sp_calculate' => 'total', ), ), array( 'post_title' => 'Tries', 'post_name' => 'tries', 'meta' => array( - 'sp_calculate' => 'sum', + 'sp_calculate' => 'total', ), ), array( 'post_title' => 'Conversions', 'post_name' => 'conversions', 'meta' => array( - 'sp_calculate' => 'sum', + 'sp_calculate' => 'total', ), ), array( 'post_title' => 'Penalty Goals', 'post_name' => 'penaltygoals', 'meta' => array( - 'sp_calculate' => 'sum', + 'sp_calculate' => 'total', ), ), array( 'post_title' => 'Drop Goals', 'post_name' => 'dropgoals', 'meta' => array( - 'sp_calculate' => 'sum', + 'sp_calculate' => 'total', ), ), ), diff --git a/presets/sports/soccer.php b/presets/sports/soccer.php index 3947848d..04e19958 100644 --- a/presets/sports/soccer.php +++ b/presets/sports/soccer.php @@ -133,10 +133,26 @@ $sportspress_sports['soccer'] = array( array( 'post_title' => 'Height', 'post_name' => 'height', + 'tax_input' => array( + 'sp_position' => array( + 'goalkeeper', + 'defender', + 'midfielder', + 'forward', + ), + ), ), array( 'post_title' => 'Weight', 'post_name' => 'weight', + 'tax_input' => array( + 'sp_position' => array( + 'goalkeeper', + 'defender', + 'midfielder', + 'forward', + ), + ), ), ), // Player Statistics @@ -145,7 +161,7 @@ $sportspress_sports['soccer'] = array( 'post_title' => 'Goals', 'post_name' => 'goals', 'meta' => array( - 'sp_calculate' => 'sum', + 'sp_calculate' => 'total', ), 'tax_input' => array( 'sp_position' => array( @@ -160,7 +176,7 @@ $sportspress_sports['soccer'] = array( 'post_title' => 'Assists', 'post_name' => 'assists', 'meta' => array( - 'sp_calculate' => 'sum', + 'sp_calculate' => 'total', ), 'tax_input' => array( 'sp_position' => array( @@ -175,7 +191,7 @@ $sportspress_sports['soccer'] = array( 'post_title' => 'Yellow Cards', 'post_name' => 'yellowcards', 'meta' => array( - 'sp_calculate' => 'sum', + 'sp_calculate' => 'total', ), 'tax_input' => array( 'sp_position' => array( @@ -190,7 +206,7 @@ $sportspress_sports['soccer'] = array( 'post_title' => 'Red Cards', 'post_name' => 'redcards', 'meta' => array( - 'sp_calculate' => 'sum', + 'sp_calculate' => 'total', ), 'tax_input' => array( 'sp_position' => array( diff --git a/readme.txt b/readme.txt index 3e960b61..46e28d2f 100644 --- a/readme.txt +++ b/readme.txt @@ -4,7 +4,7 @@ Tags: sports, sports journalism, teams, team management, fixtures, results, stan Donate link: https://www.paypal.com/cgi-bin/webscr?cmd=_xclick&business=support@themeboy.com&item_name=Donation+for+SportsPress Requires at least: 3.8 Tested up to: 3.8.1 -Stable tag: 0.3 +Stable tag: 0.3.1 License: GPLv3 License URI: http://www.gnu.org/licenses/gpl-3.0.html @@ -96,6 +96,7 @@ SportsPress is currently in beta and is undergoing testing. We are still activel = 0.3 = * Feature - Import tool added for importing players from CSV file. +* Feature - Add ability to select * Tweak - Display current team indicator in players admin screen. = 0.2.10 = diff --git a/sportspress.php b/sportspress.php index ea795cbb..51155afd 100644 --- a/sportspress.php +++ b/sportspress.php @@ -6,7 +6,7 @@ Plugin Name: SportsPress Plugin URI: http://themeboy.com/sportspress Description: Manage your club and its players, staff, events, league tables, and player lists. -Version: 0.3 +Version: 0.3.1 Author: ThemeBoy Author URI: http://themeboy.com/ License: GPLv3 @@ -18,7 +18,7 @@ if ( !function_exists( 'add_action' ) ) { exit; } -define( 'SPORTSPRESS_VERSION', '0.3' ); +define( 'SPORTSPRESS_VERSION', '0.3.1' ); define( 'SPORTSPRESS_PLUGIN_URL', plugin_dir_url( __FILE__ ) ); define( 'SPORTSPRESS_PLUGIN_BASENAME', plugin_basename( __FILE__ ) ); define( 'SPORTSPRESS_PLUGIN_FILE', __FILE__ );