From 88c4c22f8340a85c99cca09d40ef7135d5c86988 Mon Sep 17 00:00:00 2001 From: Frede Hundewadt <22748698+fhdk@users.noreply.github.com> Date: Fri, 8 Apr 2022 14:33:38 +0200 Subject: [PATCH] bump version --- Wonky.Client/AppId.cs | 6 +- Wonky.Client/Components/CompanyTable.razor | 2 +- .../Components/DisplayStateComponent.razor | 4 +- Wonky.Client/Pages/CompanyView.razor | 4 +- Wonky.Client/Pages/CompanyView.razor.cs | 1 - Wonky.Client/Pages/DraftDocument.razor | 152 ------------------ Wonky.Client/Pages/DraftDocument.razor.cs | 103 ------------ Wonky.Client/Pages/PurchaseOrderCreate.razor | 2 +- Wonky.Client/Shared/NavMenu.razor | 6 - Wonky.Client/wwwroot/css/app.css | 5 +- 10 files changed, 13 insertions(+), 272 deletions(-) delete mode 100644 Wonky.Client/Pages/DraftDocument.razor delete mode 100644 Wonky.Client/Pages/DraftDocument.razor.cs diff --git a/Wonky.Client/AppId.cs b/Wonky.Client/AppId.cs index 8a00263c..844a2c0f 100644 --- a/Wonky.Client/AppId.cs +++ b/Wonky.Client/AppId.cs @@ -2,8 +2,8 @@ namespace Wonky.Client; public class AppId { - public string Version { get; set; } = "v0.2.10"; - public string Name { get; set; } = "Wonky"; + public string Version { get; set; } = "0.2.11"; + public string Name { get; set; } = "WO"; - public bool IsBeta { get; set; } = false; + public bool IsBeta { get; set; } = true; } \ No newline at end of file diff --git a/Wonky.Client/Components/CompanyTable.razor b/Wonky.Client/Components/CompanyTable.razor index 4f25f08b..d1dbcf79 100644 --- a/Wonky.Client/Components/CompanyTable.razor +++ b/Wonky.Client/Components/CompanyTable.razor @@ -24,7 +24,7 @@ @foreach (var company in Companies) { - + @company.Name @company.Account @company.City diff --git a/Wonky.Client/Components/DisplayStateComponent.razor b/Wonky.Client/Components/DisplayStateComponent.razor index ff9e0a33..6e18f05e 100644 --- a/Wonky.Client/Components/DisplayStateComponent.razor +++ b/Wonky.Client/Components/DisplayStateComponent.razor @@ -15,7 +15,7 @@ // *@ -state +state @code{ - [Parameter] public string StateClass { get; set; } = "the-ugly"; + [Parameter] public string StateClass { get; set; } = "the-dead"; } diff --git a/Wonky.Client/Pages/CompanyView.razor b/Wonky.Client/Pages/CompanyView.razor index 58acf7bf..556ffe99 100644 --- a/Wonky.Client/Pages/CompanyView.razor +++ b/Wonky.Client/Pages/CompanyView.razor @@ -25,7 +25,7 @@
-
@(_hasFolded ? @_company.Account : "LUKKET" ) - @_company.Name
+
tombstone @_company.Name
@@ -70,7 +70,7 @@ Næste besøg - + @_company.NextVisit diff --git a/Wonky.Client/Pages/CompanyView.razor.cs b/Wonky.Client/Pages/CompanyView.razor.cs index bda9a99a..d36889f4 100644 --- a/Wonky.Client/Pages/CompanyView.razor.cs +++ b/Wonky.Client/Pages/CompanyView.razor.cs @@ -44,7 +44,6 @@ public partial class CompanyView : IDisposable if(_company.HasFolded == 1) { - _vatState = "the-dead"; _hasFolded = true; } else diff --git a/Wonky.Client/Pages/DraftDocument.razor b/Wonky.Client/Pages/DraftDocument.razor deleted file mode 100644 index 83b9ccbc..00000000 --- a/Wonky.Client/Pages/DraftDocument.razor +++ /dev/null @@ -1,152 +0,0 @@ -@using Wonky.Client.Components -@using System.Net.Http.Headers -@page "/OrdreKladde" - -@* display product filter options *@ -
-
- -
-
- -
-
- -
-
- -
-
-@if (SalesItems.Any()) -{ - // display filtered product list - - - - - - - - - - - @foreach (var item in SalesItems) - { - - - - - - - } - -
NavnVarenrStk / Pris
@item.Name@item.Sku
    - @foreach (var rate in item.Rates) - { -
  • -
    @rate.Quantity
    -
    @rate.Rate
    -
    • - } -
-} -else -{ - -} -@* Display draft line *@ -@if (_selectedItem != null && ShowItem) -{ -
-
Kladdelinje
-
-
-
- Varenavn -
-
- Varenr -
-
- Antal -
-
- Pris -
-
- -
-
-
-
- @_selectedItem.Name -
-
- @_selectedItem.Sku -
-
- -
-
- -
-
- -
-
-
-
-} - -@* Display draft lines *@ -@if (DraftStateProvider != null && DraftStateProvider.Draft.Items.Count > 0) -{ -
-
Ordrekladde (Kladde udløber efter inaktivity i @(DraftStateProvider.Draft.TimeToLiveInSeconds / 60)m)
-
- - - - - - - - - - - - - @foreach (var cItem in DraftStateProvider.Draft.Items) - { - - - - - - - - - } - - - - - - - - - -
NavnVarenrAntalEnhedsprisLinjesum 
@cItem.Item.Name@cItem.Item.Sku@cItem.Quantity@cItem.Price@cItem.Total
Total@DraftStateProvider.Draft.Total
-
-
-
-
- -
-
- Overfør -
-
-
-
-} diff --git a/Wonky.Client/Pages/DraftDocument.razor.cs b/Wonky.Client/Pages/DraftDocument.razor.cs deleted file mode 100644 index aea84052..00000000 --- a/Wonky.Client/Pages/DraftDocument.razor.cs +++ /dev/null @@ -1,103 +0,0 @@ -using Microsoft.AspNetCore.Components; -using Wonky.Client.HttpInterceptors; -using Wonky.Client.HttpRepository; -using Wonky.Client.Models; -using Wonky.Client.Services; -using Wonky.Client.Shared; -using Wonky.Entity.DTO; -using Wonky.Entity.Models; -using Wonky.Entity.Requests; - -namespace Wonky.Client.Pages; - -public partial class DraftDocument : IDisposable -{ - [CascadingParameter] DraftStateProvider DraftStateProvider { get; set; } - private bool ShowItem; - private bool ShowSearchView; - private string Quantity = "1"; - private string Price = "0"; - private SalesItemDto _selectedItem { get; set; } = new(); - private List SalesItems { get; set; } = new(); - private MetaData _meta { get; set; } = new(); - private CatalogPagingParams _paging { get; set; } = new(); - private Preferences _prefs { get; set; } = new(); - [Inject] private ISalesItemHttpRepository ItemRepo { get; set; } - [Inject] private ICompanyHttpRepository CompanyRepo { get; set; } - [Inject] private HttpInterceptorService Interceptor { get; set; } - [Inject] private UserPreferenceService UserPrefs { get; set; } - - protected override async Task OnInitializedAsync() - { - _prefs = await UserPrefs.GetPreferences(); - _paging.SearchColumn = _prefs.ItemSearch; - Interceptor.RegisterEvent(); - Interceptor.RegisterBeforeSendEvent(); - await GetSalesItems(); - } - private async Task GetSalesItems() - { - _paging.PageSize = 5; - var response = await ItemRepo.GetSalesItemsPaged(_paging); - SalesItems = response.Items!; - _meta = response.MetaData; - } - - private async Task DeleteDraft() - { - await DraftStateProvider.DeleteDraftAsync(); - } - - private void SelectItem(string itemId) - { - ShowItem = true; - _selectedItem = (from x in SalesItems where x.ItemId == itemId select x).First(); - Price = _selectedItem.Rates[0].Rate; - Quantity = "1"; - } - - private async Task AddItem(SalesItemDto salesItem) - { - ShowItem = false; - // create a new cart item - var item = new DraftItem - { - Item = salesItem, - Quantity = Convert.ToInt32(Quantity), - Price = Convert.ToDecimal(Price) - }; - - // add it to the cart - DraftStateProvider.Draft.Items.Add(item); - - // save the item using the CartStateProvider's save method - await DraftStateProvider.SaveChangesAsync(); - } - private async Task RemoveItem(DraftItem item) - { - // remove item - DraftStateProvider.Draft.Items.Remove(item); - // save the remaining draft - await DraftStateProvider.SaveChangesAsync(); - } - private async Task SetItemGroup(string groupFilter) - { - _paging.PageNumber = 1; - _paging.SelectGroup = groupFilter; - await GetSalesItems(); - } - private async Task SetSearchCol(string columnName) - { - _paging.PageNumber = 1; - _paging.SearchTerm = ""; - _paging.SearchColumn = columnName; - await GetSalesItems(); - } - private async Task SetSortCol(string searchTerm) - { - _paging.PageNumber = 1; - _paging.SearchTerm = searchTerm; - await GetSalesItems(); - } - public void Dispose() => Interceptor.DisposeEvent(); -} \ No newline at end of file diff --git a/Wonky.Client/Pages/PurchaseOrderCreate.razor b/Wonky.Client/Pages/PurchaseOrderCreate.razor index a96d782b..b13e152b 100644 --- a/Wonky.Client/Pages/PurchaseOrderCreate.razor +++ b/Wonky.Client/Pages/PurchaseOrderCreate.razor @@ -215,7 +215,7 @@ @if (DraftStateProvider != null && DraftStateProvider.Draft.Items.Count > 0) {
-
Ordrekladde (Kladde udløber efter @(DraftStateProvider.Draft.TimeToLiveInSeconds / 60)m)s inaktivitet.
+
Ordrekladde Kladde udløber efter @(DraftStateProvider.Draft.TimeToLiveInSeconds)m inaktivitet.
diff --git a/Wonky.Client/Shared/NavMenu.razor b/Wonky.Client/Shared/NavMenu.razor index e20155c4..bbb61642 100644 --- a/Wonky.Client/Shared/NavMenu.razor +++ b/Wonky.Client/Shared/NavMenu.razor @@ -48,12 +48,6 @@ Priskatalog -
- - WIP-ordre - -
- diff --git a/Wonky.Client/wwwroot/css/app.css b/Wonky.Client/wwwroot/css/app.css index d12272be..2c580eb1 100644 --- a/Wonky.Client/wwwroot/css/app.css +++ b/Wonky.Client/wwwroot/css/app.css @@ -7,7 +7,7 @@ height: 48px; } -/* Display visit state classes */ +/* visit / vat state classes */ .state { width: 24px; height: 24px; @@ -17,6 +17,9 @@ .tombstone { background-image: url(../gravestone.png); } +.the-dead { + background-color: black; +} .the-draw { background-color: purple; }