Update gestione reload CmpTop

MP-TAB3/Components/CmpTop.razor.cs

@@ -67,26 +67,30 @@ namespace MP_TAB3.Components
 
         #region Protected Methods
 
-        protected async Task RefreshLogIn(string decodValue)
+        protected async Task RefreshScadLogIn(string decodValue)
         {
             bool done = false;
-            if (TypeScadLogin <= 0 || TypeScadLogin == 2)
+            // solo se non è logout!!!
+            if (!NavMan.Uri.Contains("logout"))
             {
-                done = await MsgServ.DoLogIn(decodValue, false);
-            }
-            else
-            {
-                done = await MsgServ.DoLogIn(decodValue, true);
-            }
-            if (done)
-            {
-                if (!string.IsNullOrEmpty(LastOpenedPage) && !string.IsNullOrEmpty(CurrMacc))
+                if (TypeScadLogin <= 0 || TypeScadLogin == 2)
                 {
-                    NavMan.NavigateTo(LastOpenedPage);
+                    done = await MsgServ.DoLogIn(decodValue, false);
                 }
                 else
                 {
-                    NavMan.NavigateTo("status-map");
+                    done = await MsgServ.DoLogIn(decodValue, true);
+                }
+                if (done )
+                {
+                    if (!string.IsNullOrEmpty(LastOpenedPage) && !string.IsNullOrEmpty(CurrMacc))
+                    {
+                        NavMan.NavigateTo(LastOpenedPage);
+                    }
+                    else if(!NavMan.Uri.Contains(LastOpenedPage))
+                    {
+                        NavMan.NavigateTo("status-map");
+                    }
                 }
             }
         }
@@ -149,7 +153,7 @@ namespace MP_TAB3.Components
             CurrMacc = await MsgServ.IdxMaccGet();
 
             CurrOprTknLS = await MsgServ.GetCurrOperDtoLSAsync();
-            var decodedUrl = Uri.UnescapeDataString(CurrOprTknLS);
+            var currOprTokLsDeco = Uri.UnescapeDataString(CurrOprTknLS);
             if (!string.IsNullOrEmpty(CurrOprTknLS))
             {
                 var decryptedData = MsgServ.DecryptData(CurrOprTknLS);
@@ -176,7 +180,7 @@ namespace MP_TAB3.Components
             }
             else if (!string.IsNullOrEmpty(CurrOprTknRedis) && CurrOprTknRedis == CurrOprTknLS)
             {
-                await RefreshLogIn(decodedUrl);
+                await RefreshScadLogIn(currOprTokLsDeco);
                 await EA_UserIsOk.InvokeAsync(true);
             }
         }

MP-TAB3/MP-TAB3.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
-      <Version>6.16.2401.2618</Version>
+      <Version>6.16.2402.616</Version>
     <ImplicitUsings>enable</ImplicitUsings>
     <RootNamespace>MP_TAB3</RootNamespace>
   </PropertyGroup>

MP-TAB3/Pages/Logout.razor.cs

@@ -26,6 +26,12 @@ namespace MP_TAB3.Pages
 
         #region Protected Methods
 
+        protected override Task OnAfterRenderAsync(bool firstRender)
+        {
+            MsgServ.RigaOper = null;
+            return base.OnAfterRenderAsync(firstRender);
+        }
+
         protected override async Task OnInitializedAsync()
         {
             await Task.Delay(1);

MP-TAB3/Pages/RegNewDevice.razor

@@ -11,6 +11,7 @@
 
 @if (ShowScanBarcode)
 {
+    
     <BarcodeReader ScanResult="(e) => ScanDoneHandler(e)"
                    Close="ToggleCodeScan"
                    ScanBtnTitle="Scan"
@@ -19,7 +20,7 @@
                    UseBuiltinDiv="false"
     @ref="barcodeReaderCustom"
                    SelectDeviceBtnTitle="Select Device">
-    </BarcodeReader>
+    </BarcodeReader> 
 
     <div @ref="barcodeReaderCustom.Element" class="d-flex  justify-content-center">
         <div class="col-12 col-md-8 col-lg-6">
@@ -37,6 +38,7 @@
             </div>
         </div>
     </div>
+   
 }
 
 @if (oprsList.Count > 0)

MP-TAB3/Pages/_Layout.cshtml

@@ -22,7 +22,6 @@
     <link rel="stylesheet" href="css/site.css" />
     <link rel="stylesheet" href="MP-TAB3.styles.css" />
     <component type="typeof(HeadOutlet)" render-mode="Server" />
-    @* <component type="typeof(HeadOutlet)" render-mode="ServerPrerendered" /> *@
 </head>
 <body>
     @RenderBody()
@@ -38,7 +37,6 @@
         <a class="dismiss">🗙</a>
     </div>
 
-    @*<script src="~/lib//BarcodeReade.razor.js"></script>*@
     <script src="lib/WindowSize.js"></script>
     <script src="lib/bootstrap/js/bootstrap.bundle.js"></script>
     <script src="_framework/blazor.server.js"></script>

MP-TAB3/Resources/ChangeLog.html

@@ -1,6 +1,6 @@
 <body>
     <i>Modulo MAPOSPEC </i>
-    <h4>Versione: 6.16.2401.2618</h4>
+    <h4>Versione: 6.16.2402.616</h4>
     <br /> Note di rilascio:
     <ul>
         <li>

MP-TAB3/Resources/VersNum.txt

@@ -1 +1 @@
-6.16.2401.2618
+6.16.2402.616

MP-TAB3/Resources/manifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>6.16.2401.2618</version>
+  <version>6.16.2402.616</version>
   <url>https://nexus.steamware.net/repository/SWS/MP-TAB3/stable/LAST/MP-TAB3.zip</url>
   <changelog>https://nexus.steamware.net/repository/SWS/MP-TAB3/stable/LAST/ChangeLog.html</changelog>
   <mandatory>false</mandatory>