diff --git a/server.js b/server.js index c50d16e..ec2b124 100644 --- a/server.js +++ b/server.js @@ -559,7 +559,7 @@ async function live(req, res) { })); const subquery = ` - SELECT a.evtuuid, a.id, a.cmdno, a.time, a.serial, a.st, r.plate, g.latitude, g.longitude + SELECT a.evtuuid, a.id, a.cmdno, a.time, a.serial, a.st, r.plate, r.number, g.latitude, g.longitude FROM ( SELECT DISTINCT ON (evtuuid) evtuuid, id, cmdno, time, serial, st FROM alarms @@ -697,6 +697,7 @@ async function live(req, res) { id: alarm.id, cmdno: alarm.cmdno, time: formatDate(alarm.time), + number: alarm.number, serial: alarm.serial, st: alarm.st, type: type, diff --git a/static/scripts/table-admin.js b/static/scripts/table-admin.js index e426d4e..b65ee68 100644 --- a/static/scripts/table-admin.js +++ b/static/scripts/table-admin.js @@ -1,7 +1,7 @@ // Получаем высоту таблицы и определяем, сколько строк помещается на странице let currentPage = 1; let tableHeight = document.getElementById("content").offsetHeight; -let rowHeight = 60; +let rowHeight = 75; let rowsPerPage = Math.floor(tableHeight / rowHeight) - 3; let filteredUsers = [...users]; let timeRangeStart = null; @@ -110,7 +110,7 @@ function getRandomColor() { window.addEventListener("resize", function (event) { tableHeight = document.getElementById("content").offsetHeight; - rowHeight = 60; + rowHeight = 75; rowsPerPage = Math.floor(tableHeight / rowHeight) - 3; createTable(); createPagination(); diff --git a/static/styles/main.css b/static/styles/main.css index 862717b..4a7366e 100644 --- a/static/styles/main.css +++ b/static/styles/main.css @@ -519,6 +519,32 @@ header img { font-weight: 500; } +.organisation .checkbox-name { + display: inline-block; + white-space: nowrap; + width: 150px !important; + position: relative; + overflow: hidden; +} + +.organisation .checkbox-label .text { + display: inline-block; + white-space: nowrap; +} + +.organisation .checkbox-label .text.animated { + animation: moveText 6s linear infinite; +} + +@keyframes moveText { + 0%, 100% { + transform: translateX(5%); + } + 50% { + transform: translateX(calc(150px - 105%)); + } +} + .permission-group .checkbox-label { margin-top: 10px; float: left; diff --git a/static/templates/admin/user.html b/static/templates/admin/user.html index c450675..923f274 100644 --- a/static/templates/admin/user.html +++ b/static/templates/admin/user.html @@ -133,7 +133,7 @@