Changeset 7912

Timestamp:

11/28/2018 10:47:15 PM (8 years ago)

Author:

coreymckrill

Message:

WordCamp Reports: Refactor WordCamp Counts for better data caching

This separates the data gathering so that get_data only handles the "raw"
rows of data that could be exported to a CSV, while compile_report_data
handles the counting of totals, uniques, etc. This also streamlines the
gender estimation process so that the API client is only used once per site.

Location:

sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-reports

Files:

• classes/report/class-wordcamp-counts.php (modified) (18 diffs)
• views/html/wordcamp-counts.php (modified) (5 diffs)
• views/report/wordcamp-counts.php (modified) (1 diff)

sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-reports/classes/report/class-wordcamp-counts.php

@@ -24 +24 @@
  */
 class WordCamp_Counts extends Base {
+        /**
+         * The lowest acceptable probability when determining gender.
+         *
+         * @var float
+         */
+        const GENDER_PROBABILITY_THRESHOLD = 0.9;
+
         /**
          * Report name.
@@ -106 +113 @@
 
         /**
+         * An array of data from the WordCamp Details report.
+         *
+         * @var array|null
+         */
+        protected $wordcamps = null;
+
+        /**
          * Data fields that can be visible in a public context.
          *
@@ -111 +125 @@
          */
         protected $public_data_fields = [
-                'ID'                      => 0,
-                'Name'                    => '',
-                'URL'                     => '',
-                'Start Date (YYYY-mm-dd)' => '',
-                'Status'                  => '',
-                'attendees'               => 0,
-                'organizers'              => 0,
-                'sessions'                => 0,
-                'speakers'                => 0,
-                'sponsors'                => 0,
+                'wordcamp_id' => 0,
+                'site_id'     => 0,
+                'post_id'     => 0,
+                'type'        => '',
+                'gender'      => '',
+        ];
+
+        /**
+         * Data fields that should only be visible in a private context.
+         *
+         * @var array An associative array of key/default value pairs.
+         */
+        protected $private_data_fields = [
+                'identifier'  => '',
         ];
 
@@ -201 +219 @@
          * Query and parse the data for the report.
          *
-         * TODO Refactor the raw data structure to make it exportable as a CSV, move some of the counting stuff
-         * to compile_report_data().
-         *
          * @return array
          */
@@ -218 +233 @@
                 }
 
-                // @todo Maybe find a way to run this without having to hack the memory limit.
+                // @todo Maybe find a way to run this without having to hack the ini.
                 ini_set( 'memory_limit', '900M' );
-
-                $details_options = [
-                        'public' => false,
-                ];
-                $details_report = new WordCamp_Details( $this->range, [], false, $details_options );
-
-                if ( ! empty( $details_report->error->get_error_messages() ) ) {
-                        $this->error = $this->merge_errors( $this->error, $details_report->error );
-
-                        return [];
-                }
-
-                $wordcamps = array_filter( $details_report->get_data(), function( $wordcamp ) {
-                        // Skip camps with no website URL.
-                        if ( ! $wordcamp['URL'] ) {
-                                return false;
-                        }
-
-                        if ( ! empty( $this->statuses ) && ! in_array( $wordcamp['Status'], $this->statuses ) ) {
-                                return false;
-                        }
-
-                        return true;
-                } );
-
-                $wordcamps = array_reduce( $wordcamps, function( $carry, $item ) {
-                        $keep = [
-                                'ID'                      => '',
-                                'Name'                    => '',
-                                'URL'                     => '',
-                                'Start Date (YYYY-mm-dd)' => '',
-                                'Status'                  => '',
-                        ];
-
-                        $carry[ $item['ID'] ] = array_intersect_key( $item, $keep );
-
-                        return $carry;
-                }, [] );
+                ini_set( 'max_execution_time', 300 );
+
+                $wordcamps = $this->get_wordcamps();
 
                 $wordcamp_ids = array_keys( $wordcamps );
@@ -267 +247 @@
                                 $valid = validate_wordcamp_id( $wordcamp_id );
 
-                                $data[ $wordcamp_id ] = array_merge(
-                                        $wordcamps[ $wordcamp_id ],
-                                        $this->get_data_for_site( $valid->site_id )
-                                );
+                                $data = array_merge( $data, $this->get_data_for_site( $valid->site_id, $valid->post_id ) );
                         } catch ( Exception $e ) {
                                 $this->error->add(
@@ -276 +253 @@
                                         $e->getMessage()
                                 );
-
+                        }
+
+                        if ( ! empty( $this->error->get_error_messages() ) ) {
                                 break;
                         }
