fic/server
2
0
Fork 0
Code Issues Pull Requests 7 Releases Wiki Activity

admin: Update way of modulus calculation

Browse Source
This commit is contained in:
nemunaire 2021-09-08 02:39:51 +02:00
parent 203450df32
commit b887288c78
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
admin/static/js/app.js
View File

@ -571,10 +571,10 @@ angular.module("FICApp")
$scope.saveSettings(); $scope.saveSettings();
}); });
} }
$scope.updActivateTime = function(modulo) { $scope.updActivateTime = function(modulo) {
var ts = Date.now() - Date.now() % (60000 * modulo); var ts = Math.floor((new Date(this.config.end) - Date.now()) / (60000 * modulo)) * (60000 * modulo);
var d = new Date(ts + (60000 * modulo)); var d = new Date(this.config.end) - ts;
this.config.activateTime = d.toISOString(); this.config.activateTime = new Date(d).toISOString();
} }
$scope.reset = function(type) { $scope.reset = function(type) {
var txts = { var txts = {

4
dashboard/static/js/dashboard.js
View File

@ -95,7 +95,7 @@ angular.module("FICApp", ["ngSanitize", "ngAnimate"])
response.data.start = new Date(response.data.start); response.data.start = new Date(response.data.start);
response.data.end = new Date(response.data.end); response.data.end = new Date(response.data.end);
response.data.generation = new Date(response.data.generation); response.data.generation = new Date(response.data.generation);
response.data.awards = new Date("2019-01-23T15:00:00Z"); response.data.awards = new Date("2019-01-23T15:30:00Z");
$rootScope.settings = response.data; $rootScope.settings = response.data;
}); });
} }
@ -116,7 +116,7 @@ angular.module("FICApp", ["ngSanitize", "ngAnimate"])
response.data.start = new Date(response.data.start); response.data.start = new Date(response.data.start);
response.data.end = new Date(response.data.end); response.data.end = new Date(response.data.end);
response.data.generation = new Date(response.data.generation); response.data.generation = new Date(response.data.generation);
response.data.awards = new Date("2019-01-23T15:00:00Z"); response.data.awards = new Date("2019-01-23T15:30:00Z");
$rootScope.settings = response.data; $rootScope.settings = response.data;
}); });
$http.get("../themes.json").then(function(response) { $http.get("../themes.json").then(function(response) {