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

admin: add a progression indicator for the deep synchronization

Browse source
This commit is contained in:
nemunaire 2019-01-18 15:39:58 +01:00
commit 7227c7109e
4 changed files with 43 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -422,7 +422,7 @@ angular.module("FICApp")
$interval(updBox, 750);
})
.controller("SettingsController", function($scope, $rootScope, Settings, ROSettings, $location, $http) {
.controller("SettingsController", function($scope, $rootScope, Settings, ROSettings, $location, $http, $interval) {
$scope.config = Settings.get();
$scope.config.$promise.then(function(response) {
$rootScope.settings.start = new Date(response.start);
@ -433,6 +433,21 @@ angular.module("FICApp")
$scope.configro = ROSettings.get();
$scope.duration = 240;
var progressInterval = $interval(function() {
$http.get("/api/sync/deep").then(function(response) {
if (response.data && response.data.progress)
$scope.syncProgress = Math.floor(response.data.progress * 100 / 255) + " %";
else
$scope.syncProgress = response.data;
}, function(response) {
if (response.data && response.data.errmsg)
$scope.syncProgress = response.data.errmsg;
else
$scope.syncProgress = response.data;
})
}, 1500);
$scope.$on('$destroy', function () { $interval.cancel(progressInterval); });
$scope.saveSettings = function(msg) {
if (msg === undefined) { msg = 'New settings saved!'; }
var nStart = this.config.start;

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

@ -161,6 +161,9 @@
<dd class="col" ng-bind="configro.sync"></dd>
</dl>
<div class="float-right" ng-if="configro.sync">
{{ syncProgress }}
</div>
<div class="text-left" ng-if="configro.sync">
<button type="button" class="btn btn-secondary" ng-click="deepSync()" ng-disabled="deepSyncInProgress"><span class="glyphicon glyphicon-import" aria-hidden="true"></span> Synchronisation intégrale</button>
</div>