diff --git a/core/data/schema/base.py b/core/data/schema/base.py
index e315964..d74198b 100644
--- a/core/data/schema/base.py
+++ b/core/data/schema/base.py
@@ -109,7 +109,7 @@ class BaseData:
return result.lastrowid
async def get_event_log(self, entries: int = 100) -> Optional[List[Row]]:
- sql = event_log.select().limit(entries)
+ sql = event_log.select().order_by(event_log.c.id.desc()).limit(entries)
result = await self.execute(sql)
if result is None:
diff --git a/core/templates/sys/logs.jinja b/core/templates/sys/logs.jinja
index 3dfe531..9b7a987 100644
--- a/core/templates/sys/logs.jinja
+++ b/core/templates/sys/logs.jinja
@@ -6,6 +6,7 @@
Severity |
+ Timestamp |
System |
Name |
User |
@@ -19,7 +20,7 @@
{% if events is not defined or events|length == 0 %}
- No Events |
+ No Events |
{% endif %}
@@ -66,7 +67,11 @@ function update_tbl() {
for (var i = 0; i < per_page; i++) {
let off = (page * per_page) + i;
- if (off >= TBL_DATA.length ) {
+ if (off >= TBL_DATA.length) {
+ if (page != 0) {
+ document.getElementById("btn_next").disabled = true;
+ document.getElementById("btn_prev").disabled = false;
+ }
break;
}
@@ -99,56 +104,59 @@ function update_tbl() {
row.classList.add("table-primary");
break;
}
+
+ var cell_ts = row.insertCell(1);
+ cell_ts.innerHTML = data.when_logged;
- var cell_mod = row.insertCell(1);
+ var cell_mod = row.insertCell(2);
cell_mod.innerHTML = data.system;
- var cell_name = row.insertCell(2);
+ var cell_name = row.insertCell(3);
cell_name.innerHTML = data.type;
- var cell_usr = row.insertCell(3);
+ var cell_usr = row.insertCell(4);
if (data.user == 'NONE') {
cell_usr.innerHTML = "---";
} else {
cell_usr.innerHTML = "" + data.user + "";
}
- var cell_arcade = row.insertCell(4);
+ var cell_arcade = row.insertCell(5);
if (data.arcade == 'NONE') {
cell_arcade.innerHTML = "---";
} else {
cell_arcade.innerHTML = "" + data.arcade + "";
}
- var cell_machine = row.insertCell(5);
+ var cell_machine = row.insertCell(6);
if (data.arcade == 'NONE') {
cell_machine.innerHTML = "---";
} else {
cell_machine.innerHTML = "" + data.machine + "";
}
- var cell_game = row.insertCell(6);
+ var cell_game = row.insertCell(7);
if (data.game == 'NONE') {
cell_game.innerHTML = "---";
} else {
cell_game.innerHTML = data.game;
}
- var cell_version = row.insertCell(7);
+ var cell_version = row.insertCell(8);
if (data.version == 'NONE') {
cell_version.innerHTML = "---";
} else {
cell_version.innerHTML = data.version;
}
- var cell_msg = row.insertCell(8);
+ var cell_msg = row.insertCell(9);
if (data.message == '') {
cell_msg.innerHTML = "---";
} else {
cell_msg.innerHTML = data.message;
}
- var cell_deets = row.insertCell(9);
+ var cell_deets = row.insertCell(10);
if (data.details == '{}') {
cell_deets.innerHTML = "---";
} else {
@@ -160,9 +168,11 @@ function update_tbl() {
function chg_page(num) {
var max_page = TBL_DATA.length / per_page;
+ console.log(max_page);
page = page + num;
- if (page > max_page) {
+
+ if (page > max_page && max_page >= 1) {
page = max_page;
document.getElementById("btn_next").disabled = true;
document.getElementById("btn_prev").disabled = false;
@@ -172,6 +182,12 @@ function chg_page(num) {
document.getElementById("btn_next").disabled = false;
document.getElementById("btn_prev").disabled = true;
return;
+ } else if (page == 0) {
+ document.getElementById("btn_next").disabled = false;
+ document.getElementById("btn_prev").disabled = true;
+ } else {
+ document.getElementById("btn_next").disabled = false;
+ document.getElementById("btn_prev").disabled = false;
}
update_tbl();