From 72e818bd043dfd3700b344661cbd6514022c9276 Mon Sep 17 00:00:00 2001
From: Frede Hundewadt <22748698+fhdk@users.noreply.github.com>
Date: Tue, 22 Mar 2022 08:05:03 +0100
Subject: [PATCH] display visit date correct on list

---
 Wonky.Client/Components/CompanyTable.razor |  2 +-
 Wonky.Client/Pages/CompanyUpdate.razor     |  2 +-
 Wonky.Client/Pages/CompanyView.razor       |  2 +-
 Wonky.Client/Pages/CompanyView.razor.cs    | 17 +++++++++--------
 Wonky.Client/Shared/NavMenu.razor          |  2 +-
 5 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/Wonky.Client/Components/CompanyTable.razor b/Wonky.Client/Components/CompanyTable.razor
index 035b252d..05f11496 100644
--- a/Wonky.Client/Components/CompanyTable.razor
+++ b/Wonky.Client/Components/CompanyTable.razor
@@ -23,7 +23,7 @@
         @foreach (var company in Companies)
         {
             <tr>
-                <td><DisplayStateComponent StateClass="@(VisitState(company.LastVisit))"></DisplayStateComponent></td>
+                <td><DisplayStateComponent StateClass="@(VisitState(company.NextVisit))"></DisplayStateComponent></td>
                 <td>@company.Name</td>
                 <td>@company.Account</td>
                 <td>@company.City</td>
diff --git a/Wonky.Client/Pages/CompanyUpdate.razor b/Wonky.Client/Pages/CompanyUpdate.razor
index c2c9fa5c..827dd29f 100644
--- a/Wonky.Client/Pages/CompanyUpdate.razor
+++ b/Wonky.Client/Pages/CompanyUpdate.razor
@@ -25,7 +25,7 @@
 {
     <div class="card">
         <div class="card-header">
-            <div>CVR status <DisplayVatStateComponent StateClass="@RegState"></DisplayVatStateComponent></div>
+            <div>CVR status "@RegState"</div>
             <div>Konto @_companyDto.Account</div>
             <div>CompanyId @_companyDto.CompanyId</div>
             <div>EDIT Næste besøg @NextVisit</div> <div>EDIT Sidst besøgt @LastVisit</div>
diff --git a/Wonky.Client/Pages/CompanyView.razor b/Wonky.Client/Pages/CompanyView.razor
index d48515be..a3771846 100644
--- a/Wonky.Client/Pages/CompanyView.razor
+++ b/Wonky.Client/Pages/CompanyView.razor
@@ -64,7 +64,7 @@
             </tr>
             <tr>
                 <th scope="row">Næste besøg</th>
-                <td><DisplayStateComponent StateClass="@(VisitState(CompanyDto.LastVisit))"></DisplayStateComponent></td>
+                <td><DisplayStateComponent StateClass="@(VisitState)"></DisplayStateComponent></td>
                 <td>@CompanyDto.NextVisit</td>
             </tr>
             </tbody>
diff --git a/Wonky.Client/Pages/CompanyView.razor.cs b/Wonky.Client/Pages/CompanyView.razor.cs
index 1f376c37..2ce429e6 100644
--- a/Wonky.Client/Pages/CompanyView.razor.cs
+++ b/Wonky.Client/Pages/CompanyView.razor.cs
@@ -33,6 +33,7 @@ public partial class CompanyView : IDisposable
     [Parameter] public string CompanyId { get; set; } = "";
     private CompanyDto CompanyDto { get; set; } = new ();
     private VirkRegInfo VirkRegInfo { get; set; } = new();
+    private string VisitState { get; set; } = "the-ugly";
 
     protected override async Task OnInitializedAsync()
     {
@@ -49,16 +50,16 @@ public partial class CompanyView : IDisposable
                 CompanyDto = await CompanyRepo.GetCompanyById(CompanyId);
             }
         }
-    }
-
-    private string VisitState(string nextVisit)
-    {
-        var theUgly = DateTime.Parse(nextVisit);
+        var theUgly = DateTime.Parse(CompanyDto.NextVisit);
         var theBad = theUgly.AddDays(-14);
-        if (DateTime.Now >= theUgly)
-            return "the-ugly";
-        return DateTime.Now >= theBad ? "the-bad" : "the-good";
+        if (DateTime.Now <= theUgly)
+        {
+            VisitState = DateTime.Now >= theBad ? "the-bad" : "the-good";    
+        }
+        
+
     }
+    
     /// <summary>
     /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
     /// </summary>
diff --git a/Wonky.Client/Shared/NavMenu.razor b/Wonky.Client/Shared/NavMenu.razor
index c5c689a8..e20155c4 100644
--- a/Wonky.Client/Shared/NavMenu.razor
+++ b/Wonky.Client/Shared/NavMenu.razor
@@ -50,7 +50,7 @@
                 </div>
                 <div class="nav-item px-3">
                     <NavLink class="nav-link" href="/OrdreKladde">
-                        <span class="oi oi-list-rich" aria-hidden="true"></span> Ordrekladde
+                        <span class="oi oi-list-rich" aria-hidden="true"></span> WIP-ordre
                     </NavLink>
                 </div>