-                }
-
-                $totals = [
-                        'attendees'  => 0,
-                        'organizers' => 0,
-                        'sessions'   => 0,
-                        'speakers'   => 0,
-                        'sponsors'   => 0,
-                ];
-
-                $uniques = [
-                        'attendees'  => [],
-                        'organizers' => [],
-                        'speakers'   => [],
-                        'sponsors'   => [],
-                ];
-
-                $gender_template = [
-                        'female'  => 0,
-                        'male'    => 0,
-                        'unknown' => 0,
-                ];
-
-                $genders = [
-                        'attendees'  => $gender_template,
-                        'organizers' => $gender_template,
-                        'speakers'   => $gender_template,
-                ];
-
-                foreach ( $data as $id => &$event ) {
-                        foreach ( $totals as $key => $bucket ) {
-                                if ( isset( $uniques[ $key ] ) ) {
-                                        $uniques[ $key ] = array_unique( array_merge( $uniques[ $key ], $event[ $key ]['total'] ) );
-                                }
-
-                                if ( $this->include_gender && isset( $genders[ $key ] ) ) {
-                                        $event[ $key ]['gender'] = array_reduce( $event[ $key ]['gender'], function( $carry, $item ) {
-                                                $carry[ $item ] ++;
-
-                                                return $carry;
-                                        }, $gender_template );
-
-                                        foreach ( $genders[ $key ] as $gender => &$total ) {
-                                                $total += $event[ $key ]['gender'][ $gender ];
-                                        }
-                                }
-
-                                $event[ $key ]['total'] = count( $event[ $key ]['total'] );
-
-                                $totals[ $key ] += $event[ $key ]['total'];
-                        }
-                }
-
-                $data['totals'] = $totals;
-
-                $data['uniques'] = array_map( function( $group ) {
-                        return count( $group );
-                }, $uniques );
-
-                if ( $this->include_gender ) {
-                        $data['genders'] = $genders;
                 }
 
@@ -351 +269 @@
          * Compile the report data into results.
          *
-         * TODO Move some of the logic from get_data into here.
-         *
          * @param array $data The data to compile.
          *
@@ -358 +274 @@
          */
         public function compile_report_data( array $data ) {
-                return $data;
+                $wordcamps = $this->prepare_data_for_display( $this->get_wordcamps() );
+
+                $compiled_data = [
+                        'wordcamps' => [],
+                        'totals'    => [
+                                'attendee'  => 0,
+                                'organizer' => 0,
+                                'session'   => 0,
+                                'speaker'   => 0,
+                                'sponsor'   => 0,
+                        ],
+                        'uniques'   => [
+                                'attendee'  => [],
+                                'organizer' => [],
+                                'speaker'   => [],
+                                'sponsor'   => [],
+                        ],
+                ];
+
+                $wordcamp_template = [
+                        'totals' => [
+                                'attendee'  => 0,
+                                'organizer' => 0,
+                                'session'   => 0,
+                                'speaker'   => 0,
+                                'sponsor'   => 0,
+                        ],
+                ];
+
+                if ( $this->include_gender ) {
+                        $gender_template = [
+                                'female'  => 0,
+                                'male'    => 0,
+                                'unknown' => 0,
+                        ];
+
+                        $wordcamp_template['genders'] = $compiled_data['genders'] = [
+                                'attendee'  => $gender_template,
+                                'organizer' => $gender_template,
+                                'speaker'   => $gender_template,
+                        ];
+                }
+
+                foreach ( $data as $item ) {
+                        $wordcamp_id = $item['wordcamp_id'];
+
+                        if ( ! isset( $compiled_data['wordcamps'][ $wordcamp_id ] ) ) {
+                                $compiled_data['wordcamps'][ $wordcamp_id ] = array_merge(
+                                        [
+                                                'info' => $wordcamps[ $wordcamp_id ],
+                                        ],
+                                        $wordcamp_template
+                                );
+                        }
+
+                        $type       = $item['type'];
+                        $identifier = $item['identifier'];
+
+                        $compiled_data['wordcamps'][ $wordcamp_id ]['totals'][ $type ] ++;
+                        $compiled_data['totals'][ $type ] ++;
+                        if ( isset( $compiled_data['uniques'][ $type ] ) ) {
+                                $compiled_data['uniques'][ $type ][] = $identifier;
+                        }
+
+                        if ( $this->include_gender && isset( $wordcamp_template['genders'][ $type ] ) ) {
+                                $gender = $item['gender'];
+
+                                $compiled_data['wordcamps'][ $wordcamp_id ]['genders'][ $type ][ $gender ] ++;
+                                $compiled_data['genders'][ $type ][ $gender ] ++;
+                        }
+                }
+
+                $compiled_data['uniques'] = array_map( function( $group ) {
+                        $group = array_unique( $group );
+
+                        return count( $group );
+                }, $compiled_data['uniques'] );
+
+                return $compiled_data;
         }
 
