Calculate event list results without team column

This commit is contained in:
Brian Miyaji
2014-05-10 14:28:17 +10:00
parent 690f948347
commit 27c63a976c
2 changed files with 41 additions and 38 deletions

View File

@@ -86,15 +86,15 @@ class SP_Meta_Box_Calendar_Data {
foreach ( $data as $event ):
$teams = get_post_meta( $event->ID, 'sp_team' );
$results = get_post_meta( $event->ID, 'sp_results', true );
$main_results = array();
$video = get_post_meta( $event->ID, 'sp_video', true );
$main_results = array();
?>
<tr class="sp-row sp-post<?php if ( $i % 2 == 0 ) echo ' alternate'; ?>">
<td><?php echo get_post_time( get_option( 'date_format' ), false, $event ); ?></td>
<td><?php echo $event->post_title; ?></td>
<td>
<?php
foreach ( $teams as $team ):
if ( $teams ): foreach ( $teams as $team ):
$name = get_the_title( $team );
if ( $name ):
$team_results = sp_array_value( $results, $team, null );
@@ -119,7 +119,9 @@ class SP_Meta_Box_Calendar_Data {
echo $name . '<br>';
endif;
endforeach;
endforeach; else:
echo '&mdash;';
endif;
?>
</td>
<td>

View File

@@ -71,51 +71,52 @@ if ( isset( $columns ) )
$teams = get_post_meta( $event->ID, 'sp_team' );
$results = get_post_meta( $event->ID, 'sp_results', true );
$main_results = array();
$video = get_post_meta( $event->ID, 'sp_video', true );
$main_results = array();
$teams_output = '';
if ( $teams ):
foreach ( $teams as $team ):
$name = get_the_title( $team );
if ( $name ):
$team_results = sp_array_value( $results, $team, null );
if ( $primary_result ):
$team_result = sp_array_value( $team_results, $primary_result, null );
else:
if ( is_array( $team_results ) ):
end( $team_results );
$team_result = prev( $team_results );
else:
$team_result = null;
endif;
endif;
$teams_output .= $name;
if ( $team_result != null ):
$main_results[] = $team_result;
$teams_output .= ' (' . $team_result . ')';
endif;
$teams_output .= '<br>';
endif;
endforeach;
else:
$teams_output .= '&mdash;';
endif;
echo '<tr class="sp-row sp-post' . ( $i % 2 == 0 ? ' alternate' : '' ) . '">';
echo '<td class="data-date"><a href="' . get_permalink( $event->ID ) . '">' . get_post_time( get_option( 'date_format' ), false, $event ) . '</a></td>';
if ( $usecolumns == null || in_array( 'event', $usecolumns ) )
echo '<td class="data-event">' . $event->post_title . '</td>';
if ( $usecolumns == null || in_array( 'teams', $usecolumns ) ):
echo '<td class="data-teams">';
$teams = get_post_meta( $event->ID, 'sp_team', false );
if ( $teams ):
foreach ( $teams as $team ):
$name = get_the_title( $team );
if ( $name ):
$team_results = sp_array_value( $results, $team, null );
if ( $primary_result ):
$team_result = sp_array_value( $team_results, $primary_result, null );
else:
if ( is_array( $team_results ) ):
end( $team_results );
$team_result = prev( $team_results );
else:
$team_result = null;
endif;
endif;
echo $name;
if ( $team_result != null ):
$main_results[] = $team_result;
echo ' (' . $team_result . ')';
endif;
echo '<br>';
endif;
endforeach;
else:
echo '&mdash;';
endif;
echo $teams_output;
echo '</td>';
endif;