From eb92486316d9cf10d100682e7616a4c816e2da54 Mon Sep 17 00:00:00 2001 From: Takumi Date: Sun, 4 Aug 2013 23:42:40 +1000 Subject: [PATCH] Add post type argument to sp_get_stats_row --- helpers.php | 44 +++++++++++++++++++++++++------------------ sportspress-admin.css | 7 ------- table.php | 17 ++++++++++++++++- team.php | 2 +- 4 files changed, 43 insertions(+), 27 deletions(-) diff --git a/helpers.php b/helpers.php index 9c3ef47f..3f032656 100644 --- a/helpers.php +++ b/helpers.php @@ -236,7 +236,7 @@ if ( !function_exists( 'sp_post_checklist' ) ) { } if ( !function_exists( 'sp_get_stats_row' ) ) { - function sp_get_stats_row( $args = array() ) { + function sp_get_stats_row( $post_type = 'post', $args = array() ) { $args = array_merge( array( 'meta_value' => 0, @@ -250,23 +250,31 @@ if ( !function_exists( 'sp_get_stats_row' ) ) { $post->sp_team_index = array_search( $args['meta_value'], $post->sp_team ); $post->sp_result = get_post_meta( $post->ID, 'sp_result', false ); endforeach; - $row = array( - sizeof( $posts ), - sizeof( - array_filter( - $posts, - function( $var ) { - return max( $var->sp_result ) == $var->sp_result[ $var->sp_team_index ]; - } - ) - ), - 99, - 99, - 93, - 99, - 99, - 99 - ); + + switch ($post_type): + case 'sp_team': + $row = array( + sizeof( $posts ), + sizeof( + array_filter( + $posts, + function( $var ) { + return max( $var->sp_result ) == $var->sp_result[ $var->sp_team_index ]; + } + ) + ), + 99, + 99, + 93, + 99, + 99, + 99 + ); + break; + default: + $row = array(); + break; + endswitch; return $row; } } diff --git a/sportspress-admin.css b/sportspress-admin.css index fb706e92..6fb81b37 100644 --- a/sportspress-admin.css +++ b/sportspress-admin.css @@ -85,13 +85,6 @@ background-position: -209px -1px; } -#poststuff #sp_kickoffdiv .inside { - margin: 0; - padding: 0; -} -#sp_kickoffdiv #timestampdiv p { - display: none; -} #sp_articlediv .wp-editor-container, #sp_profilediv .wp-editor-container { background-color:#fff; diff --git a/table.php b/table.php index 628481b3..9c9839e0 100644 --- a/table.php +++ b/table.php @@ -63,10 +63,25 @@ function sp_table_stats_meta( $post ) { $stats = (array)get_post_meta( $post->ID, 'sp_stats', true ); $league_id = sp_get_the_term_id( $post->ID, 'sp_league', 0 ); $data = sp_array_combine( $teams, sp_array_value( $stats, $league_id, array() ) ); + + // Generate array of placeholder values for each team $placeholders = array(); foreach ( $teams as $team ): - $placeholders[ $team ] = sp_get_stats( $team, 0, $league_id ); + $args = array( + 'post_type' => 'sp_event', + 'meta_key' => 'sp_team', + 'meta_value' => $team, + 'tax_query' => array( + array( + 'taxonomy' => 'sp_league', + 'field' => 'id', + 'terms' => $league_id + ) + ) + ); + $placeholders[ $team ] = sp_get_stats_row( 'sp_team', $args ); endforeach; + sp_stats_table( $data, $placeholders, $league_id, array( 'Team', 'P', 'W', 'D', 'L', 'F', 'A', 'GD', 'Pts' ), false ); } ?> \ No newline at end of file diff --git a/team.php b/team.php index a93fe1d3..3d396601 100644 --- a/team.php +++ b/team.php @@ -65,7 +65,7 @@ function sp_team_stats_meta( $post ) { ) ) ); - $placeholders[ $league_id ] = sp_get_stats_row( $args ); + $placeholders[ $league_id ] = sp_get_stats_row( 'sp_team', $args ); endforeach; sp_stats_table( $data, $placeholders, 0, array( 'League', 'P', 'W', 'D', 'L', 'F', 'A', 'GD', 'Pts' ), false, 'sp_league' );