<!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>[14103] sites/trunk/wordpress.org/public_html/wp-content/plugins/photo-directory: Photo Directory, Rejection: Create admin dashboard widget for simple rejection stats.</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/14103">14103</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/14103","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>coffee2code</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2024-10-09 22:22:13 +0000 (Wed, 09 Oct 2024)</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'>Photo Directory, Rejection: Create admin dashboard widget for simple rejection stats.
- Register and display the "Rejection Stats" admin dashboard widget
- Create `count_rejections_per_reason()` to return a count of rejections for each reason type.
- Change `get_rejection_reasons()` to exclude the approval item as a rejection reason by default. It only applies to the dropdown.
Fixes <a href="http://meta.trac.wordpress.org/ticket/7796">#7796</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsphotodirectoryassetscssadmincss">sites/trunk/wordpress.org/public_html/wp-content/plugins/photo-directory/assets/css/admin.css</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsphotodirectoryincrejectionphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/photo-directory/inc/rejection.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsphotodirectoryassetscssadmincss"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/plugins/photo-directory/assets/css/admin.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/plugins/photo-directory/assets/css/admin.css 2024-10-09 20:48:37 UTC (rev 14102)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/photo-directory/assets/css/admin.css 2024-10-09 22:22:13 UTC (rev 14103)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -157,3 +157,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> .photo-all-exif {
</span><span class="cx" style="display: block; padding: 0 10px"> overflow-wrap: anywhere;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+#dashboard-photo-rejection-stats .col-num {
+ width: 50px;
+}
+#dashboard-photo-rejection-stats .row-sum {
+ font-weight: bold;
+}
+#dashboard-photo-rejection-stats .row-sum td {
+ border-top: 1px solid #c3c4c7;
+}
</ins></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsphotodirectoryincrejectionphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/plugins/photo-directory/inc/rejection.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/plugins/photo-directory/inc/rejection.php 2024-10-09 20:48:37 UTC (rev 14102)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/photo-directory/inc/rejection.php 2024-10-09 22:22:13 UTC (rev 14103)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -168,6 +168,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Use JS to inject rejected post status into post submit box.
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'admin_footer', [ __CLASS__, 'output_js_to_modify_post_status_in_submitbox_dropdown' ] );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // Register dashboard widget.
+ add_action( 'wp_dashboard_setup', [ __CLASS__, 'dashboard_setup' ] );
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -310,12 +313,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $field Optional. If a specific reason is specified, this
</span><span class="cx" style="display: block; padding: 0 10px"> * is the specific attribute of the reason to return.
</span><span class="cx" style="display: block; padding: 0 10px"> * Empty string returns all data for reason. Default ''.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param bool $include_approval Optional. Should the approval entry (which is
+ * technically not a rejection) be included? Default false.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return array|string
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public static function get_rejection_reasons( $reason = '', $field = '' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public static function get_rejection_reasons( $reason = '', $field = '', $include_approval = false ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Return all reasons if one wasn't specified.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $reason ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $reasons = self::$rejection_reasons;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $include_approval ) {
+ unset( $reasons[''] );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> uasort( $reasons, function( $a, $b ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return strcmp( $a['label'], $b['label'] );
</span><span class="cx" style="display: block; padding: 0 10px"> } );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -369,6 +377,30 @@
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Returns a count of rejections for each rejection reason.
+ *
+ * @return array Associate array of rejection reason keys and their respective rejection counts.
+ */
+ public static function count_rejections_per_reason() {
+ global $wpdb;
+
+ $reasons = self::get_rejection_reasons();
+ $reasons_keys = array_keys( $reasons );
+
+ $results = $wpdb->get_results( $wpdb->prepare(
+ "SELECT meta_value AS rejection_reason, COUNT(*) AS count FROM $wpdb->postmeta WHERE meta_key = %s GROUP BY meta_value",
+ 'rejected_reason'
+ ) );
+
+ $return = [];
+ foreach ( $results as $row ) {
+ $return[ $row->rejection_reason ] = $row->count;
+ }
+
+ return $return;
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Returns the note the moderator has for the user.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * There are two types of notes to user:
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -981,7 +1013,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> '<select id="rejected_reason" name="rejected_reason"%s>',
</span><span class="cx" style="display: block; padding: 0 10px"> disabled( true, $is_disabled, false )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach ( self::get_rejection_reasons() as $reason => $args ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( self::get_rejection_reasons( '', '', true ) as $reason => $args ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><span class="cx" style="display: block; padding: 0 10px"> '<option value="%s"%s>%s</option>' . "\n",
</span><span class="cx" style="display: block; padding: 0 10px"> esc_attr( $reason ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1303,6 +1335,62 @@
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * Registers the admin dashboard.
+ */
+ public static function dashboard_setup() {
+ if ( current_user_can( 'edit_photos' ) ) {
+ wp_add_dashboard_widget(
+ 'dashboard_photo_rejections',
+ __( 'Rejection Stats', 'wporg-photos' ),
+ [ __CLASS__, 'dashboard_photo_rejections' ],
+ null,
+ null,
+ 'column3'
+ );
+ }
+ }
+
+ /**
+ * Outputs the photo rejection stats dashboard widget.
+ */
+ public static function dashboard_photo_rejections() {
+ echo '<div class="main">';
+
+ // Get list of all rejection types.
+ $rejection_reasons = self::get_rejection_reasons();
+ ksort( $rejection_reasons );
+ $rejection_reasons_counts = self::count_rejections_per_reason();
+
+ // Omit submission errors since they aren't true rejections.
+ unset( $rejection_reasons['submission-error'] );
+ unset( $rejection_reasons_counts['submission-error'] );
+
+ echo '<table id="dashboard-photo-rejection-stats" class="wp-list-table widefat fixed striped table-view-list">';
+ echo '<thead><tr>';
+ echo '<th>' . __( 'Rejection reason', 'wporg-photos' ) . '</th>';
+ echo '<th class="col-num col-num-rejected" title="' . esc_attr__( 'Number of photos rejected', 'wporg-photos' ) . '"><span class="dashicons dashicons-thumbs-down"></span></th>';
+ echo '<th class="col-num col-percent-rejected" title="' . esc_attr( 'Percentage of overall rejections', 'wporg-photos' ) . '">%</th>';
+ echo '</tr></thead>';
+ echo '<tbody>';
+
+ $total_rejections = array_sum( $rejection_reasons_counts );
+
+ foreach ( $rejection_reasons as $reason => $data ) {
+ $data['count'] = $rejection_reasons_counts[ $reason ];
+
+ echo '<tr>';
+ echo '<td title="' . esc_attr( $data['label'] ) . '">' . esc_html( $reason ) . '</td>';
+ echo '<td>' . number_format_i18n( $data['count'] ) . '</td>';
+ echo '<td>' . round( ( $data['count'] / $total_rejections ) * 100, 2 ) . '%</td>';
+ echo "</tr>\n";
+ }
+
+ echo '<tr class="row-sum"><td>' . __( 'Total', 'wporg-photos' ) . '</td><td>' . number_format_i18n( $total_rejections ) . '</td><td>100%</td></tr>';
+ echo '</tbody></table>';
+ echo '</div>';
+ }
+
</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"> add_action( 'plugins_loaded', [ __NAMESPACE__ . '\Rejection', 'init' ] );
</span></span></pre>
</div>
</div>
</body>
</html>