From 236bb47f175c6fdade2c9b1ff093b88f63d1ea38 Mon Sep 17 00:00:00 2001 From: "zaccaria.majid" Date: Thu, 4 May 2023 10:30:52 +0200 Subject: [PATCH] ancora fix grafica door definition --- .../Components/DoorMan/DoorList.razor | 6 ++-- .../Components/DoorMan/DoorList.razor.cs | 3 ++ .../Components/Order/OrderStatusStep.razor | 19 ----------- .../Data/WebDoorCreatorService.cs | 33 +++++++++++++++++++ WebDoorCreator.UI/Pages/DoorDefinition.razor | 21 ++++++------ .../Pages/DoorDefinition.razor.cs | 6 ++-- WebDoorCreator.UI/Pages/OrderDetails.razor | 31 ++++++++--------- WebDoorCreator.UI/Pages/OrderDetails.razor.cs | 1 + .../Pages/OrderDetails.razor.css | 1 + .../Pages/OrderDetails.razor.less | 1 + .../Pages/OrderDetails.razor.min.css | 2 +- WebDoorCreator.UI/Shared/MainLayout.razor | 23 ++++++++++--- WebDoorCreator.UI/Shared/MainLayout.razor.cs | 4 +++ 13 files changed, 92 insertions(+), 59 deletions(-) diff --git a/WebDoorCreator.UI/Components/DoorMan/DoorList.razor b/WebDoorCreator.UI/Components/DoorMan/DoorList.razor index 5c2ff14..8f17a84 100644 --- a/WebDoorCreator.UI/Components/DoorMan/DoorList.razor +++ b/WebDoorCreator.UI/Components/DoorMan/DoorList.razor @@ -1,8 +1,8 @@ @if (DoorsList != null) { - - - +
+ +
@if (DoorsList == null || DoorsList.Count == 0) { } diff --git a/WebDoorCreator.UI/Components/DoorMan/DoorList.razor.cs b/WebDoorCreator.UI/Components/DoorMan/DoorList.razor.cs index 5f65dc1..52f92ba 100644 --- a/WebDoorCreator.UI/Components/DoorMan/DoorList.razor.cs +++ b/WebDoorCreator.UI/Components/DoorMan/DoorList.razor.cs @@ -30,6 +30,8 @@ namespace WebDoorCreator.UI.Components.DoorMan protected int orderStatus { get; set; } = 10; + protected Dictionary baseDict { get; set; } = new Dictionary(); + [Inject] protected WebDoorCreatorService WDService { get; set; } = null!; @@ -91,6 +93,7 @@ namespace WebDoorCreator.UI.Components.DoorMan protected async Task ReloadData() { + baseDict.Add("ADD NEW DOOR", ""); if (currOrderId != -1) { DoorsList = await WDService.DoorGetByOrderId(currOrderId); diff --git a/WebDoorCreator.UI/Components/Order/OrderStatusStep.razor b/WebDoorCreator.UI/Components/Order/OrderStatusStep.razor index b48e712..f29827e 100644 --- a/WebDoorCreator.UI/Components/Order/OrderStatusStep.razor +++ b/WebDoorCreator.UI/Components/Order/OrderStatusStep.razor @@ -5,25 +5,6 @@ { @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) diff --git a/WebDoorCreator.UI/Data/WebDoorCreatorService.cs b/WebDoorCreator.UI/Data/WebDoorCreatorService.cs index 3583dbd..02a5194 100644 --- a/WebDoorCreator.UI/Data/WebDoorCreatorService.cs +++ b/WebDoorCreator.UI/Data/WebDoorCreatorService.cs @@ -253,6 +253,39 @@ namespace WebDoorCreator.UI.Data InputType = "" }; listValues.Add(listValObj); + listValObj = new ListValuesTempModel() + { + TableName = "All", + FieldName = "DoorDefStep", + Value = "10", + Label = "Door", + Ordinal = 10, + DefaultVal = "#448AFF", + InputType = "" + }; + listValues.Add(listValObj); + listValObj = new ListValuesTempModel() + { + TableName = "All", + FieldName = "DoorDefStep", + Value = "20", + Label = "Hardware", + Ordinal = 20, + DefaultVal = "#448AFF", + InputType = "" + }; + listValues.Add(listValObj); + listValObj = new ListValuesTempModel() + { + TableName = "All", + FieldName = "DoorDefStep", + Value = "30", + Label = "Report", + Ordinal = 30, + DefaultVal = "#448AFF", + InputType = "" + }; + listValues.Add(listValObj); // parto con obj base sizeVal = fIniDef.ReadString("Size", "Width", "0.0"); diff --git a/WebDoorCreator.UI/Pages/DoorDefinition.razor b/WebDoorCreator.UI/Pages/DoorDefinition.razor index dc8242f..6ae0fd1 100644 --- a/WebDoorCreator.UI/Pages/DoorDefinition.razor +++ b/WebDoorCreator.UI/Pages/DoorDefinition.razor @@ -1,23 +1,22 @@ @page "/DoorDefinition" -
+@*

Door Definition

-
+
*@
-
+
- +
-
- +
+
-
- +
- @if (currDefStep == Core.Enum.DoorDefStep.Door) + @if (currDefStep == 10) { @if (ListBaseDoorOp != null) { @@ -25,14 +24,14 @@ } @**@ } - else if (currDefStep == Core.Enum.DoorDefStep.Hardware) + else if (currDefStep == 20) { }
-
+
diff --git a/WebDoorCreator.UI/Pages/DoorDefinition.razor.cs b/WebDoorCreator.UI/Pages/DoorDefinition.razor.cs index 59e18dc..5c76f11 100644 --- a/WebDoorCreator.UI/Pages/DoorDefinition.razor.cs +++ b/WebDoorCreator.UI/Pages/DoorDefinition.razor.cs @@ -126,12 +126,12 @@ namespace WebDoorCreator.UI.Pages /// /// /// - protected async Task setStep(Core.Enum.DoorDefStep caughtDefStep) + protected async Task setStep(int caughtDefStep) { setHwToNull = false; await Task.Delay(1); currDefStep = caughtDefStep; - if (currDefStep == Core.Enum.DoorDefStep.Hardware) + if (currDefStep == 20) { setHwToNull = true; } @@ -147,7 +147,7 @@ namespace WebDoorCreator.UI.Pages #region Private Properties - private Core.Enum.DoorDefStep currDefStep { get; set; } = Core.Enum.DoorDefStep.Door; + private int currDefStep { get; set; } = 10; private List? ListBaseDoorOp { get; set; } = null; private List? ListHwDoorOp { get; set; } = null; private List? ListOrdersStatus { get; set; } = null; diff --git a/WebDoorCreator.UI/Pages/OrderDetails.razor b/WebDoorCreator.UI/Pages/OrderDetails.razor index bbc400e..634cdce 100644 --- a/WebDoorCreator.UI/Pages/OrderDetails.razor +++ b/WebDoorCreator.UI/Pages/OrderDetails.razor @@ -4,40 +4,35 @@ @if (orderView != null) { -
-
-
Insert Date:
+
+
+
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 5b096d3..b4fb19a 100644 --- a/WebDoorCreator.UI/Pages/OrderDetails.razor.cs +++ b/WebDoorCreator.UI/Pages/OrderDetails.razor.cs @@ -321,6 +321,7 @@ namespace WebDoorCreator.UI.Pages { await Task.Delay(1); stepColor = StepColor; + StateHasChanged(); } #endregion Protected Methods diff --git a/WebDoorCreator.UI/Pages/OrderDetails.razor.css b/WebDoorCreator.UI/Pages/OrderDetails.razor.css index 18e1d7b..0860454 100644 --- a/WebDoorCreator.UI/Pages/OrderDetails.razor.css +++ b/WebDoorCreator.UI/Pages/OrderDetails.razor.css @@ -23,4 +23,5 @@ /*display: flex; justify-content: space-around;*/ font-size: 17px; + background-color: #031926; } \ No newline at end of file diff --git a/WebDoorCreator.UI/Pages/OrderDetails.razor.less b/WebDoorCreator.UI/Pages/OrderDetails.razor.less index 5191347..5285602 100644 --- a/WebDoorCreator.UI/Pages/OrderDetails.razor.less +++ b/WebDoorCreator.UI/Pages/OrderDetails.razor.less @@ -26,4 +26,5 @@ /*display: flex; justify-content: space-around;*/ font-size: 17px; + background-color: #031926; } diff --git a/WebDoorCreator.UI/Pages/OrderDetails.razor.min.css b/WebDoorCreator.UI/Pages/OrderDetails.razor.min.css index 7f16517..e27cb9d 100644 --- a/WebDoorCreator.UI/Pages/OrderDetails.razor.min.css +++ b/WebDoorCreator.UI/Pages/OrderDetails.razor.min.css @@ -1 +1 @@ -.cardStatus{border-radius:60px;background-color:var(--bgStepColor);transform:translate(0,-65px);padding:1rem 4rem 4.5rem 4rem;}.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;font-size:17px;} \ No newline at end of file +.cardStatus{border-radius:60px;background-color:var(--bgStepColor);transform:translate(0,-65px);padding:1rem 4rem 4.5rem 4rem;}.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;font-size:17px;background-color:#031926;} \ No newline at end of file diff --git a/WebDoorCreator.UI/Shared/MainLayout.razor b/WebDoorCreator.UI/Shared/MainLayout.razor index 82161dd..fdcbaff 100644 --- a/WebDoorCreator.UI/Shared/MainLayout.razor +++ b/WebDoorCreator.UI/Shared/MainLayout.razor @@ -16,14 +16,29 @@
-
- @Body -
+ @if (NavManager.Uri.Contains("OrderDetails")) + { +
+ @Body +
+ } + else if (NavManager.Uri.Contains("DoorDefinition")) + { +
+ @Body +
+ } + else + { +
+ @Body +
+ } @*
*@ @*
- +
*@
diff --git a/WebDoorCreator.UI/Shared/MainLayout.razor.cs b/WebDoorCreator.UI/Shared/MainLayout.razor.cs index 55b3afb..9a49cb5 100644 --- a/WebDoorCreator.UI/Shared/MainLayout.razor.cs +++ b/WebDoorCreator.UI/Shared/MainLayout.razor.cs @@ -1,6 +1,10 @@ +using Microsoft.AspNetCore.Components; + namespace WebDoorCreator.UI.Shared { public partial class MainLayout { + [Inject] + protected NavigationManager NavManager { get; set; } = null!; } } \ No newline at end of file