display last report status

davidmasek · Jan 14, 2025 · c16b8c4 · c16b8c4
1 parent 574ca91
commit c16b8c4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/handlers/server_gui.go b/handlers/server_gui.go
@@ -115,6 +115,7 @@ func handleAbout(db storage.Storage, config *conf.Config) http.HandlerFunc {
 			return
 		}
 		var lastReportTime, nextReportAfter string
+		lastReportStatus := ""
 		if lastReport == nil {
 			lastReportTime = "never"
 			nextReportAfter = "error"
@@ -125,6 +126,7 @@ func handleAbout(db storage.Storage, config *conf.Config) http.HandlerFunc {
 				In(&config.Timezone).Format(timeFormat)
 		} else {
 			lastReportTime = lastReport.Timestamp.In(&config.Timezone).Format(timeFormat)
+			lastReportStatus = lastReport.Status
 			nextReportAfter = NextReportTime(config, lastReport.Timestamp).
 				In(&config.Timezone).Format(timeFormat)
 		}
@@ -134,6 +136,7 @@ func handleAbout(db storage.Storage, config *conf.Config) http.HandlerFunc {
 
 		err = tmpl.Execute(w, map[string]any{
 			"lastReportTime":        lastReportTime,
+			"lastReportStatus":      lastReportStatus,
 			"serverTime":            serverTime,
 			"nextReportTime":        nextReportAfter,
 			"ReportAfter":           config.ReportAfter,

diff --git a/handlers/templates/about.html b/handlers/templates/about.html
@@ -73,7 +73,7 @@ <h2>Beacon</h2>
         <div class="block rows rows-short-labels">
             <div class="row">
                 <span class="label">Last Report:</span>
-                <span class="value">{{ .lastReportTime }}</span>
+                <span class="value">{{ .lastReportTime }} {{ lastReportStatus }}</span>
             </div>
             <div class="row">
                 <span class="label">Current Time:</span>