krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-17 14:47:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

refactor api.dayMapping to DAY_MAPPING const, not exposed on api

Browse Source
This commit is contained in:
Alys
2015-11-21 20:33:01 +10:00
parent a6fb5790e5
commit a73662bab6
3 changed files with 28 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
common/script/cron.js Normal file
View File

@@ -0,0 +1,16 @@
/*
------------------------------------------------------
Cron and time / day functions
------------------------------------------------------
*/
export const DAY_MAPPING = {
0: 'su',
1: 'm',
2: 't',
3: 'w',
4: 'th',
5: 'f',
6: 's',
};

17
common/script/index.js
View File

@@ -1,3 +1,7 @@
import {
DAY_MAPPING // temporary, pending further refactoring
} from '../../common/script/cron';
var $w, _, api, content, i18n, moment, preenHistory, sanitizeOptions, sortOrder, var $w, _, api, content, i18n, moment, preenHistory, sanitizeOptions, sortOrder,
indexOf = [].indexOf || function(item) { for (var i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; } return -1; }; indexOf = [].indexOf || function(item) { for (var i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; } return -1; };
@@ -113,17 +117,6 @@ api.startOfDay = function(options) {
return dayStart; return dayStart;
}; };
api.dayMapping = {
0: 'su',
1: 'm',
2: 't',
3: 'w',
4: 'th',
5: 'f',
6: 's'
};
/* /*
Absolute diff from "yesterday" till now Absolute diff from "yesterday" till now
*/ */
@@ -175,7 +168,7 @@ api.shouldDo = function(day, dailyTask, options) {
return false; return false;
} }
dayOfWeekNum = startOfDayWithCDSTime.day(); dayOfWeekNum = startOfDayWithCDSTime.day();
dayOfWeekCheck = dailyTask.repeat[api.dayMapping[dayOfWeekNum]]; dayOfWeekCheck = dailyTask.repeat[DAY_MAPPING[dayOfWeekNum]];
return dayOfWeekCheck; return dayOfWeekCheck;
} else { } else {
return false; return false;

10
test/common/algos.mocha.js
View File

@@ -1,4 +1,8 @@
/* eslint-disable camelcase, func-names, no-shadow */ /* eslint-disable camelcase, func-names, no-shadow */
import {
DAY_MAPPING,
} from '../../common/script/cron';
let expect = require('expect.js'); let expect = require('expect.js');
let sinon = require('sinon'); let sinon = require('sinon');
let moment = require('moment'); let moment = require('moment');
@@ -301,7 +305,7 @@ describe('User', () => {
let yesterday = moment().subtract(1, 'days'); let yesterday = moment().subtract(1, 'days');
user.dailys[0].repeat[shared.dayMapping[yesterday.day()]] = false; user.dailys[0].repeat[DAY_MAPPING[yesterday.day()]] = false;
_.each(user.dailys.slice(1), (d) => { _.each(user.dailys.slice(1), (d) => {
d.completed = true; d.completed = true;
}); });
@@ -383,7 +387,7 @@ describe('User', () => {
it('does not reset checklist on grey incomplete dailies', () => { it('does not reset checklist on grey incomplete dailies', () => {
let yesterday = moment().subtract(1, 'days'); let yesterday = moment().subtract(1, 'days');
user.dailys[0].repeat[shared.dayMapping[yesterday.day()]] = false; user.dailys[0].repeat[DAY_MAPPING[yesterday.day()]] = false;
user.dailys[0].checklist = [ user.dailys[0].checklist = [
{ {
text: '1', text: '1',
@@ -407,7 +411,7 @@ describe('User', () => {
it('resets checklist on complete grey complete dailies', () => { it('resets checklist on complete grey complete dailies', () => {
let yesterday = moment().subtract(1, 'days'); let yesterday = moment().subtract(1, 'days');
user.dailys[0].repeat[shared.dayMapping[yesterday.day()]] = false; user.dailys[0].repeat[DAY_MAPPING[yesterday.day()]] = false;
user.dailys[0].checklist = [ user.dailys[0].checklist = [
{ {
text: '1', text: '1',