tmdinosaurcenter
/
tainacan
mirror of https://github.com/tainacan/tainacan
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: order activities by date and remove fields DAY, MONTH and YEAR #483

This commit is contained in:
vnmedeiros 2021-03-11 15:07:35 -03:00
parent 3b63528305
commit 7d3dfe6c0d
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/classes/api/endpoints/class-tainacan-rest-reports-controller.php
View File

@ -500,11 +500,11 @@ class REST_Reports_Controller extends REST_Controller {
$collection_from = "INNER JOIN $wpdb->postmeta pm ON p.id = pm.post_id AND (pm.meta_key='collection_id' AND pm.meta_value='$collection_id')"; $collection_from = "INNER JOIN $wpdb->postmeta pm ON p.id = pm.post_id AND (pm.meta_key='collection_id' AND pm.meta_value='$collection_id')";
} }
$sql_statement = $wpdb->prepare( $sql_statement = $wpdb->prepare(
"SELECT count(p.id) as total, DAYOFWEEK(p.post_date) as day_of_week, DAY(p.post_date) as day, MONTH(p.post_date) as month, YEAR(p.post_date) as year "SELECT count(p.id) as total, DATE(p.post_date) as date, DAYOFWEEK(p.post_date) as day_of_week
FROM $wpdb->posts p $collection_from FROM $wpdb->posts p $collection_from
WHERE p.post_type='tainacan-log' AND p.post_date BETWEEN NOW() - INTERVAL 1 YEAR AND NOW() WHERE p.post_type='tainacan-log' AND p.post_date BETWEEN NOW() - INTERVAL 1 YEAR AND NOW()
GROUP BY DAYOFWEEK(p.post_date), DAY(p.post_date), MONTH(p.post_date), YEAR(p.post_date) GROUP BY DATE(p.post_date), DAYOFWEEK(p.post_date)
ORDER BY STR_TO_DATE(CONCAT(year,'-',month,'-',day), 'Y-m-d')" ORDER BY DATE(p.post_date)"
); );
return $wpdb->get_results($sql_statement); return $wpdb->get_results($sql_statement);
} }