diff --git a/StockMan.CORE/Components/Movimenti.razor b/StockMan.CORE/Components/Movimenti.razor
index 37d766c..e1ce615 100644
--- a/StockMan.CORE/Components/Movimenti.razor
+++ b/StockMan.CORE/Components/Movimenti.razor
@@ -12,15 +12,15 @@
Posizione
|
+
+ Riferimento
+ |
Qta
|
importo
|
-
- Riferimento
- |
|
@@ -38,24 +38,24 @@
@flux.LocationId
|
+
+ @flux.ExtLocationId
+ |
@if (flux.Qta > 0)
{
-
+ |
@flux.Qta
|
}
else
{
-
+ |
@flux.Qta
|
}
-
+ |
@($"{flux.TotValue:C2}")
|
-
- @flux.ExtLocationId
- |
diff --git a/StockMan.CORE/Components/NewNavMenu.razor b/StockMan.CORE/Components/NewNavMenu.razor
index e316524..d48929b 100644
--- a/StockMan.CORE/Components/NewNavMenu.razor
+++ b/StockMan.CORE/Components/NewNavMenu.razor
@@ -92,14 +92,12 @@
- @userName
-
- @* @if (!isComp)
+ @if (!isComp)
{
- @if (User.Contains("/"))
+ @if (User.Contains("\\"))
{
- @($"{User.Split("/")[1].Substring(0, 1).ToUpper()}")
+ @($"{User.Split("\\")[1].Substring(0, 1).ToUpper()}")
}
else
@@ -114,10 +112,10 @@
}
else
{
- @if (User.Contains("/"))
+ @if (User.Contains("\\"))
{
- @($"{User.Split("/")[1].Substring(0, 1).ToUpper()}")
+ @($"{User.Split("\\")[1].Substring(0, 1).ToUpper()}")
}
else
@@ -126,7 +124,8 @@
@($"{User.Substring(0, 1).ToUpper()}")
}
- }*@
+ }
+
diff --git a/StockMan.CORE/Components/NewNavMenu.razor.cs b/StockMan.CORE/Components/NewNavMenu.razor.cs
index 4f6f169..47d3f6f 100644
--- a/StockMan.CORE/Components/NewNavMenu.razor.cs
+++ b/StockMan.CORE/Components/NewNavMenu.razor.cs
@@ -20,6 +20,9 @@ namespace StockMan.CORE.Components
[Parameter]
public string Title { get; set; } = "";
+ [Parameter]
+ public string User { get; set; } = "";
+
#endregion Public Properties
#region Protected Fields
@@ -31,9 +34,7 @@ namespace StockMan.CORE.Components
#region Protected Properties
- [Inject]
- protected AuthenticationStateProvider AuthenticationStateProvider { get; set; } = null!;
-
+
protected int currChildOpen { get; set; } = 0;
[Inject]
@@ -118,36 +119,7 @@ namespace StockMan.CORE.Components
return answ;
}
- protected override async Task OnInitializedAsync()
- {
- await forceReload();
- }
-
+
#endregion Protected Methods
-
- #region Private Fields
-
- private string userName = "";
-
- #endregion Private Fields
-
- #region Private Methods
-
- private async Task forceReload()
- {
- var authState = await AuthenticationStateProvider.GetAuthenticationStateAsync();
- var user = authState.User;
- if (user.Identity != null && user.Identity.IsAuthenticated)
- {
- userName = $"{user.Identity.Name}";
- // cercare in tabella operators e salvare sigla da registrare nei vari records sul DB
- }
- else
- {
- userName = "N.A.";
- }
- }
-
- #endregion Private Methods
}
}
\ No newline at end of file
diff --git a/StockMan.CORE/Shared/MainLayout.razor b/StockMan.CORE/Shared/MainLayout.razor
index e2907e1..ceb8b98 100644
--- a/StockMan.CORE/Shared/MainLayout.razor
+++ b/StockMan.CORE/Shared/MainLayout.razor
@@ -5,7 +5,10 @@
-
+ @if (!string.IsNullOrEmpty(userName))
+ {
+
+ }
diff --git a/StockMan.CORE/Shared/MainLayout.razor.cs b/StockMan.CORE/Shared/MainLayout.razor.cs
index 82eaab6..83f71b8 100644
--- a/StockMan.CORE/Shared/MainLayout.razor.cs
+++ b/StockMan.CORE/Shared/MainLayout.razor.cs
@@ -1,4 +1,5 @@
using Microsoft.AspNetCore.Components;
+using Microsoft.AspNetCore.Components.Authorization;
using StockMan.CORE.Data;
using StockMan.Data.DbModels;
using System.Net;
@@ -13,16 +14,32 @@ namespace StockMan.CORE.Shared
protected List? navMenuLinks { get; set; } = null;
+ protected string userName { get; set; } = "";
+ [Inject]
+ protected AuthenticationStateProvider AuthenticationStateProvider { get; set; } = null!;
#endregion Protected Properties
#region Protected Methods
protected override async Task OnInitializedAsync()
{
- await Task.Delay(1);
+ await forceReload();
navMenuLinks = await SDService.PermessiGetAll();
}
-
+ private async Task forceReload()
+ {
+ var authState = await AuthenticationStateProvider.GetAuthenticationStateAsync();
+ var user = authState.User;
+ if (user.Identity != null && user.Identity.IsAuthenticated)
+ {
+ userName = $"{user.Identity.Name}";
+ // cercare in tabella operators e salvare sigla da registrare nei vari records sul DB
+ }
+ else
+ {
+ userName = "N.A.";
+ }
+ }
#endregion Protected Methods
}
}
\ No newline at end of file
|