@@ -388 +382 @@
 
         /**
+         * Get data from a WordCamp Details report and filter it.
+         *
+         * @return array|null
+         */
+        protected function get_wordcamps() {
+                if ( is_array( $this->wordcamps ) ) {
+                        return $this->wordcamps;
+                }
+
+                $details_options = [
+                        'public' => false,
+                ];
+                $details_report = new WordCamp_Details( $this->range, [], false, $details_options );
+
+                if ( ! empty( $details_report->error->get_error_messages() ) ) {
+                        $this->error = $this->merge_errors( $this->error, $details_report->error );
+
+                        return [];
+                }
+
+                $wordcamps = array_filter( $details_report->get_data(), function( $wordcamp ) {
+                        // Skip camps with no website URL.
+                        if ( ! $wordcamp['URL'] ) {
+                                return false;
+                        }
+
+                        if ( ! empty( $this->statuses ) && ! in_array( $wordcamp['Status'], $this->statuses ) ) {
+                                return false;
+                        }
+
+                        return true;
+                } );
+
+                $this->wordcamps = array_reduce( $wordcamps, function( $carry, $item ) {
+                        $keep = [
+                                'ID'                      => '',
+                                'Name'                    => '',
+                                'URL'                     => '',
+                                'Start Date (YYYY-mm-dd)' => '',
+                                'Status'                  => '',
+                        ];
+
+                        $carry[ $item['ID'] ] = array_intersect_key( $item, $keep );
+
+                        return $carry;
+                }, [] );
+
+                return $this->wordcamps;
+        }
+
+        /**
          * Retrieve all of the data for one site.
          *
          * @param int $site_id
+         * @param int $wordcamp_id
          *
          * @return array
          */
