From 69dd73a0796a3638849b52285db1c5188af85f4e Mon Sep 17 00:00:00 2001 From: triggermeelmo Date: Fri, 3 Oct 2025 01:39:15 +0200 Subject: [PATCH] UI Anpassungen --- Watcher/Controllers/HomeController.cs | 6 +++-- Watcher/Services/DatabaseCheck.cs | 2 +- Watcher/ViewModels/DashboardViewModel.cs | 1 + Watcher/Views/Home/_DashboardStats.cshtml | 29 +++++++++++++++++++---- 4 files changed, 31 insertions(+), 7 deletions(-) diff --git a/Watcher/Controllers/HomeController.cs b/Watcher/Controllers/HomeController.cs index 5c4b002..1cd917e 100644 --- a/Watcher/Controllers/HomeController.cs +++ b/Watcher/Controllers/HomeController.cs @@ -59,7 +59,8 @@ namespace Watcher.Controllers Containers = await _context.Containers .OrderBy(s => s.Name) .ToListAsync(), - NetworkStatus = _DashboardStore.NetworkStatus + NetworkStatus = _DashboardStore.NetworkStatus, + DatabaseStatus = _DashboardStore.DatabaseStatus }; //ViewBag.NetworkConnection = _NetworkCheckStore.NetworkStatus; return View(viewModel); @@ -92,7 +93,8 @@ namespace Watcher.Controllers Containers = await _context.Containers .OrderBy(s => s.Name) .ToListAsync(), - NetworkStatus = _DashboardStore.NetworkStatus + NetworkStatus = _DashboardStore.NetworkStatus, + DatabaseStatus = _DashboardStore.DatabaseStatus }; return PartialView("_DashboardStats", model); diff --git a/Watcher/Services/DatabaseCheck.cs b/Watcher/Services/DatabaseCheck.cs index 35b4069..d09d598 100644 --- a/Watcher/Services/DatabaseCheck.cs +++ b/Watcher/Services/DatabaseCheck.cs @@ -16,7 +16,7 @@ public class DatabaseCheck : BackgroundService protected override async Task ExecuteAsync(CancellationToken stoppingToken) { - var timer = new PeriodicTimer(TimeSpan.FromSeconds(1800)); + var timer = new PeriodicTimer(TimeSpan.FromSeconds(30)); while (await timer.WaitForNextTickAsync(stoppingToken)) { diff --git a/Watcher/ViewModels/DashboardViewModel.cs b/Watcher/ViewModels/DashboardViewModel.cs index c2cb489..25c10e2 100644 --- a/Watcher/ViewModels/DashboardViewModel.cs +++ b/Watcher/ViewModels/DashboardViewModel.cs @@ -15,6 +15,7 @@ namespace Watcher.ViewModels public List Containers { get; set; } = new(); public String? NetworkStatus { get; set; } = "?"; + public String? DatabaseStatus { get; set; } = "?"; } } diff --git a/Watcher/Views/Home/_DashboardStats.cshtml b/Watcher/Views/Home/_DashboardStats.cshtml index f0a8861..5803cb3 100644 --- a/Watcher/Views/Home/_DashboardStats.cshtml +++ b/Watcher/Views/Home/_DashboardStats.cshtml @@ -81,10 +81,31 @@ } } -
- Datenbank - OK -
+ @if (!Model.DatabaseStatus.IsNullOrEmpty()) + { + @if (Model.DatabaseStatus == "$ok") + { +
+ Datenbank + OK +
+ } else + { +
+ Datenbank + Big Problem +
+ } + } else + { +
+ Datenbank + + Missing Data +
+ } + +