bike/Yellow-Bike-Database-Mirror
1
0
Fork 0
mirror of https://github.com/fspc/Yellow-Bike-Database.git synced 2025-02-22 17:03:22 -05:00
Code Issues Projects Releases Wiki Activity

This fine tunes the searching to one day.

Browse Source
This commit is contained in:
Jonathan Rosenbaum 2016-01-29 07:47:44 +00:00
parent 9b9fbe6d55
commit 2fba96db94
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
stats/community_service_hours.php
View File

@ -63,7 +63,7 @@ $query = "SELECT contacts.contact_id, CONCAT(last_name, ', ', first_name, ' ',mi
FROM shop_hours FROM shop_hours
LEFT JOIN contacts ON shop_hours.contact_id = contacts.contact_id LEFT JOIN contacts ON shop_hours.contact_id = contacts.contact_id
LEFT JOIN shop_user_roles ON shop_hours.shop_user_role = shop_user_roles.shop_user_role_id LEFT JOIN shop_user_roles ON shop_hours.shop_user_role = shop_user_roles.shop_user_role_id
WHERE (time_in > DATE_SUB(CURDATE(),INTERVAL $days_range1 DAY) AND time_in <= DATE_SUB(CURDATE(), INTERVAL $days_range2 DAY)) WHERE (SUBSTRING_INDEX(time_in, ' ', 1) >= DATE_SUB(CURDATE(),INTERVAL $days_range1 DAY) AND SUBSTRING_INDEX(time_in, ' ', 1) <= DATE_SUB(CURDATE(), INTERVAL $days_range2 DAY))
AND shop_user_roles.other_volunteer = 1 AND shop_user_roles.other_volunteer = 1
GROUP BY contact_id GROUP BY contact_id
ORDER BY cs_volunteer_hours DESC;"; ORDER BY cs_volunteer_hours DESC;";

10
stats/status_totals.php
View File

