From 2cc9d552203c27d7f135b79347d8a56244faa843 Mon Sep 17 00:00:00 2001
From: Frede Hundewadt <noreply@wonky.codeberg.org>
Date: Thu, 1 Dec 2022 17:05:35 +0100
Subject: [PATCH] built v.072.2

---
 Wonky.Client/Pages/CrmActivityNewPage.razor.cs |  2 +-
 Wonky.Client/Pages/CrmReportNewPage.razor      |  4 ++--
 Wonky.Client/Pages/CrmReportNewPage.razor.cs   | 13 ++++++++++---
 Wonky.Client/wwwroot/appsettings.json          |  4 ++--
 4 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/Wonky.Client/Pages/CrmActivityNewPage.razor.cs b/Wonky.Client/Pages/CrmActivityNewPage.razor.cs
index 3f976f50..f04913b6 100644
--- a/Wonky.Client/Pages/CrmActivityNewPage.razor.cs
+++ b/Wonky.Client/Pages/CrmActivityNewPage.razor.cs
@@ -149,7 +149,7 @@ public partial class CrmActivityNewPage : IDisposable
             PoFormInvalid = false;
         }
         Working = false;
-        StateHasChanged();
+        //StateHasChanged();
     }
     
     /// <summary>
diff --git a/Wonky.Client/Pages/CrmReportNewPage.razor b/Wonky.Client/Pages/CrmReportNewPage.razor
index 80e43180..dee53828 100644
--- a/Wonky.Client/Pages/CrmReportNewPage.razor
+++ b/Wonky.Client/Pages/CrmReportNewPage.razor
@@ -52,7 +52,7 @@
         <tbody>
         <tr>
             <td>
-                <InputSelect  id="dayType" class="form-select text-bg-primary bg-primary"
+                <select id="dayType" class="form-select text-bg-primary bg-primary"
                         @bind-Value="Report.DayTypeEnum" @bind-Value:event="onchange">
                     <option value="">&rarr; TAG MIG &larr;</option>
                     <option value="sales">Salgsdag</option>
@@ -61,7 +61,7 @@
                     <option value="supervisor">Medkørende Supervisor</option>
                     <option value="sickLeave">Sygdom</option>
                     <option value="leave">Ferie</option>
-                </InputSelect>
+                </select>
                 <ValidationMessage For="@(() => Report.DayTypeEnum)"/>
             </td>
             @if (Report.DayTypeEnum.ToLower().Contains("leave"))
diff --git a/Wonky.Client/Pages/CrmReportNewPage.razor.cs b/Wonky.Client/Pages/CrmReportNewPage.razor.cs
index 451ab5c5..c933d292 100644
--- a/Wonky.Client/Pages/CrmReportNewPage.razor.cs
+++ b/Wonky.Client/Pages/CrmReportNewPage.razor.cs
@@ -84,7 +84,6 @@ public partial class CrmReportNewPage : IDisposable
         Report.Figures.Distance = 0;
         Report.Figures.DistancePrivateMonth = 0;
         await GetKeyFigures();
-        Working = false;
     }
 
     /// <summary>
@@ -94,7 +93,6 @@ public partial class CrmReportNewPage : IDisposable
     /// <param name="e"></param>
     private void HandleFieldChanged(object sender, FieldChangedEventArgs e)
     {
-        Console.WriteLine($"e Model => {e.FieldIdentifier.Model}");
         Console.WriteLine($"e FieldName => {e.FieldIdentifier.FieldName}");
         FormInvalid = !ReportContext.Validate();
         StateHasChanged();
@@ -109,6 +107,7 @@ public partial class CrmReportNewPage : IDisposable
     {
         FormInvalid = false;
         ReportContext.OnFieldChanged -= HandleFieldChanged;
+        ReportContext.OnValidationStateChanged -= ValidationChanged;
         ReportContext = new EditContext(Report);
         ReportContext.OnFieldChanged += HandleFieldChanged;
         ReportContext.OnValidationStateChanged += ValidationChanged;
@@ -139,7 +138,7 @@ public partial class CrmReportNewPage : IDisposable
         // attempt to eliminate doubled click on submit button
         if (Working)
             return;
-        // check daytype
+        // check day type
         if (string.IsNullOrWhiteSpace(Report.DayTypeEnum))
         {
             Toaster.ShowError("Dagtype skal vælges", "Dag type mangler");
@@ -222,14 +221,22 @@ public partial class CrmReportNewPage : IDisposable
     private async Task GetKeyFigures()
     {
         Working = true;
+        
+        Report.Figures = new ReportFiguresDto();
+        InitialValues = new ReportFiguresDto();
+        Activities = new List<ReportItemView>();
+        
         var data = await CrmReportRepo.InitializeReportData($"{_workDate:yyyy-MM-dd}");
         if(data.ReportClosed)
             Navigator.NavigateTo($"/sales-reports/view/{_workDate:yyyy-MM-dd}");
+        
         Report.Figures = data.ReportData;
         InitialValues = data.ReportData;
         Activities = data.ReportItems;
+        
         if(!Report.DayTypeEnum.ToLower().Contains("leave"))
             Report.Figures.KmMorning = Preferences.KmMorning;
+        
         NoFigures = false;
         Working = false;
     }
diff --git a/Wonky.Client/wwwroot/appsettings.json b/Wonky.Client/wwwroot/appsettings.json
index 3dab2e52..7bfdebdd 100644
--- a/Wonky.Client/wwwroot/appsettings.json
+++ b/Wonky.Client/wwwroot/appsettings.json
@@ -1,13 +1,13 @@
 {
     "appInfo": {
         "name": "Wonky Client",
-        "version": "0.72.1",
+        "version": "0.72.2",
         "rc": true,
         "sandBox": false,
         "image": "grumpy-coder.png"
     },
     "apiConfig": {
-        "baseUrl": "https://dev.innotec.dk",
+        "baseUrl": "https://zeta.innotec.dk",
         "catalog": "api/v2/catalog",
         "crmCustomers": "api/v2/crm/companies",
         "crmInventoryExt": "history/inventory",