From 9e526aef0bc2dbfd396c26b514d97c2ef2f2a3b9 Mon Sep 17 00:00:00 2001
From: "zaccaria.majid" <zaccaria.majid@egalware.com>
Date: Wed, 28 Jun 2023 12:39:59 +0200
Subject: [PATCH] fix grafici

---
 Resources/ChangeLog.html                      |   2 +-
 Resources/VersNum.txt                         |   2 +-
 Resources/manifest.xml                        |   2 +-
 .../Components/Order/OrdersDoorsDoorDef.razor | 112 ++++++++++--------
 WebDoorCreator.UI/WebDoorCreator.UI.csproj    |   2 +-
 5 files changed, 65 insertions(+), 55 deletions(-)
diff --git a/Resources/ChangeLog.html b/Resources/ChangeLog.html
index 34e9b56..06b2372 100644
--- a/Resources/ChangeLog.html
+++ b/Resources/ChangeLog.html
@@ -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>
diff --git a/Resources/VersNum.txt b/Resources/VersNum.txt
index dff9417..005e16a 100644
--- a/Resources/VersNum.txt
+++ b/Resources/VersNum.txt
@@ -1 +1 @@
-0.9.2306.2811
+0.9.2306.2812
diff --git a/Resources/manifest.xml b/Resources/manifest.xml
index ab4455f..4bad9f5 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.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>
diff --git a/WebDoorCreator.UI/Components/Order/OrdersDoorsDoorDef.razor b/WebDoorCreator.UI/Components/Order/OrdersDoorsDoorDef.razor
index 5bf92d5..b09713b 100644
--- a/WebDoorCreator.UI/Components/Order/OrdersDoorsDoorDef.razor
+++ b/WebDoorCreator.UI/Components/Order/OrdersDoorsDoorDef.razor
@@ -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>
diff --git a/WebDoorCreator.UI/WebDoorCreator.UI.csproj b/WebDoorCreator.UI/WebDoorCreator.UI.csproj
index 9335811..60d8e32 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.2811</Version>
+        <Version>0.9.2306.2812</Version>
     <ImplicitUsings>enable</ImplicitUsings>
     <UserSecretsId>aspnet-WebDoorCreator.UI-dfe95fed-1398-4144-bd43-8b3a765d6608</UserSecretsId>
   </PropertyGroup>
