From 33b3aa0e2b12c7a7103322b4f879b93af5f5a201 Mon Sep 17 00:00:00 2001
From: "zaccaria.majid" <zaccaria.majid@egalware.com>
Date: Wed, 29 Nov 2023 16:11:59 +0100
Subject: [PATCH] fix grafico + fix errore in scarti sempre presente

---
 MP-TAB-SERV/Components/FixOdl.razor    | 40 ++++++++++++++------------
 MP-TAB-SERV/Components/OdlMan.razor.cs |  2 +-
 MP-TAB-SERV/Components/ScrapMan.razor  | 21 +++++++-------
 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 +-
 MP.Data/Controllers/MpTabController.cs |  3 +-
 8 files changed, 39 insertions(+), 35 deletions(-)

diff --git a/MP-TAB-SERV/Components/FixOdl.razor b/MP-TAB-SERV/Components/FixOdl.razor
index e8998715..5da49b6c 100644
--- a/MP-TAB-SERV/Components/FixOdl.razor
+++ b/MP-TAB-SERV/Components/FixOdl.razor
@@ -6,6 +6,25 @@
         <div class="col-12">
             <h1>Riassegnazione ODL</h1>
         </div>
+
+        <div class="col-8">
+            <div class="input-group input-group-lg">
+                <input type="text" class="form-control w-25" placeholder="Cerca" aria-label="Cerca">
+                <select class="form-select w-50" @bind="IdxOdlSel">
+                    @* <option disabled>Selezionare P.ODL</option> *@
+                    @foreach (var item in ListSelODL)
+                    {
+                        <option value="@item.value">@item.label</option>
+                    }
+                </select>
+                <div class="input-group-text">
+                    <input class="form-check-input mt-0 me-1" id="chk_all" type="checkbox" @bind="ShowAll">
+                    <label class="form-check-label" for="" chk_all">
+                        Tutti
+                    </label>
+                </div>
+            </div>
+        </div>
         <div class="col-12">
             <h4>Ultimi ODL lavorati:</h4>
             <table class="table table-dark table-sm table-striped">
@@ -35,7 +54,7 @@
                                     <div class="px-1">
                                         <i class="fa-solid fa-arrow-right"></i>
                                     </div>
-                                    <div class="px-1">
+                                    <div class="px-1 fw-bold">
                                         @($"{item.DataFine:yyyy.MM.dd HH:mm:ss}")
                                     </div>
                                 </div>
@@ -61,24 +80,7 @@
             <EgwCoreLib.Razor.DataPager currPage="@PageNum" PageSize="@NumRecPage" totalCount="@TotalCount" numPageChanged="SavePage" numRecordChanged="SaveNumRec"></EgwCoreLib.Razor.DataPager>
 
         </div>
