From 327aecaffe55eebeca451dcf3cf6a8314b7c8b25 Mon Sep 17 00:00:00 2001 From: Frede Hundewadt <22748698+fhdk@users.noreply.github.com> Date: Mon, 16 May 2022 07:36:38 +0200 Subject: [PATCH] rebuild v0.2.36 --- Wonky.Client/Components/AppVersion.razor | 2 +- Wonky.Client/Pages/CrmActivityCreate.razor | 653 +++++++++--------- Wonky.Client/Pages/CrmActivityCreate.razor.cs | 29 +- 3 files changed, 356 insertions(+), 328 deletions(-) diff --git a/Wonky.Client/Components/AppVersion.razor b/Wonky.Client/Components/AppVersion.razor index 35f93016..7b4fc433 100644 --- a/Wonky.Client/Components/AppVersion.razor +++ b/Wonky.Client/Components/AppVersion.razor @@ -17,7 +17,7 @@ @Name @Version@if(IsBeta){-beta} @code { - private const string Version = "0.2.34"; + private const string Version = "0.2.36"; private const string Name = "wwo"; private const bool IsBeta = true; } diff --git a/Wonky.Client/Pages/CrmActivityCreate.razor b/Wonky.Client/Pages/CrmActivityCreate.razor index 27170c5a..4260ed78 100644 --- a/Wonky.Client/Pages/CrmActivityCreate.razor +++ b/Wonky.Client/Pages/CrmActivityCreate.razor @@ -26,344 +26,351 @@
-
-

- -

-
-
-
- -
- - -
- -
- - -
+
+

+ +

+
+
+
+ +
+ +
- -
- -
- -
- -
- -
-
- -
- -
- - -
- -
- - -
-
-
- -
- -
- -
- -
-
-
- -
- -
-
-
- -
- - -
-
-
- -
- - -
-
-
- -
- - -
-
-
- -
- - -
-
-
- -
- - -
+ +
+ +
-
-
- - @* Leverings adresse *@ -
-

- -

-
-
-
- -
- -
+
+ +
+
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
+ +
+
-
-
- @* Ordder lines *@ -
-

- -

-
-
-
-
- -
-
- -
-
- -
-
- -
+
+ +
+ +
- @if (SalesItems.Any()) - { - - - - - - - - - - - @foreach (var item in SalesItems) - { - - - - - - - } - -
NavnVarenrForkStk / Pris
@item.Name@item.Sku@item.ShortName -
    - @foreach (var rate in item.Rates) - { -
  • -
    @rate.Quantity
    -
    @rate.Rate
    - -
    • - } -
-
- } - else - { - - } - @if (_selectedItem != null && ShowItem) - { -
-
Kladdelinje
-
-
-
- Varenavn -
-
- Varenr -
-
- Antal -
-
- Pris -
-
- Rabat -
-
- SAS -
-
- -
-
-
-
- @_selectedItem.Name -
-
- @_selectedItem.Sku -
-
- -
-
- -
-
- -
-
- -
-
- -
-
-
-
- } - @* Ordrekladde *@ -
-
- Kladdelinjer Global kladde (udløber efter @(DraftStateProvider.Draft.TimeToLiveInSeconds / 60)m inaktivitet) -
-
- - - - - - - - - - - - - @if (DraftStateProvider != null && DraftStateProvider.Draft.Items.Count > 0) - { - @foreach (var cItem in DraftStateProvider.Draft.Items) - { - - - - - - - - - - } - - - - - - - - - } - -
NavnVarenrAntalEnhedsprisLinjesum 
@cItem.Item.Name@cItem.Item.Sku@cItem.Quantity@cItem.Price@cItem.LineTotal - - - -
Total@DraftStateProvider.Draft.Total
-
-
-
-
- -
-
-
+ +
+ + +
+
+
+ +
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ + +
+
+
+ +
+ + +
+
+
+ +
+ + +
+
+
+ +
+ + +
+
+
+ +
+ +
+ + @* Leverings adresse *@ +
+

+ +

+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+
+ + @* Ordder lines *@ +
+

+ +

