From 1549a58892eb6b5e0ce1ecaba876c08fa5a26bf6 Mon Sep 17 00:00:00 2001 From: Pierre-Olivier Mercier Date: Mon, 16 Jan 2017 13:14:55 +0100 Subject: [PATCH] admin: Display time before start in UI --- admin/index.go | 5 +++++ admin/static/index.html | 5 +++++ admin/static/js/app.js | 3 +++ 3 files changed, 13 insertions(+) diff --git a/admin/index.go b/admin/index.go index a7b2b457..85c7448c 100644 --- a/admin/index.go +++ b/admin/index.go @@ -28,6 +28,11 @@ const indextpl = `

+ + Démarrage dans : + {{"{{ startIn }}"}}" + | + {{"{{ time.hours | time }}"}} : {{"{{ time.minutes | time }}"}} diff --git a/admin/static/index.html b/admin/static/index.html index 39e91f33..dcbd3374 100644 --- a/admin/static/index.html +++ b/admin/static/index.html @@ -26,6 +26,11 @@

+ + Démarrage dans : + {{ startIn }}" + | + {{ time.hours | time }} : {{ time.minutes | time }} diff --git a/admin/static/js/app.js b/admin/static/js/app.js index 28fdd211..007d2c43 100644 --- a/admin/static/js/app.js +++ b/admin/static/js/app.js @@ -449,7 +449,10 @@ angular.module("FICApp") $scope.refresh(true); } if (time.st > 0 && time.st <= srv_cur) { + $scope.startIn = 0; remain = time.st + time.du - srv_cur; + } else if (time.st > 0) { + $scope.startIn = Math.floor(time.st - srv_cur); } if (remain < 0) { remain = 0;