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

Adds new value to redeemable function, and comments unneccesary code in function.

Browse Source
This commit is contained in:
Jonathan Rosenbaum 2017-08-05 06:13:59 +00:00
parent 5e80aedca7
commit 17573c20e4
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
js/transaction.js
View File

@ -608,9 +608,10 @@ $(function() {
} // end function save_or_close } // end function save_or_close
// volunteer hours magic // volunteer hours magic
function redeemable(obj, spinner_value, event) { function redeemable(obj, spinner_value, event, volunteer) {
//var sweat_equity_hours = obj.sweat_equity_limit / (obj.volunteer_hours_redeemed * obj.volunteer_hour_value);
var sweat_equity_hours = obj.sweat_equity_limit / (obj.volunteer_hours_redeemed * obj.volunteer_hour_value);
var redeemable_value; var redeemable_value;
if ($("#transaction_type").val() !== "Stand Time") { if ($("#transaction_type").val() !== "Stand Time") {
redeemable_value = obj.volunteer_hour_value * spinner_value; redeemable_value = obj.volunteer_hour_value * spinner_value;
@ -629,7 +630,7 @@ $(function() {
} }
// no volunteer_hours_redeemed or still less than the allowable sweat_equity_hours // no volunteer_hours_redeemed or still less than the allowable sweat_equity_hours
if (isNaN(sweat_equity_hours) || volunteer_hours_redeemed < sweat_equity_hours) { /*if (isNaN(sweat_equity_hours) || volunteer_hours_redeemed < sweat_equity_hours) { */
// only 1 bike per year earned with sweat_equity_hours // only 1 bike per year earned with sweat_equity_hours
if (price >= redeemable_value) { if (price >= redeemable_value) {
@ -690,13 +691,13 @@ $(function() {
} }
// some volunteer_hours_redeemed // some volunteer_hours_redeemed
} else if (sweat_equity_hours >= 1) { /*} /* else if (sweat_equity_hours >= 1) {
// only 1 bike per year earned with sweat_equity_hours // only 1 bike per year earned with sweat_equity_hours
// if running volunteer_hours >= special_volunteer_hours_qualification the special_discount kicks in // if running volunteer_hours >= special_volunteer_hours_qualification the special_discount kicks in
// other wise it is 25% // other wise it is 25%
} } */
} // end function redeemable } // end function redeemable
@ -868,12 +869,12 @@ $(function() {
var bikes_earned = 0; var bikes_earned = 0;
var volunteer_hours_redeemed = 0; var volunteer_hours_redeemed = 0;
var obj = $.parseJSON(data); var obj = $.parseJSON(data);
var volunteer = "", remaining = "", vhr = ""; var volunteer = "", remaining = "", vhr = "";
if (obj.volunteer) { if (obj.volunteer) {
volunteer = $.parseJSON(obj.volunteer); volunteer = $.parseJSON(obj.volunteer);
remaining = obj.current_year_volunteer_hours - volunteer[year].volunteer_hours_redeemed; remaining = obj.current_year_volunteer_hours - volunteer[year].volunteer_hours_redeemed;
vhr = volunteer[year].volunteer_hours_redeemed; vhr = volunteer[year].volunteer_hours_redeemed;
console.log(volunteer[year].volunteer_hours_redeemed);
} }
var title = obj.normal_full_name + "\r\n" + var title = obj.normal_full_name + "\r\n" +
@ -887,7 +888,7 @@ $(function() {
$("#volunteer_hours").prop("title","").empty(); $("#volunteer_hours").prop("title","").empty();
$("#redeemable_hours").hide(); $("#redeemable_hours").hide();
if (obj) { // redundant test if (obj) {
var volunteer_hours = obj.volunteer_hours; var volunteer_hours = obj.volunteer_hours;
if ((volunteer_hours && volunteer_hours.length)) { if ((volunteer_hours && volunteer_hours.length)) {
@ -904,7 +905,7 @@ $(function() {
spin: function( event, ui ) { spin: function( event, ui ) {
// function redeemable(obj, spinner_value) // function redeemable(obj, spinner_value)
redeemable(obj, ui.value, event); redeemable(obj, ui.value, event, volunteer);
} }
}).on('input', function (e) { }).on('input', function (e) {
@ -923,7 +924,7 @@ $(function() {
console.log("spinner value " + spinner_value); console.log("spinner value " + spinner_value);
// function redeemable(obj, spinner_value) // function redeemable(obj, spinner_value)
redeemable(obj, spinner_value, event); redeemable(obj, spinner_value, event, volunteer);
var val = this.value, var val = this.value,
$this = $(this), $this = $(this),