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

BOZZA creazione qr per ogni sessione x umper

Browse Source
This commit is contained in:
zaccaria.majid
2022-11-16 18:09:44 +01:00
parent f7b78fbd7f
commit dfbc2d655b
10 changed files with 154 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
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.1617</Version>
<Version>6.16.2211.1618</Version>
</PropertyGroup>
<ItemGroup>
MP.INVE/Pages/Session.razor
+26
View File
@@ -26,6 +26,10 @@
<tr>
<td>
@item.InveSessID
<!-- Button trigger modal -->
<button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#exampleModal" @onclick="()=> getCurrSess(item.InveSessID)">
APRI QR
</button>
</td>
<td>
@item.Description
@@ -53,4 +57,26 @@
<div class="card-footer py-1">
<DataPager />
</div>
</div>
<!-- Modal -->
<div class="modal fade" id="exampleModal" tabindex="-1" aria-labelledby="exampleModalLabel" aria-hidden="true">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title" id="exampleModalLabel">Modal title</h5>
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
</div>
<div class="modal-body">
<div class="card-body text-center">
<div class="img-fluid" id="qrCodeImg_101"></div>
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
<button type="button" class="btn btn-primary">Save changes</button>
</div>
</div>
</div>
</div>
MP.INVE/Pages/Session.razor.cs
+39 -5
View File
@@ -31,25 +31,59 @@ namespace MP.INVE.Pages
protected override async Task OnInitializedAsync()
{
//await FilterChanged.InvokeAsync(actFilter);
//await getId();
await getId();
await Task.Delay(1);
elencoSessioni = MIDataservice.InventSessCurrList();
}
#if false
protected override async Task OnAfterRenderAsync(bool firstRender)
{
if (firstRender)
{
await JSRuntime.InvokeVoidAsync("clearContent", $"qrCodeImg_{101}");
await JSRuntime.InvokeVoidAsync("displayQr", $"qrCodeImg_{101}", rawCode);
}
}
protected string BaseUrlTab { get => $"{Configuration["ServerConf:BaseUrlJumper"]}"; }
private int idOperatore { get; set; } = 0;
private int currIdSess { get; set; } = 0;
private string authKey { get; set; } = "";
protected string rawCode
{
get
{
string answ = "";
answ = $"{BaseUrlTab}IdSessione={currIdSess}&MatrOpr={idOperatore}&UserAuthKey={authKey}";
return answ;
}
}
protected void getCurrSess(int idSess)
{
currIdSess = idSess;
}
[Inject]
private IConfiguration Configuration { get; set; } = null!;
[Inject]
protected ILocalStorageService localStorage { get; set; } = null!;
[Inject]
protected NavigationManager NavManager { get; set; } = null!;
[Inject]
protected IJSRuntime JSRuntime { get; set; } = null!;
protected async Task getId()
{
OperatoreDTO local = new OperatoreDTO();
local = await localStorage.GetItemAsync<OperatoreDTO>("MatrOpr");
if ((local == null))
if(local != null)
{
NavManager.NavigateTo("OperatoreLogin");
idOperatore = local.MatrOpr;
authKey = local.hashAuthKey;
}
}
#endif
}
}
MP.INVE/Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>Modulo MAPOINVE </i>
<h4>Versione: 6.16.2211.1617</h4>
<h4>Versione: 6.16.2211.1618</h4>
<br /> Note di rilascio:
<ul>
<li>
MP.INVE/Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
6.16.2211.1617
6.16.2211.1618
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.1617</version>
<version>6.16.2211.1618</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
+1 -4
View File
@@ -6,10 +6,7 @@
<div class="page">
<div class="@sideClass">
@if (userName != "0")
{
<NavMenu EC_compressUpdated="@UpdateNavDisplay" />
}
<NavMenu EC_compressUpdated="@UpdateNavDisplay" />
</div>
<main>
MP.INVE/Shared/NavMenu.razor
+56 -42
View File
@@ -18,48 +18,62 @@
</div>
<div class="@NavMenuCssClass" @onclick="ToggleNavMenu">
<nav class="flex-column">
<div class="nav-item px-2 col-12">
<NavLink class="nav-link px-2" href="" Match="NavLinkMatch.All" @onclick='() => HandleClick("")'>
<div class="col-2">
<span class="fa-solid fa-house px-2" aria-hidden="true"></span>
</div>
<div>
<span class="@hideText">Home</span>
</div>
</NavLink>
</div>
<div class="nav-item px-2 col-12">
<NavLink class="nav-link px-2" href="Session" @onclick='() => HandleClick("Session")'>
<div class="col-2">
<span class="px-2" aria-hidden="true"><i class="fa-solid fa-spinner"></i></span>
</div>
<div>
<span class="@hideText">Session</span>
</div>
</NavLink>
</div>
<div class="nav-item px-2 col-12">
<NavLink class="nav-link px-2" href="Acquisizione" @onclick='() => HandleClick("Acquisizione")'>
<div class="col-2">
<span class="px-2" aria-hidden="true"><i class="fa-solid fa-barcode"></i></span>
</div>
<div>
<span class="@hideText">Acquisizione</span>
</div>
</NavLink>
</div>
<div class="nav-item px-2 col-12">
<NavLink class="nav-link px-2" href="Invio" @onclick='() => HandleClick("Invio")'>
<div class="col-2">
<span class="px-2" aria-hidden="true"><i class="fa-solid fa-file-export"></i></span>
</div>
<div>
<span class="@hideText">Invio</span>
</div>
</NavLink>
</div>
</nav>
@if (userName != "0")
{
<nav class="flex-column">
<div class="nav-item px-2 col-12">
<NavLink class="nav-link px-2" href="" Match="NavLinkMatch.All" @onclick='() => HandleClick("")'>
<div class="col-2">
<span class="fa-solid fa-house px-2" aria-hidden="true"></span>
</div>
<div>
<span class="@hideText">Home</span>
</div>
</NavLink>
</div>
<div class="nav-item px-2 col-12">
<NavLink class="nav-link px-2" href="Starter" @onclick='() => HandleClick("Starter")'>
<div class="col-2">
<span class="px-2" aria-hidden="true"><i class="fa-solid fa-qrcode"></i></span>
</div>
<div>
<span class="@hideText">Starter</span>
</div>
</NavLink>
</div>
<div class="nav-item px-2 col-12">
<NavLink class="nav-link px-2" href="Session" @onclick='() => HandleClick("Session")'>
<div class="col-2">
<span class="px-2" aria-hidden="true"><i class="fa-solid fa-spinner"></i></span>
</div>
<div>
<span class="@hideText">Session</span>
</div>
</NavLink>
</div>
<div class="nav-item px-2 col-12">
<NavLink class="nav-link px-2" href="Acquisizione" @onclick='() => HandleClick("Acquisizione")'>
<div class="col-2">
<span class="px-2" aria-hidden="true"><i class="fa-solid fa-barcode"></i></span>
</div>
<div>
<span class="@hideText">Acquisizione</span>
</div>
</NavLink>
</div>
<div class="nav-item px-2 col-12">
<NavLink class="nav-link px-2" href="Invio" @onclick='() => HandleClick("Invio")'>
<div class="col-2">
<span class="px-2" aria-hidden="true"><i class="fa-solid fa-file-export"></i></span>
</div>
<div>
<span class="@hideText">Invio</span>
</div>
</NavLink>
</div>
</nav>
}
</div>
MP.INVE/Shared/NavMenu.razor.cs
+27 -4
View File
@@ -15,6 +15,8 @@ using MP.INVE;
using MP.INVE.Shared;
using MP.INVE.Components;
using MP.INVE.Data;
using MP.Data.DTO;
using Blazored.LocalStorage;
namespace MP.INVE.Shared
{
@@ -27,12 +29,33 @@ namespace MP.INVE.Shared
{
collapseNavMenu = !collapseNavMenu;
}
protected string userName { get; set; } = "0";
protected async Task getId()
{
OperatoreDTO answ = new OperatoreDTO();
answ = await localStorage.GetItemAsync<OperatoreDTO>("MatrOpr");
if (answ != null)
{
userName = $"{answ.Cognome} {answ.Nome} ({answ.MatrOpr})";
if (NavigationManager.Uri.Contains("OperatoreLogin"))
{
NavigationManager.NavigateTo("Starter", true);
}
}
else
{
userName = "0";
if (!NavigationManager.Uri.Contains("OperatoreLogin"))
{
NavigationManager.NavigateTo("OperatoreLogin", true);
}
}
}
protected override async Task OnInitializedAsync()
{
// recupero elenco JQM
//ElencoLink = await MDService.ElencoLink();
await Task.Delay(1);
await getId();
}
protected bool showText { get; set; } = true;
@@ -46,8 +69,8 @@ namespace MP.INVE.Shared
[Parameter]
public EventCallback<bool> EC_compressUpdated { get; set; }
[Inject]
protected ILocalStorageService localStorage { get; set; } = null!;
[Inject]
protected NavigationManager NavigationManager { get; set; } = null!;
MP.INVE/appsettings.json
+1
View File
@@ -19,5 +19,6 @@
"redisLongTimeCache": "15",
"MpIoBaseUrl": "http://localhost:20967/",
"BaseUrl": "https://iis02.egalware.com/MP/MAG/SMART/PLScanner?"
"BaseUrlJumper": "https://iis02.egalware.com/MP/jumper?"
}
}