asc/sportspress
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow event performance tables to be split by position

Browse Source
This commit is contained in:
Brian Miyaji
2015-03-03 17:20:44 +11:00
parent 91171b9b95
commit 7cf5946880
12 changed files with 638 additions and 245 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
includes/admin/class-sp-admin-sports.php
View File

@@ -148,6 +148,9 @@ class SP_Admin_Sports {
$post = self::get_post_array( $performance, $post_type );
if ( empty( $post ) ) continue;
$id = self::insert_preset_post( $post, $index );
if ( isset( $performance['position'] ) ) {
wp_set_object_terms( $id, $performance['position'], 'sp_position', false );
}
$i ++;
}
@@ -187,6 +190,15 @@ class SP_Admin_Sports {
update_post_meta( $id, 'sp_equation', sp_array_value( $statistic, 'equation', null ) );
update_post_meta( $id, 'sp_precision', sp_array_value( $statistic, 'precision', 0 ) );
}
// Options
$options = sp_array_value( $preset, 'options', array() );
foreach ( $options as $option => $value ) {
update_option( 'sportspress_' . $option, $value );
}
// Primary Result
update_option( 'sportspress_primary_result', $primary_result );
}

56
includes/admin/post-types/meta-boxes/class-sp-meta-box-event-performance.php
View File

