From 7a81786964f1b0580b3ed13d818acab52461ccc4 Mon Sep 17 00:00:00 2001 From: sanjayk03-dev Date: Wed, 4 Sep 2024 18:42:35 +0530 Subject: [PATCH] showing 12 hour format --- src/js/admin-general-view.js | 13 +++++++++++++ src/pug/templates/admin-general-view.pug | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/src/js/admin-general-view.js b/src/js/admin-general-view.js index 73c8c8f..f713a11 100644 --- a/src/js/admin-general-view.js +++ b/src/js/admin-general-view.js @@ -57,6 +57,19 @@ module.exports = { this.autoCheckUpgrade = this.config.admin["auto-check-upgrade"]; }, + computed: { + get_current_time: function () { + if (this.is_24_hr_format == true) { + return this.current_time; + } else { + const [hour, minutes, seconds] = this.current_time.split(":"); + const suffix = hour >= 12 ? "PM" : "AM"; + const hour12 = (hour % 12 || 12).toString().padStart(2, "0"); + return `${hour12}:${minutes}:${seconds} ${suffix}`; + } + }, + }, + methods: { fetch_current_time: async function () { try { diff --git a/src/pug/templates/admin-general-view.pug b/src/pug/templates/admin-general-view.pug index 71108b5..2f56399 100644 --- a/src/pug/templates/admin-general-view.pug +++ b/src/pug/templates/admin-general-view.pug @@ -68,7 +68,7 @@ script#admin-general-view-template(type="text/x-template") p strong Current Date/Time: span(v-if="isLoadingTime") Loading... - span(v-else) {{ current_time }} + span(v-else) {{ get_current_time }} label input(type="checkbox" v-model="is_24_hr_format")