From 4d04f849dd18d7cf482280f6d5db3d7e29cd6c11 Mon Sep 17 00:00:00 2001 From: Valentin Date: Thu, 14 Sep 2023 11:08:19 +0200 Subject: [PATCH] date formatting --- routes/admin/servers.route.js | 2 +- services/server.service.js | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/routes/admin/servers.route.js b/routes/admin/servers.route.js index 1775220..dfea27a 100644 --- a/routes/admin/servers.route.js +++ b/routes/admin/servers.route.js @@ -18,7 +18,7 @@ router.get("/", (req, res) => { var secret_display = null servers.forEach((server) => { if (server.lastPull != null) { - lastPullList[server.hostname] = server.lastPull.toISOString().replace(/T/, ' ').replace(/\..+/, '') + lastPullList[server.hostname] = server.lastPull.toLocaleString() } else { lastPullList[server.hostname] = 'never' } diff --git a/services/server.service.js b/services/server.service.js index 3f6f8ca..a0ab4ce 100644 --- a/services/server.service.js +++ b/services/server.service.js @@ -69,9 +69,9 @@ async function delServer(hostname) { } async function getServerKeys(server) { - const dump = await sequelize.query('SELECT name,content FROM members JOIN users ON users.id = members.userId JOIN accesses ON members.groupName = members.groupName JOIN keys ON members.userId = keys.idOwner WHERE serverHostname = \'' + server + '\'', {}); + const dump = await sequelize.query('SELECT name, content FROM servers JOIN accesses on accesses.serverHostname = servers.hostname JOIN members on members.groupName = accesses.groupName JOIN keys on keys.idOwner = members.userid WHERE serverHostname = \'' + server + '\'', {}); result = {} - + console.log(dump) for (x in dump) { for (y in dump[x]) { try { @@ -95,7 +95,7 @@ async function getServerListForUserId(userId) { result[(dump[0][x].hostname).toString()] = { 'username': dump[0][x].username, 'ip': dump[0][x].ip, - 'lastPull': dump[0][x].lastPull + 'lastPull': new Date(dump[0][x].lastPull).toLocaleString() } } }