From 8d683a33a365119059d7391a54d4abcac6c64760 Mon Sep 17 00:00:00 2001 From: Brian Miyaji Date: Tue, 21 Mar 2017 16:38:13 +1100 Subject: [PATCH] Use the same event performance table template for team and individual mode --- .../event-performance-table-combined.php | 179 ------------------ templates/event-performance.php | 6 +- 2 files changed, 3 insertions(+), 182 deletions(-) delete mode 100644 templates/event-performance-table-combined.php diff --git a/templates/event-performance-table-combined.php b/templates/event-performance-table-combined.php deleted file mode 100644 index 97be55bc..00000000 --- a/templates/event-performance-table-combined.php +++ /dev/null @@ -1,179 +0,0 @@ - -
- -

- -
- - - - - - - - $label ): ?> - - - - - - - - - $row ): - - if ( ! $player_id ) - continue; - - $name = get_the_title( $player_id ); - - if ( ! $name ) - continue; - - echo ''; - - if ( isset( $labels['number'] ) ): - $number = sp_array_value( $row, 'number', ' ' ); - - // Player number - echo ''; - endif; - - if ( $link_posts ): - $permalink = get_post_permalink( $player_id ); - $name = '' . $name . ''; - endif; - - echo ''; - - if ( $mode == 'icons' ) echo ''; - elseif ( intval( $value ) && $mode == 'icons' ): - $performance_id = sp_array_value( $performance_ids, $key, null ); - $icons = ''; - if ( $performance_id && has_post_thumbnail( $performance_id ) ): - $icons = str_repeat( get_the_post_thumbnail( $performance_id, 'sportspress-fit-mini', array( 'title' => sp_get_singular_name( $performance_id ) ) ) . ' ', $value ); - endif; - echo apply_filters( 'sportspress_event_performance_icons', $icons, $performance_id, $value ); - endif; - endforeach; - - if ( $mode == 'icons' ) echo ''; - - echo ''; - - $i++; - - endforeach; - - } - ?> - - - - - - -  '; - endif; - echo ''; - - $row = sp_array_value( $data, 1, array() ); - - if ( $mode == 'icons' ) echo ''; - elseif ( intval( $value ) && $mode == 'icons' ): - $performance_id = sp_array_value( $performance_ids, $key, null ); - $icons = ''; - if ( $performance_id && has_post_thumbnail( $performance_id ) ): - $icons = str_repeat( get_the_post_thumbnail( $performance_id, 'sportspress-fit-mini' ) . ' ', $value ); - endif; - echo apply_filters( 'sportspress_event_performance_icons', $icons, $performance_id, $value ); - endif; - endforeach; - - if ( $mode == 'icons' ) echo ''; - ?> - - - - -
# 
' . $number . '' . $name . ''; - - foreach ( $labels as $key => $label ): - if ( in_array( $key, array( 'number', 'name' ) ) ) - continue; - - $format = sp_array_value( $formats, $key, 'number' ); - $placeholder = sp_get_format_placeholder( $format ); - - $value = '-'; - if ( $key == 'position' ): - if ( array_key_exists( $key, $row ) && $row[ $key ] != '' ): - $positions = array(); - $position_ids = (array) $row[ $key ]; - foreach ( $position_ids as $position_id ) { - $player_position = get_term_by( 'id', $position_id, 'sp_position' ); - if ( $player_position ) $positions[] = $player_position->name; - } - $value = implode( ', ', $positions ); - endif; - else: - if ( array_key_exists( $key, $row ) && $row[ $key ] != '' ): - $value = $row[ $key ]; - else: - $value = $placeholder; - endif; - endif; - if ( ! array_key_exists( $key, $totals ) ): - $totals[ $key ] = $placeholder; - endif; - - if ( 'number' === $format ) { - $add = floatval( $value ); - $totals[ $key ] += $add; - } - - if ( $mode == 'values' ): - echo '' . $value . '
' . __( 'Total', 'sportspress' ) . ''; - - foreach ( $labels as $key => $label ): - if ( in_array( $key, array( 'number', 'name' ) ) ) - continue; - if ( $key == 'position' ): - $value = '—'; - elseif ( $primary && $key !== $primary ): - $value = ' '; - elseif ( array_key_exists( $key, $row ) && $row[ $key ] != '' ): - $value = $row[ $key ]; - else: - $value = sp_array_value( $totals, $key, 0 ); - endif; - - if ( $mode == 'values' ): - echo '' . $value . '
-
-
\ No newline at end of file diff --git a/templates/event-performance.php b/templates/event-performance.php index a999cdb3..deb34399 100644 --- a/templates/event-performance.php +++ b/templates/event-performance.php @@ -9,7 +9,6 @@ if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly -$is_individual = get_option( 'sportspress_mode', 'team' ) === 'player' ? true : false; $show_players = get_option( 'sportspress_event_show_players', 'yes' ) === 'yes' ? true : false; $show_staff = get_option( 'sportspress_event_show_staff', 'yes' ) === 'yes' ? true : false; $show_total = get_option( 'sportspress_event_show_total', 'yes' ) === 'yes' ? true : false; @@ -29,6 +28,8 @@ if ( ! isset( $id ) ) $teams = get_post_meta( $id, 'sp_team', false ); +$is_individual = sp_get_post_mode( $id ) === 'player' ? true : false; + if ( is_array( $teams ) ): ob_start(); @@ -107,7 +108,7 @@ if ( is_array( $teams ) ): } } - sp_get_template( 'event-performance-table-combined.php', array( + sp_get_template( 'event-performance-table.php', array( 'scrollable' => $scrollable, 'sortable' => $sortable, 'show_players' => $show_players, @@ -125,7 +126,6 @@ if ( is_array( $teams ) ): 'primary' => 'primary' == $total ? $primary : null, ) ); } else { - // Prepare for offense and defense sections if ( -1 != $sections ) {