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

Fixes #51; a matter of SQL.

Browse Source
This commit is contained in:
Jonathan Rosenbaum 2017-12-19 04:39:30 +00:00
parent d802552d7f
commit 937bf5adff
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
js/shop.js
View File

@ -126,6 +126,7 @@ $(function(){
function volunteer_status(contacts) { function volunteer_status(contacts) {
var all_members_obj; //reuse this object var all_members_obj; //reuse this object
var year = d.getFullYear();
if (contacts) { if (contacts) {
@ -135,12 +136,10 @@ $(function(){
$.each(all_members_obj, function() { $.each(all_members_obj, function() {
var year = d.getFullYear();
var bikes_earned = 0; var bikes_earned = 0;
var volunteer_hours_redeemed = 0; var volunteer_hours_redeemed = 0;
var obj = this; var obj = this;
var volunteer = "", remaining = 0, vhr = "", max_bikes_earned = 0; var volunteer = "", remaining = 0, vhr = "", max_bikes_earned = 0;
if (obj.volunteer) { if (obj.volunteer) {
volunteer = $.parseJSON(obj.volunteer); volunteer = $.parseJSON(obj.volunteer);

7
json/transaction.php
View File

@ -125,7 +125,7 @@ $membership_discount = MEMBERSHIP_DISCOUNT;
AND shop_user_roles.volunteer = 1 AND " . AND shop_user_roles.volunteer = 1 AND " .
$_POST['contact_id'] . $_POST['contact_id'] .
" GROUP BY contact_id) AS firstset " GROUP BY contact_id) AS firstset
INNER JOIN LEFT JOIN
(SELECT contacts.contact_id, (SELECT contacts.contact_id,
COUNT(shop_hours.contact_id) AS current_year_visits, COUNT(shop_hours.contact_id) AS current_year_visits,
ROUND(SUM(HOUR(TIMEDIFF( time_out, time_in)) + MINUTE(TIMEDIFF( time_out, time_in))/60)) AS current_year_volunteer_hours ROUND(SUM(HOUR(TIMEDIFF( time_out, time_in)) + MINUTE(TIMEDIFF( time_out, time_in))/60)) AS current_year_volunteer_hours
@ -137,7 +137,10 @@ $membership_discount = MEMBERSHIP_DISCOUNT;
AND shop_user_roles.volunteer = 1 AND shop_user_roles.volunteer = 1
AND " . AND " .
$_POST['contact_id'] . $_POST['contact_id'] .
") AS secondset;"; " GROUP BY contact_id) AS secondset ON firstset.contact_id = secondset.contact_id;";
//$handler->debug($query);
$sql = mysql_query($query, $YBDB) or die(mysql_error()); $sql = mysql_query($query, $YBDB) or die(mysql_error());