Strict filter competition and seasons

This commit is contained in:
Brian Miyaji
2017-01-14 01:48:45 +11:00
parent e5ca52b59a
commit cefb48b3b4

View File

@@ -300,31 +300,17 @@ class SP_Player extends SP_Custom_Post {
if ( $league_id ): if ( $league_id ):
$args['tax_query'][] = array( $args['tax_query'][] = array(
'relation' => 'OR',
array(
'taxonomy' => 'sp_league', 'taxonomy' => 'sp_league',
'field' => 'term_id', 'field' => 'term_id',
'terms' => $league_id 'terms' => $league_id
),
array(
'taxonomy' => 'sp_league',
'operator' => 'NOT EXISTS',
),
); );
endif; endif;
if ( $div_id ): if ( $div_id ):
$args['tax_query'][] = array( $args['tax_query'][] = array(
'relation' => 'OR',
array(
'taxonomy' => 'sp_season', 'taxonomy' => 'sp_season',
'field' => 'term_id', 'field' => 'term_id',
'terms' => $div_id 'terms' => $div_id
),
array(
'taxonomy' => 'sp_season',
'operator' => 'NOT EXISTS',
),
); );
endif; endif;
@@ -347,46 +333,7 @@ class SP_Player extends SP_Custom_Post {
$player_performance = sp_array_value( $players, $this->ID, array() ); $player_performance = sp_array_value( $players, $this->ID, array() );
foreach ( $player_performance as $key => $value ): foreach ( $player_performance as $key => $value ):
if ( 'outcome' == $key ): if ( array_key_exists( $key, $totals ) ):
// Increment events attended, played, and started
$totals['eventsattended'] ++;
$totals['eventsplayed'] ++;
$totals['eventsstarted'] ++;
$totals['eventminutes'] += $minutes;
// Convert to array
if ( ! is_array( $value ) ):
$value = array( $value );
endif;
foreach ( $value as $outcome ):
if ( $outcome && $outcome != '-1' ):
// Increment outcome count
if ( array_key_exists( $outcome, $totals ) ):
$totals[ $outcome ] ++;
endif;
// Add to streak counter
if ( $streak['fire'] && ( $streak['name'] == '' || $streak['name'] == $outcome ) ):
$streak['name'] = $outcome;
$streak['count'] ++;
else:
$streak['fire'] = 0;
endif;
// Add to last 5 counter if sum is less than 5
if ( array_key_exists( $outcome, $last5 ) && array_sum( $last5 ) < 5 ):
$last5[ $outcome ] ++;
endif;
// Add to last 10 counter if sum is less than 10
if ( array_key_exists( $outcome, $last10 ) && array_sum( $last10 ) < 10 ):
$last10[ $outcome ] ++;
endif;
endif;
endforeach;
elseif ( array_key_exists( $key, $totals ) ):
$totals[ $key ] += $value; $totals[ $key ] += $value;
endif; endif;
endforeach; endforeach;