From 1e8ecff5ad34431f7828fb2df84727968aef8038 Mon Sep 17 00:00:00 2001
From: Frede Hundewadt <22748698+fhdk@users.noreply.github.com>
Date: Thu, 8 Sep 2022 08:50:23 +0200
Subject: [PATCH] wip

---
 .../HttpRepository/ReportHttpRepository.cs    |  1 -
 .../Pages/AdvisorViewActivityPage.razor       | 35 +++++++++++++------
 .../Pages/AdvisorViewActivityPage.razor.cs    |  9 +++++
 Wonky.Client/wwwroot/appsettings.json         |  6 ++--
 Wonky.Entity/Views/ReportItemLine.cs          |  2 +-
 Wonky.Entity/Views/ReportItemView.cs          |  5 ++-
 6 files changed, 41 insertions(+), 17 deletions(-)

diff --git a/Wonky.Client/HttpRepository/ReportHttpRepository.cs b/Wonky.Client/HttpRepository/ReportHttpRepository.cs
index c4010348..f70b5f58 100644
--- a/Wonky.Client/HttpRepository/ReportHttpRepository.cs
+++ b/Wonky.Client/HttpRepository/ReportHttpRepository.cs
@@ -85,6 +85,5 @@ public class ReportHttpRepository :IReportHttpRepository
             Message = result.Message,
             IsSuccess = result.IsSuccess
         };
-        
     }
 }
\ No newline at end of file
diff --git a/Wonky.Client/Pages/AdvisorViewActivityPage.razor b/Wonky.Client/Pages/AdvisorViewActivityPage.razor
index c8931779..91d753e3 100644
--- a/Wonky.Client/Pages/AdvisorViewActivityPage.razor
+++ b/Wonky.Client/Pages/AdvisorViewActivityPage.razor
@@ -101,14 +101,27 @@
     </tr>
     </tbody>
 </table>
-<div class="alert border border-1 border-primary">
-    <EditForm EditContext="OfficeNote">
-        <div class="row mb-2">
-            <label class="form-label mb-1" for="office-note">Ordre Note</label>
-            <InputTextArea  class="form-control mb-1" id="office-note" rows="5" @bind-Value="_note.OfficeNote"></InputTextArea>
-        </div>
-        <div class="row mb-1">
-            <button class="btn btn-primary btn-lg" type="button" @onclick="UpdateOfficeNote" disabled="@_disabled" >Gem note</button>
-        </div>
-    </EditForm>
-</div>
\ No newline at end of file
+@* Office Note *@
+@if (ReportItem.ProcessStatusEnum.ToLower() == "none" && !ReportItem.Express && AllowOfficeNoteUpdate())
+{
+    <div class="alert border border-1 border-primary">
+        <EditForm EditContext="OfficeNote">
+            <div class="row mb-2">
+                <label class="form-label mb-1" for="office-note">Note /Kontor ()</label>
+                <InputTextArea class="form-control mb-1" id="office-note" rows="5" @bind-Value="_note.OfficeNote"></InputTextArea>
+                <div>
+                    Ordre noten lukkes efter @_graceTime minutter eller når den er plukket.
+                </div>
+            </div>
+            <div class="row mb-1">
+                <button class="btn btn-primary btn-lg" type="button" @onclick="UpdateOfficeNote" disabled="@_disabled">Opdater Note /Kontor</button>
+            </div>
+        </EditForm>
+    </div>    
+}
+else
+{
+    <div class="alert alert-dark">
+        <h4 class="text-center">@ReportItem.OfficeNote</h4>
+    </div>
+}
diff --git a/Wonky.Client/Pages/AdvisorViewActivityPage.razor.cs b/Wonky.Client/Pages/AdvisorViewActivityPage.razor.cs
index 3810887f..09f7a8a6 100644
--- a/Wonky.Client/Pages/AdvisorViewActivityPage.razor.cs
+++ b/Wonky.Client/Pages/AdvisorViewActivityPage.razor.cs
@@ -23,6 +23,7 @@ public partial class AdvisorViewActivityPage : IDisposable
     private ActivityOfficeNote _note { get; set; } = new();
     private EditContext OfficeNote { get; set; }
     private bool _disabled { get; set; }
+    private int _graceTime { get; set; } = 60;
 
     protected override async Task OnInitializedAsync()
     {
@@ -33,6 +34,7 @@ public partial class AdvisorViewActivityPage : IDisposable
         ReportItem = await _activityRepo.GetReportItem(OrderId);
         _note.ActivityId = ReportItem.ActivityId;
         _note.OfficeNote = ReportItem.OfficeNote;
+        _logger.LogDebug("ReportItem => \n {}", JsonSerializer.Serialize(ReportItem));
     }
 
     private void HandleFieldChanged(object sender, FieldChangedEventArgs e)
@@ -48,6 +50,13 @@ public partial class AdvisorViewActivityPage : IDisposable
         _toast.ShowInfo($"{ReportItem.ESalesNumber} - notat opdateret");
     }
 
+    private bool AllowOfficeNoteUpdate()
+    {
+        if (!DateTime.TryParse(ReportItem.CreateTimestamp, out var createTs))
+            return false;
+        return DateTime.Now < createTs.AddMinutes(_graceTime);
+    }
+    
     public void Dispose()
     {
         _interceptor.DisposeEvent();
diff --git a/Wonky.Client/wwwroot/appsettings.json b/Wonky.Client/wwwroot/appsettings.json
index dbb514c7..695acfc4 100644
--- a/Wonky.Client/wwwroot/appsettings.json
+++ b/Wonky.Client/wwwroot/appsettings.json
@@ -1,8 +1,8 @@
 {
     "appInfo": {
         "name": "Wonky Client",
-        "version": "0.14.5",
-        "rc": true,
+        "version": "0.15.1",
+        "rc": false,
         "sandBox": false,
         "image": "grumpy-coder.png"
     },
@@ -31,7 +31,7 @@
     },
     "Logging": {
         "LogLevel": {
-            "Default": "Information",
+            "Default": "Debug",
             "System": "Information",
             "Microsoft": "Information"
         },
diff --git a/Wonky.Entity/Views/ReportItemLine.cs b/Wonky.Entity/Views/ReportItemLine.cs
index c9bf4cfb..6b9e7a71 100644
--- a/Wonky.Entity/Views/ReportItemLine.cs
+++ b/Wonky.Entity/Views/ReportItemLine.cs
@@ -48,5 +48,5 @@ public class ReportItemLine
     /// <summary>
     /// Flag line as picked
     /// </summary>
-    public bool Checked { get; set; }
+    public bool Picked { get; set; }
 }
\ No newline at end of file
diff --git a/Wonky.Entity/Views/ReportItemView.cs b/Wonky.Entity/Views/ReportItemView.cs
index 067c31ff..86b86c76 100644
--- a/Wonky.Entity/Views/ReportItemView.cs
+++ b/Wonky.Entity/Views/ReportItemView.cs
@@ -25,12 +25,15 @@ public class ReportItemView
     /// Lines
     /// </summary>
     public List<ReportItemLine> Lines { get; set; } = new();
-
     /// <summary>
     /// Activity entity id
     /// </summary>
     public string ActivityId { get; set; } = "";
     /// <summary>
+    /// Entity CreateTimestamp as string
+    /// </summary>
+    public string CreateTimestamp { get; set; } = "";
+    /// <summary>
     /// Closed sale
     /// </summary>
     public bool Closed { get; set; }