From 4b96550e625bdbc71b62e0e39385546ea8b3a563 Mon Sep 17 00:00:00 2001 From: Ivan Date: Fri, 29 Sep 2023 00:37:39 +0300 Subject: [PATCH] add bug button, fix dateformat parameter --- server.js | 13 ++++++------- static/img/bug.svg | 11 +++++++++++ static/templates/admin/index.html | 3 +++ static/templates/admin/organisation.html | 3 +++ static/templates/admin/user.html | 3 +++ static/templates/devices/device.html | 3 +++ static/templates/devices/groups.html | 3 +++ static/templates/devices/index.html | 3 +++ static/templates/devices/system.html | 5 +++++ static/templates/devices/update.html | 3 +++ static/templates/index.html | 3 +++ static/templates/live.html | 3 +++ static/templates/reports/index.html | 3 +++ static/templates/reports/report.html | 3 +++ static/templates/settings.html | 3 +++ static/templates/videos/export.html | 3 +++ static/templates/videos/playback.html | 3 +++ 17 files changed, 64 insertions(+), 7 deletions(-) create mode 100644 static/img/bug.svg diff --git a/server.js b/server.js index 9b7af25..2464725 100644 --- a/server.js +++ b/server.js @@ -2875,17 +2875,16 @@ app.put('/device-parameters', async (req, res) => { // Создаем JSON для GET запроса const requestBody = { "TIMEP": { - "DATEM": parseInt(DATEMOD, 10) || 1, - "TIMEM": parseInt(TIMEFORMAT, 10) || 0, - "TIMEZ": TIMEZ || "180C" + "DATEM": parseInt(DATEMOD, 10), + "TIMEM": parseInt(TIMEFORMAT, 10), + "TIMEZ": TIMEZ }, "GSP": { - "LANT": parseInt(LANGUAGE, 10) || 12, - "VGA": parseInt(VIDEOFORMAT, 10) || 0, - "GM": parseInt(GEOMOD, 10) || 0 + "LANT": parseInt(LANGUAGE, 10), + "GM": parseInt(GEOMOD, 10) }, "SUBSTRNET": { - "SM": parseInt(SUBSTREAMMODE, 10) || 1 + "SM": parseInt(SUBSTREAMMODE, 10) }, "EOSD": [ { "GE": GE, "NE": NE, "SE": SE, "TE": TE, "VE": VE, "DE": DE }, diff --git a/static/img/bug.svg b/static/img/bug.svg new file mode 100644 index 0000000..6e6db30 --- /dev/null +++ b/static/img/bug.svg @@ -0,0 +1,11 @@ + + + + + + + + + diff --git a/static/templates/admin/index.html b/static/templates/admin/index.html index c7eba6f..c44bd5c 100644 --- a/static/templates/admin/index.html +++ b/static/templates/admin/index.html @@ -44,6 +44,9 @@
Записи
 + +
Собщить об ошибке
+
Админка
 diff --git a/static/templates/admin/organisation.html b/static/templates/admin/organisation.html index 949a390..6b14ae9 100644 --- a/static/templates/admin/organisation.html +++ b/static/templates/admin/organisation.html @@ -44,6 +44,9 @@
Записи
 + +
Собщить об ошибке
+
Админка
 diff --git a/static/templates/admin/user.html b/static/templates/admin/user.html index 9431b56..20a6e64 100644 --- a/static/templates/admin/user.html +++ b/static/templates/admin/user.html @@ -54,6 +54,9 @@
Записи
 + +
Собщить об ошибке
+
Админка
 diff --git a/static/templates/devices/device.html b/static/templates/devices/device.html index 78d6954..5de75ab 100644 --- a/static/templates/devices/device.html +++ b/static/templates/devices/device.html @@ -54,6 +54,9 @@
Записи
 + +
Собщить об ошибке
+ {{#if isAdmin}}
Админка
diff --git a/static/templates/devices/groups.html b/static/templates/devices/groups.html index 4dc543d..4fad7af 100644 --- a/static/templates/devices/groups.html +++ b/static/templates/devices/groups.html @@ -44,6 +44,9 @@
Записи
 + +
Собщить об ошибке
+ {{#if isAdmin}}
Админка
diff --git a/static/templates/devices/index.html b/static/templates/devices/index.html index 94eb340..ca8345d 100644 --- a/static/templates/devices/index.html +++ b/static/templates/devices/index.html @@ -44,6 +44,9 @@
Записи
 + +
Собщить об ошибке
+ {{#if isAdmin}}
Админка
diff --git a/static/templates/devices/system.html b/static/templates/devices/system.html index 2807bb5..33b1e24 100644 --- a/static/templates/devices/system.html +++ b/static/templates/devices/system.html @@ -54,6 +54,9 @@
Записи
 + +
Собщить об ошибке
+ {{#if isAdmin}}
Админка
@@ -970,6 +973,8 @@ const requestBody = { DE, }; + console.log(requestData); + try { const response = await fetch(`/device-parameters?serial=${serial}`, { method: 'PUT', diff --git a/static/templates/devices/update.html b/static/templates/devices/update.html index c8dcaaa..1b9b8ba 100644 --- a/static/templates/devices/update.html +++ b/static/templates/devices/update.html @@ -44,6 +44,9 @@
Записи
 + +
Собщить об ошибке
+ {{#if isAdmin}}
Админка
diff --git a/static/templates/index.html b/static/templates/index.html index ac27428..dce11d1 100644 --- a/static/templates/index.html +++ b/static/templates/index.html @@ -60,6 +60,9 @@
Записи
 + +
Собщить об ошибке
+ {{#if isAdmin}}
Админка
diff --git a/static/templates/live.html b/static/templates/live.html index f4ae097..b00302d 100644 --- a/static/templates/live.html +++ b/static/templates/live.html @@ -48,6 +48,9 @@
Записи
 + +
Собщить об ошибке
+ {{#if isAdmin}}
Админка
diff --git a/static/templates/reports/index.html b/static/templates/reports/index.html index a5b2c69..9a2235c 100644 --- a/static/templates/reports/index.html +++ b/static/templates/reports/index.html @@ -44,6 +44,9 @@
Записи
 + +
Собщить об ошибке
+ {{#if isAdmin}}
Админка
diff --git a/static/templates/reports/report.html b/static/templates/reports/report.html index 9161cd2..8e9db1f 100644 --- a/static/templates/reports/report.html +++ b/static/templates/reports/report.html @@ -46,6 +46,9 @@
Записи
 + +
Собщить об ошибке
+ {{#if isAdmin}}
Админка
diff --git a/static/templates/settings.html b/static/templates/settings.html index e22d948..9f704e4 100644 --- a/static/templates/settings.html +++ b/static/templates/settings.html @@ -44,6 +44,9 @@
Записи
 + +
Собщить об ошибке
+ {{#if isAdmin}}
Админка
diff --git a/static/templates/videos/export.html b/static/templates/videos/export.html index 234bcb0..5bd14d3 100644 --- a/static/templates/videos/export.html +++ b/static/templates/videos/export.html @@ -48,6 +48,9 @@
Записи
 + +
Собщить об ошибке
+ {{#if isAdmin}}
Админка
diff --git a/static/templates/videos/playback.html b/static/templates/videos/playback.html index 65dd660..c23076a 100644 --- a/static/templates/videos/playback.html +++ b/static/templates/videos/playback.html @@ -48,6 +48,9 @@
Записи
 + +
Собщить об ошибке
+ {{#if isAdmin}}
Админка