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

Now carries over the current year volunteer hours data.

Browse Source
This commit is contained in:
Jonathan Rosenbaum 2017-07-18 05:02:44 +00:00
parent e9da500848
commit 79e246246d
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
js/transaction.js
View File

@ -702,10 +702,10 @@ $(function() {
var title = obj.normal_full_name + "\r\n" + var title = obj.normal_full_name + "\r\n" +
obj.email + "\r\n" + obj.email + "\r\n" +
obj.phone + "\r\n" + obj.phone + "\r\n" +
"volunteer hours for last 365 day: " + obj.volunteer_hours + "\r\n" + "Volunteer Hours for last 365 days: " + obj.volunteer_hours + "\r\n" +
"volunteer hours for " + d.getFullYear() + ":\r\n" + "Volunteer Hours \(" + d.getFullYear() + "\): " + obj.current_year_volunteer_hours + "\r\n" +
"volunteer hours redeemed: " + "\r\n" + "Volunteer Hours Redeemed: " + "\r\n" +
"volunteer hours remaining:"; "Volunteer Hours Remaining:";
$("#volunteer_hours").prop("title","").empty(); $("#volunteer_hours").prop("title","").empty();

7
json/transaction.php
View File

@ -136,8 +136,11 @@ $csv_directory = CSV_DIRECTORY;
$_POST['contact_id'] . $_POST['contact_id'] .
") AS members;"; ") AS members;";
//$sql = mysql_query($query, $YBDB) or die(mysql_error()); $sql = mysql_query($query, $YBDB) or die(mysql_error());
//$result .= mysql_fetch_assoc($sql); $result2 = mysql_fetch_assoc($sql);
$result = (object)array_merge((array)$result, (array)$result2);
echo json_encode($result); echo json_encode($result);