From 8cc2f1ee2ea070757b0ca11bb1d36a96060f1073 Mon Sep 17 00:00:00 2001
From: Frede Hundewadt <22748698+fhdk@users.noreply.github.com>
Date: Sat, 28 May 2022 16:27:54 +0200
Subject: [PATCH] publish 0.2.42-beta

---
 Wonky.Client/Components/AppVersion.razor |  2 +-
 Wonky.Client/Pages/SalesReport.razor     | 69 ++++++++++++++----------
 Wonky.Client/Pages/SalesReport.razor.cs  |  9 +++-
 Wonky.Entity/DTO/SalesReportDto.cs       | 29 ++++++++++
 4 files changed, 77 insertions(+), 32 deletions(-)
 create mode 100644 Wonky.Entity/DTO/SalesReportDto.cs

diff --git a/Wonky.Client/Components/AppVersion.razor b/Wonky.Client/Components/AppVersion.razor
index 93fc2bcb..3fc9f6ff 100644
--- a/Wonky.Client/Components/AppVersion.razor
+++ b/Wonky.Client/Components/AppVersion.razor
@@ -17,7 +17,7 @@
 <span class="version">@Name</span> <span class="version">@Version</span>@if(IsBeta){<span class="version">-beta</span>}
 @code
 {
-    private const string Version = "0.2.41";
+    private const string Version = "0.2.42";
     private const string Name = "wwo";
     private const bool IsBeta = true;
 }
diff --git a/Wonky.Client/Pages/SalesReport.razor b/Wonky.Client/Pages/SalesReport.razor
index 48868e4f..5ec07250 100644
--- a/Wonky.Client/Pages/SalesReport.razor
+++ b/Wonky.Client/Pages/SalesReport.razor
@@ -18,49 +18,60 @@
 @attribute [Authorize(Roles = "Adviser")]
 
 @page "/sales-report"
-<h3>Rapport</h3>
-<div class="row">
-    <div class="col">
+<h3>Dagsrapport</h3>
+<EditForm EditContext="_editContext">
+    
+    <div class="row mb-1">
+        <label for="dayType" class="col-md-2 col-form-label">Dag</label>
+        <div class="col-md-4">
+            <select id="dayType" class="form-select" @bind-Value="_reportDto.DayTypeEnum" @bind-Value:event="oninput" @onchange="CheckDayType">
+                <option value="" selected>"IKKE VALGT"</option>
+                <option value="sales">Salgsdag</option>
+                <option value="meeting">Salgsmøde</option>
+                <option value="office">Kontordag</option>
+                <option value="supervisor">Supervisor</option>
+                <option value="sickLeave">Sygdom</option>
+                <option value="leave">Ferie</option>
+                <option value="noReport">Ingen Rapport</option>
+            </select>
+            <ValidationMessage For="@(() => _reportDto.DayTypeEnum)"></ValidationMessage>
+        </div>
         <label for="reportDate" class="col-md-2 col-form-label">Dato</label>
         <div class="col-md-4">
-            <EditForm EditContext="ReportDate">
             <InputDate id="reportDate" class="form-control" @bind-Value="@(_reportDate)"/>
             <button class="btn btn-info" @onclick="GetActivities">Hent aktiviteter</button>
-            </EditForm>
         </div>
     </div>
-</div>
+    
+</EditForm>
 @if (Activities != null)
 {
     <div class="row">
         @foreach (var activity in Activities)
-    {
-        <div class="card">
-            <div class="card-header">
-                @activity.Company.Name @activity.Company.ZipCity
-            </div>
-            <div class="card-body">
-                <div class="row">
-                    <div class="col">
-                        @activity.Demo
-                    </div>
-                    <div class="col">
-                        @activity.SalesResume
-                    </div>
-                    <div class="col">
-                        @activity.OrderAmount
-                    </div>
+        {
+            <div class="card">
+                <div class="card-header">
+                    @activity.Company.Name @activity.Company.ZipCity
+                </div>
+                <div class="card-body">
+                    <div class="row">
+                        <div class="col">
+                            @activity.Demo
+                        </div>
+                        <div class="col">
+                            @activity.SalesResume
+                        </div>
+                        <div class="col">
+                            @activity.OrderAmount
+                        </div>
+                    </div>
+
                 </div>
-                
             </div>
-        </div>
-    }
-    </div>
-    <div class="row">
-                
+        }
     </div>
 }
 else
 {
-    <span>Ingen aktivitet for dato</span>
+    <AppSpinner></AppSpinner>
 }
diff --git a/Wonky.Client/Pages/SalesReport.razor.cs b/Wonky.Client/Pages/SalesReport.razor.cs
index 1556c750..1c867e5f 100644
--- a/Wonky.Client/Pages/SalesReport.razor.cs
+++ b/Wonky.Client/Pages/SalesReport.razor.cs
@@ -30,15 +30,20 @@ public partial class SalesReport
     [Inject] private IActivityHttpRepository ActivityRepo { get; set; }
 
     private DateTime _reportDate;
-    private EditContext ReportDate { get; set; }
+    private EditContext _editContext { get; set; }
+    private SalesReportDto _reportDto = new();
     private List<ReportActivity>? Activities { get; set; } = new();
 
     protected override void OnInitialized()
     {
         _reportDate = DateTime.Now;
-        ReportDate = new EditContext(_reportDate);
+        _editContext = new EditContext(_reportDate);
     }
 
+    private void CheckDayType()
+    {
+        
+    }
     private async Task GetActivities()
     {
         Activities = await ActivityRepo.GetActivities($"{_reportDate:yyyy-MM-dd}").ConfigureAwait(true);
diff --git a/Wonky.Entity/DTO/SalesReportDto.cs b/Wonky.Entity/DTO/SalesReportDto.cs
new file mode 100644
index 00000000..00c55a19
--- /dev/null
+++ b/Wonky.Entity/DTO/SalesReportDto.cs
@@ -0,0 +1,29 @@
+namespace Wonky.Entity.DTO;
+
+public class SalesReportDto
+{
+    public string ActivityDate { get; set; } = "";
+    public string DayTypeEnum { get; set; } = "";
+    public string Comment { get; set; } = "";
+    //
+    public long KmStart { get; set; }
+    public long KmFinished { get; set; }
+    public int Distance { get; set; }
+    public int DistancePrivate { get; set; }
+    // 
+    public int VisitNewCount { get; set; }
+    public int VisitRecallCount { get; set; }
+    public int DemoNewCount { get; set; }
+    public int DemoRecallCount { get; set; }
+    public int SalesNewCount { get; set; }
+    public int SalesRecallCount { get; set; }
+    public int SasCount { get; set; }
+    //
+    public decimal SumSalesDay { get; set; }
+    public decimal SumSasDay { get; set; }
+    public decimal SumTotalDay { get; set; }
+    
+    
+    
+    
+}