Merge pull request #17 from dbehnke/feature/localtime

local time display
kc1awv · Oct 8, 2022 · 45256e3 · 45256e3
2 parents f829b6e + d8b6683
commit 45256e3
Show file tree

Hide file tree

Showing 4 changed files with 66 additions and 9 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.0.6
+0.1.0
diff --git a/templates/index.html b/templates/index.html
@@ -21,7 +21,7 @@
                   <td class="text-center">${ station.callsignsuffix }</td>
                   <td>${ station.vianode }</td>
                   <td class="text-center">${ station.onmodule }</td>
-                  <td>${ station.lastheard }</td>
+                  <td>${ station.lastheardlocal }</td>
                 </tr>
               </tbody>
             </table>
@@ -67,11 +67,68 @@
         }
     },
     methods: {
-        fetchStationsList () {
-            $.getJSON('{{ .config.SubPath }}/json/stations', (stationdata) => {
-                this.stationdata = stationdata
-            });
-        },
+      fetchStationsList () {
+        $.getJSON('{{ .config.SubPath }}/json/stations', (stationdata) => {
+          stationdata.stations.forEach(function(station, index) {
+            function getDateString(dt) {
+              console.log(dt)
+              const year = dt.getFullYear()
+              const m = dt.getMonth() + 1
+              var month = "" + m
+              if (m < 10) {
+                month = "0" + m
+              }
+              const d = dt.getDate()
+              var day = "" + d
+              if (d < 10) {
+                day = "0" + d
+              }
+              return (day+"."+month+"."+year)
+            }
+            function getTimeString(dt) {
+              const h = dt.getHours()
+              var hour = "" + h
+              if (h < 10) {
+                hour = "0" + h
+              }
+              const m = dt.getMinutes()
+              var min = "" + m
+              if (m < 10) {
+                min = "0" + m
+              }
+              //const s = dt.getSeconds()
+              //var sec = "" + s
+              //if (s < 10) {
+              //  sec = "0" + s
+              //}
+              return (hour+":"+min)
+            } 
+            function diffSeconds(dt2, dt1) {
+              var diff =(dt2.getTime() - dt1.getTime()) / 1000;
+
+              return Math.abs(Math.round(diff));
+            }
+            function localTimeString(dateTimeString) {
+              const now = new Date();
+              const then = new Date(dateTimeString)
+              if (now.toLocaleDateString() == then.toLocaleDateString()) {
+                const dSeconds = diffSeconds(now, then)
+                if (dSeconds < 60) {
+                  return(dSeconds + " sec ago")
+                }
+                if (dSeconds < 60 * 5) {
+                  return(Math.abs(Math.round(dSeconds / 60)) + " min ago")
+                }
+                return(getTimeString(then))
+              }
+              return(getDateString(then) + " " + getTimeString(then))
+            }
+            station.lastheardlocal = localTimeString(station.lastheard)
+            stationdata.stations[index] = station     
+          });
+          this.stationdata = stationdata
+        });
+      },
     },
     mounted() {
         this.timer = setInterval(this.fetchStationsList, refreshTime)

diff --git a/templates/links.html b/templates/links.html
@@ -48,7 +48,7 @@
             });
         },
     },
-    mounted() {
+    created() {
         this.timer = setInterval(this.fetchLinksList, refreshTime)
         this.fetchLinksList()
     },

diff --git a/templates/peers.html b/templates/peers.html
@@ -46,7 +46,7 @@
             });
         },
     },
-    mounted() {
+    created() {
         this.timer = setInterval(this.fetchPeersList, refreshTime)
         this.fetchPeersList()
     },