From 00a55e6eb3adc01aedebf7555546f4a1c8c626b6 Mon Sep 17 00:00:00 2001
From: "zaccaria.majid" <zaccaria.majid@egalware.com>
Date: Thu, 1 Jun 2023 16:58:55 +0200
Subject: [PATCH] Ok modal template

---
 Resources/ChangeLog.html                      |  2 +-
 Resources/VersNum.txt                         |  2 +-
 Resources/manifest.xml                        |  2 +-
 .../Components/DoorMan/DoorList.razor         | 14 +++++++++++-
 .../Components/DoorMan/DoorList.razor.cs      | 22 +++++++++++++++++--
 .../Components/Order/OrderDets.razor          |  2 +-
 .../Components/Order/OrderDets.razor.cs       |  2 ++
 .../Components/TemplateMan/TemplModal.razor   |  2 +-
 .../TemplateMan/TemplModal.razor.cs           |  5 ++---
 WebDoorCreator.UI/Pages/TestPage.razor        |  1 -
 WebDoorCreator.UI/WebDoorCreator.UI.csproj    |  2 +-
 11 files changed, 43 insertions(+), 13 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.UI/Components/DoorMan/DoorList.razor b/WebDoorCreator.UI/Components/DoorMan/DoorList.razor
index 20cd192..d7bfe8b 100644
--- a/WebDoorCreator.UI/Components/DoorMan/DoorList.razor
+++ b/WebDoorCreator.UI/Components/DoorMan/DoorList.razor
@@ -14,9 +14,21 @@
             </div>
         }
 
+        @if (isTpl)
+        {
+            <TemplModal E_DoorClose="modalClose" OrderId="currOrderId"></TemplModal>
+        }
+
         <div class="d-flex justify-content-between">
             <div class=" py-1">
-                <HwSvgObj LineColor="#CFD8DC" LineWidth="8" ObjH="200" ObjW="700" EC_ExeFunct="@(()=> createDoor(""))" ObjId="-1" ItemName="Add new door" ItemCount="0" ShowPlus="true" ImagePath="images/icons/PlusWhite.svg"></HwSvgObj>
+                @if (isAddNew)
+                {
+                    <div>
+                        <button @onclick="()=>createDoor()">AO</button>
+                        <button @onclick="()=>showModalTpl()">CI</button>
+                    </div>
+                }
+                <HwSvgObj LineColor="#CFD8DC" LineWidth="8" ObjH="200" ObjW="700" EC_ExeFunct="@(()=> showAddNew())" ObjId="-1" ItemName="Add new door" ItemCount="0" ShowPlus="true" ImagePath="images/icons/PlusWhite.svg"></HwSvgObj>
             </div>
             <div class=" py-1">
                 <HwSvgObj LineColor="#CFD8DC" LineWidth="8" ObjH="200" ObjW="700" EC_ExeFunct="@(()=> recalcSVGs())" ObjId="-2" ItemName="Recalc all the SVGs" ItemCount="0" ShowPlus="true" ImagePath="images/icons/arrows-rotate-solid.svg"></HwSvgObj>
diff --git a/WebDoorCreator.UI/Components/DoorMan/DoorList.razor.cs b/WebDoorCreator.UI/Components/DoorMan/DoorList.razor.cs
index 1638362..1c40731 100644
--- a/WebDoorCreator.UI/Components/DoorMan/DoorList.razor.cs
+++ b/WebDoorCreator.UI/Components/DoorMan/DoorList.razor.cs
@@ -87,10 +87,16 @@ namespace WebDoorCreator.UI.Components.DoorMan
             {
                 await ReloadData();
             }
-            await E_DoorChanged.InvokeAsync(isChanged);
+
+        }
+        protected async Task modalClose(bool isClose)
+        {
+            await Task.Delay(1);
+            isTpl = isClose;
+            await ReloadData();
         }
 
-        protected async void createDoor(string message)
+        protected async Task createDoor()
         {
             int doorId = await WDService.createDoor(currOrderId, userId, "mm");
             if (doorId > 0)
@@ -100,7 +106,19 @@ namespace WebDoorCreator.UI.Components.DoorMan
                 await E_CurrDoor.InvokeAsync(door);
             }
         }
+        protected async Task showAddNew()
+        {
+            await Task.Delay(1);
+            isAddNew = !isAddNew;
+        }
+        protected async Task showModalTpl()
+        {
+            await Task.Delay(1);
+            isTpl = true;
+        }
 
