Egalware/StockMan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

merge into: Egalware/StockMan:master
Branches Tags
Egalware/StockMan:master Egalware/StockMan:develop
Egalware/StockMan:AutoSave_2024/10/01 Egalware/StockMan:AutoSave_2024/03/08 Egalware/StockMan:AutoSave_2024/02/02 Egalware/StockMan:2024/01/09
...
pull from: Egalware/StockMan:develop
Branches Tags
Egalware/StockMan:develop Egalware/StockMan:master
Egalware/StockMan:AutoSave_2024/10/01 Egalware/StockMan:AutoSave_2024/03/08 Egalware/StockMan:AutoSave_2024/02/02 Egalware/StockMan:2024/01/09

4 Commits
master ... develop

Author SHA1 Message Date
zaccaria.majid fe42cfc62c disable select locazione 2023-03-03 09:55:09 +01:00
zaccaria.majid b444a0a873 Merge branch 'develop' of https://gitlab.steamware.net/steamware/StockMan into develop 2023-03-03 09:34:47 +01:00
zaccaria.majid 3a3ca7a6d2 fix filtro di locazione stato magazzino 2023-03-03 09:18:45 +01:00
Samuele Locatelli fd446834f7 Merge tag 'FixDeployMvc' into develop 
Fix pubxml x versione MVC
 2023-03-03 08:42:41 +01:00
