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

fix grafico + aggiunta pagine

Browse Source
This commit is contained in:
zaccaria.majid
2022-11-14 10:09:09 +01:00
parent 330441982b
commit bc06e8250b
11 changed files with 83 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP.INVE/Data/MpDataService.cs
+4 -4
View File
@@ -481,10 +481,10 @@ namespace MP.INVE.Data
return Task.FromResult(dbController.AnagGruppiFase());
}
public Task<List<LinkMenu>> ElencoLink()
{
return Task.FromResult(dbController.ElencoLink());
}
//public Task<List<LinkMenu>> ElencoLink()
//{
// return Task.FromResult(dbController.ElencoLink());
//}
/// <summary>
/// Aggiunta record EventList
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.1117</Version>
<Version>6.16.2211.1410</Version>
</PropertyGroup>
<ItemGroup>
MP.INVE/Pages/Acquisizione.razor
+7
View File
@@ -0,0 +1,7 @@
@page "/Acquisizione"
<h3>Acquisizione</h3>
@code {
}
MP.INVE/Pages/Index.razor
+2 -2
View File
@@ -21,7 +21,7 @@
<div class="shortcuts my-3 py-3">
<div class="row">
<div class="col-12">
@if (ElencoLink == null)
@*@if (ElencoLink == null)
{
<LoadingData></LoadingData>
}
@@ -41,7 +41,7 @@
<span class="shortcut-label">@item.Testo</span>
</a>
}
}
}*@
</div>
</div>
</div>
MP.INVE/Pages/Index.razor.cs
+18 -18
View File
@@ -8,17 +8,17 @@ namespace MP.INVE.Pages
{
#region Public Properties
public List<LinkMenu>? ElencoLink { get; set; }
//public List<LinkMenu>? ElencoLink { get; set; }
#endregion Public Properties
#region Protected Properties
[Inject]
protected MpDataService MDService { get; set; } = null!;
//[Inject]
//protected MpDataService MDService { get; set; } = null!;
[Inject]
protected MessageService MessageService { get; set; } = null!;
//[Inject]
//protected MessageService MessageService { get; set; } = null!;
#endregion Protected Properties
@@ -26,19 +26,19 @@ namespace MP.INVE.Pages
protected override async Task OnInitializedAsync()
{
// nascondo ricerca
MessageService.ShowSearch = false;
// recupero elenco JQM
ElencoLink = await MDService.ElencoLink();
configData = await MDService.ConfigGetAll();
if (configData != null)
{
var currRec = configData.FirstOrDefault(x => x.Chiave == "AZIENDA");
if (currRec != null)
{
currAzienda = currRec.Valore;
}
}
//// nascondo ricerca
//MessageService.ShowSearch = false;
//// recupero elenco JQM
////ElencoLink = await MDService.ElencoLink();
//configData = await MDService.ConfigGetAll();
//if (configData != null)
//{
// var currRec = configData.FirstOrDefault(x => x.Chiave == "AZIENDA");
// if (currRec != null)
// {
// currAzienda = currRec.Valore;
// }
//}
await Task.Delay(1);
}
MP.INVE/Pages/Invio.razor
+7
View File
@@ -0,0 +1,7 @@
@page "/Invio"
<h3>Invio</h3>
@code {
}
MP.INVE/Pages/Session.razor
+7
View File
@@ -0,0 +1,7 @@
@page "/Session"
<h3>Sessione</h3>
@code {
}
MP.INVE/Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>Modulo MAPOINVE </i>
<h4>Versione: 6.16.2211.1117</h4>
<h4>Versione: 6.16.2211.1410</h4>
<br /> Note di rilascio:
<ul>
<li>
MP.INVE/Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
6.16.2211.1117
6.16.2211.1410
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.1117</version>
<version>6.16.2211.1410</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/NavMenu.razor
+34 -24
View File
@@ -1,6 +1,6 @@
@using MP.INVE.Components
@using MP.INVE.Data
@inject MpDataService MDService
@*@inject MpDataService MDService*@
<div class="top-row ps-2 navbar navbar-dark">
<div class="container-fluid px-0">
@@ -22,7 +22,7 @@
<nav class="flex-column">
<div class="nav-item px-2 col-12">
<NavLink class="nav-link px-2" href="" Match="NavLinkMatch.All">
<div class ="col-2">
<div class="col-2">
<span class="fa-solid fa-house px-2" aria-hidden="true"></span>
</div>
<div>
@@ -30,33 +30,43 @@
</div>
</NavLink>
</div>
@if (ElencoLink == null)
{
<LoadingDataSmall></LoadingDataSmall>
}
else
{
foreach (var item in ElencoLink)
{
<div class="nav-item px-2 col-12">
<NavLink class="nav-link px-2" href="@item.NavigateUrl">
<div class="col-2">
<span class="@item.icona px-2" aria-hidden="true"></span>
</div>
<div>
<span class="@hideText">@item.Testo</span>
</div>
</NavLink>
@*</div> *@
<div class="nav-item px-2 col-12">
<NavLink class="nav-link px-2" href="/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">
<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">
<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>
@code {
private bool collapseNavMenu = true;
public List<MP.Data.DatabaseModels.LinkMenu>? ElencoLink { get; set; }
//public List<MP.Data.DatabaseModels.LinkMenu>? ElencoLink { get; set; }
private string? NavMenuCssClass => collapseNavMenu ? "collapse" : null;
@@ -68,7 +78,7 @@
protected override async Task OnInitializedAsync()
{
// recupero elenco JQM
ElencoLink = await MDService.ElencoLink();
//ElencoLink = await MDService.ElencoLink();
await Task.Delay(1);
}