+
+
+
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+
+
+
+ +
+
+ @if (SalesItems.Any()) + { + + + + + + + + + + + @foreach (var item in SalesItems) + { + + + + + + + } + +
NavnVarenrForkStk / Pris
@item.Name@item.Sku@item.ShortName +
    + @foreach (var rate in item.Rates) + { +
  • +
    @rate.Quantity
    +
    @rate.Rate
    + +
    • + } +
+
+ } + else + { + + } + @if (_selectedItem != null && ShowItem) + { +
+
Kladdelinje
+
+
+
+ Varenavn +
+
+ Varenr +
+
+ Antal +
+
+ Pris +
+
+ Rabat +
+
+ SAS +
+
+ +
+
+
+
+ @_selectedItem.Name +
+
+ @_selectedItem.Sku +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+
+
+ } + @* Ordrekladde *@ +
+
+ Kladdelinjer Global kladde (udløber efter @(DraftStateProvider.Draft.TimeToLiveInSeconds / 60)m inaktivitet) +
+
+ + + + + + + + + + + + + @if (DraftStateProvider != null && DraftStateProvider.Draft.Items.Count > 0) + { + @foreach (var cItem in DraftStateProvider.Draft.Items) + { + + + + + + + + + + } + + + + + + + + + } + +
NavnVarenrAntalEnhedsprisLinjesum 
@cItem.Item.Name@cItem.Item.Sku@cItem.Quantity@cItem.Price@cItem.LineTotal + + + +
Total@DraftStateProvider.Draft.Total
+
+
+
+
+ +
+
+
+
+
+
+
Tilbage diff --git a/Wonky.Client/Pages/CrmActivityCreate.razor.cs b/Wonky.Client/Pages/CrmActivityCreate.razor.cs index e89bca83..ab30b834 100644 --- a/Wonky.Client/Pages/CrmActivityCreate.razor.cs +++ b/Wonky.Client/Pages/CrmActivityCreate.razor.cs @@ -42,7 +42,7 @@ public partial class CrmActivityCreate : IDisposable [Parameter] public string CompanyId { get; set; } private NgSalesItemView _selectedItem { get; set; } = new(); private List SalesItems { get; set; } = new(); - // private MetaData _meta { get; set; } = new(); + private MetaData MetaData { get; set; } = new(); private Preferences _prefs { get; set; } = new(); private DtoNgActivity _poDraft { get; set; } = new(); private DtoNgCompany NgCompany = new(); @@ -75,6 +75,7 @@ public partial class CrmActivityCreate : IDisposable Interceptor.RegisterBeforeSendEvent(); _prefs = await UserPrefs.GetPreferences(); _paging.SearchColumn = _prefs.ItemSearch; + _paging.PageSize = Convert.ToInt32(_prefs.PageSize); await GetSalesItems(); Ux = await StorageService.GetItemAsync("_xu"); NgCompany = await CompanyRepo.GetCompanyById(CompanyId); @@ -218,19 +219,39 @@ public partial class CrmActivityCreate : IDisposable _paging.SearchColumn = columnName; await GetSalesItems(); } - private async Task SetSortCol(string searchTerm) + private async Task SetSortCol(string orderBy) + { + SalesItems = new List(); + _paging.OrderBy = orderBy; + await GetSalesItems(); + } + private async Task SetSearchPhrase(string searchTerm) { SalesItems = new List(); _paging.PageNumber = 1; _paging.SearchTerm = searchTerm; await GetSalesItems(); + } + private async Task SelectedPage(int page) + { + SalesItems = new List(); + _paging.PageNumber = page; + await GetSalesItems(); } + + private async Task SetPageSize(string pageSize) + { + SalesItems = new List(); + _paging.PageSize = Convert.ToInt32(pageSize); + _paging.PageNumber = 1; + await GetSalesItems(); + } + private async Task GetSalesItems() { - _paging.PageSize = 5; var response = await ItemRepo.GetSalesItemsPaged(_paging); SalesItems = response.Items!; - // _meta = response.MetaData; + MetaData = response.MetaData; } private void HandleFieldChanged(object sender, FieldChangedEventArgs e)