+        protected bool isTpl { get; set; } = false;
+        protected bool isAddNew { get; set; } = false;
         protected bool isRecalc { get; set; } = false;
         protected async void recalcSVGs()
         {
diff --git a/WebDoorCreator.UI/Components/Order/OrderDets.razor b/WebDoorCreator.UI/Components/Order/OrderDets.razor
index b804986..29a2775 100644
--- a/WebDoorCreator.UI/Components/Order/OrderDets.razor
+++ b/WebDoorCreator.UI/Components/Order/OrderDets.razor
@@ -1,6 +1,6 @@
 ﻿<div class="p-5">
     <DoorList currOrderId="@OrderView!.OrderId" E_CurrDoor="SetCurrDoor" E_CurrDoorModal="SetCurrDoorModal" updateRecordCount="UpdateTotCount" actFilter="@currFilter"></DoorList>
     <div class="mt-4">
-        <EgwCoreLib.Razor.DataPager @ref="pagerDoors" PageSize="@numRecord" currPage="@currPage" numRecordChanged="ForceReload" numPageChanged="ForceReloadPage" totalCount="@totalCount" showLoading="@isLoading" />
+        <EgwCoreLib.Razor.DataPager @ref="pagerDoors" PageSize="@numRecord" currPage="@currPage" numRecordChanged="ForceReload" numPageChanged="ForceReloadPage" totalCount="@totalCount" showLoading="@isLoading" PageSizeList="@pageSizeList" />
     </div>
 </div>
\ No newline at end of file
diff --git a/WebDoorCreator.UI/Components/Order/OrderDets.razor.cs b/WebDoorCreator.UI/Components/Order/OrderDets.razor.cs
index 4df9355..b11eeae 100644
--- a/WebDoorCreator.UI/Components/Order/OrderDets.razor.cs
+++ b/WebDoorCreator.UI/Components/Order/OrderDets.razor.cs
@@ -23,6 +23,8 @@ namespace WebDoorCreator.UI.Components.Order
         [Parameter]
         public OrderStatusViewModel? OrderView { get; set; }
 
+        protected List<int> pageSizeList { get; set; } = new List<int>() { 4,8,12,16,20,24,28,64 };
+
         public string userId
         {
             get
diff --git a/WebDoorCreator.UI/Components/TemplateMan/TemplModal.razor b/WebDoorCreator.UI/Components/TemplateMan/TemplModal.razor
index d083ceb..ba1f6ee 100644
--- a/WebDoorCreator.UI/Components/TemplateMan/TemplModal.razor
+++ b/WebDoorCreator.UI/Components/TemplateMan/TemplModal.razor
@@ -35,7 +35,7 @@
                         @foreach (var door in DoorsList)
                         {
                             idxCount++;
-                            <div class="col-4 py-1">
+                            <div class="col-6 py-1">
                                 <DoorSvgObj ColorLine="#4c0969" LineWidth="8" ObjH="200" ObjW="650" ClassLeftText="col-4" ClassRightText="col-8" EC_ExeFunct="@(()=>doClone(door))" DoorId="@door.DoorId" ImagePath="@DoorSvgUrl(door.DoorId)" ObjId="idxCount" TextData="@textDictSetup(door)"></DoorSvgObj>
                             </div>
 
diff --git a/WebDoorCreator.UI/Components/TemplateMan/TemplModal.razor.cs b/WebDoorCreator.UI/Components/TemplateMan/TemplModal.razor.cs
index 2e59135..5f1b361 100644
--- a/WebDoorCreator.UI/Components/TemplateMan/TemplModal.razor.cs
+++ b/WebDoorCreator.UI/Components/TemplateMan/TemplModal.razor.cs
@@ -11,7 +11,7 @@ namespace WebDoorCreator.UI.Components.TemplateMan
         public int currOrderId { get; set; } = 56;
 
         [Parameter]
-        public EventCallback<DoorModel> E_DoorClose { get; set; }
+        public EventCallback<bool> E_DoorClose { get; set; }
 
         [Parameter]
         public int OrderId { get; set; } = 0;
@@ -76,9 +76,8 @@ namespace WebDoorCreator.UI.Components.TemplateMan
         protected async Task closeModal()
         {
             await Task.Delay(1);
-            var fakeDoor = new DoorModel();
 
-            await E_DoorClose.InvokeAsync(fakeDoor);
+            await E_DoorClose.InvokeAsync(false);
         }
 
         /// <summary>
diff --git a/WebDoorCreator.UI/Pages/TestPage.razor b/WebDoorCreator.UI/Pages/TestPage.razor
index 2d21175..f8d5c1b 100644
--- a/WebDoorCreator.UI/Pages/TestPage.razor
+++ b/WebDoorCreator.UI/Pages/TestPage.razor
@@ -9,7 +9,6 @@
 
 <CopyToClipboard Text="PROVATEST" AddSlash="true"></CopyToClipboard>
 
-<TemplModal OrderId="35"></TemplModal>
 
 <div class="row mx-2">
     @for (int i = 0; i < 8; i++)
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>