9 changed files with 59 additions and 60 deletions
Expand all files Collapse all files
Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body> <body>
<i>StockMan CORE - Gestione Magazzino</i> <i>StockMan CORE - Gestione Magazzino</i>
<h4>Versione: 3.0.2303.217</h4> <h4>Versione: 3.0.2303.309</h4>
<br /> Note di rilascio: <br /> Note di rilascio:
<ul> <ul>
<li> <li>
Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
3.0.2303.217 3.0.2303.309
Resources/manifest.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<item> <item>
<version>3.0.2303.217</version> <version>3.0.2303.309</version>
<url>http://nexus.steamware.net/repository/SWS/GPW/stable/GPW.UI.zip</url> <url>http://nexus.steamware.net/repository/SWS/GPW/stable/GPW.UI.zip</url>
<changelog>http://nexus.steamware.net/repository/SWS/GPW/stable/ChangeLog.html</changelog> <changelog>http://nexus.steamware.net/repository/SWS/GPW/stable/ChangeLog.html</changelog>
<mandatory>false</mandatory> <mandatory>false</mandatory>
StockMan.CORE/Components/Location.razor
+2 -22
View File
@@ -4,26 +4,7 @@
} }
else else
{ {
<div class="card">
<div class="card-header @bgCard text-light d-flex justify-content-between">
<div class="py-2">
@locSxoDx
</div>
@*<div>
<select class="form-select" @bind="@id">
<option value="">--Selezionare una locazione--</option>
@if (ListLocationByType != null)
{
@foreach (var item in ListLocationByType)
{
<option value="@item.Id">@item.Descr</option>
}
}
</select>
</div>*@
</div>
<div class="card-body">
@if (currStock != null) @if (currStock != null)
{ {
<div class="d-flex justify-content-between"> <div class="d-flex justify-content-between">
@@ -78,8 +59,7 @@ else
} }
</tbody> </tbody>
</table> </table>
</div>
</div>
} }
StockMan.CORE/Components/LocationFilters.razor
+1 -1
View File
@@ -1,5 +1,5 @@
<div> <div>
<select class="form-select" @bind="@LocationId"> <select class="form-control" @bind="@LocationId" disabled>
<option value="">--Selezionare una locazione--</option> <option value="">--Selezionare una locazione--</option>
@if (ListLocationByType != null) @if (ListLocationByType != null)
{ {
StockMan.CORE/Components/LocationFilters.razor.cs
+10 -22
View File
@@ -36,9 +36,13 @@ namespace StockMan.CORE.Components
[Parameter] [Parameter]
public LocDXSelectFilter actFilterDX { get; set; } = new LocDXSelectFilter(); public LocDXSelectFilter actFilterDX { get; set; } = new LocDXSelectFilter();
[Parameter] [Parameter]
public EventCallback<string> LocId_DX { get; set; } public EventCallback<string> E_LocId_DX { get; set; }
[Parameter] [Parameter]
public EventCallback<string> LocId_SX { get; set; } public EventCallback<string> E_LocId_SX { get; set; }
[Parameter]
public string currLocId_DX { get; set; } = string.Empty;
[Parameter]
public string currLocId_SX { get; set; } = string.Empty;
[Parameter] [Parameter]
public EventCallback<LocSXSelectFilter> FilterUpdatedSX { get; set; } public EventCallback<LocSXSelectFilter> FilterUpdatedSX { get; set; }
[Parameter] [Parameter]
@@ -49,19 +53,19 @@ namespace StockMan.CORE.Components
{ {
if (isSX && !isChanged) if (isSX && !isChanged)
{ {
return actFilterSX.idSx; return currLocId_SX;
} }
else if (isSX && isChanged) else if (isSX && isChanged)
{ {
return actFilterDX.idDx; return currLocId_DX;
} }
else if (!isSX && !isChanged) else if (!isSX && !isChanged)
{ {
return actFilterDX.idDx; return currLocId_DX;
} }
else else
{ {
return actFilterSX.idSx; return currLocId_SX;
} }
} }
set set
@@ -95,22 +99,6 @@ namespace StockMan.CORE.Components
protected override async Task OnParametersSetAsync() protected override async Task OnParametersSetAsync()
{ {
await Task.Delay(1); await Task.Delay(1);
//if (isSX && !isChanged)
//{
// LocationId = actFilterSX.idSx;
//}
//else if (isSX && isChanged)
//{
// LocationId = actFilterDX.idDx;
//}
//else if (!isSX && !isChanged)
//{
// LocationId = actFilterDX.idDx;
//}
//else if (!isSX && isChanged)
//{
// LocationId = actFilterSX.idSx;
//}
} }
private void ReportChangeSX() private void ReportChangeSX()
{ {
StockMan.CORE/Components/ValStockGiac.razor.cs
+13
View File
@@ -53,14 +53,27 @@ namespace StockMan.CORE.Components
protected async Task setLocationDX(string locId) protected async Task setLocationDX(string locId)
{ {
currLocId_DX = locId;
await LocId_DX.InvokeAsync(locId); await LocId_DX.InvokeAsync(locId);
} }
protected async Task setLocationSX(string locId) protected async Task setLocationSX(string locId)
{ {
currLocId_SX = locId;
await LocId_SX.InvokeAsync(locId); await LocId_SX.InvokeAsync(locId);
} }
public LocSXSelectFilter currFilterSX { get; set; } = new LocSXSelectFilter(); public LocSXSelectFilter currFilterSX { get; set; } = new LocSXSelectFilter();
public LocDXSelectFilter currFilterDX { get; set; } = new LocDXSelectFilter(); public LocDXSelectFilter currFilterDX { get; set; } = new LocDXSelectFilter();
private string currLocId_SX
{
get => currFilterSX.idSx;
set => currFilterSX.idSx = value;
}
private string currLocId_DX
{
get => currFilterDX.idDx;
set => currFilterDX.idDx = value;
}
#endregion Protected Methods #endregion Protected Methods
} }
} }
StockMan.CORE/Pages/StatoMag.razor
+29 -11
View File
@@ -21,7 +21,7 @@
</div> </div>
</div> </div>
<div class="card-body"> <div class="card-body">
<ValStockGiac isCompact="false" LocId_SX="catchCurrLocId_SX" LocId_DX="catchCurrLocId_DX"></ValStockGiac> <ValStockGiac isCompact="false" LocId_SX="catchCurrLocId_SX" LocId_DX="catchCurrLocId_DX" ></ValStockGiac>
</div> </div>
</div> </div>
} }
@@ -38,17 +38,35 @@ else
} }
<div class="row"> <div class="row">
<div class="col"> <div class="col">
<LocationFilters isSX="true" isChanged="@isChanged" ListLocationByType="@listLocationByType" FilterUpdatedSX="updateFilterSX" ></LocationFilters> <div class="card">
<div class="card-header bg-primary text-light d-flex justify-content-between">
<Location actFilterSX="@currFilterSX" updateRecordCount="UpdateTotCountSX" LocId_SX="catchCurrLocId_SX" isSX="true" isChanged="@isChanged" UserName="@currOpr.Id" locSX_ID="@currLocId_SX" locDX_ID="@currLocId_DX" ListLocationByType="@listLocationByType"></Location> <div class="py-2">
Locazione Mittente:
<DataPager PageSize="@numRecordSX" currPage="@currPageSX" numRecordChanged="ForceReloadSX" numPageChanged="ForceReloadPageSX" totalCount="@totalCountSX" showLoading="@isLoading" /> </div>
<LocationFilters isSX="true" isChanged="@isChanged" ListLocationByType="@listLocationByType" FilterUpdatedSX="updateFilterSX" currLocId_SX="@currLocId_SX" currLocId_DX="@currLocId_DX"></LocationFilters>
</div>
<div class="card-body">
<Location actFilterSX="@currFilterSX" updateRecordCount="UpdateTotCountSX" LocId_SX="catchCurrLocId_SX" isSX="true" isChanged="@isChanged" UserName="@currOpr.Id" locSX_ID="@currLocId_SX" locDX_ID="@currLocId_DX" ListLocationByType="@listLocationByType"></Location>
</div>
<div class="card-footer">
<DataPager PageSize="@numRecordSX" currPage="@currPageSX" numRecordChanged="ForceReloadSX" numPageChanged="ForceReloadPageSX" totalCount="@totalCountSX" showLoading="@isLoading" />
</div>
</div>
</div> </div>
<div class="col"> <div class="col">
<LocationFilters isSX="false" isChanged="@isChanged" ListLocationByType="@listLocationByType" FilterUpdatedDX="updateFilterDX" ></LocationFilters> <div class="card">
<div class="card-header bg-success text-light d-flex justify-content-between">
<Location actFilterDX="@currFilterDX" updateRecordCount="UpdateTotCountDX" LocId_DX="catchCurrLocId_DX" isSX="false" isChanged="@isChanged" locDX_ID="@currLocId_DX" locSX_ID="@currLocId_SX" ListLocationByType="@listLocationByType"></Location> <div class="py-2">
Locazione Destinatario:
<DataPager PageSize="@numRecordDX" currPage="@currPageDX" numRecordChanged="ForceReloadDX" numPageChanged="ForceReloadPageDX" totalCount="@totalCountDX" showLoading="@isLoading" /> </div>
<LocationFilters isSX="false" isChanged="@isChanged" ListLocationByType="@listLocationByType" FilterUpdatedDX="updateFilterDX" currLocId_SX="@currLocId_SX" currLocId_DX="@currLocId_DX"></LocationFilters>
</div>
<div class="card-body">
<Location actFilterDX="@currFilterDX" updateRecordCount="UpdateTotCountDX" LocId_DX="catchCurrLocId_DX" isSX="false" isChanged="@isChanged" locDX_ID="@currLocId_DX" locSX_ID="@currLocId_SX" ListLocationByType="@listLocationByType"></Location>
</div>
<div class="card-footer">
<DataPager PageSize="@numRecordDX" currPage="@currPageDX" numRecordChanged="ForceReloadDX" numPageChanged="ForceReloadPageDX" totalCount="@totalCountDX" showLoading="@isLoading" />
</div>
</div>
</div> </div>
</div> </div>
StockMan.CORE/StockMan.CORE.csproj
+1 -1
View File
@@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<TargetFramework>net6.0</TargetFramework> <TargetFramework>net6.0</TargetFramework>
<Version>3.0.2303.217</Version> <Version>3.0.2303.309</Version>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings> <ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup> </PropertyGroup>