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

1
admin/static/views/public.html
View file

@ -318,6 +318,7 @@
<a class="dropdown-item" ng-click="genCustomCountdownDate(1100000)">30 minutes</a> <a class="dropdown-item" ng-click="genCustomCountdownDate(1100000)">30 minutes</a>
<a class="dropdown-item" ng-click="genCustomCountdownDate(3700000)">1 heure</a> <a class="dropdown-item" ng-click="genCustomCountdownDate(3700000)">1 heure</a>
<a class="dropdown-item" ng-click="genCustomCountdownDate(5500000)">1.5 heure</a> <a class="dropdown-item" ng-click="genCustomCountdownDate(5500000)">1.5 heure</a>
<a class="dropdown-item" ng-click="genCustomCountdownDate()">Recopier propagation</a>
</div> </div>
</div> </div>
</div> </div>

10
admin/static/views/settings.html
View file

@ -92,7 +92,15 @@
<div class="col"> <div class="col">
<div class="input-group" style="margin-top: 5px;"> <div class="input-group" style="margin-top: 5px;">
<div class="input-group-prepend"> <div class="input-group-prepend">
<button ng-click="updActivateTime()" class="btn btn-sm btn-secondary" type="button"><span class="glyphicon glyphicon-record" aria-hidden="true"></span> Propager plus tard</button> <button class="btn btn-sm btn-outline-secondary dropdown-toggle" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><span class="glyphicon glyphicon-record" aria-hidden="true"></span> Propager plus tard</button>
<div class="dropdown-menu">
<a class="dropdown-item" ng-click="updActivateTime(2)">modulo 2 minutes</a>
<a class="dropdown-item" ng-click="updActivateTime(5)">modulo 5 minutes</a>
<a class="dropdown-item" ng-click="updActivateTime(10)">modulo 10 minutes</a>
<a class="dropdown-item" ng-click="updActivateTime(15)">modulo 15 minutes</a>
<a class="dropdown-item" ng-click="updActivateTime(20)">modulo 20 minutes</a>
<a class="dropdown-item" ng-click="updActivateTime(30)">modulo 30 minutes</a>
</div>
</div> </div>
<input type="text" class="form-control form-control-sm" id="activateTime" ng-model="config.activateTime"> <input type="text" class="form-control form-control-sm" id="activateTime" ng-model="config.activateTime">
</div> </div>