From b07aa8f9c27bca2aac559bcac0ebfc8badc8fb58 Mon Sep 17 00:00:00 2001
From: "zaccaria.majid" <zaccaria.majid@egalware.com>
Date: Wed, 10 May 2023 09:59:31 +0200
Subject: [PATCH] fix nav manager top

---
 .../DoorDef/DoorDefOrderTopRow.razor          |   2 +-
 .../Components/DoorDef/DoorDefStepList.razor  |   6 +-
 .../DoorDef/DoorDefStepList.razor.cs          |   8 ++
 .../Components/Gen/NavMenuHorizontal.razor    | 117 +++++++++---------
 WebDoorCreator.UI/WebDoorCreator.UI.csproj    |   2 +-
 WebDoorCreator.UI/temp/Conf.yaml              |  12 +-
 6 files changed, 84 insertions(+), 63 deletions(-)

diff --git a/WebDoorCreator.UI/Components/DoorDef/DoorDefOrderTopRow.razor b/WebDoorCreator.UI/Components/DoorDef/DoorDefOrderTopRow.razor
index fed5cc1..32d0c15 100644
--- a/WebDoorCreator.UI/Components/DoorDef/DoorDefOrderTopRow.razor
+++ b/WebDoorCreator.UI/Components/DoorDef/DoorDefOrderTopRow.razor
@@ -1,6 +1,6 @@
 @if (currOrderStatus != null)
 {
-    <div class="d-flex justify-content-between px-2 pt-2" style="background-color: @bgColor">
+    <div class="d-flex justify-content-between px-2 py-2" style="background-color: @bgColor">
         <div class="d-flex justify-content-between">
             @*<div class="badge rounded-pilll bg-dark text-light">Insert Date</div>*@
             <div>Insert Date: <b>@currOrderStatus.DateIns</b></div>
diff --git a/WebDoorCreator.UI/Components/DoorDef/DoorDefStepList.razor b/WebDoorCreator.UI/Components/DoorDef/DoorDefStepList.razor
index 5e6a04e..9e9e137 100644
--- a/WebDoorCreator.UI/Components/DoorDef/DoorDefStepList.razor
+++ b/WebDoorCreator.UI/Components/DoorDef/DoorDefStepList.razor
@@ -7,17 +7,17 @@
             <div class="col px-0" @onclick="()=>changeStep(int.Parse(item.Value))">
                 @if (int.Parse(item.Value) == CurrDoorDefStatus)
                 {
-                    <StepArrow ObjId="@int.Parse(item.Value)" StepText="@item.Label" BlockStyle="@($"fill:{item.DefaultVal};")" ObjW="650" ObjH="100"></StepArrow>
+                    <StepArrow ObjId="@int.Parse(item.Value)" StepText="@item.Label" BlockStyle="@($"fill:{item.DefaultVal};")" StrokeColors="@listBord01" TipAngle="90" ObjW="650" ObjH="100"></StepArrow>
                 }
                 else
                 {
                     @if (int.Parse(item.Value) < CurrDoorDefStatus)
                     {
-                        <StepArrow ObjId="@int.Parse(item.Value)" StepText="@($"{item.Label} ✓")" BlockStyle="@($"fill:{item.DefaultVal};")" ObjW="650" ObjH="100"></StepArrow>
+                        <StepArrow ObjId="@int.Parse(item.Value)" StepText="@($"{item.Label} ✓")" BlockStyle="@($"fill:{item.DefaultVal};")" ObjW="650" ObjH="100" TipAngle="90"></StepArrow>
                     }
                     else
                     {
-                        <StepArrow ObjId="@int.Parse(item.Value)" StepText="@item.Label" BlockStyle="@($"fill:transparent;")" ObjW="650" ObjH="100"></StepArrow>
+                        <StepArrow ObjId="@int.Parse(item.Value)" StepText="@item.Label" BlockStyle="@($"fill:transparent;")" ObjW="650" ObjH="100" TipAngle="90"></StepArrow>
                     }
                 }
             </div>
diff --git a/WebDoorCreator.UI/Components/DoorDef/DoorDefStepList.razor.cs b/WebDoorCreator.UI/Components/DoorDef/DoorDefStepList.razor.cs
index c301f5b..ab3495c 100644
--- a/WebDoorCreator.UI/Components/DoorDef/DoorDefStepList.razor.cs
+++ b/WebDoorCreator.UI/Components/DoorDef/DoorDefStepList.razor.cs
@@ -46,8 +46,16 @@ namespace WebDoorCreator.UI.Components.DoorDef
 
                 }
             }
