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

Renamed variables for clarity.

Browse Source 
Moved calculation to actually change lastcron into its own function.

Changed validation errormessage to run: if ( dayStart != Math.floor(dayStart) || dayStart < 0 || dayStart > 24 ) {error message}.

Created new calculation for daystart because daystart could never be
future to the current timestamp. This "fix" has broken the whole endeavor,
though, because cron runs immedately when newlastcron > now and now >
oldlastcron.
This commit is contained in:
carolstone
2015-08-05 22:47:45 -04:00
parent 3fa3b491dc
commit 9fe96b7f94
3 changed files with 28 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
website/public/js/controllers/settingsCtrl.js
View File

@@ -66,24 +66,31 @@ habitrpg.controller('SettingsCtrl',
User.set({'flags.newStuff':true});
}
$scope.passDayStart = User.user.preferences.dayStart;
$scope.dayStart = User.user.preferences.dayStart;
$scope.saveDayStart = function(newDayStart){
var oldDayStart = User.user.preferences.dayStart;
var dayStart = newDayStart;
function updateLastCron(oldDayStart, newDayStart){
var getOldStart = Shared.startOfDayAllowsFuture({ dayStart: oldDayStart});
var getNewStart = Shared.startOfDayAllowsFuture({ dayStart: newDayStart});
var lastCron = User.user.lastCron;
var getOldStart = Shared.startOfDay({ dayStart: oldDayStart});
var getNewStart = Shared.startOfDay({ dayStart: dayStart});
var momentLastCron = Shared.momentTimestamp(lastCron);
var isoNewStart = Shared.isoTimestamp(getNewStart);
if (dayStart == undefined || _.isNaN(dayStart) || dayStart < 0 || dayStart > 24) {
dayStart = 0;
return alert(window.env.t('enterNumber'));
}
if (Shared.momentTimestamp(getOldStart) <= Shared.momentTimestamp(lastCron) && Shared.momentTimestamp(lastCron) < Shared.momentTimestamp(getNewStart)) {
alert('Times are oldstart'+Shared.friendlyTimestamp(getOldStart)+' lastcron '+Shared.friendlyTimestamp(lastCron)+' and newstart '+Shared.friendlyTimestamp(getNewStart));
if (getOldStart < momentLastCron && momentLastCron < getNewStart) {
alert('Setting lastcron to '+Shared.friendlyTimestamp(getNewStart));
User.set({ 'lastCron' : isoNewStart});
}
User.set({'preferences.dayStart': dayStart});
};
$scope.saveDayStart = function(varDayStart){
var oldDayStart = User.user.preferences.dayStart;
var newDayStart = varDayStart;
if ( newDayStart != Math.floor(newDayStart) || newDayStart < 0 || newDayStart > 24 ) {
newDayStart = 0;
return alert(window.env.t('enterNumber'));
}
updateLastCron( oldDayStart, newDayStart);
User.set({'preferences.dayStart': Math.floor(newDayStart)});
}
$scope.language = window.env.language;