dburr/SIFTools
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Events were being calculated even if not selected

Browse source
This commit is contained in:
Donald Burr 2015-10-21 16:04:47 -07:00
parent 654fa9ffce
commit 3ab33e8624
1 changed files with 58 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

4
web_app/js/sif_tools.js
View file

@ -644,6 +644,7 @@ function calculate_gems() {
if (calc_daily_quest_gems) {
gems++;
}
if (calc_event_gems) {
// account for event
// format of returned tuple:
// tuple[0] - was this an event day? (boolean, duh)
@ -675,6 +676,7 @@ function calculate_gems() {
gems += won_gems;
}
}
}
// record verbose output if desired
if (verbose) {
if (is_gem_day(now) || is_bday || is_event) {
@ -747,6 +749,7 @@ function calculate_gems() {
if (calc_daily_quest_gems) {
gems++;
}
if (calc_event_gems) {
// account for event
// format of returned tuple:
// tuple[0] - was this an event day? (boolean, duh)
@ -778,6 +781,7 @@ function calculate_gems() {
gems += won_gems;
}
}
}
// record verbose output if desired
if (verbose) {
if (is_gem_day(now) || is_bday || is_event) {