Merge branch 'Release/AddUserLoginTrackTab_02'

2024-05-29 10:31:03 +02:00
parent 7fe9b5ae6b 6026c029a8
commit c7a908f70e
6 changed files with 39 additions and 8 deletions
@@ -3,7 +3,7 @@
  <PropertyGroup>
    <TargetFramework>net6.0</TargetFramework>
    <Nullable>enable</Nullable>
-      <Version>6.16.2405.2909</Version>
+      <Version>6.16.2405.2910</Version>
    <ImplicitUsings>enable</ImplicitUsings>
    <RootNamespace>MP_TAB3</RootNamespace>
  </PropertyGroup>
@@ -4,9 +4,29 @@
    <div class="row mb-2">
        @if (ListMSE == null || ListMSE.Count == 0 || isCalcSize)
        {
-            <div class="p-3">
-                <EgwCoreLib.Razor.LoadingData DisplaySize="LoadingData.CtrlSize.Large"></EgwCoreLib.Razor.LoadingData>
-            </div>
+            if (ListMachineEnabled == null || ListMachineEnabled.Count == 0)
+            {
+                <div class="col alert alert-primary p-5 mx-3 text-center">
+                    <h1 class="fs-1">
+                        <b>Attenzione!</b>
+                    </h1>
+                    <i class="fa-solid fa-user-slash fs-1"></i>
+                    <div class="fs-4 my-2">
+                        Nessun impianto abilitato per l'operatore.
+                    </div>
+
+
+                    <NavLink class="btn btn-primary btn-lg w-75" @onclick="()=>DoLogout()">
+                        <i class="fa fa-lg fa-sign-out pe-2" aria-hidden="true"></i> LogOut
+                    </NavLink>
+                </div>
+            }
+            else
+            {
+                <div class="p-3">
+                    <EgwCoreLib.Razor.LoadingData DisplaySize="LoadingData.CtrlSize.Large"></EgwCoreLib.Razor.LoadingData>
+                </div>
+            }
        }
        else
        {
@@ -111,6 +111,18 @@ namespace MP_TAB3.Pages
            return answ;
        }

+        protected async Task DoLogout()
+        {
+            string tgtUrl = "logout";
+            await Task.Delay(1);
+            if (tgtUrl.Contains("status-map"))
+            {
+                await MsgServ.IdxMaccSet("");
+            }
+            await MsgServ.LastOpenedPageSet(tgtUrl);
+            NavMan.NavigateTo(tgtUrl, true);
+        }
+
        protected async Task getWDim()
        {
            var dimension = await JSRuntime.InvokeAsync<WindowDimension>("getWindowDimensions");
@@ -186,7 +198,6 @@ namespace MP_TAB3.Pages
            // rileggo elenco macchine operatore...
            ListMachineEnabled = await TabDServ.MacchineByMatrOper(MatrOpr);
            // salvo valori ricevuti
-            //ListMSE = newList;
            AllDataMSE = newList;
            // filtro!
            FiltOprMse();
@@ -1,6 +1,6 @@
 <body>
    <i>Modulo MAPOSPEC </i>
-    <h4>Versione: 6.16.2405.2909</h4>
+    <h4>Versione: 6.16.2405.2910</h4>
    <br /> Note di rilascio:
    <ul>
        <li>
@@ -1 +1 @@
-6.16.2405.2909
+6.16.2405.2910
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>6.16.2405.2909</version>
+  <version>6.16.2405.2910</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>