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

settings: Save future changes in a dedicated file

Browse source
This commit is contained in:
nemunaire 2022-05-26 22:54:46 +02:00
commit 3c237819c3
5 changed files with 295 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -234,6 +234,11 @@ angular.module("FICApp")
'update': {method: 'PUT'},
})
})
.factory("NextSettings", function($resource) {
return $resource("api/settings-next/:tsId", { tsId: '@id'}, {
'update': {method: 'PUT'},
})
})
.factory("SettingsChallenge", function($resource) {
return $resource("api/challenge.json", null, {
'update': {method: 'PUT'},
@ -510,7 +515,23 @@ angular.module("FICApp")
$scope.monitor = Monitor.get();
})
.controller("SettingsController", function($scope, $rootScope, Settings, SettingsChallenge, $location, $http, $interval) {
.controller("SettingsController", function($scope, $rootScope, NextSettings, Settings, SettingsChallenge, $location, $http, $interval) {
$scope.nextsettings = NextSettings.query();
$scope.erase = false;
$scope.editNextSettings = function(ns) {
$scope.activateTime = ns.date;
$scope.erase = true;
Object.keys(ns.values).forEach(function(k) {
$scope.config[k] = ns.values[k];
});
$scope.config.enableExerciceDepend = $scope.config.unlockedChallengeDepth >= 0;
}
$scope.deleteNextSettings = function(ns) {
ns.$delete().then(function() {
$scope.nextsettings = NextSettings.query();
})
}
$scope.displayDangerousActions = false;
$scope.config = Settings.get();
$scope.dist_config = {};
@ -524,6 +545,7 @@ angular.module("FICApp")
})
$scope.challenge = SettingsChallenge.get();
$scope.duration = 360;
$scope.activateTime = "0001-01-01T00:00:00Z";
$scope.challenge.$promise.then(function(c) {
if (c.duration)
$scope.duration = c.duration;
@ -549,17 +571,24 @@ angular.module("FICApp")
var nStart = this.config.start;
var nEnd = this.config.end;
var nGen = this.config.generation;
var aTime = this.config.activateTime;
var state = this.config.enableExerciceDepend;
this.config.unlockedChallengeDepth = (this.config.enableExerciceDepend?this.config.unlockedChallengeDepth:-1)
this.config.$update(function(response) {
var updateQuery = {};
if (this.activateTime && this.activateTime != '0001-01-01T00:00:00Z') {
updateQuery['t'] = this.activateTime;
}
if (this.erase) {
updateQuery['erase'] = true;
this.erase = false;
}
this.config.$update(updateQuery, function(response) {
$scope.dist_config = Object.assign({}, response);
$scope.addToast('success', msg);
$scope.nextsettings = NextSettings.query();
response.enableExerciceDepend = response.unlockedChallengeDepth >= 0;
$rootScope.settings.start = new Date(nStart);
$rootScope.settings.end = new Date(nEnd);
$rootScope.settings.generation = new Date(nGen);
$rootScope.settings.activateTime = new Date(aTime);
}, function(response) {
$scope.addToast('danger', 'An error occurs when saving settings:', response.data.errmsg);
});
@ -582,12 +611,12 @@ angular.module("FICApp")
});
}
$scope.updateActivateTime = function() {
$rootScope.settings.activateTime = this.config.activateTime;
$rootScope.settings.activateTime = this.activateTime;
}
$scope.updActivateTime = function(modulo) {
var ts = Math.floor((new Date(this.config.end) - Date.now() - (60000 * modulo / 2)) / (60000 * modulo)) * (60000 * modulo);
var d = new Date(this.config.end) - ts;
this.config.activateTime = new Date(d).toISOString();
this.activateTime = new Date(d).toISOString();
this.updateActivateTime();
}
$scope.reset = function(type) {

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

@ -6,7 +6,7 @@
<div class="form-group float-right mr-2 mb-0">
<div class="input-group mt-1">
<div class="input-group-prepend">
<button class="btn btn-sm btn-outline-secondary dropdown-toggle" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" ng-class="{'btn-outline-secondary': !activateTimeCountDown, 'btn-warning': activateTimeCountDown && config.activateTime == settings.activateTime, 'btn-outline-warning': config.activateTime && config.activateTime != settings.activateTime}"><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" ng-class="{'btn-outline-secondary': !activateTimeCountDown, 'btn-warning': activateTimeCountDown && activateTime == settings.activateTime, 'btn-outline-warning': activateTime && activateTime != settings.activateTime}"><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>
@ -16,10 +16,10 @@
<a class="dropdown-item" ng-click="updActivateTime(30)">modulo 30 minutes</a>
<a class="dropdown-item" ng-click="updActivateTime(60)">modulo 60 minutes</a>
<a class="dropdown-item" ng-click="updActivateTime(90)">modulo 90 minutes</a>
<a class="dropdown-item" ng-click="config.activateTime = '0001-01-01T00:00:00Z'" ng-show="activateTimeCountDown">annuler la propagation</a>
<a class="dropdown-item" ng-click="activateTime = '0001-01-01T00:00:00Z'" ng-show="activateTimeCountDown">annuler la propagation</a>
</div>
</div>
<input type="text" class="form-control form-control-sm" id="activateTime" ng-model="config.activateTime" ng-change="updateActivateTime()">
<input type="text" class="form-control form-control-sm" id="activateTime" ng-model="activateTime" ng-change="updateActivateTime()">
</div>
<small ng-if="activateTimeCountDown">
Propagation dans : {{ activateTimeCountDown | timer }}
@ -279,6 +279,26 @@
</div>
<hr>
<h4>Changements anticipés</h4>
<div class="card mb-2" ng-repeat="ns in nextsettings">
<div class="card-header d-flex justify-content-between">
<h4 class="text-truncate mb-0 align-self-center" title="{{ ns.date }}">
{{ ns.date }}
</h4>
<div class="d-flex">
<button class="btn btn-sm btn-primary mr-1" ng-click="editNextSettings(ns)">
<span class="glyphicon glyphicon-pencil" aria-hidden="true"></span>
</button>
<button class="btn btn-sm btn-danger" ng-click="deleteNextSettings(ns)">
<span class="glyphicon glyphicon-trash" aria-hidden="true"></span>
</button>
</div>
</div>
<ul class="list-group list-group-flush">
<li class="list-group-item" ng-repeat="(k,v) in ns.values">
{{ k }} &rarr; {{ v }}
</li>
</ul>
</div>
</div>
<div class="card" ng-show="!config.wip && timeProgression && !displayDangerousActions">