Changeset 7734

Timestamp:

10/16/2018 05:30:06 PM (8 years ago)

Author:

vedjain

Message:

WordCamp Report: Add reporting for meetup applications.

This commit adds functionality for downloading meetup application reports from admin dashboard. Also refactors WordCamp report classes
to make code DRY.

Location:

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

Files:

• classes/report/class-base-details.php (added)
• classes/report/class-base-status.php (added)
• classes/report/class-base.php (modified) (2 diffs)
• classes/report/class-meetup-details.php (added)
• classes/report/class-meetup-status.php (added)
• classes/report/class-wordcamp-details.php (modified) (15 diffs)
• classes/report/class-wordcamp-status.php (modified) (6 diffs)
• index.php (modified) (1 diff)
• views/html/meetup-status.php (added)
• views/public/meetup-status.php (added)
• views/report/meetup-details.php (added)
• views/report/meetup-status.php (added)

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

@@ -135 +135 @@
 
         /**
-         * Determine the data fields safelist based on the context of the report.
-         *
-         * @return array The list of fields that are safe to include.
-         */
-        protected function get_data_fields_safelist() {
-                $safelist = $this->public_data_fields;
-
-                if ( false === $this->options['public'] ) {
-                        $safelist = array_merge( $safelist, $this->private_data_fields );
-                }
-
-                return $safelist;
-        }
-
-        /**
          * Filter the report data prior to caching and compiling.
          *
@@ -315 +300 @@
                 return new \WP_REST_Response( $response_data );
         }
+
+        /**
+         * Determine the data fields safelist based on the context of the report.
+         *
+         * @return array The list of fields that are safe to include.
+         */
+        public function get_data_fields_safelist() {
+                $safelist = $this->public_data_fields;
+
+                if ( false === $this->options['public'] ) {
+                        $safelist = array_merge( $safelist, $this->private_data_fields );
+                }
+
+                return $safelist;
+        }
 }

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

@@ -9 +9 @@
 use Exception;
 use DateTime;
-use WP_Post, WP_Query, WP_Error;
-use function WordCamp\Reports\{get_assets_url, get_assets_dir_path, get_views_dir_path};
+use WP_Post, WP_Query;
+use function WordCamp\Reports\{get_views_dir_path};
 use WordCamp\Reports\Utility\Date_Range;
 use function WordCamp\Reports\Validation\{validate_date_range, validate_wordcamp_id};
 use WordCamp_Admin, WordCamp_Loader;
-use WordCamp\Utilities\Export_CSV;
 
 /**
@@ -26 +25 @@
  * @package WordCamp\Reports\Report
  */
