<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[7978] sites/trunk/wordcamp.org/public_html/wp-content/plugins/wcpt/wcpt-event/tracker.php: WCPT Tracker: Refactor tracker.php to:</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://meta.trac.wordpress.org/changeset/7978">7978</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/7978","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>vedjain</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2018-12-17 07:34:25 +0000 (Mon, 17 Dec 2018)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>WCPT Tracker: Refactor tracker.php to:
1. Add support for `type` attribute in shortcode. This will be used to render WordCamp/Meetup tracking page.
2. Use single query to fetch last_update timestamp as well along with post_ids that were active within last 60 days.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswcptwcpteventtrackerphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wcpt/wcpt-event/tracker.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswcptwcpteventtrackerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/plugins/wcpt/wcpt-event/tracker.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/plugins/wcpt/wcpt-event/tracker.php 2018-12-17 07:34:19 UTC (rev 7977)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wcpt/wcpt-event/tracker.php 2018-12-17 07:34:25 UTC (rev 7978)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8,12 +8,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> const SHORTCODE_SLUG = 'application-tracker';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_shortcode( SHORTCODE_SLUG, __NAMESPACE__ . '\render_status_shortcode' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-add_action( 'wp_enqueue_scripts', __NAMESPACE__ . '\enqueue_scripts' );
</del><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Render the [application-tracker] shortcode.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function render_status_shortcode() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function render_status_shortcode( $atts = [] ) {
+ $application_type = 'wordcamp';
+ if ( isset ( $atts['type'] ) ) {
+ $application_type = $atts['type'];
+ }
+ enqueue_scripts( $application_type );
</ins><span class="cx" style="display: block; padding: 0 10px"> return '<div id="wpc-application-tracker">Loading WordCamp Application Tracker...</div>';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -37,31 +41,35 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $wordcamp_post_objs = $wpdb->get_results(
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->prepare(
</span><span class="cx" style="display: block; padding: 0 10px"> "
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- SELECT DISTINCT post_id
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ SELECT DISTINCT post_id, MAX( meta_value ) as last_updated
</ins><span class="cx" style="display: block; padding: 0 10px"> FROM {$wpdb->prefix}postmeta
</span><span class="cx" style="display: block; padding: 0 10px"> WHERE
</span><span class="cx" style="display: block; padding: 0 10px"> meta_key like '_status_change_log_$wordcamp_post_type%'
</span><span class="cx" style="display: block; padding: 0 10px"> AND
</span><span class="cx" style="display: block; padding: 0 10px"> meta_value >= %d
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ GROUP BY post_id
</ins><span class="cx" style="display: block; padding: 0 10px"> ",
</span><span class="cx" style="display: block; padding: 0 10px"> $inactive_timestamp
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $wordcamp_post_ids = wp_list_pluck( $wordcamp_post_objs, 'post_id' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $wordcamp_post_obj = array();
+ foreach ( $wordcamp_post_objs as $wordcamp_post ) {
+ $wordcamp_post_obj[ $wordcamp_post->post_id ] = $wordcamp_post->last_updated;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $raw_posts = get_posts(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => WCPT_POST_TYPE_ID,
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_status' => $shown_statuses,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'posts_per_page' => -1,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'posts_per_page' => 1000,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'order' => 'ASC',
</span><span class="cx" style="display: block; padding: 0 10px"> 'orderby' => 'post_title',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'post__in' => $wordcamp_post_ids,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'post__in' => array_keys ( $wordcamp_post_obj ),
</ins><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $raw_posts as $key => $post ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $last_update_timestamp = get_last_update_timestamp( $post->ID );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $last_update_timestamp = $wordcamp_post_obj[ $post->ID ];
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $wordcamps[] = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'city' => $post->post_title,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -77,28 +85,27 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Get the timestamp of the last time the post status changed
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Get the columns headers for WordCamp
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param int $post_id
- *
- * @return int
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return array
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function get_last_update_timestamp( $post_id ) {
- $last_update_timestamp = 0;
- $status_changes = get_post_meta( $post_id, '_status_change' );
-
- if ( $status_changes ) {
- usort( $status_changes, 'wcpt_sort_log_entries' );
- $last_update_timestamp = $status_changes[0]['timestamp'];
- }
-
- return $last_update_timestamp;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function get_wordcamp_display_columns() {
+ return array(
+ 'city' => 'City',
+ 'applicant' => 'Applicant',
+ 'milestone' => 'Milestone',
+ 'status' => 'Status',
+ 'lastUpdate' => 'Updated',
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Enqueue scripts and styles
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Enqueue scripts and styles.
+ * Based on the event type passed, we will localize different data for Meetup and WordCamp events.
+ *
+ * @param string application_type Application type for the tracker table. Could be either `wordcamp` or `meetup`.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function enqueue_scripts() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function enqueue_scripts( $application_type ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $post;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_register_script(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -116,36 +123,30 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 1
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! is_a( $post, 'WP_POST' ) || ! has_shortcode( $post->post_content, SHORTCODE_SLUG ) ) {
- return;
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> wp_enqueue_script( 'wpc-application-tracker' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_localize_script(
- 'wpc-application-tracker',
- 'wpcApplicationTracker',
- array(
- 'applications' => get_active_wordcamps(),
- 'displayColumns' => get_display_columns(),
- 'initialSortField' => 'city',
- )
- );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_enqueue_style( 'wpc-application-tracker' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_enqueue_style( 'wpc-application-tracker' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'wordcamp' === $application_type ) {
+ wp_localize_script(
+ 'wpc-application-tracker',
+ 'wpcApplicationTracker',
+ array(
+ 'applications' => get_active_wordcamps(),
+ 'displayColumns' => get_wordcamp_display_columns(),
+ 'initialSortField' => 'city',
+ )
+ );
+ } elseif ( 'meetup' === $application_type ) {
+ wp_localize_script(
+ 'wpc-application-tracker',
+ 'wpcApplicationTracker',
+ array(
+ 'applications',
+ 'displayColumns',
+ 'initialSortField',
+ )
+ );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/**
- * Get the columns headers
- *
- * @return array
- */
-function get_display_columns() {
- return array(
- 'city' => 'City',
- 'applicant' => 'Applicant',
- 'milestone' => 'Milestone',
- 'status' => 'Status',
- 'lastUpdate' => 'Updated',
- );
-}
</del></span></pre>
</div>
</div>
</body>
</html>