-        protected function get_data_for_site( $site_id ) {
-                $site_data = [
-                        'attendees'  => [],
-                        'organizers' => [],
-                        'sessions'   => [],
-                        'speakers'   => [],
-                        'sponsors'   => [],
-                ];
+        protected function get_data_for_site( $site_id, $wordcamp_id ) {
+                $site_data = [];
 
                 switch_to_blog( $site_id );
-
-                // The get_locale() function doesn't work inside switch_to_blog because it returns early.
-                $wp_locale = get_site_option( 'WPLANG', 'en_US' );
 
                 $attendees = new WP_Query( [
@@ -414 +451 @@
                 ] );
 
-                $site_data['attendees']['total'] = wp_list_pluck( $attendees->posts, 'tix_email', 'ID' );
-
-                if ( $this->include_gender ) {
-                        $names = array_map( function( $name ) {
-                                return explode( ' ', $name )[0];
-                        }, wp_list_pluck( $attendees->posts, 'tix_first_name', 'ID' ) );
-
-                        $site_data['attendees']['gender'] = $this->get_genders( $names, $wp_locale );
+                foreach ( $attendees->posts as $attendee ) {
+                        $data = [
+                                'wordcamp_id' => $wordcamp_id,
+                                'site_id'     => $site_id,
+                                'post_id'     => $attendee->ID,
+                                'type'        => 'attendee',
+                                'identifier'  => $attendee->tix_email,
+                        ];
+
+                        if ( $this->include_gender ) {
+                                $data['first_name'] = explode( ' ', $attendee->tix_first_name )[0];
+                        }
+
+                        $site_data[] = $data;
+
+                        clean_post_cache( $attendee );
                 }
 
@@ -430 +475 @@
                 ] );
 
-                $site_data['organizers']['total']  = wp_list_pluck( $organizers->posts, '_wcpt_user_id', 'ID' );
-
-                if ( $this->include_gender ) {
-                        $names = array_map( function( $name ) {
-                                return explode( ' ', $name )[0];
-                        }, wp_list_pluck( $organizers->posts, 'post_title', 'ID' ) );
-
-                        $site_data['organizers']['gender'] = $this->get_genders( $names, $wp_locale );
+                foreach ( $organizers->posts as $organizer ) {
+                        $data = [
+                                'wordcamp_id' => $wordcamp_id,
+                                'site_id'     => $site_id,
+                                'post_id'     => $organizer->ID,
+                                'type'        => 'organizer',
+                                'identifier'  => $organizer->_wcpt_user_id,
+                        ];
+
+                        if ( $this->include_gender ) {
+                                $data['first_name'] = explode( ' ', $organizer->post_title )[0];
+                        }
+
+                        $site_data[] = $data;
+
+                        clean_post_cache( $organizer );
                 }
 
                 $sessions = new WP_Query( [
-                        'posts_per_page' => - 1,
+                        'posts_per_page' => -1,
                         'post_type'      => 'wcb_session',
                         'post_status'    => 'publish',
@@ -447 +500 @@
                                 [
                                         'key'   => '_wcpt_session_type',
-                                        'value' => 'session',
+                                        'value' => 'session', // Other session types are usually things like "Lunch".
                                 ]
                         ],
                 ] );
 
-                $site_data['sessions']['total'] = wp_list_pluck( $sessions->posts, 'ID' );
+                foreach ( $sessions->posts as $session ) {
+                        $data = [
+                                'wordcamp_id' => $wordcamp_id,
+                                'site_id'     => $site_id,
+                                'post_id'     => $session->ID,
+                                'type'        => 'session',
+                                'identifier'  => '',
+                        ];
+
+                        if ( $this->include_gender ) {
+                                $data['first_name'] = '';
+                        }
+
+                        $site_data[] = $data;
+
+                        clean_post_cache( $session );
+                }
 
                 $speakers = new WP_Query( [
@@ -460 +529 @@
                 ] );
 
-                $site_data['speakers']['total']  = wp_list_pluck( $speakers->posts, '_wcb_speaker_email', 'ID' );
-
-                if ( $this->include_gender ) {
-                        $names = array_map( function( $name ) {
-                                return explode( ' ', $name )[0];
-                        }, wp_list_pluck( $speakers->posts, 'post_title', 'ID' ) );
-
-                        $site_data['speakers']['gender'] = $this->get_genders( $names, $wp_locale );
+                foreach ( $speakers->posts as $speaker ) {
+                        $data = [
+                                'wordcamp_id' => $wordcamp_id,
+                                'site_id'     => $site_id,
+                                'post_id'     => $speaker->ID,
+                                'type'        => 'speaker',
+                                'identifier'  => $speaker->_wcb_speaker_email,
+                        ];
+
+                        if ( $this->include_gender ) {
+                                $data['first_name'] = explode( ' ', $speaker->post_title )[0];
+                        }
+
+                        $site_data[] = $data;
+
+                        clean_post_cache( $speaker );
                 }
 
@@ -476 +553 @@
                 ] );
 
-                $site_data['sponsors']['total'] = array_map( function( $url ) {
-                        $hostname = wp_parse_url( $url, PHP_URL_HOST );
-
-                        if ( ! $hostname ) {
-                                return '';
-                        }
-
-                        $trimmed = substr( $hostname, 0, strripos( $hostname, '.' ) ); // Remove the TLD.
-                        $trimmed = preg_replace( '/\.com?$/', '', $trimmed ); // Remove possible secondary .com or .co.
-                        $trimmed = preg_replace( '/^www\./', '', $trimmed ); // Remove possible www.
-
-                        return $trimmed;
-                }, wp_list_pluck( $sponsors->posts, '_wcpt_sponsor_website' ) );
+                foreach ( $sponsors->posts as $sponsor ) {
+                        $data = [
+                                'wordcamp_id' => $wordcamp_id,
+                                'site_id'     => $site_id,
+                                'post_id'     => $sponsor->ID,
+                                'type'        => 'sponsor',
+                                'identifier'  => $this->get_sponsor_identifier( $sponsor->_wcpt_sponsor_website ),
+                        ];
+
+                        if ( $this->include_gender ) {
+                                $data['first_name'] = '';
+                        }
+
+                        $site_data[] = $data;
+
+                        clean_post_cache( $sponsor );
+                }
 
                 restore_current_blog();
 
