diff --git a/EgwCoreLib.Lux.Core/EgwCoreLib.Lux.Core.csproj b/EgwCoreLib.Lux.Core/EgwCoreLib.Lux.Core.csproj
index e60189cf..a74b52ec 100644
--- a/EgwCoreLib.Lux.Core/EgwCoreLib.Lux.Core.csproj
+++ b/EgwCoreLib.Lux.Core/EgwCoreLib.Lux.Core.csproj
@@ -21,9 +21,9 @@
   </ItemGroup>
   
   <ItemGroup>
-    <PackageReference Include="Egw.Lux.WebWindow.Base" Version="2.7.12.1518" />
-    <PackageReference Include="Egw.Lux.WebWindowComplex" Version="2.7.12.1518" />
-    <PackageReference Include="Egw.Window.Data" Version="2.7.12.1911" />
+    <PackageReference Include="Egw.Lux.WebWindow.Base" Version="2.7.12.2312" />
+    <PackageReference Include="Egw.Lux.WebWindowComplex" Version="2.7.12.2312" />
+    <PackageReference Include="Egw.Window.Data" Version="2.7.12.2312" />
     <PackageReference Include="EgwMultiEngineManager.Data" Version="2.7.12.1" />
   </ItemGroup>
 </Project>
diff --git a/EgwCoreLib.Lux.Data/Controllers/LuxController.cs b/EgwCoreLib.Lux.Data/Controllers/LuxController.cs
index 6eaf554c..91bca091 100644
--- a/EgwCoreLib.Lux.Data/Controllers/LuxController.cs
+++ b/EgwCoreLib.Lux.Data/Controllers/LuxController.cs
@@ -3031,6 +3031,10 @@ namespace EgwCoreLib.Lux.Data.Controllers
                     if (currRec != null)
                     {
                         currRec.ProdEstimate = prodEstim;
+                        if (!string.IsNullOrEmpty(prodEstim) && currRec.OrderRowState == OrderStates.Created)
+                        {
+                            currRec.OrderRowState = OrderStates.Estimated;
+                        }
                         dbCtx.Entry(currRec).State = EntityState.Modified;
                         // genero WLD x controllo
                         var currWLD = new WorkLoadDetailDTO(currRec.OrderRowUID, currRec.ProdEstimate);
diff --git a/EgwCoreLib.Lux.Data/EgwCoreLib.Lux.Data.csproj b/EgwCoreLib.Lux.Data/EgwCoreLib.Lux.Data.csproj
index b0a81288..caf99854 100644
--- a/EgwCoreLib.Lux.Data/EgwCoreLib.Lux.Data.csproj
+++ b/EgwCoreLib.Lux.Data/EgwCoreLib.Lux.Data.csproj
@@ -27,7 +27,7 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Egw.Lux.WebWindow.Base" Version="2.7.12.1518" />
+        <PackageReference Include="Egw.Lux.WebWindow.Base" Version="2.7.12.2312" />
         <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.21" />
         <PackageReference Include="Microsoft.EntityFrameworkCore.Abstractions" Version="8.0.21" />
         <PackageReference Include="Microsoft.EntityFrameworkCore.Analyzers" Version="8.0.21" />
diff --git a/Lux.API/Lux.API.csproj b/Lux.API/Lux.API.csproj
index 346a1afc..294562a0 100644
--- a/Lux.API/Lux.API.csproj
+++ b/Lux.API/Lux.API.csproj
@@ -4,7 +4,7 @@
         <TargetFramework>net8.0</TargetFramework>
         <Nullable>enable</Nullable>
         <ImplicitUsings>enable</ImplicitUsings>
-        <Version>0.9.2512.2310</Version>
+        <Version>0.9.2512.2312</Version>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/Lux.UI.Client/Lux.UI.Client.csproj b/Lux.UI.Client/Lux.UI.Client.csproj
index 440f903d..b47e51af 100644
--- a/Lux.UI.Client/Lux.UI.Client.csproj
+++ b/Lux.UI.Client/Lux.UI.Client.csproj
@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Egw.Lux.WebWindowComplex" Version="2.7.12.1518" />
+    <PackageReference Include="Egw.Lux.WebWindowComplex" Version="2.7.12.2312" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.21" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="8.0.21" />
   </ItemGroup>
diff --git a/Lux.UI/Components/Compo/OrderRowMan.razor b/Lux.UI/Components/Compo/OrderRowMan.razor
index 59fe6236..bfef4fb8 100644
--- a/Lux.UI/Components/Compo/OrderRowMan.razor
+++ b/Lux.UI/Components/Compo/OrderRowMan.razor
@@ -454,7 +454,7 @@ else if (WorkLoadRecord != null)
 {
     if (CurrEditMode == EditMode.WorkLoadDetailTime)
     {
-        <div class="modal" tabindex="-1" style="display:block; background-color: rgba(10,10,10,.6);" role="dialog">
+        @* <div class="modal" tabindex="-1" style="display:block; background-color: rgba(10,10,10,.6);" role="dialog">
             <div class="modal-dialog modal-xl">
                 <div class="modal-content">
                     <div class="modal-header row modal-title">
@@ -472,120 +472,15 @@ else if (WorkLoadRecord != null)
                         </div>
                     </div>
                     <div class="modal-body">
-                        @* @foreach (var item in WorkLoadRecord.ListWorkable)
-                        {
-                            <div class="col-3">
-                                <div class="alert alert-danger p-1 mb-2 text-center align-content-center">@item</div>
-                            </div>
-                        } *@
-                        <p>indicazione dei tempo</p>
-                    </div>
-                </div>
-            </div>
-        </div>
-    }
-    else if (CurrEditMode == EditMode.WorkLoadDetailTag)
-    {
-        <PartStatus DetailRecord="@WorkLoadRecord" EC_ReRunReq="ReRunJob" EC_ClosePopup="ClosePopup"></PartStatus>
-
-        @* <div class="modal" tabindex="-1" style="display:block; background-color: rgba(10,10,10,.6);" role="dialog">
-            <div class="modal-dialog modal-xl">
-                <div class="modal-content">
-                    <div class="modal-header row modal-title">
-                        <div class="col-4 fs-3">
-                            Dettaglio Workload
-                            @if (WorkLoadRecord.Workable)
-                            {
-                                <i class="fa-solid fa-thumbs-up text-success"></i>
-                            }
-                            else
-                            {
-                                <i class="fa-solid fa-thumbs-down text-danger"></i>
-                            }
-                        </div>
-                        <div class="col-4 text-center border border-2 rounded">
-                            <div class="fw-bold">Impianti considerati</div>
-                            <small class="small">@WorkLoadRecord.ListMachines</small>
-                        </div>
-                        <div class="col-4 text-end fs-4">
-                            <button class="btn btn-lg btn-primary" @onclick="() => ReRunJob()"><i class="fa-solid fa-share-from-square" title="Riesecuzione Estimate"></i> Re-Run</button>
-                            <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close" @onclick="ClosePopup">
-                            </button>
-                        </div>
-                    </div>
-                    <div class="modal-body">
-                        <div class="accordion" id="accordionPanelsStayOpenExample">
-                            @if (@WorkLoadRecord.NumKo > 0)
-                            {
-                                <div class="accordion-item">
-                                    <h2 class="accordion-header">
-                                        <button class="accordion-button" type="button" data-bs-toggle="collapse" data-bs-target="#panelsStayOpen-collapseOne" aria-expanded="true" aria-controls="panelsStayOpen-collapseOne">
-                                            Non producibili: <span class="fw-bold px-1">@WorkLoadRecord.NumKo</span>
-                                        </button>
-                                    </h2>
-                                    <div id="panelsStayOpen-collapseOne" class="accordion-collapse collapse show">
-                                        <div class="accordion-body">
-                                            <div class="row gx-2">
-                                                @foreach (var item in WorkLoadRecord.ListUnWorkable)
-                                                {
-                                                    <div class="col-2">
-                                                        <div class="alert alert-danger p-1 mb-2 text-center align-content-center">@item</div>
-                                                    </div>
-                                                }
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                            }
-                            @if (@WorkLoadRecord.NumOkVin > 0)
-                            {
-                                <div class="accordion-item">
-                                    <h2 class="accordion-header">
-                                        <button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#panelsStayOpen-collapseTwo" aria-expanded="false" aria-controls="panelsStayOpen-collapseTwo">
-                                            Vincolati: <span class="fw-bold px-1">@WorkLoadRecord.NumOkVin</span>
-                                        </button>
-                                    </h2>
-                                    <div id="panelsStayOpen-collapseTwo" class="accordion-collapse collapse">
-                                        <div class="accordion-body">
-                                            <div class="row gx-2">
-                                                @foreach (var item in WorkLoadRecord.ListVincolated)
-                                                {
-                                                    <div class="col-2">
-                                                        <div class="alert alert-info p-1 mb-2 text-center align-content-center">@item</div>
-                                                    </div>
-                                                }
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                            }
-                            @if (@WorkLoadRecord.NumOk > 0)
-                            {
-                                <div class="accordion-item">
-                                    <h2 class="accordion-header">
-                                        <button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#panelsStayOpen-collapseThree" aria-expanded="false" aria-controls="panelsStayOpen-collapseThree">
-                                            Producibili: <span class="fw-bold px-1">@WorkLoadRecord.NumOk</span>
-                                        </button>
-                                    </h2>
-                                    <div id="panelsStayOpen-collapseThree" class="accordion-collapse collapse">
-                                        <div class="accordion-body">
-                                            <div class="row gx-2">
-                                                @foreach (var item in WorkLoadRecord.ListWorkable)
-                                                {
-                                                    <div class="col-2">
-                                                        <div class="alert alert-success p-1 mb-2 text-center align-content-center">@item</div>
-                                                    </div>
-                                                }
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                            }
-                        </div>
                     </div>
                 </div>
             </div>
         </div> *@
+        <TimeEstim DetailRecord="@WorkLoadRecord" EC_ReRunReq="ReRunJob" EC_ClosePopup="ClosePopup"></TimeEstim>
+    }
+    else if (CurrEditMode == EditMode.WorkLoadDetailTag)
+    {
+        <PartStatus DetailRecord="@WorkLoadRecord" EC_ReRunReq="ReRunJob" EC_ClosePopup="ClosePopup"></PartStatus>
     }
     @*  else if (CurrEditMode == EditMode.DetailOkVin)
     {
diff --git a/Lux.UI/Components/Compo/WorkLoad/TimeEstim.razor b/Lux.UI/Components/Compo/WorkLoad/TimeEstim.razor
index f8adb019..b3f025c0 100644
--- a/Lux.UI/Components/Compo/WorkLoad/TimeEstim.razor
+++ b/Lux.UI/Components/Compo/WorkLoad/TimeEstim.razor
@@ -1,5 +1,106 @@
-<h3>TimeEstim</h3>
+<div class="modal" tabindex="-1" style="display:block; background-color: rgba(10,10,10,.6);" role="dialog">
+    <div class="modal-dialog modal-xl">
+        <div class="modal-content">
+            <div class="modal-header row modal-title">
+                <div class="col-4 fs-3">
+                    Assegnazione Workload
+                    @if (DetailRecord.Workable)
+                    {
+                        <i class="fa-solid fa-thumbs-up text-success"></i>
+                    }
+                    else
+                    {
+                        <i class="fa-solid fa-thumbs-down text-danger"></i>
+                    }
+                </div>
+                <div class="col-4 text-center border border-2 rounded">
+                    <div class="fw-bold">Impianti considerati</div>
+                    <small class="small">@DetailRecord.ListMachines</small>
+                </div>
+                <div class="col-4 text-end fs-4">
+                    <button class="btn btn-lg btn-primary" @onclick="() => ReRunJob()"><i class="fa-solid fa-share-from-square" title="Riesecuzione Estimate"></i> Re-Run</button>
+                    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close" @onclick="() => ClosePopup()">
+                    </button>
+                </div>
+            </div>
+            <div class="modal-body">
+
+                <div class="row">
+
+                </div>
+
+
+                <div class="accordion" id="accordionPanelsStayOpenExample">
+                    @if (DetailRecord.NumKo > 0)
+                    {
+                        <div class="accordion-item">
+                            <h2 class="accordion-header">
+                                <button class="accordion-button" type="button" data-bs-toggle="collapse" data-bs-target="#panelsStayOpen-collapseOne" aria-expanded="true" aria-controls="panelsStayOpen-collapseOne">
+                                    Non producibili: <span class="fw-bold px-1">@DetailRecord.NumKo</span>
+                                </button>
+                            </h2>
+                            <div id="panelsStayOpen-collapseOne" class="accordion-collapse collapse show">
+                                <div class="accordion-body">
+                                    <div class="row gx-2">
+                                        @foreach (var item in DetailRecord.ListUnWorkable)
+                                        {
+                                            <div class="col-2">
+                                                <div class="alert alert-danger p-1 mb-2 text-center align-content-center">@item</div>
+                                            </div>
+                                        }
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    }
+                    @if (DetailRecord.NumOkVin > 0)
+                    {
+                        <div class="accordion-item">
+                            <h2 class="accordion-header">
+                                <button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#panelsStayOpen-collapseTwo" aria-expanded="false" aria-controls="panelsStayOpen-collapseTwo">
+                                    Vincolati: <span class="fw-bold px-1">@DetailRecord.NumOkVin</span>
+                                </button>
+                            </h2>
+                            <div id="panelsStayOpen-collapseTwo" class="accordion-collapse collapse">
+                                <div class="accordion-body">
+                                    <div class="row gx-2">
+                                        @foreach (var item in DetailRecord.ListVincolated)
+                                        {
+                                            <div class="col-2">
+                                                <div class="alert alert-info p-1 mb-2 text-center align-content-center">@item</div>
+                                            </div>
+                                        }
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    }
+                    @if (DetailRecord.NumOk > 0)
+                    {
+                        <div class="accordion-item">
+                            <h2 class="accordion-header">
+                                <button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#panelsStayOpen-collapseThree" aria-expanded="false" aria-controls="panelsStayOpen-collapseThree">
+                                    Producibili: <span class="fw-bold px-1">@DetailRecord.NumOk</span>
+                                </button>
+                            </h2>
+                            <div id="panelsStayOpen-collapseThree" class="accordion-collapse collapse">
+                                <div class="accordion-body">
+                                    <div class="row gx-2">
+                                        @foreach (var item in DetailRecord.ListWorkable)
+                                        {
+                                            <div class="col-2">
+                                                <div class="alert alert-success p-1 mb-2 text-center align-content-center">@item</div>
+                                            </div>
+                                        }
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    }
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
 
-@code {
 
-}
diff --git a/Lux.UI/Components/Compo/WorkLoad/TimeEstim.razor.cs b/Lux.UI/Components/Compo/WorkLoad/TimeEstim.razor.cs
new file mode 100644
index 00000000..2c17a5d0
--- /dev/null
+++ b/Lux.UI/Components/Compo/WorkLoad/TimeEstim.razor.cs
@@ -0,0 +1,55 @@
+using EgwCoreLib.Lux.Core.RestPayload;
+using Microsoft.AspNetCore.Components;
+
+namespace Lux.UI.Components.Compo.WorkLoad
+{
+    public partial class TimeEstim
+    {
+        #region Public Properties
+
+        [Parameter]
+        public WorkLoadDetailDTO DetailRecord { get; set; } = null!;
+
+        [Parameter]
+        public EventCallback<bool> EC_ClosePopup { get; set; }
+
+        [Parameter]
+        public EventCallback<bool> EC_ReRunReq { get; set; }
+
+        [Parameter]
+        public EventCallback<BalanceReq> EC_RunBalance { get; set; }
+
+        #endregion Public Properties
+
+        #region Public Classes
+
+        /// <summary>
+        /// Definizione richiesta di bilanciamento per il calcolo
+        /// </summary>
+        public class BalanceReq
+        {
+            #region Public Properties
+
+            public Dictionary<string, double> MachineBalance { get; set; } = new Dictionary<string, double>();
+            public List<string> TagsList { get; set; } = new List<string>();
+
+            #endregion Public Properties
+        }
+
+        #endregion Public Classes
+
+        #region Protected Methods
+
+        protected async Task ClosePopup()
+        {
+            await EC_ClosePopup.InvokeAsync(true);
+        }
+
+        protected async Task ReRunJob()
+        {
+            await EC_ReRunReq.InvokeAsync(true);
+        }
+
+        #endregion Protected Methods
+    }
+}
\ No newline at end of file
diff --git a/Lux.UI/Lux.UI.csproj b/Lux.UI/Lux.UI.csproj
index 8346d61d..9f476827 100644
--- a/Lux.UI/Lux.UI.csproj
+++ b/Lux.UI/Lux.UI.csproj
@@ -5,7 +5,7 @@
         <Nullable>enable</Nullable>
         <ImplicitUsings>enable</ImplicitUsings>
         <UserSecretsId>aspnet-Lux.UI-a758c101-a2f4-4e38-977d-1c4887dbbd50</UserSecretsId>
-        <Version>0.9.2512.2310</Version>
+        <Version>0.9.2512.2312</Version>
     </PropertyGroup>
 
     <ItemGroup>
@@ -17,7 +17,7 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Egw.Lux.WebWindowComplex" Version="2.7.12.1518" />
+        <PackageReference Include="Egw.Lux.WebWindowComplex" Version="2.7.12.2312" />
         <PackageReference Include="EgwCoreLib.Razor" Version="1.5.2511.312" />
         <PackageReference Include="EgwCoreLib.Utils" Version="1.5.2511.312" />
         <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="8.0.21" />
diff --git a/Resources/ChangeLog.html b/Resources/ChangeLog.html
index 5fea9f2a..da7282a5 100644
--- a/Resources/ChangeLog.html
+++ b/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>LUX - Web Windows MES</i>
-    <h4>Versione: 0.9.2512.2310</h4>
+    <h4>Versione: 0.9.2512.2312</h4>
     <br /> Note di rilascio:
     <ul>
         <li>
diff --git a/Resources/VersNum.txt b/Resources/VersNum.txt
index afedc8ad..db4ff637 100644
--- a/Resources/VersNum.txt
+++ b/Resources/VersNum.txt
@@ -1 +1 @@
-0.9.2512.2310
+0.9.2512.2312
diff --git a/Resources/manifest.xml b/Resources/manifest.xml
index be2ab775..aba1c5ec 100644
--- a/Resources/manifest.xml
+++ b/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>0.9.2512.2310</version>
+  <version>0.9.2512.2312</version>
   <url>http://nexus.steamware.net/repository/SWS/GPW/stable/GPW.UI.zip</url>
   <changelog>http://nexus.steamware.net/repository/SWS/GPW/stable/ChangeLog.html</changelog>
   <mandatory>false</mandatory>