fic/server
Archived
1
0
Fork 0
Code Issues Pull requests 10 Releases Wiki Activity

admin: redesign propagation time button + can use propagation time in public timer

Browse source
This commit is contained in:
nemunaire 2020-01-23 13:28:10 +01:00
parent caea02bb4d
commit ac9361b4ce
3 changed files with 19 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
admin/static/js/app.js
View file

@ -532,9 +532,9 @@ angular.module("FICApp")
$scope.saveSettings();
});
}
$scope.updActivateTime = function() {
var ts = Date.now() - Date.now() % 60000;
var d = new Date(ts + 120000);
$scope.updActivateTime = function(modulo) {
var ts = Date.now() - Date.now() % (60000 * modulo);
var d = new Date(ts + (60000 * modulo));
this.config.activateTime = d.toISOString();
}
$scope.reset = function(type) {
@ -820,8 +820,12 @@ angular.module("FICApp")
$scope.genSceneCountdownDate = function(scene, duration) {
scene.params.end = (new Date(Date.now() + duration)).toISOString();
}
$scope.genCustomCountdownDate = function(duration) {
$scope.display.customCountdown.end = (new Date(Date.now() + duration)).toISOString();
$scope.genCustomCountdownDate = function(duration) {
if (duration == null) {
$scope.display.customCountdown.end = $rootScope.settings.activateTime;
} else {
$scope.display.customCountdown.end = (new Date(Date.now() + duration)).toISOString();
}
}
$scope.saveScenes = function() {