From aac9ef28c6eb8ff27313677a4be088f389ca2f35 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Thu, 1 Jun 2023 16:36:30 +0200
Subject: [PATCH] DoorModal (and template): - Fix clone con extCode +
 description

---
 Resources/ChangeLog.html                               |  2 +-
 Resources/VersNum.txt                                  |  2 +-
 Resources/manifest.xml                                 |  2 +-
 WebDoorCreator.Data/Services/WebDoorCreatorService.cs  |  8 ++++++--
 .../Components/DoorMan/DoorModal.razor.cs              | 10 +++++-----
 .../Components/TemplateMan/TemplModal.razor.cs         |  2 +-
 WebDoorCreator.UI/WebDoorCreator.UI.csproj             |  2 +-
 7 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/Resources/ChangeLog.html b/Resources/ChangeLog.html
index e85e0b9..abfe503 100644
--- a/Resources/ChangeLog.html
+++ b/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>WebDoorCreator - Egalware</i>
-    <h4>Version: 0.9.2306.0115</h4>
+    <h4>Version: 0.9.2306.0116</h4>
     <br /> Release note:
     <ul>
         <li>
diff --git a/Resources/VersNum.txt b/Resources/VersNum.txt
index dd525a6..4456e1e 100644
--- a/Resources/VersNum.txt
+++ b/Resources/VersNum.txt
@@ -1 +1 @@
-0.9.2306.0115
+0.9.2306.0116
diff --git a/Resources/manifest.xml b/Resources/manifest.xml
index 4074131..3f15720 100644
--- a/Resources/manifest.xml
+++ b/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>0.9.2306.0115</version>
+  <version>0.9.2306.0116</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.Data/Services/WebDoorCreatorService.cs b/WebDoorCreator.Data/Services/WebDoorCreatorService.cs
index 383fa0c..42d4d1b 100644
--- a/WebDoorCreator.Data/Services/WebDoorCreatorService.cs
+++ b/WebDoorCreator.Data/Services/WebDoorCreatorService.cs
@@ -967,11 +967,13 @@ namespace WebDoorCreator.Data.Services
         /// Clone a copy of the door in the specified order
         /// </summary>
         /// <param name="doorId">Record id to edit or add</param>
+        /// <param name="doorCode">Code associated to door</param>
+        /// <param name="doorDescr">Description for the door</param>
         /// <param name="orderId">Destination order where door must be placed</param>
         /// <param name="userName">userName for cloning</param>
         /// <param name="isClone">true = cloning a door and save TypeId from orig, false = save to template order</param>
         /// <returns></returns>
-        public async Task<int> DoorCloneToOrder(int doorId, int orderId, string userName, bool isClone)
+        public async Task<int> DoorCloneToOrder(int doorId, string doorCode, string doorDescr, int orderId, string userName, bool isClone)
         {
             int newDoorId = 0;
             var doorOps2Add = new List<DoorOpModel>();
@@ -984,10 +986,12 @@ namespace WebDoorCreator.Data.Services
                 if (CurrDoor != null)
                 {
                     var doorToAdd = CurrDoor.ObjClone(userName);
-                    // imposto ordine per la porta...
+                    // imposto dati per la porta...
                     doorToAdd.OrderId = orderId;
                     doorToAdd.TypeId = isClone ? CurrDoor.DoorId : 1;
                     doorToAdd.Quantity = 1;
+                    doorToAdd.DoorExtCode = doorCode;
+                    doorToAdd.DoorDescript = doorDescr;
                     // salvo!
                     newDoorId = await DoorInsert(doorToAdd);
                     if (newDoorId != 0 && doorOps2Clone != null)
diff --git a/WebDoorCreator.UI/Components/DoorMan/DoorModal.razor.cs b/WebDoorCreator.UI/Components/DoorMan/DoorModal.razor.cs
index 649bb54..e7ead88 100644
--- a/WebDoorCreator.UI/Components/DoorMan/DoorModal.razor.cs
+++ b/WebDoorCreator.UI/Components/DoorMan/DoorModal.razor.cs
@@ -116,7 +116,7 @@ namespace WebDoorCreator.UI.Components.DoorMan
         /// <returns></returns>
         protected async Task CloneDoor()
         {
-            var newDoorId = await WDService.DoorCloneToOrder(CurrDoor.DoorId, CurrDoor.OrderId, UserName, true);
+            var newDoorId = await WDService.DoorCloneToOrder(CurrDoor.DoorId, CurrDoor.DoorExtCode, CurrDoor.DoorDescript, CurrDoor.OrderId, UserName, true);
             if (newDoorId > 0)
             {
                 await RequestRefreshSvg(newDoorId);
@@ -264,7 +264,7 @@ namespace WebDoorCreator.UI.Components.DoorMan
         {
             if (!await JSRuntime.InvokeAsync<bool>("confirm", $"Are you sure? this operation will copy current door to selected template order?"))
                 return;
-
+#if false
             // prendo ord templ dest...
 
             DoorTypeModel newDoorType = new DoorTypeModel()
@@ -272,9 +272,9 @@ namespace WebDoorCreator.UI.Components.DoorMan
                 TypeId = CurrDoor.DoorId,
                 TypeCode = $"TPLFROM-{CurrDoor.DoorId}",
                 Description = $"TEMPLATED DOOR: {CurrDoor.DoorId} ({CurrDoor.DoorDescript})"
-            };
-
-            var newDoorId = await WDService.DoorCloneToOrder(CurrDoor.DoorId, OrderIdTplSel, UserName, false);
+            }; 
+#endif
+            var newDoorId = await WDService.DoorCloneToOrder(CurrDoor.DoorId, CurrDoor.DoorExtCode, CurrDoor.DoorDescript, OrderIdTplSel, UserName, false);
             if (newDoorId > 0)
             {
                 await RequestRefreshSvg(newDoorId);
diff --git a/WebDoorCreator.UI/Components/TemplateMan/TemplModal.razor.cs b/WebDoorCreator.UI/Components/TemplateMan/TemplModal.razor.cs
index 2e59135..7d6c79e 100644
--- a/WebDoorCreator.UI/Components/TemplateMan/TemplModal.razor.cs
+++ b/WebDoorCreator.UI/Components/TemplateMan/TemplModal.razor.cs
@@ -87,7 +87,7 @@ namespace WebDoorCreator.UI.Components.TemplateMan
         /// <returns></returns>
         protected async Task doClone(DoorModel CurrDoor)
         {
-            var newDoorId = await WDService.DoorCloneToOrder(CurrDoor.DoorId, OrderId, UserName, true);
+            var newDoorId = await WDService.DoorCloneToOrder(CurrDoor.DoorId, CurrDoor.DoorExtCode, CurrDoor.DoorDescript, OrderId, UserName, true);
             if (newDoorId > 0)
             {
                 await RequestRefreshSvg(newDoorId);
diff --git a/WebDoorCreator.UI/WebDoorCreator.UI.csproj b/WebDoorCreator.UI/WebDoorCreator.UI.csproj
index 32c92bb..0078cf8 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.2306.0115</Version>
+        <Version>0.9.2306.0116</Version>
     <ImplicitUsings>enable</ImplicitUsings>
     <UserSecretsId>aspnet-WebDoorCreator.UI-dfe95fed-1398-4144-bd43-8b3a765d6608</UserSecretsId>
   </PropertyGroup>
