From eaf380bec3c55c1f71bcd419bb19954796fdf1a1 Mon Sep 17 00:00:00 2001
From: Frede Hundewadt <22748698+fhdk@users.noreply.github.com>
Date: Tue, 22 Mar 2022 07:20:44 +0100
Subject: [PATCH] order of appearance list page top
---
Wonky.Client/AppId.cs | 2 +-
.../Components/CompanySearchDropdown.razor | 3 +-
.../Components/CompanySearchDropdown.razor.cs | 4 +-
.../Components/CompanySortDropdown.razor.cs | 2 +-
Wonky.Client/Components/CompanyTable.razor | 26 ++++---
...mber.razor => DisplayStateComponent.razor} | 10 +--
.../Components/ItemGroupDropdown.razor.cs | 2 +-
.../Components/ItemSearchDropdown.razor.cs | 2 +-
.../Components/ItemSortDropdown.razor.cs | 2 +-
.../Components/PageSizeDropdown.razor | 2 +-
.../Components/PageSizeDropdown.razor.cs | 1 +
Wonky.Client/Components/Pagination.razor | 4 +-
.../Components/RegStateVatNumber.razor.cs | 44 -----------
Wonky.Client/Pages/CompanyList.razor | 41 ++++------
Wonky.Client/Pages/CompanyUpdate.razor | 14 ++--
Wonky.Client/Pages/CompanyUpdate.razor.cs | 73 +++++++++---------
Wonky.Client/Pages/CompanyView.razor | 2 +-
Wonky.Client/Pages/CompanyView.razor.cs | 4 +
Wonky.Client/Pages/SalesItemCatalog.razor | 25 ++----
Wonky.Client/wwwroot/state.png | Bin 0 -> 591 bytes
Wonky.Entity/VirkState.cs | 9 +++
21 files changed, 114 insertions(+), 158 deletions(-)
rename Wonky.Client/Components/{RegStateVatNumber.razor => DisplayStateComponent.razor} (78%)
delete mode 100644 Wonky.Client/Components/RegStateVatNumber.razor.cs
create mode 100644 Wonky.Client/wwwroot/state.png
create mode 100644 Wonky.Entity/VirkState.cs
diff --git a/Wonky.Client/AppId.cs b/Wonky.Client/AppId.cs
index 99a373e4..539fbb62 100644
--- a/Wonky.Client/AppId.cs
+++ b/Wonky.Client/AppId.cs
@@ -2,7 +2,7 @@ namespace Wonky.Client;
public class AppId
{
- public string Version { get; set; } = "0.2.7";
+ public string Version { get; set; } = "0.2.9";
public string Name { get; set; } = "Wonky Online";
public bool IsBeta { get; set; } = false;
diff --git a/Wonky.Client/Components/CompanySearchDropdown.razor b/Wonky.Client/Components/CompanySearchDropdown.razor
index debff6fe..10173686 100644
--- a/Wonky.Client/Components/CompanySearchDropdown.razor
+++ b/Wonky.Client/Components/CompanySearchDropdown.razor
@@ -14,6 +14,7 @@
// along with this program. If not, see [https://www.gnu.org/licenses/agpl-3.0.en.html]
//
*@
+
\ No newline at end of file
+
diff --git a/Wonky.Client/Components/CompanySearchDropdown.razor.cs b/Wonky.Client/Components/CompanySearchDropdown.razor.cs
index 7efc23d6..3bbd8a9e 100644
--- a/Wonky.Client/Components/CompanySearchDropdown.razor.cs
+++ b/Wonky.Client/Components/CompanySearchDropdown.razor.cs
@@ -39,7 +39,9 @@ public partial class CompanySearchDropdown : IDisposable
private async Task OnSelectionChanged(ChangeEventArgs e)
{
var val = e.Value.ToString();
- if (val == "-1") return;
+ if (val == "-1")
+ {
+ val = "name"; };
await OnChanged.InvokeAsync(val);
await UserPreferenceService.SetCompanySearch(val);
}
diff --git a/Wonky.Client/Components/CompanySortDropdown.razor.cs b/Wonky.Client/Components/CompanySortDropdown.razor.cs
index 83698398..1d7e6c75 100644
--- a/Wonky.Client/Components/CompanySortDropdown.razor.cs
+++ b/Wonky.Client/Components/CompanySortDropdown.razor.cs
@@ -38,7 +38,7 @@ namespace Wonky.Client.Components
private async Task OnSelectionChanged(ChangeEventArgs e)
{
var val = e.Value.ToString();
- if (val == "-1") return;
+ if (val == "-1") {val = "name";};
await OnChanged.InvokeAsync(val);
await UserPreferenceService.SetCompanySort(val);
}
diff --git a/Wonky.Client/Components/CompanyTable.razor b/Wonky.Client/Components/CompanyTable.razor
index 52e38f01..035b252d 100644
--- a/Wonky.Client/Components/CompanyTable.razor
+++ b/Wonky.Client/Components/CompanyTable.razor
@@ -18,20 +18,22 @@
@using Wonky.Client.Components;
@if (Companies.Any())
{
-
- @foreach (var company in Companies)
- {
-
-
-
@company.Name
-
@company.Account
-
@company.City
-
-
- }
+
+
+ @foreach (var company in Companies)
+ {
+
+ |
+ @company.Name |
+ @company.Account |
+ @company.City |
+ Vis |
+
+ }
+
+
}
else
{
-
}
\ No newline at end of file
diff --git a/Wonky.Client/Components/RegStateVatNumber.razor b/Wonky.Client/Components/DisplayStateComponent.razor
similarity index 78%
rename from Wonky.Client/Components/RegStateVatNumber.razor
rename to Wonky.Client/Components/DisplayStateComponent.razor
index 2a43994e..42998ab2 100644
--- a/Wonky.Client/Components/RegStateVatNumber.razor
+++ b/Wonky.Client/Components/DisplayStateComponent.razor
@@ -15,11 +15,7 @@
//
*@
-@if (string.IsNullOrEmpty(VatNumber))
-{
-
-}
-else
-{
-
+
+@code{
+ [Parameter] public string StateClass { get; set; } = "the-ugly";
}
diff --git a/Wonky.Client/Components/ItemGroupDropdown.razor.cs b/Wonky.Client/Components/ItemGroupDropdown.razor.cs
index 1157e4cf..9e72a588 100644
--- a/Wonky.Client/Components/ItemGroupDropdown.razor.cs
+++ b/Wonky.Client/Components/ItemGroupDropdown.razor.cs
@@ -31,7 +31,7 @@ public partial class ItemGroupDropdown
private async Task OnSelectionChanged(ChangeEventArgs e)
{
var val = e.Value.ToString();
- if (val == "-1") return;
+ if (val == "-1") {val = "0";};
await OnChanged.InvokeAsync(val);
}
}
\ No newline at end of file
diff --git a/Wonky.Client/Components/ItemSearchDropdown.razor.cs b/Wonky.Client/Components/ItemSearchDropdown.razor.cs
index 82993878..f7792dc0 100644
--- a/Wonky.Client/Components/ItemSearchDropdown.razor.cs
+++ b/Wonky.Client/Components/ItemSearchDropdown.razor.cs
@@ -36,7 +36,7 @@ public partial class ItemSearchDropdown : IDisposable
private async Task OnSelectChanged(ChangeEventArgs e)
{
var val = e.Value.ToString();
- if (val == "-1") return;
+ if (val == "-1") {val = "name";};
await OnChanged.InvokeAsync(val);
await UserPreferenceService.SetItemSearch(val);
}
diff --git a/Wonky.Client/Components/ItemSortDropdown.razor.cs b/Wonky.Client/Components/ItemSortDropdown.razor.cs
index 51a2adf8..86c4518b 100644
--- a/Wonky.Client/Components/ItemSortDropdown.razor.cs
+++ b/Wonky.Client/Components/ItemSortDropdown.razor.cs
@@ -36,7 +36,7 @@ public partial class ItemSortDropdown : IDisposable
private async Task OnSelectChanged(ChangeEventArgs e)
{
var val = e.Value.ToString();
- if (val == "-1") return;
+ if (val == "-1") {val = "name";};
await OnChanged.InvokeAsync(val);
await UserPreferenceService.SetItemSort(val);
}
diff --git a/Wonky.Client/Components/PageSizeDropdown.razor b/Wonky.Client/Components/PageSizeDropdown.razor
index 054f4f04..6d960e07 100644
--- a/Wonky.Client/Components/PageSizeDropdown.razor
+++ b/Wonky.Client/Components/PageSizeDropdown.razor
@@ -16,7 +16,7 @@
*@