-        <div class="col-8">
-            <div class="input-group input-group-lg">
-                <input type="text" class="form-control w-25" placeholder="Cerca" aria-label="Cerca">
-                <select class="form-select w-50" @bind="IdxOdlSel">
-                    @* <option disabled>Selezionare P.ODL</option> *@
-                    @foreach (var item in ListSelODL)
-                    {
-                        <option value="@item.value">@item.label</option>
-                    }
-                </select>
-                <div class="input-group-text">
-                    <input class="form-check-input mt-0 me-1" id="chk_all" type="checkbox" @bind="ShowAll">
-                    <label class="form-check-label" for="" chk_all">
-                        Tutti
-                    </label>
-                </div>
-            </div>
-        </div>
+        
         <div class="col-4">
             @if (IdxOdlSel > 0)
             {
diff --git a/MP-TAB-SERV/Components/OdlMan.razor.cs b/MP-TAB-SERV/Components/OdlMan.razor.cs
index 17bb44fc..0e609a78 100644
--- a/MP-TAB-SERV/Components/OdlMan.razor.cs
+++ b/MP-TAB-SERV/Components/OdlMan.razor.cs
@@ -813,7 +813,7 @@ namespace MP_TAB_SERV.Components
 
         protected async Task SendFixEndSetup()
         {
-            if (!await JSRuntime.InvokeAsync<bool>("confirm", $"Confermi invio FIX chiusura atrtezzaggio ad impianto?"))
+            if (!await JSRuntime.InvokeAsync<bool>("confirm", $"Confermi invio FIX chiusura attrezzaggio ad impianto?"))
                 return;
 
             string ts = string.Format("{0:yyMMdd}T{0:HHmmss.fff}Z", DateTime.Now);
diff --git a/MP-TAB-SERV/Components/ScrapMan.razor b/MP-TAB-SERV/Components/ScrapMan.razor
index 9d18452a..e3627b41 100644
--- a/MP-TAB-SERV/Components/ScrapMan.razor
+++ b/MP-TAB-SERV/Components/ScrapMan.razor
@@ -13,21 +13,22 @@
     </div>
 </div>
 
-@if (useOdl)
-{
-    <MachineSelOdl IdxMacchina="@IdxMaccSel" E_OdlSel="SetOdl"></MachineSelOdl>
-}
-else
-{
-    <div style="font-size: .8rem">
-        <EgwCoreLib.Razor.PeriodoSel CurrPeriodo="CurrPeriodo" E_PeriodoSel="SetPeriodo"></EgwCoreLib.Razor.PeriodoSel>
-    </div>
-}
 <ShowProcessing Message="Caricamento" IsProcessing="@isProcessing"></ShowProcessing>
 <div class="cardObj p-2 mt-2">
     <div class="mb-2">
         <ScrapEditor RecMSE="@RecMSE" E_Updated="doUpdate"></ScrapEditor>
     </div>
+
+    @if (useOdl)
+    {
+        <MachineSelOdl IdxMacchina="@IdxMaccSel" E_OdlSel="SetOdl"></MachineSelOdl>
+    }
+    else
+    {
+        <div style="font-size: .8rem">
+            <EgwCoreLib.Razor.PeriodoSel CurrPeriodo="CurrPeriodo" E_PeriodoSel="SetPeriodo"></EgwCoreLib.Razor.PeriodoSel>
+        </div>
+    }
     <div class="mb-2 p-1">
         <div class="row">
             <div class="col-12">
diff --git a/MP-TAB-SERV/MP-TAB-SERV.csproj b/MP-TAB-SERV/MP-TAB-SERV.csproj
index 3c6861de..0637c48d 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.2909</Version>
+      <Version>6.16.2311.2916</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 0d8f349d..73b25e01 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.2909</h4>
+    <h4>Versione: 6.16.2311.2916</h4>
     <br /> Note di rilascio:
     <ul>
         <li>
diff --git a/MP-TAB-SERV/Resources/VersNum.txt b/MP-TAB-SERV/Resources/VersNum.txt
index e06a3900..b1553713 100644
--- a/MP-TAB-SERV/Resources/VersNum.txt
+++ b/MP-TAB-SERV/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2311.2909
+6.16.2311.2916
diff --git a/MP-TAB-SERV/Resources/manifest.xml b/MP-TAB-SERV/Resources/manifest.xml
index 26822669..151379be 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.2909</version>
+  <version>6.16.2311.2916</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>
diff --git a/MP.Data/Controllers/MpTabController.cs b/MP.Data/Controllers/MpTabController.cs
index 362694d3..27878bcb 100644
--- a/MP.Data/Controllers/MpTabController.cs
+++ b/MP.Data/Controllers/MpTabController.cs
@@ -1574,7 +1574,8 @@ namespace MP.Data.Controllers
                                  .Database
                                  .ExecuteSqlRawAsync("exec dbo.stp_RS_Insert_withCheck @idxMacchina, @DataOra, @Causale, @Qta, @Note, @MatrOpr", IdxMacchina, DataOra, Causale, Qta, Note, MatrOpr);
                 // indico eseguito!
-                fatto = result > 0;
+                // -1 = restituisce una select
+                fatto = result != 0;
             }
             return fatto;
         }