Egalware/webdoorcreator
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ok modal template

Browse Source
This commit is contained in:
zaccaria.majid
2023-06-01 16:58:55 +02:00
parent a4175a5681
commit 00a55e6eb3
11 changed files with 43 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Resources/ChangeLog.html
+1 -1
View File
@@ -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>
Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
0.9.2306.0115
0.9.2306.0116
Resources/manifest.xml
+1 -1
View File
@@ -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>
WebDoorCreator.UI/Components/DoorMan/DoorList.razor
+13 -1
View File
@@ -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>
WebDoorCreator.UI/Components/DoorMan/DoorList.razor.cs
+20 -2
View File
@@ -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()
{
WebDoorCreator.UI/Components/Order/OrderDets.razor
+1 -1
View File
@@ -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>
WebDoorCreator.UI/Components/Order/OrderDets.razor.cs
+2
View File
@@ -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
WebDoorCreator.UI/Components/TemplateMan/TemplModal.razor
+1 -1
View File
@@ -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>
WebDoorCreator.UI/Components/TemplateMan/TemplModal.razor.cs
+2 -3
View File
@@ -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>
WebDoorCreator.UI/Pages/TestPage.razor
-1
View File
@@ -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++)
WebDoorCreator.UI/WebDoorCreator.UI.csproj
+1 -1
View File
@@ -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>