@@ -29,8 +29,27 @@ class SP_Meta_Box_Event_Performance {
// Get results for players in the team
$players = sp_array_between( (array)get_post_meta( $post->ID, 'sp_player', false ), 0, $key );
$players[] = -1;
$data = sp_array_combine( $players, sp_array_value( $stats, $team_id, array() ) );
// Determine if we need checkboxes
if ( 'manual' == get_option( 'sportspress_event_performance_columns', 'auto' ) && $i == 0 )
$has_checkboxes = true;
else
$has_checkboxes = false;
// Determine if we need extras
if ( 'yes' == get_option( 'sportspress_event_show_extras', 'no' ) )
$show_extras = true;
else
$show_extras = false;
// Determine if we are splitting positions
if ( 'yes' == get_option( 'sportspress_event_split_players_by_position', 'no' ) )
$split_positions = true;
else
$split_positions = false;
?>
<div>
<?php if ( $team_id ): ?>
@@ -38,7 +57,7 @@ class SP_Meta_Box_Event_Performance {
<?php elseif ( $i ): ?>
<br>
<?php endif; ?>
<?php self::table( $labels, $columns, $data, $team_id, $i == 0 ); ?>
<?php self::table( $labels, $columns, $data, $team_id, $has_checkboxes, $show_extras, $split_positions ); ?>
</div>
<?php
$i ++;
@@ -56,7 +75,7 @@ class SP_Meta_Box_Event_Performance {
/**
* Admin edit table
*/
public static function table( $labels = array(), $columns = array(), $data = array(), $team_id, $has_checkboxes = false ) {
public static function table( $labels = array(), $columns = array(), $data = array(), $team_id, $has_checkboxes = false, $show_extras = false, $split_positions = false ) {
?>
<div class="sp-data-table-container">
<table class="widefat sp-data-table sp-performance-table sp-sortable-table">
@@ -65,7 +84,7 @@ class SP_Meta_Box_Event_Performance {
<th class="icon">&nbsp;</th>
<th>#</th>
<th><?php _e( 'Player', 'sportspress' ); ?></th>
<th>
<th class="column-position">
<?php if ( $has_checkboxes ): ?>
<label for="sp_columns_position">
<input type="checkbox" name="sp_columns[]" value="position" id="sp_columns_position" <?php checked( ! is_array( $columns ) || in_array( 'position', $columns ) ); ?>>
@@ -99,6 +118,22 @@ class SP_Meta_Box_Event_Performance {
</tr>
</thead>
<tfoot>
<?php if ( $show_extras ) { ?>
<tr class="sp-row sp-post sp-extras">
<td>&nbsp;</td>
<td>&nbsp;</td>
<td><strong><?php _e( 'Extras', 'sportspress' ); ?></strong></td>
<td>&nbsp;</td>
<?php foreach( $labels as $column => $label ):
$player_id = -1;
$player_performance = sp_array_value( $data, $player_id, array() );
$value = sp_array_value( $player_performance, $column, '' );
?>
<td><input type="text" name="sp_players[<?php echo $team_id; ?>][<?php echo $player_id; ?>][<?php echo $column; ?>]" value="<?php echo $value; ?>" /></td>
<?php endforeach; ?>
<td>&nbsp;</td>
</tr>
<?php } ?>
<tr class="sp-row sp-total">
<td>&nbsp;</td>
<td>&nbsp;</td>
@@ -106,10 +141,10 @@ class SP_Meta_Box_Event_Performance {
<td>&nbsp;</td>
<?php foreach( $labels as $column => $label ):
$player_id = 0;
$player_performance = sp_array_value( $data, 0, array() );
$player_performance = sp_array_value( $data, $player_id, array() );
$value = sp_array_value( $player_performance, $column, '' );
?>
<td><input type="text" name="sp_players[<?php echo $team_id; ?>][<?php echo $player_id; ?>][<?php echo $column; ?>]" value="<?php echo $value; ?>" placeholder="0" /></td>
<td><input type="text" name="sp_players[<?php echo $team_id; ?>][<?php echo $player_id; ?>][<?php echo $column; ?>]" placeholder="0" <?php if ( $split_positions ) { ?>readonly="readonly"<?php } else { ?>value="<?php echo $value; ?>"<?php } ?> /></td>
<?php endforeach; ?>
<td>&nbsp;</td>
</tr>
@@ -117,7 +152,7 @@ class SP_Meta_Box_Event_Performance {
<tbody>
<?php
foreach ( $data as $player_id => $player_performance ):
if ( !$player_id ) continue;
if ( $player_id <= 0 ) continue;
$number = get_post_meta( $player_id, 'sp_number', true );
$value = sp_array_value( $player_performance, 'number', '' );
?>
@@ -129,16 +164,19 @@ class SP_Meta_Box_Event_Performance {
<td><?php echo get_the_title( $player_id ); ?></td>
<td>
<?php
$selected = sp_array_value( $player_performance, 'position', null );
$selected = (array) sp_array_value( $player_performance, 'position', null );
if ( $selected == null ):
$selected = sp_get_the_term_id( $player_id, 'sp_position', 0 );
$selected = (array) sp_get_the_term_id( $player_id, 'sp_position', 0 );
endif;
$args = array(
'taxonomy' => 'sp_position',
'name' => 'sp_players[' . $team_id . '][' . $player_id . '][position]',
'name' => 'sp_players[' . $team_id . '][' . $player_id . '][position][]',
'values' => 'term_id',
'orderby' => 'slug',
'selected' => $selected,
'class' => 'sp-position',
'property' => 'multiple',
'chosen' => true,
);
sp_dropdown_taxonomies( $args );
?>

128
includes/admin/settings/class-sp-settings-events.php
View File

@@ -40,7 +40,7 @@ class SP_Settings_Events extends SP_Settings_Page {
$settings = array_merge(
array(
array( 'title' => __( 'Event Options', 'sportspress' ), 'type' => 'title','desc' => '', 'id' => 'event_options' ),
array( 'title' => __( 'Event Options', 'sportspress' ), 'type' => 'title', 'desc' => '', 'id' => 'event_options' ),
),
apply_filters( 'sportspress_event_options', array(
@@ -86,24 +86,8 @@ class SP_Settings_Events extends SP_Settings_Page {
),
array(
'desc' => __( 'Players', 'sportspress' ),
'id' => 'sportspress_event_show_players',
'default' => 'yes',
'type' => 'checkbox',
'checkboxgroup' => '',
),
array(
'desc' => __( 'Staff', 'sportspress' ),
'id' => 'sportspress_event_show_staff',
'default' => 'yes',
'type' => 'checkbox',
'checkboxgroup' => '',
),
array(
'desc' => __( 'Total', 'sportspress' ),
'id' => 'sportspress_event_show_total',
'desc' => __( 'Player Performance', 'sportspress' ),
'id' => 'sportspress_event_show_performance',
'default' => 'yes',
'type' => 'checkbox',
'checkboxgroup' => 'end',
@@ -124,17 +108,6 @@ class SP_Settings_Events extends SP_Settings_Page {
array( 'type' => 'delimiter' ),
array(
'title' => __( 'Player Performance', 'sportspress' ),
'id' => 'sportspress_event_performance_mode',
'default' => 'values',
'type' => 'radio',
'options' => array(
'values' => __( 'Values', 'sportspress' ),
'icons' => __( 'Icons', 'sportspress' ),
),
),
array(
'title' => __( 'Venues', 'sportspress' ),
'desc' => __( 'Display maps', 'sportspress' ),
@@ -185,10 +158,103 @@ class SP_Settings_Events extends SP_Settings_Page {
'default' => 'no',
'type' => 'checkbox',
),
)),
) ),
array(
array( 'type' => 'sectionend', 'id' => 'event_options' ),
),
array(
array( 'title' => __( 'Player Performance', 'sportspress' ), 'type' => 'title', 'desc' => '', 'id' => 'performance_options' ),
),
apply_filters( 'sportspress_performance_options', array(
array(
'title' => __( 'Rows', 'sportspress' ),
'desc' => __( 'Staff', 'sportspress' ),
'id' => 'sportspress_event_show_staff',
'default' => 'yes',
'type' => 'checkbox',
'checkboxgroup' => 'start',
),
array(
'desc' => __( 'Players', 'sportspress' ),
'id' => 'sportspress_event_show_players',
'default' => 'yes',
'type' => 'checkbox',
'checkboxgroup' => '',
),
array(
'desc' => __( 'Extras', 'sportspress' ),
'id' => 'sportspress_event_show_extras',
'default' => 'no',
'type' => 'checkbox',
'checkboxgroup' => '',
),
array(
'desc' => __( 'Total', 'sportspress' ),
'id' => 'sportspress_event_show_total',
'default' => 'yes',
'type' => 'checkbox',
'checkboxgroup' => 'end',
),
array(
'title' => __( 'Columns', 'sportspress' ),
'id' => 'sportspress_event_performance_columns',
'default' => 'auto',
'type' => 'radio',
'options' => array(
'auto' => __( 'Auto', 'sportspress' ),
'manual' => __( 'Manual', 'sportspress' ),
),
),
array(
'title' => __( 'Mode', 'sportspress' ),
'id' => 'sportspress_event_performance_mode',
'default' => 'values',
'type' => 'radio',
'options' => array(
'values' => __( 'Values', 'sportspress' ),
'icons' => __( 'Icons', 'sportspress' ),
),
),
array(
'title' => __( 'Players', 'sportspress' ),
'desc' => __( 'Display squad numbers', 'sportspress' ),
'id' => 'sportspress_event_show_player_numbers',
'default' => 'yes',
'type' => 'checkbox',
'checkboxgroup' => 'start',
),
array(
'desc' => __( 'Split players by position', 'sportspress' ),
'id' => 'sportspress_event_split_players_by_position',
'default' => 'false',
'type' => 'checkbox',
'checkboxgroup' => 'end',
),
array(
'title' => __( 'Total', 'sportspress' ),
'id' => 'sportspress_event_total_performance',
'default' => 'all',
'type' => 'radio',
'options' => array(
'all' => __( 'All', 'sportspress' ),
'primary' => __( 'Primary', 'sportspress' ),
),
),
) ),
array(
array( 'type' => 'sectionend', 'id' => 'performance_options' ),
)
);

83
includes/admin/views/html-admin-config.php
View File

@@ -77,7 +77,7 @@
<td class="forminp">
<legend class="screen-reader-text"><span><?php _e( 'Event Results', 'sportspress' ) ?></span></legend>
<form>
<?php wp_nonce_field( 'sp-save-primary-result', 'sp-config-nonce', false ); ?>
<?php wp_nonce_field( 'sp-save-primary-result', 'sp-primary-result-nonce', false ); ?>
<table class="widefat sp-admin-config-table">
<thead>
<tr>
@@ -131,6 +131,8 @@
<table class="form-table">
<tbody>
<?php
$selection = get_option( 'sportspress_primary_performance', 0 );
$args = array(
'post_type' => 'sp_performance',
'numberposts' => -1,
@@ -146,30 +148,61 @@
<p class="description"><?php _e( 'Used for events.', 'sportspress' ); ?></p>
</th>
<td class="forminp">
<table class="widefat sp-admin-config-table">
<thead>
<tr>
<th class="icon" scope="col"><?php _e( 'Icon', 'sportspress' ); ?></th>
<th scope="col"><?php _e( 'Label', 'sportspress' ); ?></th>
<th scope="col"><?php _e( 'Variable', 'sportspress' ); ?></th>
<th scope="col"><?php _e( 'Description', 'sportspress' ); ?></th>
<th scope="col" class="edit"></th>
</tr>
</thead>
<?php if ( $data ): $i = 0; foreach ( $data as $row ): ?>
<tr<?php if ( $i % 2 == 0 ) echo ' class="alternate"'; ?>>
<td class="icon"><?php if ( has_post_thumbnail( $row->ID ) ) echo get_the_post_thumbnail( $row->ID, 'sportspress-fit-mini' ); ?></td>
<td class="row-title"><?php echo $row->post_title; ?></td>
<td><?php echo $row->post_name; ?></td>
<td><p class="description"><?php echo $row->post_excerpt; ?></p></td>
<td class="edit"><a class="button" href="<?php echo get_edit_post_link( $row->ID ); ?>"><?php _e( 'Edit', 'sportspress' ); ?></s></td>
</tr>
<?php $i++; endforeach; else: ?>
<tr class="alternate">
<td colspan="5"><?php _e( 'No results found.', 'sportspress' ); ?></td>
</tr>
<?php endif; ?>
</table>
<legend class="screen-reader-text"><span><?php _e( 'Event Results', 'sportspress' ) ?></span></legend>
<form>
<?php wp_nonce_field( 'sp-save-primary-performance', 'sp-primary-performance-nonce', false ); ?>
<table class="widefat sp-admin-config-table">
<thead>
<tr>
<th class="radio" scope="col"><?php _e( 'Primary', 'sportspress' ); ?></th>
<th class="icon" scope="col"><?php _e( 'Icon', 'sportspress' ); ?></th>
<th scope="col"><?php _e( 'Label', 'sportspress' ); ?></th>
<th scope="col"><?php _e( 'Variable', 'sportspress' ); ?></th>
<th scope="col"><?php _e( 'Position', 'sportspress' ); ?></th>
<th scope="col"><?php _e( 'Description', 'sportspress' ); ?></th>
<th scope="col" class="edit"></th>
</tr>
</thead>
<tfoot>
<tr>
<th class="radio"><input type="radio" class="sp-primary-performance-option" id="sportspress_primary_performance_0" name="sportspress_primary_performance" value="0" <?php checked( $selection, 0 ); ?>></th>
<th class="icon">&nbsp;</td>
<th colspan="5"><label for="sportspress_primary_performance_0">
<?php
if ( sizeof( $data ) > 0 ):
$default = reset( $data );
printf( __( 'Default (%s)', 'sportspress' ), $default->post_title );
else:
_e( 'Default', 'sportspress' );
endif;
?>
</label></th>
</tr>
</tfoot>
<?php if ( $data ): $i = 0; foreach ( $data as $row ): ?>
<tr<?php if ( $i % 2 == 0 ) echo ' class="alternate"'; ?>>
<td class="radio"><input type="radio" class="sp-primary-performance-option" id="sportspress_primary_performance_<?php echo $row->post_name; ?>" name="sportspress_primary_performance" value="<?php echo $row->post_name; ?>" <?php checked( $selection, $row->post_name ); ?>></td>
<td class="icon">
<?php
if ( has_post_thumbnail( $row->ID ) )
echo get_the_post_thumbnail( $row->ID, 'sportspress-fit-mini' );
else
echo '&nbsp;';
?>
</td>
<td class="row-title"><?php echo $row->post_title; ?></td>
<td><?php echo $row->post_name; ?></td>
<td><?php echo get_the_terms ( $row->ID, 'sp_position' ) ? the_terms( $row->ID, 'sp_position' ) : __( 'All', 'sportspress' );; ?></td>
<td><p class="description"><?php echo $row->post_excerpt; ?></p></td>
<td class="edit"><a class="button" href="<?php echo get_edit_post_link( $row->ID ); ?>"><?php _e( 'Edit', 'sportspress' ); ?></s></td>
</tr>
<?php $i++; endforeach; else: ?>
<tr class="alternate">
<td colspan="7"><?php _e( 'No results found.', 'sportspress' ); ?></td>
</tr>
<?php endif; ?>
</table>
</form>
<div class="tablenav bottom">
<a class="button alignleft" href="<?php echo admin_url( 'edit.php?post_type=sp_performance' ); ?>"><?php _e( 'View All', 'sportspress' ); ?></a>
<a class="button button-primary alignright" href="<?php echo admin_url( 'post-new.php?post_type=sp_performance' ); ?>"><?php _e( 'Add New', 'sportspress' ); ?></a>

2
includes/class-sp-event.php
View File

@@ -99,7 +99,7 @@ class SP_Event extends SP_Custom_Post{
else:
// Add position to performance labels
$labels = array_merge( array( 'position' => __( 'Position', 'sportspress' ) ), $labels );
if ( is_array( $columns ) ):
if ( 'manual' == get_option( 'sportspress_event_performance_columns', 'auto' ) && is_array( $columns ) ):
foreach ( $labels as $key => $label ):
if ( ! in_array( $key, $columns ) ):
unset( $labels[ $key ] );

2
includes/class-sp-post-types.php
View File

@@ -142,7 +142,7 @@ class SP_Post_types {
'hierarchical' => true,
'rewrite' => array( 'slug' => get_option( 'sportspress_position_slug', 'position' ) ),
);
$object_types = apply_filters( 'sportspress_position_object_types', array( 'sp_player' ) );
$object_types = apply_filters( 'sportspress_position_object_types', array( 'sp_player', 'sp_performance' ) );
register_taxonomy( 'sp_position', $object_types, $args );
foreach ( $object_types as $object_type ):
register_taxonomy_for_object_type( 'sp_position', $object_type );

1
includes/sp-core-functions.php
View File

@@ -13,6 +13,7 @@
if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
// Include core functions
include( 'sp-option-filters.php' );
include( 'sp-conditional-functions.php' );
include( 'sp-formatting-functions.php' );
include( 'sp-deprecated-functions.php' );

22
includes/sp-option-filters.php Normal file
View File

@@ -0,0 +1,22 @@
<?php
/**
* SportsPress Option Filters
*
* Filters for SportsPress options.
*
* @author ThemeBoy
* @category Core
* @package SportsPress/Functions
* @version 1.7
*/
if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
function sportspress_primary_performance_filter( $option ) {
if ( $option ) return $option;
$performance_posts = get_posts( array( 'posts_per_page' => 1, 'orderby' => 'menu_order', 'order' => 'ASC', 'post_type' => 'sp_performance' ) );
if ( ! $performance_posts ) return $option;
$post = reset( $performance_posts );
return $post->post_name;
}
add_filter( 'option_sportspress_primary_performance', 'sportspress_primary_performance_filter' );