+
+            listBord01 = new();
+            listBord01.Add("White");
+            listBord01.Add("White");
+            listBord01.Add("White");
+            listBord01.Add("White");
         }
 
+        protected List<string> listBord01 { get; set; } = new();
+
         protected async Task changeStep(int step)
         {
             await E_CurrStep.InvokeAsync(step);
diff --git a/WebDoorCreator.UI/Components/Gen/NavMenuHorizontal.razor b/WebDoorCreator.UI/Components/Gen/NavMenuHorizontal.razor
index 3f2062e..4634d75 100644
--- a/WebDoorCreator.UI/Components/Gen/NavMenuHorizontal.razor
+++ b/WebDoorCreator.UI/Components/Gen/NavMenuHorizontal.razor
@@ -11,34 +11,37 @@
                                 aria-expanded="false" aria-label="Toggle navigation">
                             <span class="navbar-toggler-icon"></span>
                         </button>
-                        <AuthorizeView Roles="SuperAdmin, CompAdmin, CompUser" Context="MenuHide">
-                            <Authorized>
-                                <div class="nav-item px-3 d-flex flex-warp align-items-center">
-                                    <NavLink class="nav-link" href="OrdersHomePage">
-                                        <span class="oi oi-cart" aria-hidden="true"></span> Orders home page
-                                    </NavLink>
-                                </div>
-                            </Authorized>
-                        </AuthorizeView>
-                        <!--Hiding to non-SuperAdmin users the option to manage the application -->
-                        <AuthorizeView Roles="SuperAdmin" Context="MenuHide">
-                            <Authorized>
-                                <div class="nav-item px-3 d-flex flex-warp align-items-center">
-                                    <NavLink class="nav-link" href="SuperAdmin">
-                                        <span class="oi oi-list-rich" aria-hidden="true"></span> General management
-                                    </NavLink>
-                                </div>
-                            </Authorized>
-                        </AuthorizeView>
+                        <div class="w-100 d-flex justify-content-start">
+                            <AuthorizeView Roles="SuperAdmin, CompAdmin, CompUser" Context="MenuHide">
+                                <Authorized>
+                                    <div class="nav-item px-3 d-flex flex-warp align-items-center">
+                                        <NavLink class="nav-link" href="OrdersHomePage">
+                                            <span class="oi oi-cart" aria-hidden="true"></span> Orders home page
+                                        </NavLink>
+                                    </div>
+                                </Authorized>
+                            </AuthorizeView>
+                            <!--Hiding to non-SuperAdmin users the option to manage the application -->
+                            <AuthorizeView Roles="SuperAdmin" Context="MenuHide">
+                                <Authorized>
+                                    <div class="nav-item px-3 d-flex flex-warp align-items-center">
+                                        <NavLink class="nav-link" href="SuperAdmin">
+                                            <span class="oi oi-list-rich" aria-hidden="true"></span> General management
+                                        </NavLink>
+                                    </div>
+                                </Authorized>
+                            </AuthorizeView>
+                        </div>
+
                         @*<div class="nav-item px-3 d-flex flex-warp align-items-center">
-                            <NavLink class="nav-link" href="DoorDefinition">
-                                <span class="bi bi-door-open-fill pe-3" aria-hidden="true"></span> Door definition page
-                            </NavLink>
+                        <NavLink class="nav-link" href="DoorDefinition">
+                        <span class="bi bi-door-open-fill pe-3" aria-hidden="true"></span> Door definition page
+                        </NavLink>
                         </div>*@
                     </div>
                 </div>
             </div>
-            <div class="text-end text-nowrap px-3">                
+            <div class="text-end text-nowrap px-3">
                 <div class="dropdown">
                     <a class="btn btn-primary dropdown-toggle" href="#" role="button" data-bs-toggle="dropdown" aria-expanded="false">
                         @context.User.Identity?.Name
@@ -87,7 +90,7 @@
                             </div>
 
                             <hr />
-                        </li>                        
+                        </li>
                         <li>
                             <div class="text-end">
                                 <form method="post" action="Identity/Account/LogOut">
@@ -98,39 +101,39 @@
                     </ul>
                 </div>
                 @*<div class="d-flex justify-content-between small">
-                    <div class="d-flex justify-content-between">
-                        <a href="Identity/Account/Manage" class="text-decoration-none text-dark" style="">@context.User.Identity?.Name</a>
-                        <div class="text-decoration-none text-secondary small" style="">
-                            @if (listCompanies != null)
-                            {
-                                @if (listCompanies.Count > 1)
-                                {
-                                    <select @bind="userCurrCompany" class="form-select form-select-sm">
-                                        @foreach (var item in listCompanies)
-                                        {
-                                            <option value="@item.CompanyId">@item.CompanyName</option>
-                                        }
-                                    </select>
-                                }
-                                else
-                                {
-                                    @if (compToShow != null)
-                                    {
-                                        <div>@compToShow.CompanyName</div>
-                                    }
-                                }
-                            }
-                        </div>
-                        <div>
-                            <select @bind="userLang" class="form-select form-select-sm">
-                                <option>EN</option>
-                                <option>IT</option>
-                            </select>
-                        </div>
-                    </div>
-                    <form method="post" action="Identity/Account/LogOut">
-                        <button type="submit" class="btnLogout">Log out</button>
-                    </form>
+                <div class="d-flex justify-content-between">
+                <a href="Identity/Account/Manage" class="text-decoration-none text-dark" style="">@context.User.Identity?.Name</a>
+                <div class="text-decoration-none text-secondary small" style="">
+                @if (listCompanies != null)
+                {
+                @if (listCompanies.Count > 1)
+                {
+                <select @bind="userCurrCompany" class="form-select form-select-sm">
+                @foreach (var item in listCompanies)
+                {
+                <option value="@item.CompanyId">@item.CompanyName</option>
+                }
+                </select>
+                }
+                else
+                {
+                @if (compToShow != null)
+                {
+                <div>@compToShow.CompanyName</div>
+                }
+                }
+                }
+                </div>
+                <div>
+                <select @bind="userLang" class="form-select form-select-sm">
+                <option>EN</option>
+                <option>IT</option>
+                </select>
+                </div>
+                </div>
+                <form method="post" action="Identity/Account/LogOut">
+                <button type="submit" class="btnLogout">Log out</button>
+                </form>
                 </div>*@
             </div>
         </nav>
diff --git a/WebDoorCreator.UI/WebDoorCreator.UI.csproj b/WebDoorCreator.UI/WebDoorCreator.UI.csproj
index 78b6b52..6ff3724 100644
--- a/WebDoorCreator.UI/WebDoorCreator.UI.csproj
+++ b/WebDoorCreator.UI/WebDoorCreator.UI.csproj
@@ -34,7 +34,7 @@
   <ItemGroup>
     <PackageReference Include="Blazored.LocalStorage" Version="4.3.0" />
     <PackageReference Include="Blazored.SessionStorage" Version="2.3.0" />
-    <PackageReference Include="EgwCoreLib.Razor" Version="1.4.2305.911" />
+    <PackageReference Include="EgwCoreLib.Razor" Version="1.4.2305.1008" />
     <PackageReference Include="EntityFrameworkCore.SqlServer.HierarchyId" Version="3.0.1" />
     <PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="6.0.11" />
     <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="6.0.14" />
diff --git a/WebDoorCreator.UI/temp/Conf.yaml b/WebDoorCreator.UI/temp/Conf.yaml
index e74f35e..c93667b 100644
--- a/WebDoorCreator.UI/temp/Conf.yaml
+++ b/WebDoorCreator.UI/temp/Conf.yaml
@@ -12,7 +12,7 @@ order:
   project: 
   pO: 
   line: 
-date: 2023-05-09T00:00:00.0000000Z
+date: 2023-05-10T00:00:00.0000000Z
 piece: DO_1
 properties: Oak
 finishing: Veneer
@@ -47,6 +47,16 @@ hardware:
       back_set: 6
       depth: 1
       face: secure
+    - template: Generic\Circle
+      position: 35
+      back_set: 5
+      depth: 1
+      face: secure
+    - template: Generic\Circle
+      position: 35
+      back_set: 5
+      depth: 1
+      face: secure
  
 
 ---