From 314372a0f20f5edb1839f8c4e151fc35babaeeb3 Mon Sep 17 00:00:00 2001
From: jokob-sk <jokob-sk@gmail.com>
Date: Tue, 14 Jan 2025 13:28:34 +1100
Subject: [PATCH] server time format #954

---
 front/php/templates/header.php | 58 ++++++++++++++++++++++++----------
 1 file changed, 41 insertions(+), 17 deletions(-)
diff --git a/front/php/templates/header.php b/front/php/templates/header.php
index 1527206f..667d10a7 100755
--- a/front/php/templates/header.php
+++ b/front/php/templates/header.php
@@ -70,9 +70,6 @@
   <!-- Theme style -->
   <link rel="stylesheet" href="lib/AdminLTE/dist/css/AdminLTE.min.css">
 
-
-
-
   <!-- AdminLTE Skins. We have chosen the skin-blue for this starter
         page. However, you can choose any other skin. Make sure you
         apply the skin class to the body tag so the changes take effect. -->
@@ -107,6 +104,8 @@
 <!-- Servertime to the right of the hostname -->
 <script>
 
+  // -------------------------------------------------------------
+  // Updates the backend application state/status in the header
   function updateState(){
     $.get('/php/server/query_json.php', { file: 'app_state.json', nocache: Date.now() }, function(appState) {    
 
@@ -117,19 +116,46 @@ function updateState(){
     })
   }
 
-  function show_pia_servertime() {
-
-    // datetime in timeZone in the "en-UK" locale
-    let time = new Date().toLocaleString("en-UK", { timeZone: "<?php echo $timeZone?>" });
+  // -------------------------------------------------------------
+  // updates the date and time in the header
+  function update_servertime() {
+    // Get the current date and time in the specified time zone
+    let timeZone = "<?php echo $timeZone ?>";
+    let now = new Date();
+
+    // Convert to the specified time zone
+    let formatter = new Intl.DateTimeFormat("en-UK", {
+      timeZone: timeZone,
+      day: "2-digit",
+      month: "short",
+      year: "numeric",
+      hour: "2-digit",
+      minute: "2-digit",
+      second: "2-digit",
+      hour12: false, // Use 24-hour format
+    });
+    let parts = formatter.formatToParts(now);
+
+    // Extract date components
+    let day = parts.find(p => p.type === "day").value;
+    let month = parts.find(p => p.type === "month").value;
+    let year = parts.find(p => p.type === "year").value;
+
+    // Extract time components
+    let hour = parts.find(p => p.type === "hour").value;
+    let minute = parts.find(p => p.type === "minute").value;
+    let second = parts.find(p => p.type === "second").value;
+
+    // Construct the date and time in DD-MMM-YYYY HH:MM:SS format
+    let formattedDateTime = `${day}-${month}-${year} ${hour}:${minute}:${second}`;
+
+    if (document.getElementById) {
+      document.getElementById("PIA_Servertime_place").innerHTML = '(' + formattedDateTime + ')';
+    }
 
-    if (document.getElementById) { 
-      document.getElementById("PIA_Servertime_place").innerHTML = '('+time+')'; 
-    } 
-    
-    setTimeout("show_pia_servertime()", 1000);
+    setTimeout(update_servertime, 1000); // Call recursively every second
   }
 
-
 </script>
 
 </head>
@@ -137,7 +163,7 @@ function show_pia_servertime() {
 <!-- ----------------------------------------------------------------------- -->
 <!-- Layout Boxed Yellow -->
 
-<body class="hold-transition fixed <?php echo $pia_skin_selected;?> sidebar-mini" onLoad="show_pia_servertime();" >
+<body class="hold-transition fixed <?php echo $pia_skin_selected;?> sidebar-mini" onLoad="update_servertime();" >
 <!-- Site wrapper -->
 <div class="wrapper">
 
@@ -145,8 +171,6 @@ function show_pia_servertime() {
   <!-- Main Header -->
   <header class="main-header">
 
-  
-
 <!-- ----------------------------------------------------------------------- -->
     <!-- Logo -->
     <a href="devices.php" class="logo">
@@ -468,7 +492,7 @@ function toggleFullscreen() {
   //--------------------------------------------------------------
 
   // Update server time in the header
-  show_pia_servertime()
+  update_servertime()
 
   // Update server state in the header
   updateState()