@ -47,7 +47,7 @@ $query = "SELECT shop_user_role,
FROM shop_hours FROM shop_hours
LEFT JOIN contacts ON shop_hours.contact_id = contacts.contact_id LEFT JOIN contacts ON shop_hours.contact_id = contacts.contact_id
LEFT JOIN shop_user_roles ON shop_hours.shop_user_role = shop_user_roles.shop_user_role_id LEFT JOIN shop_user_roles ON shop_hours.shop_user_role = shop_user_roles.shop_user_role_id
WHERE (time_in > DATE_SUB(CURDATE(),INTERVAL $days_range1 DAY) AND time_in <= DATE_SUB(CURDATE(), INTERVAL $days_range2 DAY)) WHERE (SUBSTRING_INDEX(time_in, ' ', 1) >= DATE_SUB(CURDATE(),INTERVAL $days_range1 DAY) AND SUBSTRING_INDEX(time_in, ' ', 1) <= DATE_SUB(CURDATE(), INTERVAL $days_range2 DAY))
AND (shop_user_roles.volunteer = 1 OR shop_user_roles.other_volunteer = 1) AND (shop_user_roles.volunteer = 1 OR shop_user_roles.other_volunteer = 1)
GROUP BY shop_user_role ORDER BY volunteer_hours DESC;"; GROUP BY shop_user_role ORDER BY volunteer_hours DESC;";
$volunteers_sql = mysql_query($query, $YBDB) or die(mysql_error()); $volunteers_sql = mysql_query($query, $YBDB) or die(mysql_error());
@ -58,7 +58,7 @@ $query = "SELECT COUNT(DISTINCT shop_hours.contact_id) as unique_volunteers,
FROM shop_hours FROM shop_hours
LEFT JOIN contacts ON shop_hours.contact_id = contacts.contact_id LEFT JOIN contacts ON shop_hours.contact_id = contacts.contact_id
LEFT JOIN shop_user_roles ON shop_hours.shop_user_role = shop_user_roles.shop_user_role_id LEFT JOIN shop_user_roles ON shop_hours.shop_user_role = shop_user_roles.shop_user_role_id
WHERE (time_in > DATE_SUB(CURDATE(),INTERVAL $days_range1 DAY) AND time_in <= DATE_SUB(CURDATE(), INTERVAL $days_range2 DAY)) WHERE (SUBSTRING_INDEX(time_in, ' ', 1) >= DATE_SUB(CURDATE(),INTERVAL $days_range1 DAY) AND SUBSTRING_INDEX(time_in, ' ', 1) <= DATE_SUB(CURDATE(), INTERVAL $days_range2 DAY))
AND (shop_user_roles.volunteer = 1 OR shop_user_roles.other_volunteer = 1);"; AND (shop_user_roles.volunteer = 1 OR shop_user_roles.other_volunteer = 1);";
$total_volunteers_sql = mysql_query($query, $YBDB) or die(mysql_error()); $total_volunteers_sql = mysql_query($query, $YBDB) or die(mysql_error());
@ -69,7 +69,7 @@ $query = "SELECT shop_user_role, COUNT(DISTINCT shop_hours.contact_id) as unique
FROM shop_hours FROM shop_hours
LEFT JOIN contacts ON shop_hours.contact_id = contacts.contact_id LEFT JOIN contacts ON shop_hours.contact_id = contacts.contact_id
LEFT JOIN shop_user_roles ON shop_hours.shop_user_role = shop_user_roles.shop_user_role_id LEFT JOIN shop_user_roles ON shop_hours.shop_user_role = shop_user_roles.shop_user_role_id
WHERE (time_in > DATE_SUB(CURDATE(),INTERVAL $days_range1 DAY) AND time_in <= DATE_SUB(CURDATE(), INTERVAL $days_range2 DAY)) WHERE (time_in >= DATE_SUB(CURDATE(),INTERVAL $days_range1 DAY) AND time_in <= DATE_SUB(CURDATE(), INTERVAL $days_range2 DAY))
AND (shop_user_roles.volunteer = 0 AND shop_user_roles.other_volunteer = 0) AND (shop_user_roles.volunteer = 0 AND shop_user_roles.other_volunteer = 0)
GROUP BY shop_user_role GROUP BY shop_user_role
ORDER BY hours DESC;"; ORDER BY hours DESC;";
@ -81,7 +81,7 @@ $query = "SELECT COUNT(DISTINCT shop_hours.contact_id) as unique_visitors,
FROM shop_hours FROM shop_hours
LEFT JOIN contacts ON shop_hours.contact_id = contacts.contact_id LEFT JOIN contacts ON shop_hours.contact_id = contacts.contact_id
LEFT JOIN shop_user_roles ON shop_hours.shop_user_role = shop_user_roles.shop_user_role_id LEFT JOIN shop_user_roles ON shop_hours.shop_user_role = shop_user_roles.shop_user_role_id
WHERE (time_in > DATE_SUB(CURDATE(),INTERVAL $days_range1 DAY) AND time_in <= DATE_SUB(CURDATE(), INTERVAL $days_range2 DAY)) WHERE (SUBSTRING_INDEX(time_in, ' ', 1) >= DATE_SUB(CURDATE(),INTERVAL $days_range1 DAY) AND SUBSTRING_INDEX(time_in, ' ', 1) <= DATE_SUB(CURDATE(), INTERVAL $days_range2 DAY))
AND (shop_user_roles.volunteer = 0 AND shop_user_roles.other_volunteer = 0);"; AND (shop_user_roles.volunteer = 0 AND shop_user_roles.other_volunteer = 0);";
$total_visitors_sql = mysql_query($query, $YBDB) or die(mysql_error()); $total_visitors_sql = mysql_query($query, $YBDB) or die(mysql_error());
@ -91,7 +91,7 @@ $query = "SELECT COUNT(DISTINCT shop_hours.contact_id) as unique_vv,
FROM shop_hours FROM shop_hours
LEFT JOIN contacts ON shop_hours.contact_id = contacts.contact_id LEFT JOIN contacts ON shop_hours.contact_id = contacts.contact_id
LEFT JOIN shop_user_roles ON shop_hours.shop_user_role = shop_user_roles.shop_user_role_id LEFT JOIN shop_user_roles ON shop_hours.shop_user_role = shop_user_roles.shop_user_role_id
WHERE (time_in > DATE_SUB(CURDATE(),INTERVAL $days_range1 DAY) AND time_in <= DATE_SUB(CURDATE(), INTERVAL $days_range2 DAY)) WHERE (SUBSTRING_INDEX(time_in, ' ', 1) >= DATE_SUB(CURDATE(),INTERVAL $days_range1 DAY) AND SUBSTRING_INDEX(time_in, ' ', 1) <= DATE_SUB(CURDATE(), INTERVAL $days_range2 DAY))
AND (shop_user_roles.volunteer >= 0 OR shop_user_roles.other_volunteer >= 0);"; AND (shop_user_roles.volunteer >= 0 OR shop_user_roles.other_volunteer >= 0);";
$total_sql = mysql_query($query, $YBDB) or die(mysql_error()); $total_sql = mysql_query($query, $YBDB) or die(mysql_error());