diff --git a/.vs/StockManMVC/config/applicationhost.config b/.vs/StockManMVC/config/applicationhost.config index 0152c4d..fd7cce8 100644 --- a/.vs/StockManMVC/config/applicationhost.config +++ b/.vs/StockManMVC/config/applicationhost.config @@ -162,7 +162,7 @@ - + @@ -170,7 +170,7 @@ - + diff --git a/Resources/ChangeLog.html b/Resources/ChangeLog.html index 89dda1a..7d8352b 100644 --- a/Resources/ChangeLog.html +++ b/Resources/ChangeLog.html @@ -1,6 +1,6 @@ StockMan CORE - Gestione Magazzino -

Versione: 3.0.2303.215

+

Versione: 3.0.2303.217


Note di rilascio:
  • diff --git a/Resources/VersNum.txt b/Resources/VersNum.txt index d6821d4..7328df5 100644 --- a/Resources/VersNum.txt +++ b/Resources/VersNum.txt @@ -1 +1 @@ -3.0.2303.215 +3.0.2303.217 diff --git a/Resources/manifest.xml b/Resources/manifest.xml index 7006e4a..3843b55 100644 --- a/Resources/manifest.xml +++ b/Resources/manifest.xml @@ -1,6 +1,6 @@ - 3.0.2303.215 + 3.0.2303.217 http://nexus.steamware.net/repository/SWS/GPW/stable/GPW.UI.zip http://nexus.steamware.net/repository/SWS/GPW/stable/ChangeLog.html false diff --git a/SiteSelector/SiteSelector.csproj.user b/SiteSelector/SiteSelector.csproj.user index 510a6eb..e288075 100644 --- a/SiteSelector/SiteSelector.csproj.user +++ b/SiteSelector/SiteSelector.csproj.user @@ -5,7 +5,7 @@ disabled enabled IIS01 - Debug|Any CPU + Release|Any CPU diff --git a/StockMan.CORE/Components/ItemFilter.razor b/StockMan.CORE/Components/ItemFilter.razor new file mode 100644 index 0000000..8655ca2 --- /dev/null +++ b/StockMan.CORE/Components/ItemFilter.razor @@ -0,0 +1,23 @@ +
    +
    +
    + + +
    +
    + + +
    +
    +
    + + diff --git a/StockMan.CORE/Components/ItemFilter.razor.cs b/StockMan.CORE/Components/ItemFilter.razor.cs new file mode 100644 index 0000000..6768717 --- /dev/null +++ b/StockMan.CORE/Components/ItemFilter.razor.cs @@ -0,0 +1,49 @@ +using Microsoft.AspNetCore.Components; +using StockMan.CORE.Data; +using StockMan.Data.DbModels; + +namespace StockMan.CORE.Components +{ + public partial class ItemFilter + { + [Parameter] + public EventCallback FilterUpdated { get; set; } + [Parameter] + public ItemSelectFilter actFilter { get; set; } = new ItemSelectFilter(); + public List? itemFamList { get; set; } = null; + [Inject] + protected StockDataService SDService { get; set; } = null!; + protected override async Task OnParametersSetAsync() + { + itemFamList = await SDService.ItemFamilyGetAll(); + } + + private string searchVal + { + get => actFilter.searchValue; + set + { + actFilter.CurrPage = 1; + actFilter.searchValue = value; + StateHasChanged(); + ReportChange(); + } + } + private string searchFamily + { + get => actFilter.itemFamily; + set + { + actFilter.CurrPage = 1; + actFilter.itemFamily = value; + StateHasChanged(); + ReportChange(); + } + } + private void ReportChange() + { + FilterUpdated.InvokeAsync(actFilter); + } + + } +} \ No newline at end of file diff --git a/StockMan.CORE/Components/ItemList.razor b/StockMan.CORE/Components/ItemList.razor index 92d8ca5..6cd54f2 100644 --- a/StockMan.CORE/Components/ItemList.razor +++ b/StockMan.CORE/Components/ItemList.razor @@ -8,165 +8,162 @@ else if (ListRecord == null || ListRecord.Count == 0) } else { -
    -
    -
    -
    -
    - - -
    -
    - - -
    -
    -
    - -
    - @**@ + @*
    +
    +
    + + +
    +
    + + +
    +
    +
    + +
    + @*
    -
    -
    - - - - + *@ +
    +
    -
    + + + - + + + + + + + + + @foreach (var item in ListRecord) + { + + + + - - - + + + + - - - @foreach (var item in ListRecord) - { - - - - - - - - - - } - -
    + + +
    +
    + COD. ARTICOLO + @if (orderType == orderTypeEnum.codIntAscending) + { + + } + else if (orderType == orderTypeEnum.codIntDescending) + { + + } + else + { + + } +
    +
    +
    +
    + COD. FORNITORE + @if (orderType == orderTypeEnum.codExtAscending) + { + + } + else if (orderType == orderTypeEnum.codExtDescending) + { + + } + else + { + + } +
    +
    +     		+
    +
    + DESC. ARTICOLO +
    +
    +
    +
    + DESC. FORNITORE +
    +
    +     		+ STOCK + @if (orderType == orderTypeEnum.stockAscending) + { + + } + else if (orderType == orderTypeEnum.stockDescending) + { + + } + else + { + + } + + VALORE UNIT. + + VALORE TOT. + +
    + + + @item.CodInt +
    + @item.CodExt +
    +
    -
    - COD. ARTICOLO - @if (orderType == orderTypeEnum.codIntAscending) - { - - } - else if (orderType == orderTypeEnum.codIntDescending) - { - - } - else - { - - } -
    + + @item.Descr +
    -
    - COD. FORNITORE - @if (orderType == orderTypeEnum.codExtAscending) - { - - } - else if (orderType == orderTypeEnum.codExtDescending) - { - - } - else - { - - } -
    + + @item.DescrExt +
    - -     		-
    -
    - DESC. ARTICOLO -
    + +
    		+
    + @item.QtaBatch
    -
    -
    - DESC. FORNITORE -
    -
    - -     		- STOCK - @if (orderType == orderTypeEnum.stockAscending) - { - - } - else if (orderType == orderTypeEnum.stockDescending) - { - - } - else - { - - } - - VALORE UNIT. - - VALORE TOT. - - + @($"{item.CurrValue:C2}") + + @($"{(item.CurrValue * item.QtaBatch):C2}") + + +
    - - - @item.CodInt -
    - @item.CodExt -
    -     		-
    - - @item.Descr - -
    -
    - - @item.DescrExt - -
    -     		-
    - @item.QtaBatch -
    -     		- @($"{item.CurrValue:C2}") - - @($"{(item.CurrValue * item.QtaBatch):C2}") - - -
    -
    + } + +
    -