Changeset 299 for binary-improvements/webserver

Timestamp:

Dec 14, 2016, 7:47:05 PM (8 years ago)

Author:

alloc

Message:

Fixes

Location:

binary-improvements/webserver

Files:

• css/style.css (modified) (1 diff)
• js/stats.js (modified) (2 diffs)

binary-improvements/webserver/css/style.css

@@ -135 +135 @@
 .adminnavbar #serverstats #stats_time {
         white-space: nowrap;
+        border-bottom: 1px dashed orange;
 }
 

binary-improvements/webserver/js/stats.js

@@ +1 @@
+function DayName (days) {
+        var daynames = ["", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Bloodday"];
+        return daynames[DayOfWeek(days)];
+}
+
+function DayOfWeek (days) {
+        return days % 7 > 0 ? days % 7 : 7;
+}
+
+function GetDayStat (days) {
+        var daynames = ["", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Bloodday"];
+        var dayOfWeek = days % 7 > 0 ? days % 7 : 7;
+        var result = "";
+        // Show days til blood moon:
+        result += " (" + (7 - dayOfWeek) + " til blood moon)";
+        // Show day of week (number):
+        result += " (DoW: " + dayOfWeek + ")";
+        // Show day of week (name):
+        result += " (" + daynames[dayOfWeek] + ")";
+        return result;
+}
+
+function FormatServerTime (gametime) {
+        var time = "Day " + gametime.days;
+        time += " (" + DayName (gametime.days) + "), ";
+        if (gametime.hours < 10)
+                time += "0";
+        time += gametime.hours;
+        time += ":";
+        if (gametime.minutes < 10)
+                time += "0";
+        time += gametime.minutes;
+        return time;
+}
+
+function TimeTitle (gametime) {
+        var daynames = ["", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Bloodday"];
+        var dayOfWeek = DayOfWeek (gametime.days);
+        var result = "";
+        // Show days til blood moon:
+        result += (7 - dayOfWeek) + " days til blood moon\n";
+        // Show day of week (number):
+        result += "Day of week: " + dayOfWeek + "\n";
+        // Show day of week (name):
+        //result += daynames[dayOfWeek];
+        return result;
+}
+
 function StartStatsModule () {
         var updateGameTimeEvent = function() {
                 $.getJSON( "../api/getstats")
                 .done(function(data) {
-                        var time = "Day " + data.gametime.days + ", ";
-                        if (data.gametime.hours < 10)
-                                time += "0";
-                        time += data.gametime.hours;
-                        time += ":";
-                        if (data.gametime.minutes < 10)
-                                time += "0";
-                        time += data.gametime.minutes;
+                        var time = FormatServerTime (data.gametime);
 
                         $("#stats_time").html (time);
+                        $("#stats_time").prop ("title", TimeTitle (data.gametime));
                         $("#stats_players").html (data.players);
                         $("#stats_hostiles").html (data.hostiles);
@@ -31 +73 @@
                 $.getJSON( "../api/getwebuiupdates?latestLine=" + lastLogLine)
                 .done(function(data) {
-                        var time = "Day " + data.gametime.days + ", ";
-                        if (data.gametime.hours < 10)
-                                time += "0";
-                        time += data.gametime.hours;
-                        time += ":";
-                        if (data.gametime.minutes < 10)
-                                time += "0";
-                        time += data.gametime.minutes;
+                        var time = FormatServerTime (data.gametime);
 
                         $("#stats_time").html (time);
+                        $("#stats_time").prop ("title", TimeTitle (data.gametime));
                         $("#stats_players").html (data.players);
                         $("#stats_hostiles").html (data.hostiles);