From a0a727321332077f08006e61ccc683611ba06d4c Mon Sep 17 00:00:00 2001
From: Frede Hundewadt <noreply@wonky.codeberg.org>
Date: Tue, 18 Oct 2022 13:27:57 +0200
Subject: [PATCH] wip

---
 .../Pages/CrmCompanyActivityListPage.razor    | 65 +++++++++++--------
 .../Pages/CrmCompanyActivityListPage.razor.cs | 12 ++--
 Wonky.Client/wwwroot/appsettings.json         |  2 +-
 Wonky.Entity/DTO/ActivityLineDto.cs           |  5 ++
 Wonky.Entity/DTO/CompanyDto.cs                |  5 ++
 5 files changed, 57 insertions(+), 32 deletions(-)

diff --git a/Wonky.Client/Pages/CrmCompanyActivityListPage.razor b/Wonky.Client/Pages/CrmCompanyActivityListPage.razor
index faeada60..bde42523 100644
--- a/Wonky.Client/Pages/CrmCompanyActivityListPage.razor
+++ b/Wonky.Client/Pages/CrmCompanyActivityListPage.razor
@@ -21,29 +21,32 @@
 @attribute [Authorize(Roles = "Advisor")]
 
 
-<h2>@_company.Name</h2>
+<h2>@Company.Name</h2>
 
-@if (_activities.Any())
-{
-    <div class="list-group">
-        <div class="list-group-item">
-            <div class="row">
-                <div class="col">
-                    <h4>Dato</h4>                    
-                </div>
-                <div class="col">
-                    <h4>Demo</h4>
-                </div>
-                <div class="col">
-                    <h4>Salg</h4>
-                </div>
-                <div class="col">
-                    <h4>Note /Kontor</h4>
-                </div>
-                <div class="col">Note /Selv</div>
+<div class="list-group-flush">
+    <div class="list-group-item">
+        <div class="row">
+            <div class="col">
+                <h4>Dato</h4>
+            </div>
+            <div class="col">
+                <h4>Demo</h4>
+            </div>
+            <div class="col">
+                <h4>Salg</h4>
+            </div>
+            <div class="col">
+                <h4>Note /Kontor</h4>
+            </div>
+            <div class="col">
+                <h4>Note /Selv</h4>
             </div>
         </div>
-        @foreach (var activity in _activities)
+    </div>
+
+    @if (Activities.Any())
+    {
+        @foreach (var activity in Activities)
         {
             <div class="list-group-item">
                 <div class="row">
@@ -60,15 +63,25 @@
                         @activity.OfficeNote
                     </div>
                     <div class="col">
-                        
+
                     </div>
                 </div>
             </div>
         }
-
+    }
+    else
+    {
+    
+    <div class="list-group-item">
+        <div class="row">
+            <div class="col">
+                Ingen data
+            </div>
+        </div>
     </div>
-}
-else
+    }
+</div>
+@if (Working)
 {
-    <LoaderThreeDots/>
-}
\ No newline at end of file
+    <LoaderThreeDots Loading="Working"/>
+}
diff --git a/Wonky.Client/Pages/CrmCompanyActivityListPage.razor.cs b/Wonky.Client/Pages/CrmCompanyActivityListPage.razor.cs
index e1e898a0..f1767222 100644
--- a/Wonky.Client/Pages/CrmCompanyActivityListPage.razor.cs
+++ b/Wonky.Client/Pages/CrmCompanyActivityListPage.razor.cs
@@ -31,18 +31,20 @@ public partial class CrmCompanyActivityListPage : IDisposable
     
     [Inject] public HttpInterceptorService _interceptor { get; set; }
     [Inject] public ICrmActivityHttpRepository CrmActivityRepo { get; set; }
-    [Inject] public ICrmCompanyHttpRepository _companyRepo { get; set; }
-    private List<ReportItemView> _activities { get; set; }
-    private CompanyDto _company { get; set; }
+    [Inject] public ICrmCompanyHttpRepository CompanyRepo { get; set; }
+    private List<ReportItemView> Activities { get; set; } = new();
+    private CompanyDto Company { get; set; } = new();
+    private bool Working { get; set; } = true;
     
     protected override async Task OnInitializedAsync()
     {
         _interceptor.RegisterEvent();
         _interceptor.RegisterBeforeSendEvent();
-        _company = await _companyRepo.GetCompanyById(CompanyId);
         
-        _activities = await CrmActivityRepo.GetCustomerActivities(CompanyId);
+        Company = await CompanyRepo.GetCompanyById(CompanyId);
         
+        Activities = await CrmActivityRepo.GetCustomerActivities(CompanyId);
+        Working = false;
     }
 
     public void Dispose()
diff --git a/Wonky.Client/wwwroot/appsettings.json b/Wonky.Client/wwwroot/appsettings.json
index 70c95ff4..79e12301 100644
--- a/Wonky.Client/wwwroot/appsettings.json
+++ b/Wonky.Client/wwwroot/appsettings.json
@@ -7,7 +7,7 @@
         "image": "grumpy-coder.png"
     },
     "apiConfig": {
-        "innoBaseUrl": "https://app.innotec.dk",
+        "innoBaseUrl": "https://dev.innotec.dk",
         "glsTrackUrl": "https://www.gls-group.eu/276-I-PORTAL-WEB/content/GLS/DK01/DA/5004.htm?txtAction=71000&txtRefNo=",
         "glsId": "",
         "serviceVirk": "api/v2/services/virk",
diff --git a/Wonky.Entity/DTO/ActivityLineDto.cs b/Wonky.Entity/DTO/ActivityLineDto.cs
index 8f59ab66..1923190c 100644
--- a/Wonky.Entity/DTO/ActivityLineDto.cs
+++ b/Wonky.Entity/DTO/ActivityLineDto.cs
@@ -13,6 +13,8 @@
 //    along with this program.  If not, see [https://www.gnu.org/licenses/agpl-3.0.en.html]
 //
 
+using System.ComponentModel.DataAnnotations;
+
 namespace Wonky.Entity.DTO;
 
 public class ActivityLineDto
@@ -20,16 +22,19 @@ public class ActivityLineDto
     /// <summary>
     /// Item Sku
     /// </summary>
+    [MaxLength(30, ErrorMessage = "Højst 30 teng i varenummer")]
     public string Sku { get; set; } = "";
     
     /// <summary>
     /// Description
     /// </summary>
+    [MaxLength(50, ErrorMessage = "Højst 50 tegn i teksten")]
     public string Text { get; set; } = "";
     
     /// <summary>
     /// ShortName
     /// </summary>
+    [MaxLength(30, ErrorMessage = "Maks 30 tegn i forkortelse")]
     public string ShortName { get; set; } = "";
     
     /// <summary>
diff --git a/Wonky.Entity/DTO/CompanyDto.cs b/Wonky.Entity/DTO/CompanyDto.cs
index cba7132d..f6a29139 100644
--- a/Wonky.Entity/DTO/CompanyDto.cs
+++ b/Wonky.Entity/DTO/CompanyDto.cs
@@ -28,6 +28,11 @@ public class CompanyDto
     [MaxLength(100, ErrorMessage = "Du kan højst bruge 100 tegn")]
     public string Name { get; set; } = "";
 
+    /// <summary>
+    /// Note
+    /// </summary>
+    [MaxLength(100, ErrorMessage = "Du kan højst bruge 100 tegn")]
+    public string Note { get; set; } = "";
     /// <summary>
     /// Postal code
     /// </summary>