From d5cffa4d417414015b526fdcbf0c02f514cf3d68 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Wed, 16 Nov 2022 17:16:33 +0100
Subject: [PATCH] Fix gestione verifica operatore

---
 MP.INVE/Components/CmpTop.razor.cs |  5 +++
 MP.INVE/MP.INVE.csproj             |  2 +-
 MP.INVE/Resources/ChangeLog.html   |  2 +-
 MP.INVE/Resources/VersNum.txt      |  2 +-
 MP.INVE/Resources/manifest.xml     |  2 +-
 MP.INVE/Shared/MainLayout.razor    | 20 +++------
 MP.INVE/Shared/MainLayout.razor.cs | 70 ++++++++++++++++++++++++++++++
 MP.INVE/Shared/NavMenu.razor       | 41 ++---------------
 MP.INVE/Shared/NavMenu.razor.cs    | 59 +++++++++++++++++++++++++
 9 files changed, 149 insertions(+), 54 deletions(-)
 create mode 100644 MP.INVE/Shared/MainLayout.razor.cs
 create mode 100644 MP.INVE/Shared/NavMenu.razor.cs
diff --git a/MP.INVE/Components/CmpTop.razor.cs b/MP.INVE/Components/CmpTop.razor.cs
index 3a58fbc0..70f510b7 100644
--- a/MP.INVE/Components/CmpTop.razor.cs
+++ b/MP.INVE/Components/CmpTop.razor.cs
@@ -63,6 +63,11 @@ namespace MP.INVE.Components
             await getId();
         }
 
+        protected override async Task OnAfterRenderAsync(bool firstRender)
+        {
+            await getId();
+        }
+
         #endregion Protected Methods
 
         #region Private Fields
diff --git a/MP.INVE/MP.INVE.csproj b/MP.INVE/MP.INVE.csproj
index c37ab6ce..4e2a8c5e 100644
--- a/MP.INVE/MP.INVE.csproj
+++ b/MP.INVE/MP.INVE.csproj
@@ -5,7 +5,7 @@
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <RootNamespace>MP.INVE</RootNamespace>
-    <Version>6.16.2211.1616</Version>
+    <Version>6.16.2211.1617</Version>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/MP.INVE/Resources/ChangeLog.html b/MP.INVE/Resources/ChangeLog.html
index db464b6c..0742b597 100644
--- a/MP.INVE/Resources/ChangeLog.html
+++ b/MP.INVE/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>Modulo MAPOINVE </i>
-    <h4>Versione: 6.16.2211.1616</h4>
+    <h4>Versione: 6.16.2211.1617</h4>
     <br /> Note di rilascio:
     <ul>
         <li>
diff --git a/MP.INVE/Resources/VersNum.txt b/MP.INVE/Resources/VersNum.txt
index c7a3e740..0e34ded0 100644
--- a/MP.INVE/Resources/VersNum.txt
+++ b/MP.INVE/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2211.1616
+6.16.2211.1617
diff --git a/MP.INVE/Resources/manifest.xml b/MP.INVE/Resources/manifest.xml
index 6db4351e..d95385a5 100644
--- a/MP.INVE/Resources/manifest.xml
+++ b/MP.INVE/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>6.16.2211.1616</version>
+  <version>6.16.2211.1617</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>
diff --git a/MP.INVE/Shared/MainLayout.razor b/MP.INVE/Shared/MainLayout.razor
index 8ac70466..75da5b44 100644
--- a/MP.INVE/Shared/MainLayout.razor
+++ b/MP.INVE/Shared/MainLayout.razor
@@ -1,4 +1,6 @@
-﻿@inherits LayoutComponentBase
+﻿@using Blazored.LocalStorage;
+@using MP.Data.DTO;
+@inherits LayoutComponentBase
 
 <PageTitle>MP.INVE</PageTitle>
 
@@ -12,7 +14,10 @@
             <CmpTop></CmpTop>
         </div>
         <article class="content pt-0 m-2">
-            @Body
+            @if (userName != "0" || NavManager.Uri.Contains("OperatoreLogin"))
+            {
+                @Body
+            }
         </article>
         <div class="fixed-bottom bottom-row px-2">
             <CmpFooter></CmpFooter>
@@ -20,14 +25,3 @@
     </main>
 </div>
 
