Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

#2496 - Select & Tags Cumulative Activity Metrics Charts #2514

Merged
merged 7 commits into from
Jul 12, 2024
Merged

#2496 - Select & Tags Cumulative Activity Metrics Charts #2514

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5ae7c0d
Select & tags cumulative activity metrics charts
kodinkat Jun 6, 2024
c2e4d63
UI tweaks & end of time range cumulative total matches
kodinkat Jul 2, 2024
c329815
Improved modal count mismatches
kodinkat Jul 3, 2024
09904c6
Added pm.meta_value group by to updated month sql
kodinkat Jul 3, 2024
061da8f
wording
corsacca Jul 9, 2024
a262c59
Cleaned up stale code blocks
kodinkat Jul 10, 2024
719ca69
Cleaned up straggling stale code blocks
kodinkat Jul 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
109 changes: 62 additions & 47 deletions dt-metrics/counters/counter-post-stats.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -426,21 +426,13 @@ public static function get_multi_field_by_month( $post_type, $field, $year ) {
$multi_values = self::get_meta_values( $field );
}

// Build dynamic sql for counting meta_values
$count_dynamic_values = array_map( function ( $value ) {
return "COUNT( CASE WHEN log.meta_value = '" . esc_sql( $value ) . "' THEN log.meta_value END ) AS `" . esc_sql( $value ) . '`';
}, $multi_values);
$count_dynamic_values_query = implode( ', ', $count_dynamic_values );
if ( strlen( $count_dynamic_values_query ) !== 0 ) {
$count_dynamic_values_query = ", $count_dynamic_values_query";
}