-                foreach ( $site_data as $type => &$data ) {
-                        if ( 'sessions' === $type ) {
-                                continue;
-                        }
-
-                        // Convert blanks to unique values.
-                        array_walk( $data['total'], function( &$value, $key ) use ( $site_id ) {
-                                if ( ! $value ) {
-                                        $value = "{$site_id}_{$key}";
+                // Convert blanks to unique values.
+                array_walk( $site_data, function( &$value ) {
+                        if ( 'session' === $value['type'] ) {
+                                return;
+                        }
+
+                        if ( empty( $value['identifier'] ) ) {
+                                $value['identifier'] = "{$value['site_id']}_{$value['post_id']}";
+                        }
+                } );
+
+                if ( $this->include_gender ) {
+                        $names = array_filter( wp_list_pluck( $site_data, 'first_name' ) );
+
+                        // The get_locale() function doesn't work inside switch_to_blog because it returns early.
+                        $wp_locale = get_site_option( 'WPLANG', 'en_US' );
+
+                        $gender_data = $this->genderize->get_gender_data( $names, $wp_locale );
+
+                        if ( ! empty( $this->genderize->error->get_error_messages() ) ) {
+                                $this->merge_errors( $this->error, $this->genderize->error );
+
+                                return [];
+                        }
+
+                        array_walk( $site_data, function( &$value ) use ( $gender_data ) {
+                                $name = strtolower( $value['first_name'] );
+                                $data = $gender_data[ $name ];
+
+                                if ( ! $data['gender'] || $data['probability'] < self::GENDER_PROBABILITY_THRESHOLD ) {
+                                        $value['gender'] = 'unknown';
+                                } else {
+                                        $value['gender'] = $data['gender'];
                                 }
+
+                                unset( $value['first_name'] );
                         } );
                 }
@@ -509 +616 @@
 
         /**
-         * Try to detect the genders for a list of first names.
-         *
-         * @param array  $names
-         * @param string $locale
-         *
-         * @return array
-         */
-        protected function get_genders( $names, $locale ) {
-                $probability_threshold = (float) 0.9;
-
-                $names   = array_map( 'strtolower', $names );
-                $genders = [];
-
-                $gender_data = $this->genderize->get_gender_data( $names, $locale );
-
-                if ( ! empty( $this->genderize->error->get_error_messages() ) ) {
-                        $this->merge_errors( $this->error, $this->genderize->error );
-
-                        return [];
-                }
-
-                foreach ( $names as $name ) {
-                        $data = $gender_data[ $name ];
-
-                        if ( ! $data['gender'] || $data['probability'] < $probability_threshold ) {
-                                $genders[] = 'unknown';
-                                continue;
-                        }
-
-                        $genders[] = $data['gender'];
-                }
-
-                return $genders;
+         * Reduce a sponsor URL to a simple domain name with no TLD.
+         *
+         * @param string $sponsor_url
+         *
+         * @return string
+         */
+        protected function get_sponsor_identifier( $sponsor_url ) {
+                $hostname = wp_parse_url( $sponsor_url, PHP_URL_HOST );
+
+                if ( ! $hostname ) {
+                        return '';
+                }
+
+                $trimmed = substr( $hostname, 0, strripos( $hostname, '.' ) ); // Remove the TLD.
+                $trimmed = preg_replace( '/\.com?$/', '', $trimmed ); // Remove possible secondary .com or .co.
+                $trimmed = preg_replace( '/^www\./', '', $trimmed ); // Remove possible www.
+
+                return $trimmed;
         }
 
@@ -550 +642 @@
          */
         public function render_html() {
-                $data = $this->prepare_data_for_display( $this->get_data() );
+                $data       = $this->compile_report_data( $this->get_data() );
                 $start_date = $this->range->start;
                 $end_date   = $this->range->end;
                 $statuses   = $this->statuses;
-
-                if ( $this->include_gender ) {
-                        $genders = array_pop( $data );
-                }
-
-                $uniques = array_pop( $data );
-                $totals  = array_pop( $data );
 
                 if ( ! empty( $this->error->get_error_messages() ) ) {
@@ -592 +677 @@
                 ) {
                         $options = array(
-                                'public' => false,
+                                'public'       => false,
                                 'max_interval' => new DateInterval( 'P1Y1M' ),
                         );

sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-reports/views/html/wordcamp-counts.php

@@ -9 +9 @@
 use DateTime;
 
+/** @var array $data */
 /** @var DateTime $start_date */
 /** @var DateTime $end_date */
 /** @var string $statuses */
-/** @var array $data */
-/** @var array $totals */
-/** @var array $uniques */
-/** @var array $genders */
 
 $gender_legend = '<span class="description small"><span class="total">Total</span> / F / M / ?</span>';
 ?>
 
-<?php if ( count( $data ) ) : ?>
+<?php if ( count( $data['wordcamps'] ) ) : ?>
         <h3 id="active-heading">
-                Numbers for WordCamps occurring
+                Counts for WordCamps occurring
                 <?php if ( $start_date->format( 'Y-m-d' ) === $end_date->format( 'Y-m-d' ) ) : ?>
                         on <?php echo esc_html( $start_date->format( 'M jS, Y' ) ); ?>
@@ -33 +30 @@
                 <tr>
                         <td>WordCamps</td>
-                        <td class="number total"><?php echo number_format_i18n( count( $data ) ); ?></td>
+                        <td class="number total"><?php echo number_format_i18n( count( $data['wordcamps'] ) ); ?></td>
                 </tr>
         </table>
@@ -47 +44 @@
                 <tr>
                         <td>Attendees</td>
-                        <td class="number"><?php echo number_format_i18n( $totals['attendees'] ); ?></td>
-                        <td class="number"><?php echo number_format_i18n( $uniques['attendees'] ); ?></td>
+                        <td class="number"><?php echo number_format_i18n( $data['totals']['attendee'] ); ?></td>
+                        <td class="number"><?php echo number_format_i18n( $data['uniques']['attendee'] ); ?></td>
                 </tr>
                 <tr>
                         <td>Organizers</td>
-                        <td class="number"><?php echo number_format_i18n( $totals['organizers'] ); ?></td>
-                        <td class="number"><?php echo number_format_i18n( $uniques['organizers'] ); ?></td>
+                        <td class="number"><?php echo number_format_i18n( $data['totals']['organizer'] ); ?></td>
+                        <td class="number"><?php echo number_format_i18n( $data['uniques']['organizer'] ); ?></td>
                 </tr>
                 <tr>
                         <td>Sessions</td>
-                        <td class="number"><?php echo number_format_i18n( $totals['sessions'] ); ?></td>
+                        <td class="number"><?php echo number_format_i18n( $data['totals']['session'] ); ?></td>
                         <td class="number">n/a</td>
                 </tr>
                 <tr>
                         <td>Speakers</td>
-                        <td class="number"><?php echo number_format_i18n( $totals['speakers'] ); ?></td>
-                        <td class="number"><?php echo number_format_i18n( $uniques['speakers'] ); ?></td>
+                        <td class="number"><?php echo number_format_i18n( $data['totals']['speaker'] ); ?></td>
+                        <td class="number"><?php echo number_format_i18n( $data['uniques']['speaker'] ); ?></td>
                 </tr>
                 <tr>
                         <td>Sponsors</td>
-                        <td class="number"><?php echo number_format_i18n( $totals['sponsors'] ); ?></td>
-                        <td class="number"><?php echo number_format_i18n( $uniques['sponsors'] ); ?></td>
+                        <td class="number"><?php echo number_format_i18n( $data['totals']['sponsor'] ); ?></td>
+                        <td class="number"><?php echo number_format_i18n( $data['uniques']['sponsor'] ); ?></td>
                 </tr>
         </table>
 
-        <?php if ( ! empty( $genders ) ) : ?>
-                <h4>Gender Breakdown</h4>
+        <?php if ( ! empty( $data['genders'] ) ) : ?>
+                <h4>Estimated Gender Breakdown</h4>
 
                 <table class="striped widefat but-not-too-wide">
@@ -85 +82 @@
                         <tr>
                                 <td>Attendees</td>
-                                <td class="number"><?php echo number_format_i18n( $totals['attendees'] ); ?></td>
-                                <td class="number"><?php echo number_format_i18n( $genders['attendees']['female'] ); ?></td>
-                                <td class="number"><?php echo number_format_i18n( $genders['attendees']['male'] ); ?></td>
-                                <td class="number"><?php echo number_format_i18n( $genders['attendees']['unknown'] ); ?></td>
+                                <td class="number"><?php echo number_format_i18n( $data['totals']['attendee'] ); ?></td>
+                                <td class="number"><?php echo number_format_i18n( $data['genders']['attendee']['female'] ); ?></td>
+                                <td class="number"><?php echo number_format_i18n( $data['genders']['attendee']['male'] ); ?></td>
+                                <td class="number"><?php echo number_format_i18n( $data['genders']['attendee']['unknown'] ); ?></td>
                         </tr>
                         <tr>
                                 <td>Organizers</td>
-                                <td class="number"><?php echo number_format_i18n( $totals['organizers'] ); ?></td>
-                                <td class="number"><?php echo number_format_i18n( $genders['organizers']['female'] ); ?></td>
-                                <td class="number"><?php echo number_format_i18n( $genders['organizers']['male'] ); ?></td>
-                                <td class="number"><?php echo number_format_i18n( $genders['organizers']['unknown'] ); ?></td>
+                                <td class="number"><?php echo number_format_i18n( $data['totals']['organizer'] ); ?></td>
+                                <td class="number"><?php echo number_format_i18n( $data['genders']['organizer']['female'] ); ?></td>
+                                <td class="number"><?php echo number_format_i18n( $data['genders']['organizer']['male'] ); ?></td>
+                                <td class="number"><?php echo number_format_i18n( $data['genders']['organizer']['unknown'] ); ?></td>
                         </tr>
                         <tr>
                                 <td>Speakers</td>
-                                <td class="number"><?php echo number_format_i18n( $totals['speakers'] ); ?></td>
-                                <td class="number"><?php echo number_format_i18n( $genders['speakers']['female'] ); ?></td>
-                                <td class="number"><?php echo number_format_i18n( $genders['speakers']['male'] ); ?></td>
-                                <td class="number"><?php echo number_format_i18n( $genders['speakers']['unknown'] ); ?></td>
+                                <td class="number"><?php echo number_format_i18n( $data['totals']['speaker'] ); ?></td>
+                                <td class="number"><?php echo number_format_i18n( $data['genders']['speaker']['female'] ); ?></td>
+                                <td class="number"><?php echo number_format_i18n( $data['genders']['speaker']['male'] ); ?></td>
+                                <td class="number"><?php echo number_format_i18n( $data['genders']['speaker']['unknown'] ); ?></td>
                         </tr>
                 </table>
@@ -114 +111 @@
                         <td>Date</td>
                         <td>Status</td>
-                        <td>Attendees<?php if ( ! empty( $genders ) ) : ?><br /><?php echo $gender_legend ?><?php endif; ?></td>
-                        <td>Organizers<?php if ( ! empty( $genders ) ) : ?><br /><?php echo $gender_legend ?><?php endif; ?></td>
+                        <td>Attendees<?php if ( ! empty( $data['genders'] ) ) : ?><br /><?php echo $gender_legend ?><?php endif; ?></td>
+                        <td>Organizers<?php if ( ! empty( $data['genders'] ) ) : ?><br /><?php echo $gender_legend ?><?php endif; ?></td>
                         <td>Sessions</td>
-                        <td>Speakers<?php if ( ! empty( $genders ) ) : ?><br /><?php echo $gender_legend ?><?php endif; ?></td>
+                        <td>Speakers<?php if ( ! empty( $data['genders'] ) ) : ?><br /><?php echo $gender_legend ?><?php endif; ?></td>
                         <td>Sponsors</td>
                 </tr>
-                <?php foreach ( $data as $event ) : ?>
+                <?php foreach ( $data['wordcamps'] as $event ) : ?>
                         <tr>
-                                <td><a href="<?php echo esc_attr( $event['URL'] ); ?>"><?php echo esc_html( $event['Name'] ); ?></a></td>
-                                <td><?php echo esc_html( $event['Start Date (YYYY-mm-dd)'] ); ?></td>
-                                <td><?php echo esc_html( $event['Status'] ); ?></td>
+                                <td><a href="<?php echo esc_attr( $event['info']['URL'] ); ?>"><?php echo esc_html( $event['info']['Name'] ); ?></a></td>
+                                <td><?php echo esc_html( $event['info']['Start Date (YYYY-mm-dd)'] ); ?></td>
+                                <td><?php echo esc_html( $event['info']['Status'] ); ?></td>
                                 <td class="number">
-                                        <span class="total"><?php echo number_format_i18n( $event['attendees']['total'] ); ?></span>
-                                        <?php if ( ! empty( $genders ) ) : ?>
-                                                / <?php echo number_format_i18n( $event['attendees']['gender']['female'] ); ?>
-                                                / <?php echo number_format_i18n( $event['attendees']['gender']['male'] ); ?>
-                                                / <?php echo number_format_i18n( $event['attendees']['gender']['unknown'] ); ?>
+                                        <span class="total"><?php echo number_format_i18n( $event['totals']['attendee'] ); ?></span>
+                                        <?php if ( ! empty( $data['genders'] ) ) : ?>
+                                                / <?php echo number_format_i18n( $event['genders']['attendee']['female'] ); ?>
+                                                / <?php echo number_format_i18n( $event['genders']['attendee']['male'] ); ?>
+                                                / <?php echo number_format_i18n( $event['genders']['attendee']['unknown'] ); ?>
                                         <?php endif; ?>
                                 </td>
                                 <td class="number">
-                                        <span class="total"><?php echo number_format_i18n( $event['organizers']['total'] ); ?></span>
-                                        <?php if ( ! empty( $genders ) ) : ?>
-                                                / <?php echo number_format_i18n( $event['organizers']['gender']['female'] ); ?>
-                                                / <?php echo number_format_i18n( $event['organizers']['gender']['male'] ); ?>
-                                                / <?php echo number_format_i18n( $event['organizers']['gender']['unknown'] ); ?>
+                                        <span class="total"><?php echo number_format_i18n( $event['totals']['organizer'] ); ?></span>
+                                        <?php if ( ! empty( $data['genders'] ) ) : ?>
+                                                / <?php echo number_format_i18n( $event['genders']['organizer']['female'] ); ?>
+                                                / <?php echo number_format_i18n( $event['genders']['organizer']['male'] ); ?>
+                                                / <?php echo number_format_i18n( $event['genders']['organizer']['unknown'] ); ?>
                                         <?php endif; ?>
                                 </td>
                                 <td class="number total">
-                                        <?php echo number_format_i18n( $event['sessions']['total'] ); ?>
+                                        <?php echo number_format_i18n( $event['totals']['session'] ); ?>
                                 </td>
                                 <td class="number">
-                                        <span class="total"><?php echo number_format_i18n( $event['speakers']['total'] ); ?></span>
-                                        <?php if ( ! empty( $genders ) ) : ?>
-                                                / <?php echo number_format_i18n( $event['speakers']['gender']['female'] ); ?>
-                                                / <?php echo number_format_i18n( $event['speakers']['gender']['male'] ); ?>
-                                                / <?php echo number_format_i18n( $event['speakers']['gender']['unknown'] ); ?>
+                                        <span class="total"><?php echo number_format_i18n( $event['totals']['speaker'] ); ?></span>
+                                        <?php if ( ! empty( $data['genders'] ) ) : ?>
+                                                / <?php echo number_format_i18n( $event['genders']['speaker']['female'] ); ?>
+                                                / <?php echo number_format_i18n( $event['genders']['speaker']['male'] ); ?>
+                                                / <?php echo number_format_i18n( $event['genders']['speaker']['unknown'] ); ?>
                                         <?php endif; ?>
                                 </td>
                                 <td class="number total">
-                                        <?php echo number_format_i18n( $event['sponsors']['total'] ); ?>
+                                        <?php echo number_format_i18n( $event['totals']['sponsor'] ); ?>
                                 </td>
                         </tr>

sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-reports/views/report/wordcamp-counts.php

@@ -56 +56 @@
                         </tr>
                         <tr>
-                                <th scope="row"><label for="refresh">Include gender breakdowns</label></th>
+                                <th scope="row"><label for="refresh">Include estimated gender breakdowns</label></th>
                                 <td><input type="checkbox" id="include-gender" name="include-gender" <?php checked( $include_gender ); ?> /></td>
                         </tr>