Merge branch 'dev-v6'

Wonky.Client/Components/QuoteListComponent.razor

@@ -3,14 +3,14 @@
 
 <div class="list-group list-group-flush">
     <div class="list-group-item bg-dark text-white">
-        <div class="row g-3">
+        <div class="row g-2">
             <div class="col-sm-4">
                 Kunde
             </div>
             <div class="col-sm-2">
                 Dato
             </div>
-            <div class="col-sm-3 -text-center">
+            <div class="col-sm-3">
                 Skift status
             </div>
             <div class="col-sm-1 text-center">
@@ -26,18 +26,20 @@
         foreach (var quote in Quotes)
         {
             <div class="list-group-item list-group-item-action">
-                <div class="row align-items-center">
                     <div class="col-sm-4">
                         @quote.Company.Name
                     </div>
                     <di class="col-sm-2">
                         @quote.OrderDate
                     </di>
-                    <div class="col-sm-3 text-center">
+                    <div class="col-sm-3">
                         <button type="button" class="btn btn-outline-dark me-2" @onclick="() => SetQuote(quote.ESalesNumber, QStatus.Lose)"><i class="bi-trash-fill"></i></button>
-                        <button type="button" class="btn btn-outline-dark me-2" @onclick="() => SetQuote(quote.ESalesNumber, QStatus.Archive)"><i class="bi-archive-fill"></i> </button>
+                        <button type="button" class="btn btn-outline-dark me-2" @onclick="() => SetQuote(quote.ESalesNumber, QStatus.Archive)"><i class="bi-archive-fill"></i></button>
-                        <button type="button" class="btn btn-outline-dark me-2" @onclick="() => SetQuote(quote.ESalesNumber, QStatus.Note)"><i class="bi-tag-fill"></i> </button>
+                        <button type="button" class="btn btn-outline-dark me-2" @onclick="() => SetQuote(quote.ESalesNumber, QStatus.Note)"><i class="bi-tag-fill"></i></button>
-                        <button type="button" class="btn btn-success" @onclick="() => SetQuote(quote.ESalesNumber, QStatus.Win)"><i class="bi-cart-fill"></i> </button>
+                        @if (quote.QuoteStatusEnum == "None")
+                        {
+                            <button type="button" class="btn btn-success" @onclick="() => SetQuote(quote.ESalesNumber, QStatus.Win)"><i class="bi-cart-fill"></i></button>
+                        }
                     </div>
                     <div class="col-sm-1 text-center">
                         @switch (quote.QuoteStatusEnum)

Wonky.Client/Models/QStatus.cs

@@ -7,5 +7,6 @@ public enum QStatus
     Lose,
     Archive,
     Note,
-    All
+    All,
-}
+    NoteOpen
+}

Wonky.Client/Pages/CrmQuotesListPage.razor

@@ -3,10 +3,10 @@
 @using Wonky.Client.Models
 
 <div class="row g-3 align-items-center">
-    <div class="col-sm-9">
+    <div class="col-sm-8">
-        <h2>Tilbud</h2>
+        <h2>Aftaler og Tilbud</h2>
     </div>
-    <div class="col-sm-3">
+    <div class="col-sm-4 text-end">
         <div class="btn-group btn-group" role="group" aria-label="Filter tilbud">
             
             <input type="radio" class="btn-check" name="btn-filter" id="btn-filter1" autocomplete="off" @onchange="() =>  FilterQuotes(QStatus.Lose)"/>
@@ -21,9 +21,11 @@
             <input type="radio" class="btn-check" name="btn-filter" id="btn-filter4" autocomplete="off" @onchange="() => FilterQuotes(QStatus.All)"/>
             <label class="btn btn-dark" for="btn-filter4"><i class="bi-list"></i></label>
 
-            <input type="radio" class="btn-check" name="btn-filter" id="btn-filter5" autocomplete="off" checked @onchange="() => FilterQuotes(QStatus.None)"/>
+            <input type="radio" class="btn-check" name="btn-filter" id="btn-filter5" autocomplete="off" @onchange="() => FilterQuotes(QStatus.None)"/>
             <label class="btn btn-dark" for="btn-filter5"><i class="bi-question-circle-fill"></i></label>
             
+            <input type="radio" class="btn-check" name="btn-filter" id="btn-filter6" autocomplete="off" @onchange="() => FilterQuotes(QStatus.NoteOpen)" checked/>
+            <label class="btn btn-dark" for="btn-filter6"><i class="bi-activity"></i></label>
         </div>
 
         @*
@@ -41,4 +43,4 @@
 @if (Working)
 {
     <WorkingThreeDots/>
-}
+}

Wonky.Client/Pages/CrmQuotesListPage.razor.cs

@@ -23,7 +23,7 @@ public partial class CrmQuotesListPage : IDisposable
     private List<ReportItemView> Quotes { get; set; } = new();
     private List<ReportItemView> _quotes { get; set; } = new();
     private bool Working { get; set; } = true;
-    private QStatus QFilter { get; set; } = QStatus.All;
+    private QStatus QFilter { get; set; } = QStatus.NoteOpen;
     
     protected override async Task OnInitializedAsync()
     {
@@ -46,6 +46,7 @@ public partial class CrmQuotesListPage : IDisposable
             QStatus.Lose => Quotes.Where(x => x.QuoteStatusEnum is "Lose").ToList(),
             QStatus.Archive => Quotes.Where(x => x.QuoteStatusEnum is "Archive").ToList(),
             QStatus.Note => Quotes.Where(x => x.QuoteStatusEnum is "Note").ToList(),
+            QStatus.NoteOpen => Quotes.Where(x => x.QuoteStatusEnum is "Note" or "None").ToList(),
             _ => Quotes.ToList()
         };
     }
@@ -77,4 +78,4 @@ public partial class CrmQuotesListPage : IDisposable
         Storage.RemoveItemAsync("quotes");
         Interceptor.DisposeEvent();
     }
-}
+}

Wonky.Client/wwwroot/appsettings.json

@@ -1,6 +1,7 @@
 {
     "appInfo": {
         "name": "Wonky Client",
+        "version": "0.86.0",
         "rc": true,
         "sandBox": false,
         "image": "grumpy-coder.png"