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

continuo pagina acquisizione inve

Browse Source
This commit is contained in:
zaccaria.majid
2022-11-28 16:55:44 +01:00
parent 09f2e8cd81
commit 51152a10c4
17 changed files with 94 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP.INVE/Components/CmpFooter.razor
+2 -2
View File
@@ -1,9 +1,9 @@
<div class="row text-light">
<div class="col-5 pe-0 text-left">
<div class="col-5 pe-0 text-left text-nowrap">
<b>Mapo INVE @(DateTime.Today.Year)</b> | <span class="small">v.@version</span>
</div>
<div class="col-7 ps-0 text-end">
<span class="small">@($"{DateTime.Now:HH:mm:ss}")</span> | <a class="text-light" href="https://www.egalware.com/" target="_blank"><img class="img-fluid" width="16" src="images/LogoEgw.png" /> Egalware </a>
<span class="small">@*@($"{DateTime.Now:HH:mm:ss}")*@</span><a class="text-light" href="https://www.egalware.com/" target="_blank"><img class="img-fluid" width="16" src="images/LogoEgw.png" /> Egalware </a>
</div>
</div>
MP.INVE/Components/CodeScan.razor
+3 -2
View File
@@ -1,5 +1,6 @@
<input @bind="@rawScan" class="fs-3 mb-2" @ref="@target" style="width: 17rem;" />
<div class="input-group input-group-sm">
<input @bind="@rawScan" class="fs-6 text-center mb-2 form-control" @ref="@target" style="width: 17rem;" />
</div>
@if (rawScan != null)
{
MP.INVE/Components/ProcOperat.razor
+3 -3
View File
@@ -8,9 +8,9 @@ elenco di buttons che servono a confermare operazione:
<li>mostrare button conferma/annulla</li>
</ul>*@
<div class="btn-group" role="group" aria-label="Basic example">
<button type="button" class="btn btn-success">Conferma</button>
<button type="button" class="btn btn-danger">Annulla</button>
<div class="btn-group col-12" role="group" aria-label="Basic example">
<button type="button" class="btn btn-success col-6">Conferma</button>
<button type="button" class="btn btn-danger col-6">Annulla</button>
</div>
MP.INVE/Components/ProcSuggestion.razor
+32 -12
View File
@@ -11,31 +11,51 @@
@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-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: @udc.lottoNav.Lotto</li>
<li class="list-group-item">Articolo: @udc.lottoNav.CodArt</li>
<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" value="@Math.Round(udc.Qta, 0)" />
<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 d-flex flex-row-reverse">
<div class="col-12">
<ProcOperat></ProcOperat>
</div>
</div>
<div class="card-footer">
<div class="col-12">
Last scan: @udc.UDC
</div>
</div>
</div>
}
else
{
MP.INVE/Components/ProcSuggestion.razor.cs
+10
View File
@@ -52,5 +52,15 @@ namespace MP.INVE.Components
}
}
protected string reqArtMod = "disabilita";
protected string reqQtaMod = "disabilita";
protected void cssDisableArt()
{
reqArtMod = "";
}
protected void cssDisableQta()
{
reqQtaMod = "";
}
}
}
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.2813</Version>
<Version>6.16.2211.2815</Version>
</PropertyGroup>
<ItemGroup>
MP.INVE/Pages/Acquisizione.razor
+5 -23
View File
@@ -2,27 +2,9 @@
<div class="card mb-5">
<div class="card-header">
<h3>Acquisizione</h3>
</div>
<div class="card-body">
<div class="row">
<div class="col-12">
<CodeScan></CodeScan>
</div>
</div>
</div>
<div class="card-footer">
<div class="row">
@if (lastScan != null)
{
<div class="col-12 text-end">
last scan: @($"{lastScan:yyyy.MM.dd HH:mm:ss}")
</div>
}
</div>
</div>
<div class="mb-2">
<h3 class="fw-bold">Acquisizione</h3>
</div>
<div class="col-12">
<CodeScan></CodeScan>
</div>
MP.INVE/Pages/_Layout.cshtml
+1
View File
@@ -63,5 +63,6 @@
<script type="text/javascript" src="~/lib/qrcode.js"></script>
<script type="text/javascript" src="~/lib/qrHelper.js"></script>
<script type="text/javascript" src="~/lib/WindowSize.js"></script>
<script type="text/javascript" src="~/lib/UserAgent.js"></script>
</body>
</html>
MP.INVE/Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>Modulo MAPOINVE </i>
<h4>Versione: 6.16.2211.2813</h4>
<h4>Versione: 6.16.2211.2815</h4>
<br /> Note di rilascio:
<ul>
<li>
MP.INVE/Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
6.16.2211.2813
6.16.2211.2815
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.2813</version>
<version>6.16.2211.2815</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>
MP.INVE/Shared/MainLayout.razor
+4 -12
View File
@@ -6,24 +6,16 @@
<div class="page">
<div class="@sideClass">
@if ((Height != 480) && (Width != 320))
{
<NavMenu EC_compressUpdated="@UpdateNavDisplay" />
}
<NavMenu EC_compressUpdated="@UpdateNavDisplay" />
</div>
<main>
<div class="top-row px-4 justify-content-between">
@if ((Height != 480) && (Width != 320))
{
<CmpTop></CmpTop>
}
<CmpTop></CmpTop>
</div>
<article class="content pt-0 m-2">
@if(!NavManager.Uri.Contains("OperatoreLogin"))
{
@Body
}
@*@remoteUserAgent*@
@Body
</article>
<div class="fixed-bottom bottom-row px-2">
<CmpFooter></CmpFooter>
MP.INVE/Shared/MainLayout.razor.cs
+10 -27
View File
@@ -1,7 +1,10 @@
using Blazored.LocalStorage;
using Microsoft.AspNetCore;
using Microsoft.AspNetCore.Components;
using Microsoft.EntityFrameworkCore.Metadata.Internal;
using Microsoft.JSInterop;
using MP.Data.DTO;
using System.Reflection;
namespace MP.INVE.Shared
{
@@ -23,32 +26,10 @@ namespace MP.INVE.Shared
#region Protected Methods
protected async Task getId()
protected string remoteUserAgent = "--";
protected async Task getAgent()
{
OperatoreDTO answ = new OperatoreDTO();
answ = await localStorage.GetItemAsync<OperatoreDTO>("MatrOpr");
if (!NavManager.Uri.Contains("Jumper"))
{
if (answ != null)
{
userName = $"{answ.Cognome} {answ.Nome} ({answ.MatrOpr})";
if (NavManager.Uri.Contains("OperatoreLogin"))
{
NavManager.NavigateTo("ElencoMagazzini", true);
}
}
else
{
userName = "0";
if (Height != 480 && Width != 320)
{
if (!NavManager.Uri.Contains("OperatoreLogin"))
{
NavManager.NavigateTo("OperatoreLogin", true);
}
}
}
}
remoteUserAgent = await JSRuntime.InvokeAsync<string>("getUserAgent");
}
public int Height { get; set; }
@@ -62,10 +43,12 @@ namespace MP.INVE.Shared
protected override async Task OnInitializedAsync()
{
#if false
var dimension = await JSRuntime.InvokeAsync<WindowDimension>("getWindowDimensions");
Height = dimension.Height;
Width = dimension.Width;
await getId();
Width = dimension.Width;
#endif
await getAgent();
}
protected void UpdateNavDisplay()
MP.INVE/wwwroot/css/site.css
+8 -3
View File
@@ -23,9 +23,9 @@ body {
font-family: 'Roboto Condensed', sans-serif;
}
@media (max-width: 320px) {
.navbar-toggler {
display: none;
}
/*.navbar-toggler {
display: none;
}*/
}
.compresser {
display: none;
@@ -60,6 +60,11 @@ a,
.loginOperatore {
box-shadow: rgba(50, 50, 93, 0.25) 0px 50px 100px -20px, rgba(0, 0, 0, 0.3) 0px 30px 60px -30px;
}
.disabilita {
pointer-events: none;
color: #AAA;
background: #F5F5F5;
}
.watermark {
position: absolute;
top: 250px;
MP.INVE/wwwroot/css/site.less
+8 -2
View File
@@ -17,9 +17,9 @@ html, body {
@media(max-width: 320px) {
.navbar-toggler {
/*.navbar-toggler {
display: none;
}
}*/
}
.compresser {
@@ -64,6 +64,12 @@ a, .btn-link {
box-shadow: rgba(50, 50, 93, 0.25) 0px 50px 100px -20px, rgba(0, 0, 0, 0.3) 0px 30px 60px -30px;
}
.disabilita {
pointer-events: none;
color: #AAA;
background: #F5F5F5;
}
.watermark {
position: absolute;
top: 250px;
MP.INVE/wwwroot/css/site.min.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
MP.INVE/wwwroot/lib/UserAgent.js
+3
View File
@@ -0,0 +1,3 @@
window.getUserAgent = () => {
return navigator.userAgent;
};