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

Solve equations only when variables exist and events have been played

Browse Source
This commit is contained in:
Brian Miyaji
2014-01-01 23:38:19 +11:00
parent 900bebee72
commit 6aef61164d
4 changed files with 51 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
admin/post-types/player.php
View File

@@ -146,7 +146,11 @@ function sp_player_stats_meta( $post ) {
else: else:
// Calculate value // Calculate value
$placeholders[ $team_id ][ $div_id ][ $key ] = $eos->solveIF( str_replace( ' ', '', $value ), $totals ); if ( sizeof( $events ) > 0 ):
$placeholders[ $team_id ][ $div_id ][ $key ] = sp_solve( $value, $totals );
else:
$placeholders[ $team_id ][ $div_id ][ $key ] = 0;
endif;
endif; endif;

6
admin/post-types/team.php
View File

@@ -134,7 +134,11 @@ function sp_team_columns_meta( $post ) {
// Generate array of placeholder values for each league // Generate array of placeholder values for each league
$placeholders[ $div_id ] = array(); $placeholders[ $div_id ] = array();
foreach ( $equations as $key => $value ): foreach ( $equations as $key => $value ):
$placeholders[ $div_id ][ $key ] = $eos->solveIF( str_replace( ' ', '', $value ), $totals ); if ( sizeof( $events ) > 0 ):
$placeholders[ $div_id ][ $key ] = sp_solve( $value, $totals );
else:
$placeholders[ $div_id ][ $key ] = 0;
endif;
endforeach; endforeach;
endforeach; endforeach;

45
sportspress-functions.php
View File

@@ -779,15 +779,41 @@ if ( !function_exists( 'sportspress_render_option_field' ) ) {
} }
} }
if ( !function_exists( 'sp_solve' ) ) {
function sp_solve( $equation, $vars ) {
// Clearance to begin calculating remains true if all equation variables are in vars
$clearance = true;
// Check if each variable part is in vars
$parts = explode( ' ', $equation );
foreach( $parts as $key => $value ):
if ( substr( $value, 0, 1 ) == '$' ):
if ( ! array_key_exists( preg_replace( "/[^a-z]/", '', $value ), $vars ) )
$clearance = false;
endif;
endforeach;
if ( $clearance ):
// Equation Operating System
$eos = new eqEOS();
// Solve using EOS
return $eos->solveIF( str_replace( ' ', '', $equation ), $vars );
else:
return 0;
endif;
}
}
if ( !function_exists( 'sp_get_table' ) ) { if ( !function_exists( 'sp_get_table' ) ) {
function sp_get_table( $post_id, $breakdown = false ) { function sp_get_table( $post_id, $breakdown = false ) {
$div_id = sp_get_the_term_id( $post_id, 'sp_league', 0 ); $div_id = sp_get_the_term_id( $post_id, 'sp_league', 0 );
$team_ids = (array)get_post_meta( $post_id, 'sp_team', false ); $team_ids = (array)get_post_meta( $post_id, 'sp_team', false );
$table_stats = (array)get_post_meta( $post_id, 'sp_teams', true ); $table_stats = (array)get_post_meta( $post_id, 'sp_teams', true );
// Equation Operating System
$eos = new eqEOS();
// Get labels from result variables // Get labels from result variables
$result_labels = (array)sp_get_var_labels( 'sp_result' ); $result_labels = (array)sp_get_var_labels( 'sp_result' );
@@ -915,7 +941,11 @@ if ( !function_exists( 'sp_get_table' ) ) {
foreach ( $stats as $stat ): foreach ( $stats as $stat ):
if ( sp_array_value( $placeholders[ $team_id ], $stat->post_name, '' ) == '' ): if ( sp_array_value( $placeholders[ $team_id ], $stat->post_name, '' ) == '' ):
$placeholders[ $team_id ][ $stat->post_name ] = $eos->solveIF( str_replace( ' ', '', $stat->equation ), sp_array_value( $totals, $team_id, array() ) ); if ( sizeof( $events ) > 0 ):
$placeholders[ $team_id ][ $stat->post_name ] = sp_solve( $stat->equation, sp_array_value( $totals, $team_id, array() ) );
else:
$placeholders[ $team_id ][ $stat->post_name ] = 0;
endif;
endif; endif;
endforeach; endforeach;
endforeach; endforeach;
@@ -1126,8 +1156,11 @@ if ( !function_exists( 'sp_get_list' ) ) {
else: else:
// Calculate value // Calculate value
$placeholders[ $player_id ][ $statistic->post_name ] = $eos->solveIF( str_replace( ' ', '', $statistic->equation ), sp_array_value( $totals, $player_id, array() ) ); if ( sizeof( $events ) > 0 ):
$placeholders[ $player_id ][ $statistic->post_name ] = sp_solve( $statistic->equation, sp_array_value( $totals, $player_id, array() ) );
else:
$placeholders[ $player_id ][ $statistic->post_name ] = 0;
endif;
endif; endif;
endif; endif;
endforeach; endforeach;

2
sportspress-globals.php
View File

@@ -67,4 +67,6 @@ $sportspress_thumbnail_texts = array(
'Remove featured image' => sprintf( __( 'Remove %s', 'sportspress' ), __( 'Photo', 'sportspress' ) ) 'Remove featured image' => sprintf( __( 'Remove %s', 'sportspress' ), __( 'Photo', 'sportspress' ) )
) )
); );
add_option( 'sp_event_team_count', 2 ); // TODO: dynamic team appending
?> ?>