';
$delimiter = get_option( 'sportspress_event_teams_delimiter', 'vs' );
diff --git a/templates/event-performance.php b/templates/event-performance.php
index e2448324..b590574f 100644
--- a/templates/event-performance.php
+++ b/templates/event-performance.php
@@ -13,32 +13,35 @@ if ( ! isset( $id ) )
$id = get_the_ID();
$event = new SP_Event( $id );
+$data = $event->performance();
+
+// The first row should be column labels
+$labels = $data[0];
+
+// Remove the first row to leave us with the actual data
+unset( $data[0] );
+
+$data = array_filter( $data );
$teams = (array)get_post_meta( $id, 'sp_team', false );
-$staff = (array)get_post_meta( $id, 'sp_staff', false );
-
$status = $event->status();
-$stats = (array)get_post_meta( $id, 'sp_players', true );
-if ( $status == 'results' ):
- $performance_labels = sp_get_var_labels( 'sp_performance' );
-else:
- $performance_labels = array();
-endif;
$link_posts = get_option( 'sportspress_event_link_players', 'yes' ) == 'yes' ? true : false;
$sortable = get_option( 'sportspress_enable_sortable_tables', 'yes' ) == 'yes' ? true : false;
$responsive = get_option( 'sportspress_enable_responsive_tables', 'yes' ) == 'yes' ? true : false;
-foreach( $teams as $key => $team_id ):
+foreach( $teams as $index => $team_id ):
if ( ! $team_id ) continue;
+ // Get results for players in the team
+ $players = sp_array_between( (array)get_post_meta( $id, 'sp_player', false ), 0, $index );
+ $has_players = sizeof( $players ) > 1;
+
+ if ( ! $has_players && $status != 'results' ) continue;
+
$totals = array();
- // Get results for players in the team
- $players = sp_array_between( (array)get_post_meta( $id, 'sp_player', false ), 0, $key );
- $has_players = sizeof( $players ) > 1;
-
- $data = sp_array_combine( $players, sp_array_value( $stats, $team_id, array() ) );
+ $data = sp_array_combine( $players, sp_array_value( $data, $team_id, array() ) );
?>
@@ -47,8 +50,8 @@ foreach( $teams as $key => $team_id ):
| # |
- |
- $label ): ?>
+ |
+ $label ): ?>
|
@@ -101,7 +104,7 @@ foreach( $teams as $key => $team_id ):
echo '' . $name . ' | ';
- foreach( $performance_labels as $key => $label ):
+ foreach( $labels as $key => $label ):
if ( $key == 'name' )
continue;
if ( array_key_exists( $key, $row ) && $row[ $key ] != '' ):
@@ -135,7 +138,7 @@ foreach( $teams as $key => $team_id ):
$row = $data[0];
- foreach( $performance_labels as $key => $label ):
+ foreach( $labels as $key => $label ):
if ( $key == 'name' ):
continue;
endif;
@@ -152,4 +155,5 @@ foreach( $teams as $key => $team_id ):