From 42cf1110e98e698dfb9eee8f0928fa09ceb1df6c Mon Sep 17 00:00:00 2001
From: Frede Hundewadt <22748698+fhdk@users.noreply.github.com>
Date: Mon, 20 Jun 2022 19:07:43 +0200
Subject: [PATCH] wip

---
 Wonky.Client/Helpers/Utils.cs           | 6 ++++--
 Wonky.Client/Pages/CompanyView.razor.cs | 3 ++-
 Wonky.Client/wwwroot/appsettings.json   | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/Wonky.Client/Helpers/Utils.cs b/Wonky.Client/Helpers/Utils.cs
index 36f0688b..57bc7bbd 100644
--- a/Wonky.Client/Helpers/Utils.cs
+++ b/Wonky.Client/Helpers/Utils.cs
@@ -27,7 +27,9 @@ public static class Utils
 
     public static string GetVisitState(string dtNextVisit)
     {
-        if (dtNextVisit is "0001-01-01" or "1970-01-01" or "1970-00-00")
+        if (dtNextVisit is "0001-01-01" or "1970-01-01")
+            return "the-draw";
+        if (!DateTime.TryParse(dtNextVisit, out _))
             return "the-draw";
         
         var dtNow = DateTime.Now;
@@ -35,6 +37,6 @@ public static class Utils
         if (dtNow > dtNext)
             return "the-ugly";
         
-        return (dtNow > dtNext.AddDays(-14)) ? "the-bad" : "the-good";
+        return dtNow > dtNext.AddDays(-14) ? "the-bad" : "the-good";
     }
 }
\ No newline at end of file
diff --git a/Wonky.Client/Pages/CompanyView.razor.cs b/Wonky.Client/Pages/CompanyView.razor.cs
index 261c5a46..a7783ba5 100644
--- a/Wonky.Client/Pages/CompanyView.razor.cs
+++ b/Wonky.Client/Pages/CompanyView.razor.cs
@@ -83,6 +83,8 @@ public partial class CompanyView : IDisposable
         
         if (!_company.ValidDateSpan())
             _nextVisit = _lastVisit.AddDays(_company.Interval * 7);
+        _visitState = Utils.GetVisitState($"{_nextVisit:yyyy-MM-dd}");
+        
         if(_company.HasFolded == 1)
         {
             _hasFolded = true;
@@ -95,7 +97,6 @@ public partial class CompanyView : IDisposable
                 _company.ValidVat = VatUtils.ValidateFormat(_company.CountryCode, _company.VatNumber) ? 1 : 0;
             _validVat = _company.ValidVat == 1;
             _vatState = _company.ValidVat == 1  ? "the-good" : "the-draw";
-            _visitState = Utils.GetVisitState($"{_nextVisit:yyyy-HH-mm}");
         }
         _editContext = new EditContext(_company);
         _editContext.OnFieldChanged += HandleFieldChanged;
diff --git a/Wonky.Client/wwwroot/appsettings.json b/Wonky.Client/wwwroot/appsettings.json
index de3a06d8..62dadf55 100644
--- a/Wonky.Client/wwwroot/appsettings.json
+++ b/Wonky.Client/wwwroot/appsettings.json
@@ -18,7 +18,7 @@
     },
     "appInfo": {
         "name": "Wonky Client",
-        "version": "0.8.14",
+        "version": "0.8.15",
         "isBeta": true,
         "image": "grumpy-coder.png"
     },