From df0dfcec2061819028bb869ffe9cc186604363c8 Mon Sep 17 00:00:00 2001
From: "zaccaria.majid" <zaccaria.majid@egalware.com>
Date: Fri, 1 Dec 2023 11:42:15 +0100
Subject: [PATCH] fix grafici + fix logout con timeout

---
 MP-TAB-SERV/Components/CmpFooter.razor.cs   |  2 +-
 MP-TAB-SERV/Components/NotesEditor.razor    |  2 +-
 MP-TAB-SERV/Components/NotesEditor.razor.cs |  5 ++-
 MP-TAB-SERV/Components/ProdConfirm.razor    | 49 ++++++++++-----------
 MP-TAB-SERV/MP-TAB-SERV.csproj              |  2 +-
 MP-TAB-SERV/Resources/ChangeLog.html        |  2 +-
 MP-TAB-SERV/Resources/VersNum.txt           |  2 +-
 MP-TAB-SERV/Resources/manifest.xml          |  2 +-
 8 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/MP-TAB-SERV/Components/CmpFooter.razor.cs b/MP-TAB-SERV/Components/CmpFooter.razor.cs
index e90e41e6..9d669395 100644
--- a/MP-TAB-SERV/Components/CmpFooter.razor.cs
+++ b/MP-TAB-SERV/Components/CmpFooter.razor.cs
@@ -33,7 +33,7 @@ namespace MP_TAB_SERV.Components
                 {
                     await Task.Delay(1);
                     await InvokeAsync(() => StateHasChanged());
-                    if(diffOfTime.Minutes > dtTimerScadenzaLogin)
+                    if(diffOfTime.Minutes >= dtTimerScadenzaLogin)
                     {
                         NavMan.NavigateTo("logout");
                     }
diff --git a/MP-TAB-SERV/Components/NotesEditor.razor b/MP-TAB-SERV/Components/NotesEditor.razor
index 791921d8..1958a1b7 100644
--- a/MP-TAB-SERV/Components/NotesEditor.razor
+++ b/MP-TAB-SERV/Components/NotesEditor.razor
@@ -1,5 +1,5 @@
 <div class="row mt-2">
-    @if (UserComment != "")
+    @if (!ShowBtn)
     {
         <div class="col-6">
             <div class="input-group">
diff --git a/MP-TAB-SERV/Components/NotesEditor.razor.cs b/MP-TAB-SERV/Components/NotesEditor.razor.cs
index 5b891c17..20bd31e4 100644
--- a/MP-TAB-SERV/Components/NotesEditor.razor.cs
+++ b/MP-TAB-SERV/Components/NotesEditor.razor.cs
@@ -155,7 +155,7 @@ namespace MP_TAB_SERV.Components
             {
                 await Task.Delay(1);
                 ShowBtn = false;
-                //UserComment = await MServ.CommentoValGet(true);
+                UserComment = await MServ.CommentoValGet(true);
                 DateSel = await MServ.CommentoDtRifGet(true);
                 await InvokeAsync(StateHasChanged);
             }
@@ -245,7 +245,8 @@ namespace MP_TAB_SERV.Components
         {
             UserComment = "";
             DateSel = DateTime.Now;
-            CurrComm = null;
+            //CurrComm = null;
+            ShowBtn = true;
             //StateHasChanged();
         }
 
diff --git a/MP-TAB-SERV/Components/ProdConfirm.razor b/MP-TAB-SERV/Components/ProdConfirm.razor
index bcc4e7c6..001916b4 100644
--- a/MP-TAB-SERV/Components/ProdConfirm.razor
+++ b/MP-TAB-SERV/Components/ProdConfirm.razor
@@ -1,17 +1,17 @@
 
 
+<div class="col-12 mt-1">
+    <MachSel RecMSE="RecMSE" E_MachSel="SetMacc"></MachSel>
+</div>
 <div class="d-flex justify-content-between mt-2">
-    <div class="col-4">
-        <MachSel RecMSE="RecMSE" E_MachSel="SetMacc"></MachSel>
-    </div>
 
-    <div class="col-8 d-flex justify-content-end">
-        <div class="px-1 col-4">
+    <div class="col-12 d-flex justify-content-between">
+        <div class="px-1 col-6">
             <PrintMag RecMSE="RecMSE"></PrintMag>
         </div>
         @if (odlOk)
         {
-            <div class="px-1 col-8">
+            <div class="px-1 col-6">
                 <button class="btn btn-sm @ConfBg py-2 px-4" style="width: 100%" @onclick="()=>ToggleConfProd()">
                     <i class="fa-solid fa-check pe-1"></i><span>@ConfTitle</span>
                 </button>
@@ -32,32 +32,28 @@
         <div class="d-flex justify-content-between">
             <div class="col-6">
                 <div class="p-1">
-                    <div class="bg-success rounded">
-                        <div class="ps-1 fw-bold" style="font-size: 1.3rem;">Pz Prodotti CONFERMATI</div>
-                        <input class="form-control text-light bg-success border-0" style="font-size: 1.3rem;" aria-label="Floating label select example" @bind="numPzProdotti2Rec" @onblur="() => setConfirmBtn(true)" @onfocus="() => setConfirmBtn(false)" />
+                    <div class="ps-1 fw-bold" style="font-size: 1.3rem;">Pz Prodotti CONFERMATI</div>
+                    <div class="rounded">
+                        <input class="form-control border-0 fw-bold" style="font-size: 1.5rem; background-color: #fff3cd; color: #000" aria-label="Floating label select example" @bind="numPzProdotti2Rec" @onblur="() => setConfirmBtn(true)" @onfocus="() => setConfirmBtn(false)" />
                     </div>
                 </div>
                 <div class="p-1">
-                    <div class="bg-secondary rounded">
-                        @if (enablePzProdLasciati)
-                        {
-                            <div class="ps-1 fw-bold" style="font-size: 1.3rem;">Pz Prodotti LASCIATI</div>
-
-                            <input class="form-control text-light bg-secondary border-0" style="font-size: 1.3rem;" aria-label="Floating label select example" @bind="numPzLasciati" @onblur="() => setConfirmBtn(true)" @onfocus="() => setConfirmBtn(false)" />
-                        }
-                        else
-                        {
-                            <label class="btn btn-dark text-light btn-lg w-100" Visible="false">&nbsp;</label>
-                        }
-                    </div>
+                    @if (enablePzProdLasciati)
+                    {
+                        <div class="ps-1 fw-bold" style="font-size: 1.3rem;">Pz Prodotti LASCIATI</div>
+                        <div class="bg-secondary rounded">
+                            <input class="form-control text-light bg-secondary border-0" style="font-size: 1.5rem;" aria-label="Floating label select example" @bind="numPzLasciati" @onblur="() => setConfirmBtn(true)" @onfocus="() => setConfirmBtn(false)" />
+                        </div>
+                    }
+                    else
+                    {
+                        <label class="btn btn-dark text-light btn-lg w-100" Visible="false">&nbsp;</label>
+                    }
                 </div>
             </div>
             <div class="col-6">
                 <div style="display: flex; flex-direction: column; justify-content: space-between; height: 100%;">
-                    <div class="text-center">
-                        @($"{dtReqUpdate:HH:mm:ss} | {dtReqUpdate:ddd yyyy.MM.dd}")
-                    </div>
-                    <div class="p-1" style="font-size: 1.3rem">
+                    <div class="p-1" style="font-size: 1.5rem">
                         <div class="d-flex justify-content-between">
                             <span class="text-success">Pz Buoni</span>
                             <span>@lblPz2RecBuoni</span>
@@ -67,6 +63,9 @@
                             <span>@lblPz2RecScarto</span>
                         </div>
                     </div>
+                    <div class="text-center h-100 d-flex flex-column align-items-center flex-nowrap justify-content-end">
+                        @($"{dtReqUpdate:HH:mm:ss} | {dtReqUpdate:ddd yyyy.MM.dd}")
+                    </div>
                     <div class="p-1">
                         @if (showConfirm)
                         {
diff --git a/MP-TAB-SERV/MP-TAB-SERV.csproj b/MP-TAB-SERV/MP-TAB-SERV.csproj
index da386b70..bfde8a91 100644
--- a/MP-TAB-SERV/MP-TAB-SERV.csproj
+++ b/MP-TAB-SERV/MP-TAB-SERV.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
-      <Version>6.16.2311.3018</Version>
+      <Version>6.16.2312.110</Version>
     <ImplicitUsings>enable</ImplicitUsings>
     <RootNamespace>MP_TAB_SERV</RootNamespace>
   </PropertyGroup>
diff --git a/MP-TAB-SERV/Resources/ChangeLog.html b/MP-TAB-SERV/Resources/ChangeLog.html
index 38abd60d..e5541a35 100644
--- a/MP-TAB-SERV/Resources/ChangeLog.html
+++ b/MP-TAB-SERV/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>Modulo MAPOSPEC </i>
-    <h4>Versione: 6.16.2311.3018</h4>
+    <h4>Versione: 6.16.2312.110</h4>
     <br /> Note di rilascio:
     <ul>
         <li>
diff --git a/MP-TAB-SERV/Resources/VersNum.txt b/MP-TAB-SERV/Resources/VersNum.txt
index 2fa44d88..259fa006 100644
--- a/MP-TAB-SERV/Resources/VersNum.txt
+++ b/MP-TAB-SERV/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2311.3018
+6.16.2312.110
diff --git a/MP-TAB-SERV/Resources/manifest.xml b/MP-TAB-SERV/Resources/manifest.xml
index 29a2b035..73b7d034 100644
--- a/MP-TAB-SERV/Resources/manifest.xml
+++ b/MP-TAB-SERV/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>6.16.2311.3018</version>
+  <version>6.16.2312.110</version>
   <url>https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/MP-TAB-SERV.zip</url>
   <changelog>https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/ChangeLog.html</changelog>
   <mandatory>false</mandatory>