diff --git a/json/transaction.php b/json/transaction.php index 9682579..e71e109 100644 --- a/json/transaction.php +++ b/json/transaction.php @@ -116,10 +116,30 @@ $csv_directory = CSV_DIRECTORY; AND shop_user_roles.volunteer = 1 AND contacts.contact_id=" . $_POST['contact_id'] . " GROUP BY contact_id) AS members;"; - - $sql = mysql_query($query, $YBDB) or die(mysql_error()); - $result = mysql_fetch_assoc($sql); - echo json_encode($result); + + $sql = mysql_query($query, $YBDB) or die(mysql_error()); + $result = mysql_fetch_assoc($sql); + + // current year volunteer hours and visits + $query = "SELECT current_year_visits, current_year_volunteer_hours + FROM (SELECT contacts.contact_id, CONCAT(last_name, ', ', first_name, ' ',middle_initial) AS full_name, + CONCAT(first_name, ' ', last_name) AS normal_full_name, contacts.email AS email, + contacts.phone AS phone, COUNT(shop_hours.contact_id) AS current_year_visits, + ROUND(SUM(HOUR(SUBTIME( TIME(time_out), TIME(time_in))) + MINUTE(SUBTIME( TIME(time_out), TIME(time_in)))/60)) AS current_year_volunteer_hours + FROM shop_hours + 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 + WHERE (SUBSTRING_INDEX(time_in, ' ', 1) >= CONCAT(YEAR(CURDATE()),'-01-01') + AND SUBSTRING_INDEX(time_in, ' ', 1) <= DATE_ADD(CONCAT(YEAR(CURDATE()),'-01-01'),INTERVAL DAYOFYEAR(CONCAT(YEAR(CURDATE()),'-12-31')) - 1 DAY)) + AND shop_user_roles.volunteer = 1 + AND contacts.contact_id=" . + $_POST['contact_id'] . + ") AS members;"; + + //$sql = mysql_query($query, $YBDB) or die(mysql_error()); + //$result .= mysql_fetch_assoc($sql); + + echo json_encode($result); } // Volunteer Benefits