From 4cde37cd5f1e4518a898902ddc4d9413b2d5be83 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Thu, 27 Jun 2024 15:34:15 +0200
Subject: [PATCH] Inserita gestione tipo richiesta (svg/3dm) Rimesso bottone x
 export 3d con timeout x risposta calcolo

---
 Resources/ChangeLog.html                      |   2 +-
 Resources/VersNum.txt                         |   2 +-
 Resources/manifest.xml                        |   2 +-
 .../Controllers/DoorImageController.cs        |  10 --
 .../Controllers/QueueController.cs            |   2 +-
 WebDoorCreator.CamSrv/ProcMan.vb              |   2 +-
 WebDoorCreator.Core/Constants.cs              |   1 +
 WebDoorCreator.Data/DTO/CalcReqDTO.cs         |  23 +++
 WebDoorCreator.Data/DTO/CalcResultDTO.cs      |   8 +-
 .../Services/QueueDataService.cs              | 137 +++++++++++++++---
 WebDoorCreator.SDK/CalcReqDTO.cs              |  22 +++
 WebDoorCreator.SDK/CalcResultDTO.cs           |   8 +-
 .../Components/Buttons/ButtonsDoorDef.razor   |  23 ++-
 .../Buttons/ButtonsDoorDef.razor.cs           |  93 ++++++++----
 WebDoorCreator.UI/WebDoorCreator.UI.csproj    |   2 +-
 WebDoorCreator.UI/appsettings.Production.json |   3 +-
 WebDoorCreator.UI/appsettings.json            |   3 +-
 17 files changed, 266 insertions(+), 77 deletions(-)
 create mode 100644 WebDoorCreator.Data/DTO/CalcReqDTO.cs
 create mode 100644 WebDoorCreator.SDK/CalcReqDTO.cs
diff --git a/Resources/ChangeLog.html b/Resources/ChangeLog.html
index 0c0df5b..a40c364 100644
--- a/Resources/ChangeLog.html
+++ b/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>WebDoorCreator - Egalware</i>
-    <h4>Version: 0.9.2406.2015</h4>
+    <h4>Version: 0.9.2406.2715</h4>
     <br /> Release note:
     <ul>
         <li>
diff --git a/Resources/VersNum.txt b/Resources/VersNum.txt
index 48e0906..874b098 100644
--- a/Resources/VersNum.txt
+++ b/Resources/VersNum.txt
@@ -1 +1 @@
-0.9.2406.2015
+0.9.2406.2715
diff --git a/Resources/manifest.xml b/Resources/manifest.xml
index 7048842..d32d02e 100644
--- a/Resources/manifest.xml
+++ b/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>0.9.2406.2015</version>
+  <version>0.9.2406.2715</version>
   <url>http://nexus.steamware.net/repository/SWS/WDC/stable/WDC.UI.zip</url>
   <changelog>http://nexus.steamware.net/repository/SWS/WDC/stable/ChangeLog.html</changelog>
   <mandatory>false</mandatory>
diff --git a/WebDoorCreator.API/Controllers/DoorImageController.cs b/WebDoorCreator.API/Controllers/DoorImageController.cs
index 50fbe88..6f8c2ac 100644
--- a/WebDoorCreator.API/Controllers/DoorImageController.cs
+++ b/WebDoorCreator.API/Controllers/DoorImageController.cs
@@ -71,16 +71,6 @@ namespace WebDoorCreator.API.Controllers
                         }
                     }
                 }
-#if false
-                    var mySvg = SvgDocument.FromSvg<SvgDocument>(svgContent);
-                    //result = System.Text.Encoding.UTF8.GetBytes(svgContent);
-                    var myBmp = mySvg.Draw();
-                    using (var stream = new MemoryStream())
-                    {
-                        img.Save(stream, System.Drawing.Imaging.ImageFormat.Png);
-                        result= stream.ToArray();
-                    }
-#endif
             }
             return File(result, "image/png");
         }
