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

fix grafici

Browse Source
This commit is contained in:
zaccaria.majid
2023-06-28 12:39:59 +02:00
parent 1449647645
commit 9e526aef0b
5 changed files with 65 additions and 55 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.2811</h4>
<h4>Version: 0.9.2306.2812</h4>
<br /> Release note:
<ul>
<li>
Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
0.9.2306.2811
0.9.2306.2812
Resources/manifest.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>0.9.2306.2811</version>
<version>0.9.2306.2812</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/Order/OrdersDoorsDoorDef.razor
+61 -51
View File
@@ -39,7 +39,7 @@
@translOpt(isTplPage, "UI_OrdList","UI_TplList")
</h2>
</div>
<div class=" px-2 small" style="font-size: 0.6rem">
<div class="px-2 small">
@if (ord2Show.OrderStatus <= 40)
{
<div class="small">Order Date:</div>
@@ -56,31 +56,31 @@
<div class="fw-bold">@(ord2Show.DateDelivery.ToString("yyyy-MM-dd"))</div>
}
</div>
<div class=" px-2 small" style="font-size: 0.6rem">
<div class="small">Order Number:</div>
<div class="fw-bold">@ord2Show.OrderExtCode</div>
</div>
<div class=" px-2 small text-truncate">
<div class="small">Order Description:</div>
<div class="fw-bold">@ord2Show.OrderDescript</div>
</div>
<div class=" px-2 small" style="font-size: 0.6rem">
@*<div class=" px-2 small" style="font-size: 0.6rem">
<div class="small">Order Number:</div>
</div>*@
<div class="fw-bold">@ord2Show.OrderExtCode</div>
@*<div class=" px-2 small text-truncate">
<div class="small">Order Description:</div>
</div>*@
<div class="fw-bold">@ord2Show.OrderDescript</div>
<div class=" px-2 small">
<div class="small">Models #:</div>
<div class="fw-bold">@ord2Show.NumType</div>
</div>
<div class=" px-2 small" style="font-size: 0.6rem">
<div class=" px-2 small">
<div class="text-center">Quantity #:</div>
<div class="fw-bold">@ord2Show.NumDoors</div>
</div>
<div class=" px-2" style="font-size: 0.6rem">
<div class="fw-bold">
<span class="badge" style="background: @getOrderStatusColor(ord2Show.OrderStatus)"><div class="fs-6">@getOrderStatusLabel(ord2Show.OrderStatus)</div></span>
</div>
</div>
<div class=" px-2 small">
<div class="text-center">TOTAL COST:</div>
<div class="fw-bold pulse-warning">@($"{ord2Show.TotCost:C2}")</div>
@*<div class=" px-2" style="font-size: 0.6rem">
</div>*@
<div class="fw-bold">
<span class="badge" style="background: @getOrderStatusColor(ord2Show.OrderStatus)"><div class="fs-4">@getOrderStatusLabel(ord2Show.OrderStatus)</div></span>
</div>
@*<div class=" px-2 small">
<div class="text-center">TOTAL COST:</div>
</div>*@
<div class="fw-bold pulse-warning">@($"{ord2Show.TotCost:C2}")</div>
<div class="d-flex justify-content-between">
<button class="btn btn-sm btn-primary" @onclick="() => changeLevel(1)">
<i class="fa-solid fa-arrow-turn-up fa-flip-horizontal"></i> @translate("UI_302")
@@ -108,7 +108,7 @@
@translOpt(isTplPage, "UI_OrdList","UI_TplList")
</h2>
</div>
<div class=" px-2 small" style="font-size: 0.6rem">
<div class="px-2 small">
@if (ord2Show.OrderStatus <= 40)
{
<div class="small">Order Date:</div>
@@ -125,31 +125,31 @@
<div class="fw-bold">@(ord2Show.DateDelivery.ToString("yyyy-MM-dd"))</div>
}
</div>
<div class=" px-2 small" style="font-size: 0.6rem">
<div class="small">Order Number:</div>
<div class="fw-bold">@ord2Show.OrderExtCode</div>
</div>
<div class=" px-2 small text-truncate">
<div class="small">Order Description:</div>
<div class="fw-bold">@ord2Show.OrderDescript</div>
</div>
<div class=" px-2 small" style="font-size: 0.6rem">
@*<div class=" px-2 small" style="font-size: 0.6rem">
<div class="small">Order Number:</div>
</div>*@
<div class="fw-bold">@ord2Show.OrderExtCode</div>
@*<div class=" px-2 small text-truncate">
<div class="small">Order Description:</div>
</div>*@
<div class="fw-bold">@ord2Show.OrderDescript</div>
<div class=" px-2 small">
<div class="small">Models #:</div>
<div class="fw-bold">@ord2Show.NumType</div>
</div>
<div class=" px-2 small" style="font-size: 0.6rem">
<div class=" px-2 small">
<div class="text-center">Quantity #:</div>
<div class="fw-bold">@ord2Show.NumDoors</div>
</div>
<div class=" px-2" style="font-size: 0.6rem">
<div class="fw-bold">
<span class="badge" style="background: @getOrderStatusColor(ord2Show.OrderStatus)"><div class="fs-6">@getOrderStatusLabel(ord2Show.OrderStatus)</div></span>
</div>
</div>
<div class=" px-2 small">
<div class="text-center">TOTAL COST:</div>
<div class="fw-bold pulse-warning">@($"{ord2Show.TotCost:C2}")</div>
@*<div class=" px-2" style="font-size: 0.6rem">
</div>*@
<div class="fw-bold">
<span class="badge" style="background: @getOrderStatusColor(ord2Show.OrderStatus)"><div class="fs-4">@getOrderStatusLabel(ord2Show.OrderStatus)</div></span>
</div>
@*<div class=" px-2 small">
<div class="text-center">TOTAL COST:</div>
</div>*@
<div class="fw-bold">@($"{ord2Show.TotCost:C2}")</div>
<div class="d-flex justify-content-between">
<button class="btn btn-sm btn-primary" @onclick="() => changeLevel(1)">
<i class="fa-solid fa-arrow-turn-up fa-flip-horizontal"></i> @translate("UI_302")
@@ -167,22 +167,32 @@
@translOpt(isTplPage, "UI_OrdList","UI_TplList")
</h2>
</div>
<div class=" px-3 d-flex justify-content-between small">
<div>Door ID:</div>
<div>&nbsp;</div>
<div class="fw-bold">@currDoor.DoorId</div>
<div class="px-3">
<div class="fw-bold">@($"D.{currDoor.DoorId}")</div>
</div>
<div class=" px-3 d-flex justify-content-between small">
<div>Door Type:</div>
<div>&nbsp;</div>
<div class=" fw-bold">@currDoor.ParentId</div>
@if (currDoor.ParentId != 1)
{
<div class=" px-3">
<div>Door Type:</div>
<div class=" fw-bold">@currDoor.ParentId</div>
</div>
}
<div class=" px-3">
<div>Door description:</div>
<div class=" fw-bold">@currDoor.DoorDescript</div>
</div>
<div class=" px-3 d-flex justify-content-between small">
<div>Door Price:</div>
<div>&nbsp;</div>
<div class=" fw-bold">@(currDoor.UnitCost * currDoor.Quantity)</div>
<div class=" px-3">
<div>Doors total Price:</div>
@if (currDoor.Quantity > 1)
{
<div class=" fw-bold">@($"{(currDoor.UnitCost * currDoor.Quantity):C2}") @($"({(currDoor.UnitCost):C2} x {currDoor.Quantity})")</div>
}
else
{
<div class=" fw-bold">@($"{(currDoor.UnitCost * currDoor.Quantity):C2}")</div>
}
</div>
<div class="d-flex justify-content-between">
<div class="">
<button class="btn btn-sm btn-primary" @onclick="() => changeLevel(2)">
<i class="fa-solid fa-arrow-turn-up fa-flip-horizontal"></i> @translate("UI_304")
</button>
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.2811</Version>
<Version>0.9.2306.2812</Version>
<ImplicitUsings>enable</ImplicitUsings>
<UserSecretsId>aspnet-WebDoorCreator.UI-dfe95fed-1398-4144-bd43-8b3a765d6608</UserSecretsId>
</PropertyGroup>