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 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
+@* Office Note *@
+@if (ReportItem.ProcessStatusEnum.ToLower() == "none" && !ReportItem.Express && AllowOfficeNoteUpdate())
+{
+
+
+
+
+
+
+ Ordre noten lukkes efter @_graceTime minutter eller når den er plukket.
+
+
+
+
+
+
+
+}
+else
+{
+
+
@ReportItem.OfficeNote
+
+}
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
///
/// Flag line as picked
///
- 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
///
public List Lines { get; set; } = new();
-
///
/// Activity entity id
///
public string ActivityId { get; set; } = "";
///
+ /// Entity CreateTimestamp as string
+ ///
+ public string CreateTimestamp { get; set; } = "";
+ ///
/// Closed sale
///
public bool Closed { get; set; }