Browse Source

Now carries over the current year volunteer hours data.

devel
Jonathan Rosenbaum 7 years ago
parent
commit
79e246246d
  1. 8
      js/transaction.js
  2. 7
      json/transaction.php

8
js/transaction.js

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

7
json/transaction.php

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

Loading…
Cancel
Save