diff --git a/WebDoorCreator.API/Controllers/QueueController.cs b/WebDoorCreator.API/Controllers/QueueController.cs
index ecafa22..27fa372 100644
--- a/WebDoorCreator.API/Controllers/QueueController.cs
+++ b/WebDoorCreator.API/Controllers/QueueController.cs
@@ -196,7 +196,7 @@ namespace WebDoorCreator.API.Controllers
         /// </summary>
         /// <returns></returns>
         [HttpGet("TakeNextItems")]
-        public async Task<Dictionary<string, string>> TakeProcessingItems(int numItems = 10)
+        public async Task<Dictionary<string, CalcReqtDTO>> TakeProcessingItems(int numItems = 10)
         {
             var actQueue = await QDataServ.TakeProcessingItems(numItems);
             Log.Debug($"Eseguito TakeProcessingItems per {numItems} items");
diff --git a/WebDoorCreator.CamSrv/ProcMan.vb b/WebDoorCreator.CamSrv/ProcMan.vb
index 80f8b5f..e79a5fa 100644
--- a/WebDoorCreator.CamSrv/ProcMan.vb
+++ b/WebDoorCreator.CamSrv/ProcMan.vb
@@ -986,7 +986,7 @@ Public Class ProcMan
                   currRes.DoorIdVers = Item.Key
                   ' se NON fosse validato --> messo il messaggio...
                   If (currRes.Validated) Then
-                     currRes.SvgGen = fContent
+                     currRes.RawContent = fContent
                   Else
                      bOk = GetFileContent(Path.ChangeExtension(sDdfPath, "txt"), fContent)
                      currRes.ErrorMsg = fContent
diff --git a/WebDoorCreator.Core/Constants.cs b/WebDoorCreator.Core/Constants.cs
index ba4b3f0..8a8b75a 100644
--- a/WebDoorCreator.Core/Constants.cs
+++ b/WebDoorCreator.Core/Constants.cs
@@ -24,6 +24,7 @@ namespace WebDoorCreator.Core
         public static readonly string CALC_REQ_ERRS = $"{BASE_HASH}:CalcRequests:Errors";
         public static readonly string CALC_REQ_PEND = $"{BASE_HASH}:CalcRequests:Pending";
         public static readonly string CALC_REQ_PROC = $"{BASE_HASH}:CalcRequests:Processing";
+        public static readonly string CALC_REQ_TYPE = $"{BASE_HASH}:CalcRequests:Type";
         public static readonly string CALC_REQ_DDF_CACHE = $"{BASE_HASH}:CalcRequests:CacheDDF";
         public static readonly string CALC_REQ_SVG_CACHE = $"{BASE_HASH}:CalcRequests:CacheSVG";
         public static readonly string CALC_REQ_VETO_REC = $"{BASE_HASH}:CalcRequests:VetoRecalc";
diff --git a/WebDoorCreator.Data/DTO/CalcReqDTO.cs b/WebDoorCreator.Data/DTO/CalcReqDTO.cs
new file mode 100644
index 0000000..8aa1401
--- /dev/null
+++ b/WebDoorCreator.Data/DTO/CalcReqDTO.cs
@@ -0,0 +1,23 @@
+﻿using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WebDoorCreator.Data.DTO
+{
+    /// <summary>
+    /// Oggetto contenitore richiesta calcolo
+    /// </summary>
+    public class CalcReqtDTO
+    {
+        /// <summary>
+        /// DDF file content (origin)
+        /// </summary>
+        public string DDF { get; set; } = "";
+        /// <summary>
+        /// MimeType (out) requested: svg / 3dm...
+        /// </summary>
+        public string MimeType { get; set; } = "";
+    }
+}
diff --git a/WebDoorCreator.Data/DTO/CalcResultDTO.cs b/WebDoorCreator.Data/DTO/CalcResultDTO.cs
index 2a3dc41..f20e328 100644
--- a/WebDoorCreator.Data/DTO/CalcResultDTO.cs
+++ b/WebDoorCreator.Data/DTO/CalcResultDTO.cs
@@ -24,9 +24,13 @@ namespace WebDoorCreator.Data.DTO
         /// </summary>
         public string ErrorMsg { get; set; } = "";
         /// <summary>
-        /// SVG generated
+        /// Object RAW generated output ( was SvgGen )
         /// </summary>
-        public string SvgGen { get; set; } = "";
+        public string RawContent { get; set; } = "";
+        /// <summary>
+        /// MimeType: svg / 3dm...
+        /// </summary>
+        public string MimeType { get; set; } = "";
         /// <summary>
         /// Artifats path (ex 3d zip/pack)
         /// </summary>
diff --git a/WebDoorCreator.Data/Services/QueueDataService.cs b/WebDoorCreator.Data/Services/QueueDataService.cs
index 4efdf73..c0ba56a 100644
--- a/WebDoorCreator.Data/Services/QueueDataService.cs
+++ b/WebDoorCreator.Data/Services/QueueDataService.cs
@@ -356,7 +356,6 @@ namespace WebDoorCreator.Data.Services
         public async Task<long> NumRequestDone()
         {
             long numReq = 0;
-            string source = "REDIS";
             Dictionary<string, string> dictResult = new Dictionary<string, string>();
             // cerco da cache
             RedisKey currKey = new RedisKey(Constants.CALC_REQ_DONE);
@@ -381,7 +380,6 @@ namespace WebDoorCreator.Data.Services
         public async Task<long> NumRequestErrors()
         {
             long numReq = 0;
-            string source = "REDIS";
             Dictionary<string, string> dictResult = new Dictionary<string, string>();
             // cerco da cache
             RedisKey currKey = new RedisKey(Constants.CALC_REQ_ERRS);
@@ -406,7 +404,6 @@ namespace WebDoorCreator.Data.Services
         public async Task<long> NumRequestPending()
         {
             long numReq = 0;
-            string source = "REDIS";
             Dictionary<string, string> dictResult = new Dictionary<string, string>();
             // cerco da cache
             RedisKey currKey = new RedisKey(Constants.CALC_REQ_PEND);
@@ -431,7 +428,6 @@ namespace WebDoorCreator.Data.Services
         public async Task<long> NumRequestProcessing()
         {
             long numReq = 0;
-            string source = "REDIS";
             Dictionary<string, string> dictResult = new Dictionary<string, string>();
             // cerco da cache
             RedisKey currKey = new RedisKey(Constants.CALC_REQ_PROC);
@@ -567,7 +563,7 @@ namespace WebDoorCreator.Data.Services
         }
 
         /// <summary>
-        /// Restitusice gli errori della porta in oggetto
+        /// Rimuove info della porta in oggetto
         /// </summary>
         /// <param name="doorIdVers">formato DoorId:Versione</param>
         /// <returns></returns>
@@ -576,6 +572,7 @@ namespace WebDoorCreator.Data.Services
             await DoorRefreshRemove($"{doorId}");
             await RequestDoneRemove($"{doorId}");
             await RequestErrRemove($"{doorId}");
+            await RequestTypeRemove($"{doorId}");
             await RequestPendingRemove($"{doorId}");
             await RequestProcessingRemove($"{doorId}");
 
@@ -771,7 +768,7 @@ namespace WebDoorCreator.Data.Services
         }
 
         /// <summary>
-        /// Upsert for single hash record
+        /// Upsert for single hash record of req pending
         /// </summary>
         /// <returns>Dictionary of DoorId, saveVersNumb</returns>
         public async Task<long> RequestPendingUpsert(string doorId, string vers)
@@ -839,6 +836,73 @@ namespace WebDoorCreator.Data.Services
             return numReq;
         }
 
+        /// <summary>
+        /// Get list of request type
+        /// </summary>
+        /// <returns>Dictionary of DoorId, saveVersNumb</returns>
+        public async Task<Dictionary<string, string>> RequestType()
+        {
+            long numReq = 0;
+            Dictionary<string, string> dictResult = new Dictionary<string, string>();
+            // cerco da cache
+            RedisKey currKey = new RedisKey(Constants.CALC_REQ_TYPE);
+            Stopwatch sw = new Stopwatch();
+            if (logTimingEnable)
+            {
+                sw.Start();
+            }
+            numReq = redisDb.HashLength(currKey);
+            if (numReq > 0)
+            {
+                var rawData = await redisDb.HashGetAllAsync(currKey);
+                foreach (var item in rawData)
+                {
+                    dictResult.Add($"{item.Name}", $"{item.Value}");
+                }
+            }
+            if (logTimingEnable)
+            {
+                sw.Stop();
+                // gestione statistiche
+                await ProcStatLog("RequestType", sw.Elapsed, 1, 10);
+            }
+            return dictResult;
+        }
+
+        /// <summary>
+        /// Remove for single hash record from TYPE hash table
+        /// </summary>
+        /// <returns>Dictionary of DoorId, saveVersNumb</returns>
+        public async Task<bool> RequestTypeRemove(string doorId)
+        {
+            RedisKey currKey = new RedisKey(Constants.CALC_REQ_TYPE);
+            bool fatto = await RedHashRemove(currKey, doorId);
+            return fatto;
+        }
+
+        /// <summary>
+        /// Upsert for single hash record of TYPE
+        /// </summary>
+        /// <returns>Dictionary of DoorId, Type proc requested</returns>
+        public async Task<bool> RequestTypeUpsert(string doorId, string type)
+        {
+            RedisKey currKey = new RedisKey(Constants.CALC_REQ_TYPE);
+            long numReq = 0;
+            bool answ = false;
+            if (!string.IsNullOrEmpty(type))
+            {
+                numReq = await RedHashUpsert(currKey, doorId, type);
+                answ = numReq > 0;
+            }
+            // se vuoto --> rimuovo!
+            else
+            {
+                await RedHashRemove(currKey, doorId);
+                answ = true;
+            }
+            return answ;
+        }
+
         /// <summary>
         /// Reset to queue request all processing/processed data
         /// </summary>
@@ -878,6 +942,14 @@ namespace WebDoorCreator.Data.Services
                 await RequestDoneRemove(item.Name!);
                 fatto = true;
             }
+            // svuoto in blocco hashatble tipo richieste...
+            currKey = new RedisKey(Constants.CALC_REQ_TYPE);
+            rawData = await redisDb.HashGetAllAsync(currKey);
+            foreach (var item in rawData)
+            {
+                await RequestTypeRemove(item.Name!);
+                fatto = true;
+            }
             if (logTimingEnable)
             {
                 sw.Stop();
@@ -906,11 +978,11 @@ namespace WebDoorCreator.Data.Services
             foreach (var item in rawData)
             {
                 // se è nell'elenco...
-                if (DoorIdList.Contains(item.Name.ToString()))
+                if (DoorIdList.Contains($"{item.Name}"))
                 {
                     await RequestPendingUpsert(item.Name!, item.Value!);
                     await RequestProcessingRemove(item.Name!);
-                    listDone.Add(item.Name.ToString());
+                    listDone.Add($"{item.Name}");
                 }
             }
             // cerco le richieste con errori
@@ -919,11 +991,11 @@ namespace WebDoorCreator.Data.Services
             foreach (var item in rawData)
             {
                 // se è nell'elenco...
-                if (DoorIdList.Contains(item.Name.ToString()))
+                if (DoorIdList.Contains($"{item.Name}"))
                 {
                     await RequestPendingUpsert(item.Name!, item.Value!);
                     await RequestErrRemove(item.Name!);
-                    listDone.Add(item.Name.ToString());
+                    listDone.Add($"{item.Name}");
                 }
             }
             // cerco le richieste processed
@@ -932,20 +1004,25 @@ namespace WebDoorCreator.Data.Services
             foreach (var item in rawData)
             {
                 // se è nell'elenco...
-                if (DoorIdList.Contains(item.Name.ToString()))
+                if (DoorIdList.Contains($"{item.Name}"))
                 {
                     await RequestPendingUpsert(item.Name!, item.Value!);
                     await RequestDoneRemove(item.Name!);
-                    listDone.Add(item.Name.ToString());
+                    listDone.Add($"{item.Name}");
                 }
             }
-#if false
-            // calcolo eventuali porte NON ancora richieste...
-            foreach (var item in listDone)
+            // svuoto hashatble tipo richieste...
+            currKey = new RedisKey(Constants.CALC_REQ_TYPE);
+            rawData = await redisDb.HashGetAllAsync(currKey);
+            foreach (var item in rawData)
             {
-                DoorIdList.Remove(item);
+                // se è nell'elenco...
+                if (DoorIdList.Contains($"{item.Name}"))
+                {
+                    await RequestTypeRemove(item.Name!);
+                    listDone.Add($"{item.Name}");
+                }
             }
-#endif
             if (logTimingEnable)
             {
                 sw.Stop();
@@ -1021,12 +1098,12 @@ namespace WebDoorCreator.Data.Services
                         // se template --> no scadenza
                         if (doorIsTpl)
                         {
-                            await redisDb.StringSetAsync(currSvgKey, calcTask.SvgGen);
+                            await redisDb.StringSetAsync(currSvgKey, calcTask.RawContent);
                         }
                         else
                         {
                             // 2024.02.15 salvo in cache x 2 settimane, fare 1+ mesi?!?
-                            await redisDb.StringSetAsync(currSvgKey, calcTask.SvgGen, DblWeekLongCache);
+                            await redisDb.StringSetAsync(currSvgKey, calcTask.RawContent, DblWeekLongCache);
                         }
                         // elimino dalle code proc/err
                         await RequestProcessingRemove(sDoorId);
@@ -1069,8 +1146,9 @@ namespace WebDoorCreator.Data.Services
         /// </summary>
         /// <param name="DoorId"></param>
         /// <param name="FullDDF">Contenuto completo del DDF</param>
+        /// <param name="MimeType">Tipo di file richeisto in OUT: svg / 3dm...</param>
         /// <returns>indice/versione del calcolo DDF</returns>
-        public async Task<int> SendCalcReq(int DoorId, string FullDDF)
+        public async Task<int> SendCalcReq(int DoorId, string FullDDF, string? MimeType = "")
         {
             Stopwatch sw = new Stopwatch();
             if (logTimingEnable)
@@ -1080,6 +1158,9 @@ namespace WebDoorCreator.Data.Services
             string sDoorId = $"{DoorId}";
             int currVers = await DoorCalcRev(sDoorId);
             string sCurrVers = $"{currVers}";
+            // salvo il mimeType (se nullo è "svg")
+            string mimeType = MimeType ?? "";
+            await RequestTypeUpsert(sDoorId, mimeType);
             // elimino da code errori (SE fosse presente)
             await RequestErrRemove(sDoorId);
 
@@ -1175,11 +1256,11 @@ namespace WebDoorCreator.Data.Services
         /// Get Queue request pending, removing from queue and putting on processing queue
         /// </summary>
         /// <returns>Dictionary of DoorId, saveVersNumb</returns>
-        public async Task<Dictionary<string, string>> TakeProcessingItems(int numItems)
+        public async Task<Dictionary<string, CalcReqtDTO>> TakeProcessingItems(int numItems)
         {
             int maxTake = Math.Min(10, numItems);
             long numReq = 0;
-            Dictionary<string, string> dictResult = new Dictionary<string, string>();
+            Dictionary<string, CalcReqtDTO> dictResult = new Dictionary<string, CalcReqtDTO>();
             // cerco da cache
             RedisKey currKey = new RedisKey(Constants.CALC_REQ_PEND);
             Stopwatch sw = new Stopwatch();
@@ -1209,7 +1290,17 @@ namespace WebDoorCreator.Data.Services
                     // recupero il DDF...
                     RedisKey currDdfKey = new RedisKey($"{Constants.CALC_REQ_DDF_CACHE}:{item.Name}:{item.Value}");
                     var rawDDF = await redisDb.StringGetAsync(currDdfKey);
-                    dictResult.Add($"{item.Name}.{item.Value}", $"{rawDDF}");
+                    // verifico il tpo richiesta, se non trovassi prendo "svg" default...
+                    var curTypeKey = new RedisKey(Constants.CALC_REQ_TYPE);
+                    var rawType = await RedHashGetString(curTypeKey, item.Name!, true);
+                    string mimeType = string.IsNullOrEmpty(rawType) ? "svg" : $"{rawType}";
+                    // preparo DTO
+                    CalcReqtDTO currReq = new CalcReqtDTO()
+                    {
+                        MimeType = mimeType,
+                        DDF = $"{rawDDF}"
+                    };
+                    dictResult.Add($"{item.Name}.{item.Value}", currReq);
                     if (maxTake <= 0)
                     {
                         break;
diff --git a/WebDoorCreator.SDK/CalcReqDTO.cs b/WebDoorCreator.SDK/CalcReqDTO.cs
new file mode 100644
index 0000000..85a2f0f
--- /dev/null
+++ b/WebDoorCreator.SDK/CalcReqDTO.cs
@@ -0,0 +1,22 @@
+﻿using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WebDoorCreator.SDK
+{
+    /// Oggetto contenitore richiesta calcolo
+    /// </summary>
+    public class CalcReqtDTO
+    {
+        /// <summary>
+        /// DDF file content (origin)
+        /// </summary>
+        public string DDF { get; set; } = "";
+        /// <summary>
+        /// MimeType (out) requested: svg / 3dm...
+        /// </summary>
+        public string MimeType { get; set; } = "";
+    }
+}
diff --git a/WebDoorCreator.SDK/CalcResultDTO.cs b/WebDoorCreator.SDK/CalcResultDTO.cs
index 1e88bd3..b7b1456 100644
--- a/WebDoorCreator.SDK/CalcResultDTO.cs
+++ b/WebDoorCreator.SDK/CalcResultDTO.cs
@@ -24,9 +24,13 @@ namespace WebDoorCreator.SDK
         /// </summary>
         public string ErrorMsg { get; set; } = "";
         /// <summary>
-        /// SVG generated
+        /// Object RAW generated output ( was SvgGen )
         /// </summary>
-        public string SvgGen { get; set; } = "";
+        public string RawContent { get; set; } = "";
+        /// <summary>
+        /// MimeType: svg / 3dm...
+        /// </summary>
+        public string MimeType { get; set; } = "";
         /// <summary>
         /// Articat path (ex 3d zip/pack)
         /// </summary>
diff --git a/WebDoorCreator.UI/Components/Buttons/ButtonsDoorDef.razor b/WebDoorCreator.UI/Components/Buttons/ButtonsDoorDef.razor
index 6258040..ed55243 100644
--- a/WebDoorCreator.UI/Components/Buttons/ButtonsDoorDef.razor
+++ b/WebDoorCreator.UI/Components/Buttons/ButtonsDoorDef.razor
@@ -1,18 +1,25 @@
 ﻿<div>
     @if (B_doorOpUpd)
     {
-        <button class="btn btn-success" @onclick="() => refreshSVG()"><i class="fa-solid fa-rotate-right"></i></button>
-        
-        <button class="btn btn-warning" href="https://iis01.egalware.com/Test3D/Doors041122/EXB_0267100040/EXB_0267100040.html" target="_blank"><i class="fa-solid fa-cube"></i></button>
+        <button class="btn btn-success mx-1" @onclick="() => refreshSVG()"><i class="fa-solid fa-rotate-right"></i></button>
+
         @if (IsErr)
         {
-            <button class="btn btn-danger" @onclick="() => toggleErrors(true)"><i class="fa-solid fa-triangle-exclamation"></i></button>
+            <button class="btn btn-danger mx-1" @onclick="() => toggleErrors(true)"><i class="fa-solid fa-triangle-exclamation"></i></button>
         }
     }
     else
     {
-        <button class="btn btn-secondary"><i class="fa-solid fa-rotate-right"></i></button>
-        <button class="btn btn-secondary" disabled><i class="fa-solid fa-cube"></i></button>
+        <button class="btn btn-secondary mx-1"><i class="fa-solid fa-rotate-right"></i></button>
+    }
+    @if (IsErr)
+    {
+        <button class="btn btn-secondary mx-1" disabled><i class="fa-solid fa-cube"></i></button>
+    }
+    else
+    {
+        @* <button class="btn btn-warning" href="https://iis01.egalware.com/Test3D/Doors041122/EXB_0267100040/EXB_0267100040.html" target="_blank"><i class="fa-solid fa-cube"></i></button> *@
+        <button class="btn btn-warning mx-1" @onclick="() => open3D()"><i class="fa-solid fa-cube"></i></button>
     }
 
 </div>
@@ -40,4 +47,8 @@
             </div>
         </div>
     </div>
+}
+@if (isRecalc)
+{
+    <LoadingData DisplayMode="LoadingData.SpinMode.BounceLine" DisplaySize="LoadingData.CtrlSize.Normal" Title="Render 3DM"></LoadingData>
 }
\ No newline at end of file
diff --git a/WebDoorCreator.UI/Components/Buttons/ButtonsDoorDef.razor.cs b/WebDoorCreator.UI/Components/Buttons/ButtonsDoorDef.razor.cs
index 96f07a4..ab2a5f8 100644
--- a/WebDoorCreator.UI/Components/Buttons/ButtonsDoorDef.razor.cs
+++ b/WebDoorCreator.UI/Components/Buttons/ButtonsDoorDef.razor.cs
@@ -83,15 +83,6 @@ namespace WebDoorCreator.UI.Components.Buttons
             await refreshSVG();
         }
 
-        /// <summary>
-        /// Effettua Richiesta visione porta 3D
-        /// </summary>
-        /// <returns></returns>
-        protected async Task doReq3D()
-        {
-            await Task.Delay(1);
-        }
-
         protected override void OnInitialized()
         {
             base.OnInitialized();
@@ -99,6 +90,7 @@ namespace WebDoorCreator.UI.Components.Buttons
             bool remDoorOp = config.GetValue<bool>("ConfDDF:RemoveDoorOps");
             var headRows = config.GetSection("ConfDDF:Header").Get<List<string>>();
             var footRows = config.GetSection("ConfDDF:Footer").Get<List<string>>();
+            WaitOpen3d = config.GetValue<int>("ServerConf:WaitOpen3d");
             currDdfConv = new WebDoorCreator.Data.DDF.Converter(vers, remDoorOp, headRows, footRows);
             WDCRService.EA_UpdDoorOp += WDCRService_EA_UpdDoorOp;
         }
@@ -109,11 +101,76 @@ namespace WebDoorCreator.UI.Components.Buttons
             await Task.Delay(1);
         }
 
+        /// <summary>
+        /// Apertura visualizzatore 3D della porta in oggetto
+        /// </summary>
+        /// <param name="orderId"></param>
+        /// <returns></returns>
+        protected async Task open3D()
+        {
+            isRecalc = true;
+            // inserisco richiesta calcolo
+            await sendCalcReqForType("3dm");
+            // apro link in nuova pagina...
+            //var url = $"api/Report/GetOrderReport?OrderId={orderId}&Format=PDF";
+            var url = $"https://iis01.egalware.com/Test3D/TJSD/index_2.html?src=Door2.3dm";
+            //var url = $"https://iis01.egalware.com/Test3D/TJSD/index_2.html?src=D{idDoor:000000000000}.3dm";
+            // chiamo apertura via jscript in target _blank
+
+            // attendo per apertura WaitOpen3d ms
+            await Task.Delay(WaitOpen3d);
+            isRecalc = false;
+            await InvokeAsync(StateHasChanged);
+            await Task.Delay(10);
+            await JSRuntime.InvokeAsync<object>("open", url, "_blank");
+        }
+
         /// <summary>
         /// Effettua generazione DDF + refresh SVG
         /// </summary>
         /// <returns></returns>
         protected async Task refreshSVG()
+        {
+            // mettere svg?
+            await sendCalcReqForType("");
+        }
+
+        protected async Task toggleErrors(bool show)
+        {
+            showModal = show;
+            await InvokeAsync(StateHasChanged);
+        }
+
+        #endregion Protected Methods
+
+        #region Private Fields
+
+        /// <summary>
+        /// Variabile stato recalc x mostrare attesa..
+        /// </summary>
+        private bool isRecalc = false;
+
+        /// <summary>
+        /// tempo attesa apertura pagina 3d x tempo calcolo e ritorno
+        /// </summary>
+        private int WaitOpen3d = 500;
+
+        #endregion Private Fields
+
+        #region Private Properties
+
+        private bool showModal { get; set; } = false;
+
+        #endregion Private Properties
+
+        #region Private Methods
+
+        /// <summary>
+        /// salva ddf serializzato ed invia richiesta calcolo specifica
+        /// </summary>
+        /// <param name="mType"></param>
+        /// <returns></returns>
+        private async Task sendCalcReqForType(string mType)
         {
             List<DoorOpModel>? listOpAll = await WDCService.DoorOpGetByDoorId(idDoor);
             if (listOpAll != null)
@@ -135,7 +192,7 @@ namespace WebDoorCreator.UI.Components.Buttons
 
                     string currDdf = currDdfConv.GetSerialized(listOp);
                     // versione corrente del DDF generato
-                    int currVers = await QDataServ.SendCalcReq(idDoor, currDdf);
+                    int currVers = await QDataServ.SendCalcReq(idDoor, currDdf, mType);
 
                     if (currVers > 0)
                     {
@@ -145,22 +202,6 @@ namespace WebDoorCreator.UI.Components.Buttons
             }
         }
 
-        protected async Task toggleErrors(bool show)
-        {
-            showModal = show;
-            await InvokeAsync(StateHasChanged);
-        }
-
-        #endregion Protected Methods
-
-        #region Private Properties
-
-        private bool showModal { get; set; } = false;
-
-        #endregion Private Properties
-
-        #region Private Methods
-
         private async void WDCRService_EA_UpdDoorOp()
         {
             await InvokeAsync(() =>
diff --git a/WebDoorCreator.UI/WebDoorCreator.UI.csproj b/WebDoorCreator.UI/WebDoorCreator.UI.csproj
index 02e25a0..4a675b2 100644
--- a/WebDoorCreator.UI/WebDoorCreator.UI.csproj
+++ b/WebDoorCreator.UI/WebDoorCreator.UI.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
-        <Version>0.9.2406.2015</Version>
+        <Version>0.9.2406.2715</Version>
     <ImplicitUsings>enable</ImplicitUsings>
     <UserSecretsId>aspnet-WebDoorCreator.UI-dfe95fed-1398-4144-bd43-8b3a765d6608</UserSecretsId>
   </PropertyGroup>
diff --git a/WebDoorCreator.UI/appsettings.Production.json b/WebDoorCreator.UI/appsettings.Production.json
index 7e29d2c..524a2b8 100644
--- a/WebDoorCreator.UI/appsettings.Production.json
+++ b/WebDoorCreator.UI/appsettings.Production.json
@@ -17,7 +17,8 @@
   },
   "ServerConf": {
     //"BasePathPdf": "U:\\WebDoorSync\\WdcPdf",
-    "BasePathPdf": "U:\\nextcloud.egalware\\ABH\\WdcPdf"
+    "BasePathPdf": "U:\\nextcloud.egalware\\ABH\\WdcPdf",
+    "WaitOpen3d": 800
   },
   "CompoBaseDirs": {
     //"CurrCompoDir": "U:\\WebDoorSync\\CurrentComp\\Compo",
diff --git a/WebDoorCreator.UI/appsettings.json b/WebDoorCreator.UI/appsettings.json
index 3ddd733..1046ca9 100644
--- a/WebDoorCreator.UI/appsettings.json
+++ b/WebDoorCreator.UI/appsettings.json
@@ -29,7 +29,8 @@
     "DisableWDCMigrate": true
   },
   "ServerConf": {
-    "BasePathPdf": "\\\\IIS04\\WebDoorSync\\WdcPdf"
+    "BasePathPdf": "\\\\IIS04\\WebDoorSync\\WdcPdf",
+    "WaitOpen3d":  400
   },
   "RuntimeOpt": {
     "WaitReloadSvg": 100,
