diff --git a/includes/admin/class-sp-admin-sports.php b/includes/admin/class-sp-admin-sports.php index a7aae40f..c329636b 100644 --- a/includes/admin/class-sp-admin-sports.php +++ b/includes/admin/class-sp-admin-sports.php @@ -166,6 +166,7 @@ class SP_Admin_Sports { } update_post_meta( $id, 'sp_icon', sp_array_value( $performance, 'icon', null ) ); update_post_meta( $id, 'sp_color', sp_array_value( $performance, 'color', null ) ); + update_post_meta( $id, 'sp_section', sp_array_value( $performance, 'section', -1 ) ); $i ++; } diff --git a/includes/admin/post-types/meta-boxes/class-sp-meta-box-event-teams.php b/includes/admin/post-types/meta-boxes/class-sp-meta-box-event-teams.php index 19d44ef2..798f9cdd 100644 --- a/includes/admin/post-types/meta-boxes/class-sp-meta-box-event-teams.php +++ b/includes/admin/post-types/meta-boxes/class-sp-meta-box-event-teams.php @@ -62,19 +62,58 @@ class SP_Meta_Box_Event_Teams { } ?>

- + __( 'Offense', 'sportspress' ), + 'post_type' => 'sp_player', + ); + $tabs['sp_defense'] = array( + 'label' => __( 'Defense', 'sportspress' ), + 'post_type' => 'sp_player', + ); + } elseif ( 1 == $sections ) { + $tabs['sp_defense'] = array( + 'label' => __( 'Defense', 'sportspress' ), + 'post_type' => 'sp_player', + ); + $tabs['sp_offense'] = array( + 'label' => __( 'Offense', 'sportspress' ), + 'post_type' => 'sp_player', + ); + } else { + $tabs['sp_player'] = array( + 'label' => __( 'Players', 'sportspress' ), + 'post_type' => 'sp_player', + ); + } + $tabs['sp_staff'] = array( + 'label' => __( 'Staff', 'sportspress' ), + 'post_type' => 'sp_staff', + ); + ?> $post_type ) { - do_action( 'sportspress_event_teams_meta_box_checklist', $post->ID, $post_type, ( 0 == $index ? 'block' : 'none' ), $team, $i ); + $j = 0; + foreach ( $tabs as $slug => $tab ) { + do_action( 'sportspress_event_teams_meta_box_checklist', $post->ID, $tab['post_type'], ( 0 == $j ? 'block' : 'none' ), $team, $i, $slug ); if ( apply_filters( 'sportspress_event_teams_meta_box_default_checklist', true ) ) { - sp_post_checklist( $post->ID, $post_type, ( 0 == $index ? 'block' : 'none' ), array( 'sp_league', 'sp_season', 'sp_current_team' ), $i ); + sp_post_checklist( $post->ID, $tab['post_type'], ( 0 == $j ? 'block' : 'none' ), array( 'sp_league', 'sp_season', 'sp_current_team' ), $i, $slug ); } + $j++; } ?> @@ -107,11 +146,16 @@ class SP_Meta_Box_Event_Teams { */ public static function save( $post_id, $post ) { sp_update_post_meta_recursive( $post_id, 'sp_team', sp_array_value( $_POST, 'sp_team', array() ) ); - $tabs = apply_filters( 'sportspress_event_team_tabs', array( 'sp_player', 'sp_staff' ) ); - if ( $tabs ) { - foreach ( $tabs as $post_type ) { - sp_update_post_meta_recursive( $post_id, $post_type, sp_array_value( $_POST, $post_type, array() ) ); - } + $tabs = array(); + $sections = get_option( 'sportspress_event_performance_sections', -1 ); + if ( -1 == $sections ) { + sp_update_post_meta_recursive( $post_id, 'sp_player', sp_array_value( $_POST, 'sp_player', array() ) ); + } else { + $players = array_merge( sp_array_value( $_POST, 'sp_offense', array() ), sp_array_value( $_POST, 'sp_defense', array() ) ); + sp_update_post_meta_recursive( $post_id, 'sp_offense', sp_array_value( $_POST, 'sp_offense', array() ) ); + sp_update_post_meta_recursive( $post_id, 'sp_defense', sp_array_value( $_POST, 'sp_defense', array() ) ); + sp_update_post_meta_recursive( $post_id, 'sp_player', $players ); } + sp_update_post_meta_recursive( $post_id, 'sp_staff', sp_array_value( $_POST, 'sp_staff', array() ) ); } } diff --git a/includes/admin/post-types/meta-boxes/class-sp-meta-box-performance-details.php b/includes/admin/post-types/meta-boxes/class-sp-meta-box-performance-details.php index efeb8b87..71b13d22 100644 --- a/includes/admin/post-types/meta-boxes/class-sp-meta-box-performance-details.php +++ b/includes/admin/post-types/meta-boxes/class-sp-meta-box-performance-details.php @@ -29,12 +29,51 @@ class SP_Meta_Box_Performance_Details extends SP_Meta_Box_Config { } else { $readonly = false; } + $section = get_post_meta( $post->ID, 'sp_section', true ); + if ( '' === $section ) { + $section = -1; + } + $format = get_post_meta( $post->ID, 'sp_format', true ); + if ( '' === $format ) { + $format = 'number'; + } ?>

readonly="readonly">

+

+

+ +

+

+

+ +

__( 'Split players by team', 'sportspress' ), - 'id' => 'sportspress_event_split_players_by_team', - 'default' => 'yes', - 'type' => 'checkbox', - 'checkboxgroup' => '', - ), - - array( - 'desc' => __( 'Split players by position', 'sportspress' ), - 'id' => 'sportspress_event_split_players_by_position', - 'default' => 'no', - 'type' => 'checkbox', - 'checkboxgroup' => 'end', + 'title' => __( 'Performance', 'sportspress' ), + 'id' => 'sportspress_event_performance_sections', + 'default' => -1, + 'type' => 'radio', + 'options' => array( + -1 => __( 'Combined', 'sportspress' ), + 0 => __( 'Offense', 'sportspress' ) . ' → ' . __( 'Defense', 'sportspress' ), + 1 => __( 'Defense', 'sportspress' ) . ' → ' . __( 'Offense', 'sportspress' ), + ), ), array( diff --git a/includes/sp-core-functions.php b/includes/sp-core-functions.php index d999e304..e891aee1 100644 --- a/includes/sp-core-functions.php +++ b/includes/sp-core-functions.php @@ -449,6 +449,41 @@ if ( !function_exists( 'sp_get_post_order' ) ) { } } +if ( !function_exists( 'sp_get_post_section' ) ) { + function sp_get_post_section( $post_id ) { + $section = get_post_meta ( $post_id, 'sp_section', true ); + if ( isset( $section ) ): + $options = apply_filters( 'sportspress_performance_sections', array( -1 => __( 'All', 'sportspress' ), 0 => __( 'Offense', 'sportspress' ), 1 => __( 'Defense', 'sportspress' ) ) ); + return sp_array_value( $options, $section, __( 'All', 'sportspress' ) ); + else: + return __( 'All', 'sportspress' ); + endif; + } +} + +if ( !function_exists( 'sp_get_post_format' ) ) { + function sp_get_post_format( $post_id ) { + $format = get_post_meta ( $post_id, 'sp_format', true ); + if ( isset( $format ) ): + $options = apply_filters( 'sportspress_performance_formats', array( 'number' => __( 'Number', 'sportspress' ), 'time' => __( 'Time', 'sportspress' ), 'text' => __( 'Text', 'sportspress' ) ) ); + return sp_array_value( $options, $format, __( 'Number', 'sportspress' ) ); + else: + return __( 'Number', 'sportspress' ); + endif; + } +} + +if ( !function_exists( 'sp_get_format_placeholder' ) ) { + function sp_get_format_placeholder( $key = 'number' ) { + $placeholders = apply_filters( 'sportspress_format_placeholders', array( + 'number' => 0, + 'time' => '0:00', + 'text' => '', + ) ); + return sp_array_value( $placeholders, $key, 0 ); + } +} + if ( !function_exists( 'sp_dropdown_statuses' ) ) { function sp_dropdown_statuses( $args = array() ) { $defaults = array( @@ -786,12 +821,14 @@ if ( !function_exists( 'sp_posts' ) ) { } if ( !function_exists( 'sp_post_checklist' ) ) { - function sp_post_checklist( $post_id = null, $meta = 'post', $display = 'block', $filters = null, $index = null ) { + function sp_post_checklist( $post_id = null, $meta = 'post', $display = 'block', $filters = null, $index = null, $slug = null ) { if ( ! isset( $post_id ) ) global $post_id; + if ( ! isset( $slug ) ) + $slug = $meta; ?> -
- +
+ ', sizeof( $parents ) ); ?> @@ -854,10 +891,10 @@ if ( !function_exists( 'sp_post_checklist' ) ) { ?>
  • - +
    • -
    • +
    • @@ -882,6 +919,10 @@ if ( !function_exists( 'sp_column_checklist' ) ) { endif; if ( sizeof( $posts ) ): foreach ( $posts as $post ): + if ( 'sp_performance' == $meta ) { + $format = get_post_meta( $post->ID, 'sp_format', true ); + if ( 'text' === $format ) continue; + } ?>
    • + + - - \ No newline at end of file diff --git a/templates/event-performance.php b/templates/event-performance.php index 3cd3e653..9b6a8dea 100644 --- a/templates/event-performance.php +++ b/templates/event-performance.php @@ -13,8 +13,7 @@ $show_players = get_option( 'sportspress_event_show_players', 'yes' ) === 'yes' $show_staff = get_option( 'sportspress_event_show_staff', 'yes' ) === 'yes' ? true : false; $show_total = get_option( 'sportspress_event_show_total', 'yes' ) === 'yes' ? true : false; $show_numbers = get_option( 'sportspress_event_show_player_numbers', 'yes' ) === 'yes' ? true : false; -$split_positions = get_option( 'sportspress_event_split_players_by_position', 'no' ) === 'yes' ? true : false; -$split_teams = get_option( 'sportspress_event_split_players_by_team', 'yes' ) === 'yes' ? true : false; +$sections = get_option( 'sportspress_event_performance_sections', -1 ); $reverse_teams = get_option( 'sportspress_event_performance_reverse_teams', 'no' ) === 'yes' ? true : false; $primary = sp_get_main_performance_option(); $total = get_option( 'sportspress_event_total_performance', 'all'); @@ -28,7 +27,7 @@ $teams = get_post_meta( $id, 'sp_team', false ); if ( is_array( $teams ) ): ?> -
    +
    'sp_performance', + 'numberposts' => 100, + 'posts_per_page' => 100, + 'orderby' => 'menu_order', + 'order' => 'ASC', + ); - if ( $split_teams ) { - // Split tables - foreach( $teams as $index => $team_id ): - if ( -1 == $team_id ) continue; + $columns = get_posts( $args ); + + // Get formats + $formats = array(); + + // Add to formats + foreach ( $columns as $column ) { + $format = get_post_meta( $column->ID, 'sp_format', true ); + if ( '' === $format ) { + $format = 'number'; + } + $formats[ $column->post_name ] = $format; + } - // 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; + // Prepare for offense and defense sections + if ( -1 != $sections ) { + + // Determine order of sections + if ( 1 == $sections ) { + $section_order = array( __( 'Defense', 'sportspress' ), __( 'Offense', 'sportspress' ) ); + } else { + $section_order = array( __( 'Offense', 'sportspress' ), __( 'Defense', 'sportspress' ) ); + } + + // Initialize labels + $labels = array( array(), array() ); + + // Add positions if applicable + if ( 'yes' == get_option( 'sportspress_event_show_position', 'yes' ) ) { + $labels[0]['position'] = $labels[1]['position'] = __( 'Position', 'sportspress' ); + } - $players = apply_filters( 'sportspress_event_performance_split_team_players', $players ); + // Get labels by section + foreach ( $columns as $column ): + $section = get_post_meta( $column->ID, 'sp_section', true ); + if ( '' === $section ) { + $section = -1; + } + switch ( $section ): + case 1: + $labels[1][ $column->post_name ] = $column->post_title; + break; + case 0: + $labels[0][ $column->post_name ] = $column->post_title; + break; + default: + $labels[0][ $column->post_name ] = $column->post_title; + $labels[1][ $column->post_name ] = $column->post_title; + endswitch; + endforeach; + } - $show_team_players = $show_players && $has_players; + foreach( $teams as $index => $team_id ): + if ( -1 == $team_id ) continue; - if ( 0 < $team_id ) { - $data = sp_array_combine( $players, sp_array_value( $performance, $team_id, array() ) ); - } elseif ( 0 == $team_id ) { + // 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; + + $players = apply_filters( 'sportspress_event_performance_split_team_players', $players ); + + $show_team_players = $show_players && $has_players; + + if ( ! $show_team_players && ! $show_staff && ! $show_total ) continue; + + if ( $show_team_players || $show_total ) { + if ( -1 != $sections ) { + $data = array(); - foreach ( $players as $player_id ) { - if ( isset( $performance[ $player_id ][ $player_id ] ) ) { - $data[ $player_id ] = $performance[ $player_id ][ $player_id ]; + + // Get results for offensive players in the team + $offense = sp_array_between( (array)get_post_meta( $id, 'sp_offense', false ), 0, $index ); + $data[0] = sp_array_combine( $offense, sp_array_value( $performance, $team_id, array() ) ); + + // Get results for defensive players in the team + $defense = sp_array_between( (array)get_post_meta( $id, 'sp_defense', false ), 0, $index ); + $data[1] = sp_array_combine( $defense, sp_array_value( $performance, $team_id, array() ) ); + + foreach ( $section_order as $section_id => $section_label ) { + if ( sizeof( $data[ $section_id ] ) ) { + sp_get_template( 'event-performance-table.php', array( + 'section' => $section_label, + 'scrollable' => $scrollable, + 'sortable' => $sortable, + 'show_players' => $show_team_players, + 'show_numbers' => $show_numbers, + 'show_total' => $show_total, + 'caption' => 0 == $section_id && $team_id ? get_the_title( $team_id ) : null, + 'labels' => $labels[ $section_id ], + 'formats' => $formats, + 'mode' => $mode, + 'data' => $data[ $section_id ], + 'event' => $event, + 'link_posts' => $link_posts, + 'performance_ids' => isset( $performance_ids ) ? $performance_ids : null, + 'primary' => 'primary' == $total ? $primary : null, + 'class' => 'sp-template-event-performance-team-' . $index . '-section-' . $section_id, + ) ); } } } else { - $data = sp_array_value( array_values( $performance ), $index ); - } - - if ( ! $show_team_players && ! $show_staff && ! $show_total ) continue; - - if ( $show_team_players || $show_total ) { - if ( $split_positions ) { - $positions = get_terms( 'sp_position', array( - 'orderby' => 'slug', - 'hide_empty' => 0, - ) ); - - foreach ( $positions as $position_index => $position ) { - $subdata = array(); - foreach ( $data as $player_id => $player ) { - $player_positions = (array) sp_array_value( $player, 'position' ); - $player_positions = array_filter( $player_positions ); - if ( empty( $player_positions ) ) { - $player_positions = (array) sp_get_the_term_id( $player_id, 'sp_position' ); - } - if ( in_array( $position->term_id, $player_positions ) ) { - $subdata[ $player_id ] = $data[ $player_id ]; - } - } - - // Initialize Sublabels - $sublabels = $labels; - - // Get performance with position - $performance_labels = get_posts( array( - 'post_type' => 'sp_performance', - 'posts_per_page' => -1, - 'tax_query' => array( - array( - 'taxonomy' => 'sp_position', - 'terms' => $position->term_id, - ), - ), - ) ); - - $allowed_labels = array(); - if ( ! empty( $performance_labels ) ) { - foreach ( $performance_labels as $label ) { - $allowed_labels[ $label->post_name ] = $label->post_title; - } - - $allowed_labels = apply_filters( 'sportspress_event_performance_allowed_labels', $allowed_labels, $position_index ); - - $sublabels = array_intersect_key( $sublabels, $allowed_labels ); - } - - if ( sizeof( $subdata ) ) { - $subdata = apply_filters( 'sportspress_event_performance_split_team_split_position_subdata', $subdata, $data, $position_index ); - - sp_get_template( 'event-performance-table.php', array( - 'position' => sp_get_position_caption( $position->term_id ), - 'scrollable' => $scrollable, - 'sortable' => $sortable, - 'show_players' => $show_team_players, - 'show_numbers' => $show_numbers, - 'show_total' => $show_total, - 'caption' => 0 == $position_index && $team_id ? get_the_title( $team_id ) : null, - 'labels' => $sublabels, - 'mode' => $mode, - 'data' => $subdata, - 'event' => $event, - 'link_posts' => $link_posts, - 'performance_ids' => isset( $performance_ids ) ? $performance_ids : null, - 'primary' => 'primary' == $total ? $primary : null, - 'class' => 'sp-template-event-performance-team-' . $index . '-position-' . $position_index, - ) ); + if ( 0 < $team_id ) { + $data = sp_array_combine( $players, sp_array_value( $performance, $team_id, array() ) ); + } elseif ( 0 == $team_id ) { + $data = array(); + foreach ( $players as $player_id ) { + if ( isset( $performance[ $player_id ][ $player_id ] ) ) { + $data[ $player_id ] = $performance[ $player_id ][ $player_id ]; } } } else { - sp_get_template( 'event-performance-table.php', array( - 'scrollable' => $scrollable, - 'sortable' => $sortable, - 'show_players' => $show_team_players, - 'show_numbers' => $show_numbers, - 'show_total' => $show_total, - 'caption' => $team_id ? get_the_title( $team_id ) : null, - 'labels' => $labels, - 'mode' => $mode, - 'data' => $data, - 'event' => $event, - 'link_posts' => $link_posts, - 'performance_ids' => isset( $performance_ids ) ? $performance_ids : null, - 'primary' => 'primary' == $total ? $primary : null, - - ) ); - } - } - if ( $show_staff ): - sp_get_template( 'event-staff.php', array( 'id' => $id, 'index' => $index ) ); - endif; - ?> - $player ) { - if ( $player_id == 0 ) continue; - $data[ $player_id ] = $player; - } - } - - if ( $split_positions ) { - $positions = get_terms( 'sp_position', array( - 'orderby' => 'slug', - 'hide_empty' => 0, - ) ); - - foreach ( $positions as $position_index => $position ) { - $subdata = array(); - foreach ( $data as $player_id => $player ) { - $player_positions = (array) sp_array_value( $player, 'position' ); - $player_positions = array_filter( $player_positions ); - if ( empty( $player_positions ) ) { - $player_positions = (array) sp_get_the_term_id( $player_id, 'sp_position' ); - } - if ( in_array( $position->term_id, $player_positions ) ) { - $subdata[ $player_id ] = $data[ $player_id ]; - } + $data = sp_array_value( array_values( $performance ), $index ); } - $subdata = apply_filters( 'sportspress_event_performance_split_position_subdata', $subdata, $data, $position_index ); + sp_get_template( 'event-performance-table.php', array( + 'scrollable' => $scrollable, + 'sortable' => $sortable, + 'show_players' => $show_team_players, + 'show_numbers' => $show_numbers, + 'show_total' => $show_total, + 'caption' => $team_id ? get_the_title( $team_id ) : null, + 'labels' => $labels, + 'formats' => $formats, + 'mode' => $mode, + 'data' => $data, + 'event' => $event, + 'link_posts' => $link_posts, + 'performance_ids' => isset( $performance_ids ) ? $performance_ids : null, + 'primary' => 'primary' == $total ? $primary : null, - if ( sizeof( $subdata ) ) { - sp_get_template( 'event-performance-table-combined.php', array( - 'scrollable' => $scrollable, - 'sortable' => $sortable, - 'show_players' => $show_players, - 'show_numbers' => $show_numbers, - 'show_total' => $show_total, - 'caption' => sp_get_position_caption( $position->term_id ), - 'labels' => $labels, - 'mode' => $mode, - 'data' => $subdata, - 'event' => $event, - 'link_posts' => $link_posts, - 'performance_ids' => isset( $performance_ids ) ? $performance_ids : null, - 'primary' => 'primary' == $total ? $primary : null, - ) ); - } + ) ); } - } else { - sp_get_template( 'event-performance-table-combined.php', array( - 'scrollable' => $scrollable, - 'sortable' => $sortable, - 'show_players' => $show_players, - 'show_numbers' => $show_numbers, - 'show_total' => $show_total, - 'caption' => __( 'Scorecard', 'sportspress' ), - 'labels' => $labels, - 'mode' => $mode, - 'data' => $data, - 'event' => $event, - 'link_posts' => $link_posts, - 'performance_ids' => isset( $performance_ids ) ? $performance_ids : null, - 'primary' => 'primary' == $total ? $primary : null, - ) ); } - } + if ( $show_staff ): + sp_get_template( 'event-staff.php', array( 'id' => $id, 'index' => $index ) ); + endif; + ?> +