From cce116ececd635e298f25f02a48ac27c5f521778 Mon Sep 17 00:00:00 2001 From: TheSaminator Date: Mon, 7 Feb 2022 12:10:06 -0500 Subject: [PATCH] Let's not throw a time zone exception, shall we? --- .../kotlin/starshipfights/info/views_user.kt | 15 ++++++++------- src/jvmMain/resources/static/init.js | 9 +++++++++ 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/src/jvmMain/kotlin/starshipfights/info/views_user.kt b/src/jvmMain/kotlin/starshipfights/info/views_user.kt index 015a5c3..2d0be5f 100644 --- a/src/jvmMain/kotlin/starshipfights/info/views_user.kt +++ b/src/jvmMain/kotlin/starshipfights/info/views_user.kt @@ -24,11 +24,6 @@ import starshipfights.game.GlobalSide import starshipfights.game.toUrlSlug import starshipfights.redirect import java.time.Instant -import java.time.format.DateTimeFormatter -import java.time.format.FormatStyle -import java.util.* - -private val instantFormatter: DateTimeFormatter = DateTimeFormatter.ofLocalizedDateTime(FormatStyle.MEDIUM).withLocale(Locale.US) suspend fun ApplicationCall.userPage(): HTML.() -> Unit { val username = parameters["name"]!! @@ -169,7 +164,10 @@ suspend fun ApplicationCall.manageUserPage(): HTML.() -> Unit { } td { +"Expired at " - +instantFormatter.format(Instant.ofEpochMilli(session.expirationMillis)) + span(classes = "moment") { + style = "display:none" + +session.expirationMillis.toString() + } } } } @@ -365,7 +363,10 @@ suspend fun ApplicationCall.admiralPage(): HTML.() -> Unit { } } td { - +instantFormatter.format(record.whenEnded) + span(classes = "moment") { + style = "display:none" + +record.whenEnded.toEpochMilli().toString() + } } td { +when (recordRoles[record.id]) { diff --git a/src/jvmMain/resources/static/init.js b/src/jvmMain/resources/static/init.js index 57b7818..3ea86f8 100644 --- a/src/jvmMain/resources/static/init.js +++ b/src/jvmMain/resources/static/init.js @@ -63,3 +63,12 @@ window.addEventListener("load", function () { }); } }); + +window.addEventListener("load", function () { + const moments = document.getElementsByClassName("moment"); + for (let moment of moments) { + let date = new Date(Number(moment.innerHTML.trim())); + moment.innerHTML = date.toLocaleString(); + moment.attributes["style"] = ""; + } +}); -- 2.25.1