-class WordCamp_Details extends Base {
+class WordCamp_Details extends Base_Details {
         /**
          * Report name.
@@ -69 +68 @@
 
         /**
-         * A date range that WordCamp events must fall within.
-         *
-         * @var null|Date_Range
-         */
-        public $range = null;
-
-        /**
-         * A list of WordCamp post IDs.
-         *
-         * @var array
-         */
-        public $wordcamp_ids = [];
-
-        /**
          * Whether to include counts of various post types for each WordCamp.
          *
@@ -88 +73 @@
          */
         public $include_counts = false;
-
-        /**
-         * Data fields that can be visible in a public context.
-         *
-         * @var array An associative array of key/default value pairs.
-         */
-        protected $public_data_fields = [];
-
-        /**
-         * 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 = [];
 
         /**
@@ -118 +89 @@
          * }
          */
-        public function __construct( Date_Range $date_range = null, array $wordcamp_ids = [], $include_counts = false, array $options = [] ) {
+        public function __construct( Date_Range $date_range = null, array $wordcamp_ids = null, $include_counts = false, array $options = [] ) {
                 // Report-specific options.
-                $options = wp_parse_args( $options, [
-                        'fields' => [],
-                ] );
-
-                parent::__construct( $options );
-
-                if ( $date_range instanceof Date_Range ) {
-                        $this->range = $date_range;
-                }
-
-                if ( ! empty( $wordcamp_ids ) ) {
-                        foreach ( $wordcamp_ids as $wordcamp_id ) {
-                                try {
-                                        $this->wordcamp_ids[] = validate_wordcamp_id( $wordcamp_id, [ 'require_site' => false ] )->post_id;
-                                } catch ( Exception $e ) {
-                                        $this->error->add(
-                                                self::$slug . '-wordcamp-id-error',
-                                                $e->getMessage()
-                                        );
-
-                                        break;
-                                }
-                        }
+
+                parent::__construct( $date_range, $wordcamp_ids, $options );
+                if ( ! is_null( $wordcamp_ids ) ) {
+                        $this->event_ids = [];
+                        $this->validate_wordcamp_ids( $wordcamp_ids );
                 }
 
                 $this->include_counts = wp_validate_boolean( $include_counts );
-
-                $public_data_field_keys = array_merge(
+        }
+
+        /**
+         * Return fields that can be displayed in public context.
+         *
+         * @return array
+         */
+        public function get_public_data_fields() {
+                return array_merge(
                         [
                                 'Name',
@@ -153 +113 @@
                         WordCamp_Loader::get_public_meta_keys()
                 );
-                $this->public_data_fields = array_fill_keys( $public_data_field_keys, '' );
-
-                $private_data_field_keys = array_merge(
+        }
+
+        /**
+         * Return fields that can be viewed in private context.
+         *
+         * @return array
+         */
+        public function get_private_data_fields() {
+                return array_merge(
                         [
                                 'ID',
@@ -165 +131 @@
                                 'Organizers',
                         ],
-                        array_diff( $this->get_meta_keys(), array_keys( $this->public_data_fields ) )
+                        array_diff( $this->get_meta_keys(), array_keys( $this->get_public_data_fields() ) )
                 );
-                $this->private_data_fields = array_fill_keys( $private_data_field_keys, '' );
-
-                try {
-                        $this->options['fields'] = $this->validate_fields_input( $this->options['fields'] );
-                } catch ( Exception $e ) {
-                        $this->error->add(
-                                self::$slug . '-fields-error',
-                                $e->getMessage()
-                        );
-                }
-        }
-
-        /**
-         * Check the array of fields to include in the spreadsheet against the safelist of data fields.
-         *
-         * @param array $fields
-         *
-         * @return array The validated fields.
-         * @throws Exception
-         */
-        protected function validate_fields_input( array $fields ) {
-                $valid_fields = $this->get_data_fields_safelist();
-                $fields       = array_unique( $fields );
-
-                foreach ( $fields as $field ) {
-                        if ( ! array_key_exists( $field, $valid_fields ) ) {
-                                throw new Exception( sprintf(
-                                        'Invalid field: %s',
-                                        esc_html( $field )
-                                ) );
+        }
+
+        /**
+         * Validate WordCamp ids and filter those without a site.
+         *
+         * @param $wordcamp_ids
+         */
+        public function validate_wordcamp_ids( $wordcamp_ids ) {
+                if ( ! empty( $wordcamp_ids ) ) {
+                        foreach ( $wordcamp_ids as $wordcamp_id ) {
+                                try {
+                                        $this->event_ids[] = validate_wordcamp_id( $wordcamp_id, [ 'require_site' => false ] )->post_id;
+                                } catch ( Exception $e ) {
+                                        $this->error->add(
+                                                self::$slug . '-wordcamp-id-error',
+                                                $e->getMessage()
+                                        );
+
+                                        break;
+                                }
                         }
                 }
-
-                return $fields;
-        }
-
-        /**
-         * Query and parse the data for the report.
-         *
-         * @return array
-         */
-        public function get_data() {
-                // Bail if there are errors.
-                if ( ! empty( $this->error->get_error_messages() ) ) {
-                        return array();
-                }
-
-                $data = [];
-
-                $wordcamp_posts = $this->get_wordcamp_posts();
-
-                foreach ( $wordcamp_posts as $post ) {
-                        $data[] = $this->fill_data_row( $post );
-                }
-
-                $data = $this->filter_data_fields( $data );
-
-                // Reorder of the fields in each row.
-                $field_order = array_fill_keys( self::get_field_order(), '' );
-                array_walk( $data, function( &$row ) use ( $field_order ) {
-                        $row = array_intersect_key( array_replace( $field_order, $row ), $row );
-                } );
-
-                return $data;
-        }
-
-        /**
-         * Compile the report data into results.
-         *
-         * Currently unused.
-         *
-         * @param array $data The data to compile.
-         *
-         * @return array
-         */
-        public function compile_report_data( array $data ) {
-                return $data;
         }
 
@@ -251 +162 @@
          * @return array
          */
-        protected static function get_field_order() {
+        public static function get_field_order() {
                 /* @var WordCamp_Admin $wordcamp_admin */
                 global $wordcamp_admin;
@@ -336 +247 @@
          * @return array An array of WP_Post objects.
          */
-        protected function get_wordcamp_posts() {
+        public function get_event_posts() {
                 $post_args = array(
                         'post_type'           => WCPT_POST_TYPE_ID,
@@ -361 +272 @@
                 }
 
-                if ( ! empty( $this->wordcamp_ids ) ) {
-                        $post_args['post__in'] = $this->wordcamp_ids;
+                if ( ! empty( $this->event_ids ) ) {
+                        $post_args['post__in'] = $this->event_ids;
                 }
 
@@ -373 +284 @@
 
         /**
-         * Get the values of all the relevant post meta keys for a WordCamp post.
-         *
-         * @param WP_Post $wordcamp
-         *
-         * @return array
-         */
-        protected function fill_data_row( WP_Post $wordcamp ) {
-                $meta_keys   = $this->get_meta_keys();
-
-                $row = [
-                        'ID'      => $wordcamp->ID,
-                        'Name'    => $wordcamp->post_title,
-                        'Created' => get_the_date( 'Y-m-d', $wordcamp->ID ),
-                        'Status'  => $wordcamp->post_status,
-                ];
-
-                if ( $this->include_counts ) {
-                        $row = array_merge( $row, $this->get_counts( $wordcamp ) );
-                }
-
-                foreach ( $meta_keys as $key ) {
-                        $row[ $key ] = get_post_meta( $wordcamp->ID, $key, true ) ?: '';
-                }
-
-                return $row;
-        }
-
-        /**
          * Get a list of all the relevant meta keys for WordCamp posts.
          *
          * @return array
          */
-        protected function get_meta_keys() {
+        public function get_meta_keys() {
                 /* @var WordCamp_Admin $wordcamp_admin */
                 global $wordcamp_admin;
@@ -420 +303 @@
         }
 
+        public function fill_data_row( $event ) {
+                $row = parent::fill_data_row( $event );
+
+                if ( $this->include_counts ) {
+                        $row = array_merge( $row, $this->get_counts( $event ) );
+                }
+
+                return $row;
+        }
+
+        /**
+         * Create an object of this class with relevant requirements passed to constructor
+         *
+         * @param string $context Can be 'public' or 'private'
+         *
+         * @return Base_Details
+         */
+        static public function create_shadow_report_obj( $context ) {
+                return new self( null, null, false, ['public' => 'public' === $context ] );
+        }
+
+        /**
+         * Render list of fields that can be present in exported CSV.
+         *
+         * @param string $context
+         * @param array $field_defaults
+         */
+        static public function render_available_fields( $context = 'public', array $field_defaults = [] ) {
+                $shadow_report = self::create_shadow_report_obj( $context );
+                self::render_available_fields_in_report( $shadow_report, $context, $field_defaults );
+        }
+
         /**
          * Count the number of various post types for a WordCamp.
@@ -429 +344 @@
          * @return array
          */
-        protected function get_counts( WP_Post $wordcamp ) {
+        public function get_counts( WP_Post $wordcamp ) {
                 $counts = [
                         'Tickets'    => 0,
@@ -473 +388 @@
 
                 return $counts;
-        }
-
-        /**
-         * Render HTML form inputs for the fields that are available for inclusion in the spreadsheet.
-         *
-         * @param string $context        'public' or 'private'. Default 'public'.
-         * @param array  $field_defaults Optional. An associative array where the keys are field keys and the values
-         *                               are extra attributes for those field inputs. Examples: checked or required.
-         */
-        public static function render_available_fields( $context = 'public', array $field_defaults = [] ) {
-                $field_order      = array_fill_keys( self::get_field_order(), '' );
-                $field_defaults   = array_replace( $field_order, $field_defaults );
-
-                $shadow_report = new self( null, [], false, [ 'public' => ( 'private' === $context ) ? false : true ] );
-
-                $available_fields = array_intersect_key( $field_defaults, $shadow_report->get_data_fields_safelist() );
-                ?>
-                <fieldset class="fields-container">
-                        <legend class="fields-label">Available Fields</legend>
-
-                        <?php foreach ( $available_fields as $field_name => $extra_props ) : ?>
-                                <div class="field-checkbox">
-                                        <input
-                                                type="checkbox"
-                                                id="fields-<?php echo esc_attr( $field_name ); ?>"
-                                                name="fields[]"
-                                                value="<?php echo esc_attr( $field_name ); ?>"
-                                                <?php if ( $extra_props && is_string( $extra_props ) ) echo esc_html( $extra_props ); ?>
-                                        />
-                                        <label for="fields-<?php echo esc_attr( $field_name ); ?>">
-                                                <?php echo esc_attr( $field_name ); ?>
-                                        </label>
-                                </div>
-                        <?php endforeach; ?>
-                </fieldset>
-                <?php
-        }
-
-        /**
-         * Register all assets used by this report.
-         *
-         * @return void
-         */
-        public static function register_assets() {
-                wp_register_script(
-                        self::$slug,
-                        get_assets_url() . 'js/' . self::$slug . '.js',
-                        array(),
-                        filemtime( get_assets_dir_path() . 'js/' . self::$slug . '.js' ),
-                        true
-                );
-
-                wp_register_style(
-                        self::$slug,
-                        get_assets_url() . 'css/' . self::$slug . '.css',
-                        array(),
-                        filemtime( get_assets_dir_path() . 'css/' . self::$slug . '.css' ),
-                        'screen'
-                );
-        }
-
-        /**
-         * Enqueue JS and CSS assets for this report's admin interface.
-         *
-         * @return void
-         */
-        public static function enqueue_admin_assets() {
-                self::register_assets();
-
-                wp_enqueue_script( self::$slug );
-                wp_enqueue_style( self::$slug );
         }
 
@@ -582 +426 @@
                 }
 
-                if ( wp_verify_nonce( $nonce, 'run-report' ) && current_user_can( 'manage_network' ) ) {
-                        $error = null;
-                        $range = null;
-
-                        if ( $start_date || $end_date ) {
-                                try {
-                                        $range = validate_date_range( $start_date, $end_date, [
-                                                'allow_future_start' => true,
-                                                'earliest_start'     => new DateTime( '2006-01-01' ), // No WordCamp posts before 2006.,
-                                        ] );
-                                } catch ( Exception $e ) {
-                                        $error = new WP_Error(
-                                                self::$slug . '-date-range-error',
-                                                $e->getMessage()
-                                        );
-                                }
+                if ( ! wp_verify_nonce( $nonce, 'run-report' ) ) {
+                        return;
+                }
+
+                if ( ! current_user_can( 'manage_network' ) ) {
+                        return;
+                }
+
+                $error = null;
+                $range = null;
+
+                if ( $start_date || $end_date ) {
+                        try {
+                                $range = validate_date_range( $start_date, $end_date, [
+                                        'allow_future_start' => true,
+                                        'earliest_start'     => new DateTime( '2006-01-01' ), // No WordCamp posts before 2006.,
+                                ] );
+                        } catch ( Exception $e ) {
+                                $error = new WP_Error(
+                                        self::$slug . '-date-range-error',
+                                        $e->getMessage()
+                                );
                         }
-
-                        $include_counts = false;
-                        if ( ! empty( array_intersect( $fields, [ 'Tickets', 'Speakers', 'Sponsors', 'Organizers' ] ) ) ) {
-                                $include_counts = true;
-                        }
-
-                        // The "Name" field should always be included, but does not get submitted because the input is disabled,
-                        // so add it in here.
-                        $fields[] = 'Name';
-
-                        $options = array(
-                                'fields' => $fields,
-                                'public' => false,
-                        );
-
-                        $report = new self( $range, [], $include_counts, $options );
-
-                        $filename = [ $report::$name ];
-                        if ( $report->range instanceof Date_Range ) {
-                                $filename[] = $report->range->start->format( 'Y-m-d' );
-                                $filename[] = $report->range->end->format( 'Y-m-d' );
-                        }
-                        if ( $report->include_counts ) {
-                                $filename[] = 'include-counts';
-                        }
-
-                        $data = $report->prepare_data_for_display( $report->get_data() );
-
-                        $headers = ( ! empty( $data ) ) ? array_keys( $data[0] ) : [];
-
-                        $exporter = new Export_CSV( array(
-                                'filename' => $filename,
-                                'headers'  => $headers,
-                                'data'     => $data,
-                        ) );
-
-                        if ( ! empty( $report->error->get_error_messages() ) ) {
-                                $exporter->error = $report->merge_errors( $report->error, $exporter->error );
-                        }
-
-                        if ( $error instanceof WP_Error ) {
-                                $exporter->error = $report->merge_errors( $error, $exporter->error );
-                        }
-
-                        $exporter->emit_file();
-                } // End if().
-        }
+                }
+
+                $include_counts = false;
+                if ( ! empty( array_intersect( $fields, [ 'Tickets', 'Speakers', 'Sponsors', 'Organizers' ] ) ) ) {
+                        $include_counts = true;
+                }
+
+                // The "Name" field should always be included, but does not get submitted because the input is disabled,
+                // so add it in here.
+                $fields[] = 'Name';
+
+                $options = array(
+                        'fields' => $fields,
+                        'public' => false,
+                );
+
+
+                $report = new self( $range, null, $include_counts, $options );
+
+                self::export_to_file_common( $report );
+        }
+
 }

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

@@ -10 +10 @@
 use DateTime;
 use WP_Error, WP_Post;
-use function WordCamp\Reports\{get_assets_url, get_assets_dir_path, get_views_dir_path};
+use function WordCamp\Reports\{get_views_dir_path};
 use WordCamp\Reports\Utility\Date_Range;
 use function WordCamp\Reports\Validation\{validate_date_range, validate_wordcamp_status};
-use function WordCamp\Reports\Time\{year_array, quarter_array, month_array, convert_time_period_to_date_range};
+use function WordCamp\Reports\Time\{year_array, quarter_array, month_array};
 use WordCamp_Loader;
 use WordCamp\Utilities\Export_CSV;
@@ -24 +24 @@
  * @package WordCamp\Reports\Report
  */
-class WordCamp_Status extends Base {
+class WordCamp_Status extends Base_Status {
         /**
          * Report name.
@@ -223 +223 @@
 
                         $latest_log    = end( $logs );
-                        $latest_status = $this->get_log_status_result( $latest_log );
+                        $latest_status = $this->get_log_status_result( $latest_log, WordCamp_Loader::get_post_statuses() );
                         reset( $logs );
 
@@ -349 +349 @@
          * @return array
          */
-        protected function get_wordcamp_status_logs( WP_Post $wordcamp ) {
-                $log_entries = get_post_meta( $wordcamp->ID, '_status_change' );
-
-                if ( ! empty( $log_entries ) ) {
-                        // Sort log entries in chronological order.
-                        usort( $log_entries, function( $a, $b ) {
-                                if ( $a['timestamp'] === $b['timestamp'] ) {
-                                        return 0;
-                                }
-
-                                return ( $a['timestamp'] > $b['timestamp'] ) ? 1 : -1;
-                        } );
-
-                        return $log_entries;
-                }
-
-                return array();
-        }
-
-        /**
-         * Determine the ending status of a particular status change event.
-         *
-         * E.g. for this event:
-         *
-         *     Needs Vetting → More Info Requested
-         *
-         * The ending status would be "More Info Requested".
-         *
-         * @param array $log_entry A status change log entry.
-         *
-         * @return string
-         */
-        protected function get_log_status_result( $log_entry ) {
-                if ( isset( $log_entry['message'] ) ) {
-                        $pieces = explode( ' → ', $log_entry['message'] );
-
-                        if ( isset( $pieces[1] ) ) {
-                                return $this->get_status_id_from_name( $pieces[1] );
-                        }
-                }
-
-                return '';
-        }
-
-        /**
-         * Given the ID of a WordCamp status, determine the ID string.
-         *
-         * @param string $status_name A WordCamp status name.
-         *
-         * @return string
-         */
-        protected function get_status_id_from_name( $status_name ) {
-                $statuses = array_flip( WordCamp_Loader::get_post_statuses() );
-
-                if ( isset( $statuses[ $status_name ] ) ) {
-                        return $statuses[ $status_name ];
-                }
-
-                return '';
+        protected function get_wordcamp_status_logs( \WP_Post $wordcamp ) {
+                return $this->sort_logs( get_post_meta( $wordcamp->ID, '_status_change' ) );
         }
 
@@ -447 +390 @@
 
         /**
-         * Register all assets used by this report.
+         * Determine whether to render the public report form.
+         *
+         * This shortcode is limited to use on pages.
+         *
+         * @return string HTML content to display shortcode.
+         */
+        public static function handle_shortcode() {
+                $html = '';
+
+                if ( 'page' === get_post_type() ) {
+                        self::register_assets();
+
+                        wp_enqueue_style( 'select2' );
+                        wp_enqueue_script( self::$slug );
+
+                        ob_start();
+                        self::render_public_page();
+                        $html = ob_get_clean();
+                }
+
+                return $html;
+        }
+
+        /**
+         * Render the page for this report on the front end.
          *
          * @return void
          */
-        protected static function register_assets() {
-                wp_register_script(
-                        self::$slug,
-                        get_assets_url() . 'js/' . self::$slug . '.js',
-                        array( 'jquery', 'select2' ),
-                        filemtime( get_assets_dir_path() . 'js/' . self::$slug . '.js' ),
-                        true
-                );
-
-                wp_register_style(
-                        self::$slug,
-                        get_assets_url() . 'css/' . self::$slug . '.css',
-                        array( 'select2' ),
-                        filemtime( get_assets_dir_path() . 'css/' . self::$slug . '.css' ),
-                        'screen'
-                );
-        }
-
-        /**
-         * Enqueue JS and CSS assets for this report's admin interface.
-         *
-         * @return void
-         */
-        public static function enqueue_admin_assets() {
-                self::register_assets();
-                WordCamp_Details::register_assets();
-
-                wp_enqueue_style( WordCamp_Details::$slug );
-                wp_enqueue_script( self::$slug );
-                wp_enqueue_style( self::$slug );
+        public static function render_public_page() {
+                $params = self::parse_public_report_input();
+                $years    = year_array( absint( date( 'Y' ) ), 2015 );
+                $quarters = quarter_array();
+                $months   = month_array();
+                $statuses = WordCamp_Loader::get_post_statuses();
+
+                $error = $params['error'];
+                $report = null;
+                $period = $params['period'];
+                $year = $params['year'];
+                $status = $params['status'];
+                if ( ! empty( $params ) && isset( $params['range'] ) ) {
+                        $report = new self( $params['range']->start, $params['range']->end, $params['status'], $params['options'] );
+                }
+
+                include get_views_dir_path() . 'public/wordcamp-status.php';
         }
 
@@ -619 +573 @@
         }
 
-        /**
-         * Determine whether to render the public report form.
-         *
-         * This shortcode is limited to use on pages.
-         *
-         * @return string HTML content to display shortcode.
-         */
-        public static function handle_shortcode() {
-                $html = '';
-
-                if ( 'page' === get_post_type() ) {
-                        self::register_assets();
-
-                        wp_enqueue_style( 'select2' );
-                        wp_enqueue_script( self::$slug );
-
-                        ob_start();
-                        self::render_public_page();
-                        $html = ob_get_clean();
-                }
-
-                return $html;
-        }
-
-        /**
-         * Render the page for this report on the front end.
-         *
-         * @return void
-         */
-        public static function render_public_page() {
-                // Apparently 'year' is a reserved URL parameter on the front end, so we prepend 'report-'.
-                $year   = filter_input( INPUT_GET, 'report-year', FILTER_VALIDATE_INT );
-                $period = filter_input( INPUT_GET, 'period' );
-                $status = filter_input( INPUT_GET, 'status' );
-                $action = filter_input( INPUT_GET, 'action' );
-
-                $years    = year_array( absint( date( 'Y' ) ), 2015 );
-                $quarters = quarter_array();
-                $months   = month_array();
-                $statuses = WordCamp_Loader::get_post_statuses();
-
-                if ( ! $year ) {
-                        $year = absint( date( 'Y' ) );
-                }
-
-                if ( ! $period ) {
-                        $period = absint( date( 'm' ) );
-                }
-
-                $report = null;
-
-                if ( 'Show results' === $action ) {
-                        try {
-                                $range = convert_time_period_to_date_range( $year, $period );
-                        } catch ( Exception $e ) {
-                                $error = new WP_Error(
-                                        self::$slug . '-time-period-error',
-                                        $e->getMessage()
-                                );
-                        }
-
-                        $options = array(
-                                'earliest_start' => new DateTime( '2015-01-01' ), // No status log data before 2015.
-                        );
-
-                        $report = new self( $range->start, $range->end, $status, $options );
-                }
-
-                include get_views_dir_path() . 'public/wordcamp-status.php';
-        }
+        static public function get_report_object( $date_range, $status, $options ) {
+                return new self( $date_range->start, $date_range->end, $status, $options );
+        }
+
 }

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

@@ -139 +139 @@
                 __NAMESPACE__ . '\Report\Meetup_Events',
                 __NAMESPACE__ . '\Report\WordCamp_Payment_Methods',
+                __NAMESPACE__ . '\Report\Meetup_Status',
+                __NAMESPACE__ . '\Report\Meetup_Details',
         );
 }