diff --git a/WebDoorCreator.UI/Components/DoorDef/DoorDefOrderTopRow.razor b/WebDoorCreator.UI/Components/DoorDef/DoorDefOrderTopRow.razor index b22e577..8d88929 100644 --- a/WebDoorCreator.UI/Components/DoorDef/DoorDefOrderTopRow.razor +++ b/WebDoorCreator.UI/Components/DoorDef/DoorDefOrderTopRow.razor @@ -1,6 +1,6 @@ @if (currOrderStatus != null) { -
+
Insert Date
@currOrderStatus.DateIns
diff --git a/WebDoorCreator.UI/Components/DoorMan/DoorList.razor b/WebDoorCreator.UI/Components/DoorMan/DoorList.razor index cb3fa8a..e1ff8ac 100644 --- a/WebDoorCreator.UI/Components/DoorMan/DoorList.razor +++ b/WebDoorCreator.UI/Components/DoorMan/DoorList.razor @@ -1,58 +1,8 @@ @if (DoorsList != null) { - @*
- -
*@ - - @* - - - - - - - - - - - - - - - - - - - - - - - - - } - -
Door TypeDescriptionDoor external codeDoors Number
- - @(door.TypeNav?.Description ?? "-")@door.DoorDescript@door.DoorExtCode@door.Quantity - @if (door.Quantity > 1) - { - - } - else - { - - } - - - - @if (door.OrderNav?.Status < 20) - { - - } -
*@
@if (DoorsList == null || DoorsList.Count == 0) { } @@ -64,8 +14,8 @@ { imgPath = $"images/LogoEgw{idxCount % 5:00}.png"; idxCount++; -
- +
+
} } diff --git a/WebDoorCreator.UI/Components/DoorMan/DoorSvgObj.razor.cs b/WebDoorCreator.UI/Components/DoorMan/DoorSvgObj.razor.cs index 7913eb3..e3d4a8a 100644 --- a/WebDoorCreator.UI/Components/DoorMan/DoorSvgObj.razor.cs +++ b/WebDoorCreator.UI/Components/DoorMan/DoorSvgObj.razor.cs @@ -33,7 +33,7 @@ namespace WebDoorCreator.UI.Components.DoorMan public int LineWidth { get; set; } = 8; [Parameter] - public string TextStyle { get; set; } = "font-size: 1.5em; font-weight:bold; fill: white;"; + public string TextStyle { get; set; } = "font-size: 1.5em; font-weight:bold; fill: #000;"; private void setupGraphParams() diff --git a/WebDoorCreator.UI/Components/Order/OrderStatusStep.razor b/WebDoorCreator.UI/Components/Order/OrderStatusStep.razor index 23f0850..b48e712 100644 --- a/WebDoorCreator.UI/Components/Order/OrderStatusStep.razor +++ b/WebDoorCreator.UI/Components/Order/OrderStatusStep.razor @@ -1,54 +1,47 @@ -@*
- @if (DoorDefStep == Core.Enum.DoorDefStep.Door) - { -
-
Door
-
- } - else - { -
Door
- } -
-
- @if (DoorDefStep == Core.Enum.DoorDefStep.Hardware) - { -
-
Hardware
-
- } - else - { -
Hardware
- } -
- *@ +@using Components.SvgComp -
+
@if (currListOrderStatus != null) { @foreach (var item in currListOrderStatus) { -
+ @*
+ @if (int.Parse(item.Value) == CurrOrderStatus) + { +
+
@item.Label
+
+ } + else + { + @if (int.Parse(item.Value) < CurrOrderStatus) + { +
@item.Label
+ } + else + { +
@item.Label
+ } + } +
*@ + +
@if (int.Parse(item.Value) == CurrOrderStatus) { -
-
@item.Label
-
+ } else { @if (int.Parse(item.Value) < CurrOrderStatus) { -
@item.Label
+ } else { -
@item.Label
+ } }
- } }
\ No newline at end of file diff --git a/WebDoorCreator.UI/Components/SvgComp/StepArrow.razor.cs b/WebDoorCreator.UI/Components/SvgComp/StepArrow.razor.cs index aba9c11..25f138c 100644 --- a/WebDoorCreator.UI/Components/SvgComp/StepArrow.razor.cs +++ b/WebDoorCreator.UI/Components/SvgComp/StepArrow.razor.cs @@ -25,13 +25,22 @@ namespace WebDoorCreator.UI.Components.SvgComp [Parameter] public string BlockStyle { get; set; } = "fill:rgb(0,0,255);stroke-width:0;stroke:rgb(0,0,0);"; + [Parameter] + public string BlockStyleBorderUp { get; set; } = "stroke-width:5px;stroke:rgb(255,255,255);stroke-dasharray: 650,600;"; + #endregion Public Properties #region Protected Properties + protected int deltaH + { + get => ObjH / 100; + } + protected int rectH { - get => ObjH / 2; + get => (ObjH / 2); + //* (96 / 100); } protected int rectW diff --git a/WebDoorCreator.UI/Pages/OrderDetails.razor b/WebDoorCreator.UI/Pages/OrderDetails.razor index 09b2a03..a0cd005 100644 --- a/WebDoorCreator.UI/Pages/OrderDetails.razor +++ b/WebDoorCreator.UI/Pages/OrderDetails.razor @@ -1,22 +1,47 @@ @page "/OrderDetails" -
-
+
+ + @if (orderView != null) + { +
+
+
Insert Date
+
@orderView.DateIns
+
+
+
Order External Code
+
@orderView.OrderExtCode
+
+
+
Models Number
+
@orderView.NumType
+
+
+
Doors Number
+
@orderView.NumDoors
+
+ + @*
LIST DOORS IN ORDER @idOrd -
-
-
- -
+
+
+ + +
+
*@ + +
+ } + +
+
-
- -
-
+
diff --git a/WebDoorCreator.UI/Pages/OrderDetails.razor.cs b/WebDoorCreator.UI/Pages/OrderDetails.razor.cs index 30126ce..5b096d3 100644 --- a/WebDoorCreator.UI/Pages/OrderDetails.razor.cs +++ b/WebDoorCreator.UI/Pages/OrderDetails.razor.cs @@ -25,6 +25,7 @@ namespace WebDoorCreator.UI.Pages protected DoorModel? currDoor { get; set; } = null; protected int currDoorType { get; set; } = 0; + protected OrderStatusViewModel? orderView { get; set; } = null; /// /// Unità di misura selezionata @@ -290,15 +291,28 @@ namespace WebDoorCreator.UI.Pages NavManager.NavigateTo($"/DoorDefinition?idOrd={idOrd}&idDoor={doorId}"); } + protected int userCurrCompany + { + get => WDCUService.userCurrComp; + } + protected override async Task OnInitializedAsync() { await Task.Delay(1); + var domani = DateTime.Today.AddDays(1); var uri = NavManager.ToAbsoluteUri(NavManager.Uri); if (QueryHelpers.ParseQuery(uri.Query).TryGetValue("idOrd", out var _idOrd) && QueryHelpers.ParseQuery(uri.Query).TryGetValue("orderStat", out var _orderStat)) { idOrd = int.Parse(_idOrd); orderStat = int.Parse(_orderStat); } + + var orders = await WDService.OrderStatusGetFilt(userCurrCompany, 0, domani.AddYears(-2), domani); + + if(orders != null) + { + orderView = orders.Where(x => x.OrderId == idOrd).FirstOrDefault(); + } } protected string stepColor { get; set; } = ""; diff --git a/WebDoorCreator.UI/Pages/OrderDetails.razor.css b/WebDoorCreator.UI/Pages/OrderDetails.razor.css index 99deee1..17e1c11 100644 --- a/WebDoorCreator.UI/Pages/OrderDetails.razor.css +++ b/WebDoorCreator.UI/Pages/OrderDetails.razor.css @@ -1,9 +1,26 @@ .cardStatus { - border-radius: 60px 60px 0 0; + border-radius: 60px /*60px 0 0*/; background-color: var(--bgStepColor); + transform: translate(0, -65px); + padding: 1.5rem 3rem 5rem 3rem; } .cardDoors { width: 100%; - transform: translate(0, -53px); border-radius: 60px 60px 0 0; + transform: translate(0, -120px); + background-color: #FFF; + padding: 0; + box-shadow: rgba(0, 0, 0, 0.45) 0px -24px 27px -20px; +} +.testataOrder { + border: 3px solid var(--bgStepColor); + padding: 1rem 1rem 4.5rem 1rem; + border-radius: 60px 60px 20px 20px; + transform: translate(63px, 0); + width: 93%; + z-index: -99999; + position: relative; + display: flex; + justify-content: space-around; + font-size: 17px; } \ No newline at end of file diff --git a/WebDoorCreator.UI/Pages/OrderDetails.razor.less b/WebDoorCreator.UI/Pages/OrderDetails.razor.less index c8deb45..59516a9 100644 --- a/WebDoorCreator.UI/Pages/OrderDetails.razor.less +++ b/WebDoorCreator.UI/Pages/OrderDetails.razor.less @@ -1,10 +1,29 @@ .cardStatus { - border-radius: 60px 60px 0 0; + border-radius: 60px /*60px 0 0*/; background-color: var(--bgStepColor); + transform: translate(0, -65px); + padding: 1.5rem 3rem 5rem 3rem; } .cardDoors { width: 100%; - transform: translate(0, -53px); + //transform: translate(0, -53px); border-radius: 60px 60px 0 0; + transform: translate(0, -120px); + background-color: #FFF; + padding: 0; + box-shadow: rgba(0, 0, 0, 0.45) 0px -24px 27px -20px; +} + +.testataOrder { + border: 3px solid var(--bgStepColor); + padding: 1rem 1rem 4.5rem 1rem; + border-radius: 60px 60px 20px 20px; + transform: translate(63px, 0); + width: 93%; + z-index: -99999; + position: relative; + display: flex; + justify-content: space-around; + font-size: 17px; } diff --git a/WebDoorCreator.UI/Pages/OrderDetails.razor.min.css b/WebDoorCreator.UI/Pages/OrderDetails.razor.min.css index cfa874c..05f90d6 100644 --- a/WebDoorCreator.UI/Pages/OrderDetails.razor.min.css +++ b/WebDoorCreator.UI/Pages/OrderDetails.razor.min.css @@ -1 +1 @@ -.cardStatus{border-radius:60px 60px 0 0;background-color:var(--bgStepColor);}.cardDoors{width:100%;transform:translate(0,-53px);border-radius:60px 60px 0 0;} \ No newline at end of file +.cardStatus{border-radius:60px;background-color:var(--bgStepColor);transform:translate(0,-65px);padding:1.5rem 3rem 5rem 3rem;}.cardDoors{width:100%;border-radius:60px 60px 0 0;transform:translate(0,-120px);background-color:#fff;padding:0;box-shadow:rgba(0,0,0,.45) 0 -24px 27px -20px;}.testataOrder{border:3px solid var(--bgStepColor);padding:1rem 1rem 4.5rem 1rem;border-radius:60px 60px 20px 20px;transform:translate(63px,0);width:93%;z-index:-99999;position:relative;display:flex;justify-content:space-around;font-size:17px;} \ No newline at end of file diff --git a/WebDoorCreator.UI/Shared/MainLayout.razor b/WebDoorCreator.UI/Shared/MainLayout.razor index 056acad..82161dd 100644 --- a/WebDoorCreator.UI/Shared/MainLayout.razor +++ b/WebDoorCreator.UI/Shared/MainLayout.razor @@ -22,9 +22,9 @@ @*
*@ -
+ @*
-
+
*@
@*