$results = $wpdb->get_results(
// phpcs:disable
$wpdb->prepare( "
SELECT
MONTH( FROM_UNIXTIME( log.hist_time ) ) AS month
$count_dynamic_values_query
MONTH( FROM_UNIXTIME( log.hist_time ) ) AS month,
pm.meta_value AS value,
count( Distinct( pm.post_id)) AS count
FROM $wpdb->posts AS p
JOIN $wpdb->postmeta AS pm
ON p.ID = pm.post_id
Expand All @@ -450,10 +442,13 @@ public static function get_multi_field_by_month( $post_type, $field, $year ) {
WHERE p.post_type = %s
AND pm.meta_key = %s
AND log.meta_value = pm.meta_value
AND pm.meta_value != ''
AND pm.meta_value IS NOT NULL
AND log.hist_time = (
SELECT MAX( log2.hist_time )
FROM $wpdb->dt_activity_log AS log2
WHERE log.meta_value = log2.meta_value
AND log.meta_value = pm.meta_value
AND log.object_id = log2.object_id
AND log2.hist_time >= %s
AND log2.hist_time <= %s
Expand All @@ -462,56 +457,38 @@ public static function get_multi_field_by_month( $post_type, $field, $year ) {
AND log.object_type = %s
AND log.hist_time >= %s
AND log.hist_time <= %s
GROUP BY MONTH( FROM_UNIXTIME( log.hist_time ) )
GROUP BY MONTH( FROM_UNIXTIME( log.hist_time ) ), pm.meta_value
ORDER BY MONTH( FROM_UNIXTIME( log.hist_time ) )
", $field, $post_type, $field, $start, $end, $field, $post_type, $start, $end )
", $field, $post_type, $field, $start, $end, $field, $post_type, $start, $end ), ARRAY_A
// phpcs:enable
);

$cumulative_offset = self::get_multi_field_cumulative_offsets( $post_type, $field, $start, $multi_values );

return [
'data' => $results,
'data' => self::reshape_multi_field_results( $results, 'month' ),
'cumulative_offset' => $cumulative_offset,
'changes' => self::get_changed_post_counts( $post_type, $field, $start, $end, true )
];
}

public static function get_multi_field_by_year( $post_type, $field ) {
public static function get_multi_field_by_year( $post_type, $field, $current_year = null ) {
global $wpdb;

$current_year = gmdate( 'Y' );
$start = 0;
$end = mktime( 24, 60, 60, 12, 31, $current_year );

// get possible values of multi select field
$multi_values = [];

$field_settings = DT_Posts::get_post_field_settings( $post_type );
$default_values = array_key_exists( $field, $field_settings ) ? $field_settings[$field]['default'] : [];

if ( !empty( $default_values ) ) {
$multi_values = array_keys( $default_values );
} else {
// there are no defaults hardcoded, so we will need to get them
// from the metadata
$multi_values = self::get_meta_values( $field );
if ( empty( $current_year ) ) {
$current_year = gmdate( 'Y' );
}

$count_dynamic_values = array_map( function ( $value ) {
return "COUNT( CASE WHEN log.meta_value = '" . esc_sql( $value ) . "' THEN log.meta_value END ) AS `" . esc_sql( $value ) . '`';
}, $multi_values);
$count_dynamic_values_query = implode( ', ', $count_dynamic_values );
if ( strlen( $count_dynamic_values_query ) !== 0 ) {
$count_dynamic_values_query = ", $count_dynamic_values_query";
}
$start = 0;
$end = mktime( 24, 60, 60, 12, 31, $current_year );

$results = $wpdb->get_results(
// phpcs:disable
$wpdb->prepare( "
SELECT
YEAR( FROM_UNIXTIME( log.hist_time ) ) AS year
$count_dynamic_values_query
YEAR( FROM_UNIXTIME( log.hist_time ) ) AS year,
pm.meta_value AS value,
count( Distinct( pm.post_id)) AS count
FROM $wpdb->posts AS p
JOIN $wpdb->postmeta AS pm
ON p.ID = pm.post_id
Expand All @@ -521,30 +498,62 @@ public static function get_multi_field_by_year( $post_type, $field ) {
WHERE p.post_type = %s
AND pm.meta_key = %s
AND log.meta_value = pm.meta_value
AND pm.meta_value != ''
AND pm.meta_value IS NOT NULL
AND log.hist_time = (
SELECT MAX( log2.hist_time )
FROM $wpdb->dt_activity_log AS log2
WHERE log.meta_value = log2.meta_value
AND log.object_id = log2.object_id
AND log2.hist_time >= %s
AND log2.hist_time <= %s
AND log2.meta_key = %s
AND log.meta_value = pm.meta_value
AND log.object_id = log2.object_id
AND log2.hist_time >= %s
AND log2.hist_time <= %s
AND log2.meta_key = %s
)
AND log.object_type = %s
AND log.hist_time >= %s
AND log.hist_time <= %s
GROUP BY YEAR( FROM_UNIXTIME( log.hist_time ) )
GROUP BY YEAR( FROM_UNIXTIME( log.hist_time ) ), pm.meta_value
ORDER BY YEAR( FROM_UNIXTIME( log.hist_time ) )
", $field, $post_type, $field, $start, $end, $field, $post_type, $start, $end )
", $field, $post_type, $field, $start, $end, $field, $post_type, $start, $end ), ARRAY_A
// phpcs:enable
);

return [
'data' => $results,
'data' => self::reshape_multi_field_results( $results, 'year' ),
'changes' => self::get_changed_post_counts( $post_type, $field, $start, $end, false )
];
}

private static function reshape_multi_field_results( $multi_field_results, $time_unit_label ): array {
$reshaped_results = [];
$grouped_results = [];
foreach ( $multi_field_results as $value_count ) {
$time_unit = $value_count[ $time_unit_label ];
$value = $value_count['value'];
$count = $value_count['count'];

if ( !isset( $grouped_results[ $time_unit ] ) ) {
$grouped_results[ $time_unit ] = [];
}
$grouped_results[ $time_unit ][] = [
'value' => $value,
'count' => $count
];
}

foreach ( $grouped_results as $time_unit => $grouped_result ) {
$updated_grouping = [];
$updated_grouping[ $time_unit_label ] = $time_unit;
foreach ( $grouped_result as $group ) {
$updated_grouping[ $group['value'] ] = $group['count'];
}
$reshaped_results[] = $updated_grouping;
}

return $reshaped_results;
}

public static function get_connection_field_by_state_month( $post_type, $field, $connection_type, $start, $end ) {
global $wpdb;

Expand Down Expand Up @@ -933,10 +942,13 @@ public static function get_posts_by_field_in_date_range( $post_type, $field, $ar
WHERE p.post_type = %s
AND pm.meta_key = %s
AND log.meta_value = pm.meta_value
AND pm.meta_value != ''
AND pm.meta_value IS NOT NULL
AND log.hist_time = (
SELECT MAX( log2.hist_time )
FROM $wpdb->dt_activity_log AS log2
WHERE log.meta_value = log2.meta_value
AND log.meta_value = pm.meta_value
AND log.object_id = log2.object_id
AND log2.hist_time >= %s
AND log2.hist_time <= %s
Expand All @@ -961,10 +973,13 @@ public static function get_posts_by_field_in_date_range( $post_type, $field, $ar
WHERE p.post_type = %s
AND pm.meta_key = %s
AND log.meta_value = pm.meta_value
AND pm.meta_value != ''
AND pm.meta_value IS NOT NULL
AND log.hist_time = (
SELECT MAX( log2.hist_time )
FROM $wpdb->dt_activity_log AS log2
WHERE log.meta_value = log2.meta_value
AND log.meta_value = pm.meta_value
AND log.object_id = log2.object_id
AND log2.hist_time >= %s
AND log2.hist_time <= %s
Expand Down
1 change: 1 addition & 0 deletions dt-metrics/metrics.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ public function __construct(){
if ( !empty( $modules['access_module']['enabled'] ) ){
require_once( get_template_directory() . '/dt-metrics/combined/critical-path.php' );
}
require_once( get_template_directory() . '/dt-metrics/records/select-tags-charts.php' );
require_once( get_template_directory() . '/dt-metrics/records/time-charts.php' );
require_once( get_template_directory() . '/dt-metrics/records/date-range-activity.php' );
}, 1000);
Expand Down