Egalware/mapo-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'FeaturefixPaginaAcquisizione' into develop

Browse Source
This commit is contained in:
zaccaria.majid
2022-12-02 13:08:42 +01:00
parent 7ecba56748 06ab1433f2
commit df4c53c88a
16 changed files with 162 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP.Data/Controllers/MpInveController.cs
+28
View File
@@ -28,6 +28,34 @@ namespace MP.Data.Controllers
_configuration = null;
}
#region gestione config
/// <summary>
/// Elenco da tabella Config
/// </summary>
/// <returns></returns>
public List<ConfigModel> ConfigGetAll()
{
List<ConfigModel> dbResult = new List<ConfigModel>();
using (var dbCtx = new MoonProContext(_configuration))
{
dbResult = dbCtx
.DbSetConfig
.AsNoTracking()
.OrderBy(x => x.Chiave)
.ToList();
}
return dbResult;
}
#endregion gestione config
/// <summary>
/// Elenco Scansioni dato Id sessione inventario
/// </summary>
MP.Data/DTO/OperatoreDTO.cs
+1
View File
@@ -12,5 +12,6 @@ namespace MP.Data.DTO
public string Cognome { get; set; } = "";
public string Nome { get; set; } = "";
public string hashAuthKey { get; set; } = "";
public DateTime dtExp { get; set; }
}
}
MP.INVE/Components/CmpTop.razor.cs
+2
View File
@@ -40,6 +40,8 @@ namespace MP.INVE.Components
#region Protected Methods
//&& !(answ.dtExp < DateTime.Now)
protected async Task getId()
{
OperatoreDTO answ = new OperatoreDTO();
MP.INVE/Components/CodeScan.razor
+1 -8
View File
@@ -1,10 +1,3 @@
<div class="input-group input-group-sm">
<input @bind="@rawScan" class="fs-6 text-center mb-2 form-control" @ref="@target" style="width: 17rem;" />
<input @bind="LastScan" class="fs-6 text-center mb-2 form-control" @ref="@target" style="width: 17rem;" />
</div>
@if (rawScan != null)
{
<div class="col-12">
<ProcSuggestion currParams="@currParams"></ProcSuggestion>
</div>
}
MP.INVE/Components/CodeScan.razor.cs
+26 -7
View File
@@ -15,34 +15,47 @@ using MP.INVE;
using MP.INVE.Shared;
using MP.INVE.Components;
using MP.INVE.Data;
using StackExchange.Redis;
namespace MP.INVE.Components
{
public partial class CodeScan
{
// FIXME TODO creare evento x riportare scansione
[Parameter]
public EventCallback<string> lastRawScan { get; set; }
/// <summary>
/// Imposta il focus su input scansione
/// </summary>
protected void setFocus()
{
// all'apertura del componente --> focus su txtbox scan (e anche dopo input)
{
// all'apertura del componente --> focus su txtbox scan (e anche dopo input)
}
private ElementReference target;
protected string lastScan { get; set; } = "";
//protected string lastScan { get; set; } = "";
public SelectScanParams currParams = new SelectScanParams();
protected string rawScan
//protected string rawScan
//{
// get => currParams.UDC;
// set => currParams.UDC = value;
//}
protected string _lastScan = "";
protected string LastScan
{
get => currParams.UDC;
set => currParams.UDC = value;
get => _lastScan;
set
{
_lastScan = value;
saveSel(LastScan);
}
}
protected override async Task OnAfterRenderAsync(bool firstRender)
{
if (firstRender)
@@ -50,6 +63,12 @@ namespace MP.INVE.Components
await target.FocusAsync();
}
}
private void saveSel(string scanToSend)
{
//LastScan = scanToSend;
Task.FromResult(lastRawScan.InvokeAsync(scanToSend));
}
}
}
MP.INVE/Components/ProcSuggestion.razor
+21 -44
View File
@@ -10,52 +10,29 @@
@if (udc != null)
{
<div class="card">
@*
<div class="card-title d-flex justify-content-between px-2">
<span class="fs-6 py-1 fw-bold">
@udc.UDC
</span>
<span class="fs-5 fw-bold">
@tipo
</span>
</div>*@
<div class="card-body">
<ul class="p-0">
<li class="list-group-item">
Lotto:
<div class="input-group input-group-sm">
<input class="form-control" value="@udc.lottoNav.Lotto" disabled />
<span class="input-group-text" id="basic-addon1">@tipo</span>
</div>
</li>
<li class="list-group-item">
Articolo:
<div class="input-group input-group-sm">
<input class="form-control @reqArtMod" value="@udc.lottoNav.CodArt" type="text" />
<button title="Mod articolo" @onclick="@cssDisableArt" class="btn btn-sm btn-primary"><i class="fa-solid fa-pen-to-square"></i></button>
</div>
</li>
<li class="list-group-item">
Quantità:
<div class="input-group input-group-sm">
<input class="form-control @reqQtaMod" value="@Math.Round(udc.Qta, 0)" type="number" />
<button title="Mod quantità" @onclick="@cssDisableQta" class="btn btn-sm btn-primary"><i class="fa-solid fa-pen-to-square"></i></button>
</div>
</li>
</ul>
<div class="col-12">
<ProcOperat></ProcOperat>
<ul class="p-0">
<li class="list-group-item">
Lotto:
<div class="input-group input-group-sm">
<input class="form-control" value="@udc.lottoNav.Lotto" disabled />
<span class="input-group-text" id="basic-addon1">@tipo</span>
</div>
</div>
<div class="card-footer">
<div class="col-12">
Last scan: @udc.UDC
</li>
<li class="list-group-item">
Articolo:
<div class="input-group input-group-sm">
<input class="form-control @reqArtMod" @bind-value="@udc.lottoNav.CodArt" type="text" />
<button title="Mod articolo" @onclick="@cssDisableArt" class="btn btn-sm btn-primary"><i class="fa-solid fa-pen-to-square"></i></button>
</div>
</div>
</div>
</li>
<li class="list-group-item">
Quantità:
<div class="input-group input-group-sm">
<input class="form-control @reqQtaMod" @bind-value="@udc.Qta" type="number" />
<button title="Mod quantità" @onclick="@cssDisableQta" class="btn btn-sm btn-primary"><i class="fa-solid fa-pen-to-square"></i></button>
</div>
</li>
</ul>
}
else
{
MP.INVE/Components/ProcSuggestion.razor.cs
+2 -9
View File
@@ -23,14 +23,8 @@ namespace MP.INVE.Components
{
[Inject]
private MiDataService MIService { get; set; } = null!;
[Parameter]
public SelectScanParams currParams { get; set; } = null!;
protected string rawScan
{
get => currParams.UDC;
set => currParams.UDC = value;
}
public string lastScan { get; set; } = null!;
private string tipo { get; set; } = "";
public List<AnagUdcModel>? searchrecords;
@@ -38,10 +32,9 @@ namespace MP.INVE.Components
protected override async Task OnParametersSetAsync()
{
//await FilterChanged.InvokeAsync(actFilter);
await Task.Delay(1);
searchrecords = MIService.ElencoUDC();
udc = searchrecords.Where(x => x.UDC == rawScan).FirstOrDefault();
udc = searchrecords.Where(x => x.UDC == lastScan).FirstOrDefault();
if (udc != null)
{
MP.INVE/MP.INVE.csproj
+1 -1
View File
@@ -5,7 +5,7 @@
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<RootNamespace>MP.INVE</RootNamespace>
<Version>6.16.2211.2916</Version>
<Version>6.16.2212.212</Version>
</PropertyGroup>
<ItemGroup>
MP.INVE/Pages/Acquisizione.razor
+22 -1
View File
@@ -6,5 +6,26 @@
<h3 class="fw-bold">Acquisizione</h3>
</div>
<div class="col-12">
<CodeScan></CodeScan>
<CodeScan lastRawScan="saveScan"></CodeScan>
</div>
<div class="card">
<div class="card-body">
@*if (rawScan != null)
{
}*@
<div class="col-12">
<ProcSuggestion lastScan="@rawScan"></ProcSuggestion>
</div>
@if (rawScan != null)
{
<div class="col-12">
<ProcOperat></ProcOperat>
</div>
}
</div>
<div class="card-footer">
<div class="col-12">
Last scan: @rawScan
</div>
</div>
</div>
MP.INVE/Pages/Acquisizione.razor.cs
+6 -2
View File
@@ -33,12 +33,16 @@ namespace MP.INVE.Pages
private SelectScanParams currParams = new SelectScanParams();
private bool logged { get;set; } = false;
protected string rawScan { get; set; } = null!;
protected string idOPeratore { get; set; } = null!;
protected string authKey { get; set; } = null!;
protected override async Task OnInitializedAsync()
{
}
protected DateTime? lastScan { get; set; } = null;
protected void saveScan(string newScan)
{
rawScan = newScan;
}
//protected DateTime? lastScan { get; set; } = null;
}
}
MP.INVE/Pages/Jumper.razor.cs
+2 -1
View File
@@ -62,7 +62,8 @@ namespace MP.INVE.Pages
MatrOpr = currOpr.MatrOpr,
Nome = currOpr.Nome,
Cognome = currOpr.Cognome,
hashAuthKey = hash
hashAuthKey = hash,
dtExp = DateTime.Now.AddMinutes(1)
};
await localStorage.SetItemAsync("MatrOpr", currOpr);
MP.INVE/Pages/OperatoreLogin.razor
+42 -34
View File
@@ -5,50 +5,58 @@
<div class="col-10">
<div class="align-content-center p-3">
<div class="card loginOperatore">
<div class="card-header text-center">
<h1>login Operatore</h1>
</div>
<div class="card-body">
<div class="row">
<div class="col-1"></div>
<div class="col-10">
<label class="form-label">Selezionare operatore</label>
<div class="mb-3">
@if (isLoading)
{
<LoadingData></LoadingData>
}
else
{
<div>
<select class="form-select" aria-label="Default select example" @bind="@idOperatore">
@if (elencoOperatori != null)
{
@foreach (var item in elencoOperatori)
<div class="card loginOperatore">
<div class="card-header text-center">
<h1>login Operatore</h1>
</div>
<div class="card-body">
<div class="row">
<div class="col-1"></div>
<div class="col-10">
<label class="form-label">Selezionare operatore</label>
<div class="mb-3">
<div>
<select class="form-select" aria-label="Default select example" @bind="@idOperatore">
@if (elencoOperatori != null)
{
<option value="@item.MatrOpr">@item.Cognome @item.Nome (@item.MatrOpr)</option>
@foreach (var item in elencoOperatori)
{
<option value="@item.MatrOpr">@item.Cognome @item.Nome (@item.MatrOpr)</option>
}
}
}
</select>
</select>
</div>
</div>
</div>
<div class="col-1"></div>
</div>
<div class="col-1"></div>
</div>
<div class="row">
<div class="col-1"></div>
<div class="col-10">
<label class="form-label">Inserire auth key</label>
<input class="form-control mb-3" type="password" @bind="@authKey" />
<div class="row">
<div class="col-1"></div>
<div class="col-10">
<label class="form-label">Inserire auth key</label>
<input class="form-control mb-3" type="password" @bind="@authKey" />
</div>
<div class="col-1"></div>
</div>
<div class="col-1"></div>
</div>
<div class="row">
<div class="col-1"></div>
<div class="col-10">
<button class="btn btn-primary" @onclick="login">LOGIN</button>
</div>
<div class="col-1"></div>
<div class="row">
<div class="col-1"></div>
<div class="col-10">
<button class="btn btn-primary" @onclick="login">LOGIN</button>
</div>
<div class="col-1"></div>
</div>
</div>
</div>
</div>
}
</div>
MP.INVE/Pages/OperatoreLogin.razor.cs
+5 -1
View File
@@ -48,14 +48,17 @@ namespace MP.INVE.Pages
private string _authKey { get; set; } = "";
private bool logged { get; set; } = false;
private bool isLoading { get; set; } = false;
private List<AnagOperatoriModel>? elencoOperatori;
protected override async Task OnInitializedAsync()
{
isLoading = true;
//await FilterChanged.InvokeAsync(actFilter);
await Task.Delay(1);
elencoOperatori = MIDataservice.ElencoOperatori();
isLoading = false;
}
private void login()
@@ -74,7 +77,8 @@ namespace MP.INVE.Pages
MatrOpr = currOpr.MatrOpr,
Nome = currOpr.Nome,
Cognome = currOpr.Cognome,
hashAuthKey = hash
hashAuthKey = hash,
dtExp = DateTime.Now.AddMinutes(1)
};
localStorage.SetItemAsync("MatrOpr", sessionOpr);
NavManager.NavigateTo("InveSession", true);
MP.INVE/Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>Modulo MAPOINVE </i>
<h4>Versione: 6.16.2211.2916</h4>
<h4>Versione: 6.16.2212.212</h4>
<br /> Note di rilascio:
<ul>
<li>
MP.INVE/Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
6.16.2211.2916
6.16.2212.212
MP.INVE/Resources/manifest.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>6.16.2211.2916</version>
<version>6.16.2212.212</version>
<url>https://nexus.steamware.net/repository/SWS/MP-INVE/stable/LAST/MP.INVE.zip</url>
<changelog>https://nexus.steamware.net/repository/SWS/MP-INVE/stable/LAST/ChangeLog.html</changelog>
<mandatory>false</mandatory>