-@code {
-    protected bool navLarge { get; set; } = true;
-
-    protected string sideClass { get; set; } = "sidebar";
-
-    protected void UpdateNavDisplay()
-    {
-        navLarge = !navLarge;
-        sideClass = navLarge ? "sidebar" : "sidebarSmall";
-    }
-}
\ No newline at end of file
diff --git a/MP.INVE/Shared/MainLayout.razor.cs b/MP.INVE/Shared/MainLayout.razor.cs
new file mode 100644
index 00000000..089b4dfa
--- /dev/null
+++ b/MP.INVE/Shared/MainLayout.razor.cs
@@ -0,0 +1,70 @@
+using Blazored.LocalStorage;
+using Microsoft.AspNetCore.Components;
+using MP.Data.DTO;
+
+namespace MP.INVE.Shared
+{
+    public partial class MainLayout
+    {
+        #region Protected Fields
+
+        protected string userName = "0";
+
+        #endregion Protected Fields
+
+        #region Protected Properties
+
+        protected bool navLarge { get; set; } = true;
+
+        protected string sideClass { get; set; } = "sidebar";
+
+        #endregion Protected Properties
+
+        #region Protected Methods
+
+        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 (NavManager.Uri.Contains("OperatoreLogin"))
+                {
+                    NavManager.NavigateTo("Starter", true);
+                }
+            }
+            else
+            {
+                userName = "0";
+                if (!NavManager.Uri.Contains("OperatoreLogin"))
+                {
+                    NavManager.NavigateTo("OperatoreLogin", true);
+                }
+            }
+        }
+
+        protected override async Task OnInitializedAsync()
+        {
+            await getId();
+        }
+
+        protected void UpdateNavDisplay()
+        {
+            navLarge = !navLarge;
+            sideClass = navLarge ? "sidebar" : "sidebarSmall";
+        }
+
+        #endregion Protected Methods
+
+        #region Private Properties
+
+        [Inject]
+        private ILocalStorageService localStorage { get; set; } = null!;
+
+        [Inject]
+        private NavigationManager NavManager { get; set; } = null!;
+
+        #endregion Private Properties
+    }
+}
\ No newline at end of file
diff --git a/MP.INVE/Shared/NavMenu.razor b/MP.INVE/Shared/NavMenu.razor
index 4a7f7eb4..cf60bfa1 100644
--- a/MP.INVE/Shared/NavMenu.razor
+++ b/MP.INVE/Shared/NavMenu.razor
@@ -20,7 +20,7 @@
 <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">
+            <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>
@@ -29,9 +29,8 @@
                 </div>
             </NavLink>
         </div>
-        @*</div> *@
         <div class="nav-item px-2 col-12">
-            <NavLink class="nav-link px-2" href="/Session">
+            <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>
@@ -41,7 +40,7 @@
             </NavLink>
         </div>
         <div class="nav-item px-2 col-12">
-            <NavLink class="nav-link px-2" href="/Acquisizione">
+            <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>
@@ -51,7 +50,7 @@
             </NavLink>
         </div>
         <div class="nav-item px-2 col-12">
-            <NavLink class="nav-link px-2" href="/Invio">
+            <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>
@@ -63,36 +62,4 @@
     </nav>
 </div>
 
-@code {
-    private bool collapseNavMenu = true;
-    //public List<MP.Data.DatabaseModels.LinkMenu>? ElencoLink { get; set; }
 
-    private string? NavMenuCssClass => collapseNavMenu ? "collapse" : null;
-
-    private void ToggleNavMenu()
-    {
-        collapseNavMenu = !collapseNavMenu;
-    }
-
-    protected override async Task OnInitializedAsync()
-    {
-        // recupero elenco JQM
-        //ElencoLink = await MDService.ElencoLink();
-        await Task.Delay(1);
-    }
-
-    protected bool showText { get; set; } = true;
-    protected void ToggleCompress()
-    {
-        showText = !showText;
-        EC_compressUpdated.InvokeAsync(showText);
-    }
-
-    protected string hideText
-    {
-        get => showText ? "" : "invisible";
-    }
-
-    [Parameter]
-    public EventCallback<bool> EC_compressUpdated { get; set; }
-}
diff --git a/MP.INVE/Shared/NavMenu.razor.cs b/MP.INVE/Shared/NavMenu.razor.cs
new file mode 100644
index 00000000..fd219e3e
--- /dev/null
+++ b/MP.INVE/Shared/NavMenu.razor.cs
@@ -0,0 +1,59 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Components;
+using System.Net.Http;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Components.Authorization;
+using Microsoft.AspNetCore.Components.Forms;
+using Microsoft.AspNetCore.Components.Routing;
+using Microsoft.AspNetCore.Components.Web;
+using Microsoft.AspNetCore.Components.Web.Virtualization;
+using Microsoft.JSInterop;
+using MP.INVE;
+using MP.INVE.Shared;
+using MP.INVE.Components;
+using MP.INVE.Data;
+
+namespace MP.INVE.Shared
+{
+    public partial class NavMenu
+    {
+        private bool collapseNavMenu = true;
+        //public List<MP.Data.DatabaseModels.LinkMenu>? ElencoLink { get; set; }
+        private string? NavMenuCssClass => collapseNavMenu ? "collapse" : null;
+        private void ToggleNavMenu()
+        {
+            collapseNavMenu = !collapseNavMenu;
+        }
+
+        protected override async Task OnInitializedAsync()
+        {
+            // recupero elenco JQM
+            //ElencoLink = await MDService.ElencoLink();
+            await Task.Delay(1);
+        }
+
+        protected bool showText { get; set; } = true;
+        protected void ToggleCompress()
+        {
+            showText = !showText;
+            EC_compressUpdated.InvokeAsync(showText);
+        }
+
+        protected string hideText { get => showText ? "" : "invisible"; }
+
+        [Parameter]
+        public EventCallback<bool> EC_compressUpdated { get; set; }
+
+
+        [Inject]
+        protected NavigationManager NavigationManager { get; set; } = null!;
+
+        private void HandleClick(string target)
+        {
+            NavigationManager.NavigateTo(target, true);
+        }
+    }
+}
\ No newline at end of file
