From 2c68d27c2f166222a201c0381c20f26d1d042b3d Mon Sep 17 00:00:00 2001
From: Frede Hundewadt <22748698+fhdk@users.noreply.github.com>
Date: Fri, 5 Aug 2022 13:03:19 +0200
Subject: [PATCH] build v0.10.54
---
.../ProductInventoryTableComponent.razor | 62 +--
.../Components/SearchPhraseComponent.razor | 2 +-
.../Components/SearchPhraseComponent.razor.cs | 17 +-
Wonky.Client/Models/Draft.cs | 2 +-
Wonky.Client/Pages/ActivityNewVisitPage.razor | 381 +++++++++---------
.../Pages/ActivityNewVisitPage.razor.cs | 102 +++--
Wonky.Client/Pages/CustomerViewPage.razor | 17 +-
Wonky.Client/Pages/CustomerViewPage.razor.cs | 13 +-
Wonky.Client/Pages/ItemCatalogPage.razor | 2 +-
Wonky.Client/Pages/ItemCatalogPage.razor.cs | 19 +-
.../Pages/ProductHistoryItemPage.razor | 2 +-
.../Pages/ProductHistoryItemPage.razor.cs | 1 +
.../Pages/ProductHistoryListPage.razor | 2 +-
Wonky.Client/Pages/ProductInventoryPage.razor | 10 +-
.../Pages/ProductInventoryPage.razor.cs | 19 +-
.../Shared/DraftStateProvider.razor.cs | 13 +-
Wonky.Client/Shared/NavMenu.razor | 4 +-
Wonky.Client/Shared/PriceListModal.razor | 6 +-
Wonky.Client/Shared/PriceListModal.razor.cs | 47 ++-
Wonky.Client/Shared/ProductHistoryModal.razor | 68 ++++
.../Shared/ProductHistoryModal.razor.cs | 65 +++
Wonky.Client/wwwroot/appsettings.json | 4 +-
Wonky.Entity/DTO/ActivityDto.cs | 5 +-
23 files changed, 530 insertions(+), 333 deletions(-)
create mode 100644 Wonky.Client/Shared/ProductHistoryModal.razor
create mode 100644 Wonky.Client/Shared/ProductHistoryModal.razor.cs
diff --git a/Wonky.Client/Components/ProductInventoryTableComponent.razor b/Wonky.Client/Components/ProductInventoryTableComponent.razor
index c111761d..63881426 100644
--- a/Wonky.Client/Components/ProductInventoryTableComponent.razor
+++ b/Wonky.Client/Components/ProductInventoryTableComponent.razor
@@ -17,35 +17,41 @@
@if (Inventory.Any())
{
-
-
-
-
- Produkt
-
-
- Varenr.
-
-
- Antal
-
-
-
+
}
\ No newline at end of file
diff --git a/Wonky.Client/Components/SearchPhraseComponent.razor b/Wonky.Client/Components/SearchPhraseComponent.razor
index d6d74a2b..e59023e0 100644
--- a/Wonky.Client/Components/SearchPhraseComponent.razor
+++ b/Wonky.Client/Components/SearchPhraseComponent.razor
@@ -17,7 +17,7 @@
+ @bind-value="@_searchTerm" @bind-value:event="oninput" @onkeyup="OnSearchChanged" />
diff --git a/Wonky.Client/Components/SearchPhraseComponent.razor.cs b/Wonky.Client/Components/SearchPhraseComponent.razor.cs
index 7154744d..ef32b804 100644
--- a/Wonky.Client/Components/SearchPhraseComponent.razor.cs
+++ b/Wonky.Client/Components/SearchPhraseComponent.razor.cs
@@ -24,7 +24,7 @@ namespace Wonky.Client.Components
private Timer _timer = new();
private string _searchTerm { get; set; } = "";
[Parameter] public EventCallback
OnChanged { get; set; }
- [Parameter] public string SavedSearch { get; set; } = string.Empty;
+ [Parameter] public string SavedSearch { get; set; } = "";
protected override void OnParametersSet()
{
@@ -33,29 +33,32 @@ namespace Wonky.Client.Components
protected override void OnInitialized()
{
- if (string.IsNullOrWhiteSpace(_searchTerm))
- return;
- OnSearchChanged();
+ if (string.IsNullOrWhiteSpace(_searchTerm)) return;
+ OnChanged.InvokeAsync(_searchTerm);
}
private void ClearSearch()
{
- SavedSearch = string.Empty;
- _searchTerm = string.Empty;
+ SavedSearch = "";
+ _searchTerm = "";
OnChanged.InvokeAsync(_searchTerm);
}
private void OnSearchChanged()
{
- _timer = new Timer(750);
+ _timer.Enabled = false;
+ _timer.Dispose();
+ _timer = new Timer(500);
_timer.Elapsed += OnTimerElapsed;
_timer.AutoReset = false;
_timer.Enabled = true;
+
}
private void OnTimerElapsed(object? sender, ElapsedEventArgs e)
{
OnChanged.InvokeAsync(_searchTerm);
+ _timer.Elapsed -= OnTimerElapsed;
_timer.Enabled = false;
_timer.Dispose();
}
diff --git a/Wonky.Client/Models/Draft.cs b/Wonky.Client/Models/Draft.cs
index f8d608fd..677053df 100644
--- a/Wonky.Client/Models/Draft.cs
+++ b/Wonky.Client/Models/Draft.cs
@@ -25,7 +25,7 @@ public class DraftItem
public decimal Price { get; set; }
public decimal Discount { get; set; }
public bool Sas { get; set; }
- public decimal LineTotal => (Price - Price * Discount / 100) * (decimal) Quantity;
+ public decimal LineTotal => (Price - Price * Discount / 100) * Quantity;
}
public class Draft
diff --git a/Wonky.Client/Pages/ActivityNewVisitPage.razor b/Wonky.Client/Pages/ActivityNewVisitPage.razor
index 06e813ae..4608ffec 100644
--- a/Wonky.Client/Pages/ActivityNewVisitPage.razor
+++ b/Wonky.Client/Pages/ActivityNewVisitPage.razor
@@ -15,30 +15,38 @@
//
*@
-@page "/companies/{companyId}/activities/new"
+@page "/companies/{CompanyId}/activities/new"
@using Microsoft.AspNetCore.Authorization
@attribute [Authorize(Roles = "Advisor")]
@using Wonky.Client.Components
-
-
-