diff --git a/Docs/ActualToDo.md b/Docs/ActualToDo.md index e4fc7f9..e6d8dfd 100644 --- a/Docs/ActualToDo.md +++ b/Docs/ActualToDo.md @@ -45,6 +45,7 @@ Per completare: - [x] sostituire il salva generale con 2 buttons: - salva, o meglio RECALC PNG = update PNG, potrebbe andare in automatico DOPO i vari SALVA nella pagina (opzione x auto-recalc?!?) - get 3D obj (in new window/tab) +- [x] delete singola porta da ordine ### DoorDefinition Hardware diff --git a/Docs/ActualToDo.pdf b/Docs/ActualToDo.pdf index 38bdb10..5d5b01d 100644 Binary files a/Docs/ActualToDo.pdf and b/Docs/ActualToDo.pdf differ diff --git a/WebDoorCreator.UI/Components/DoorMan/DoorList.razor b/WebDoorCreator.UI/Components/DoorMan/DoorList.razor index d3ea635..8bfc991 100644 --- a/WebDoorCreator.UI/Components/DoorMan/DoorList.razor +++ b/WebDoorCreator.UI/Components/DoorMan/DoorList.razor @@ -10,7 +10,7 @@
- +
} diff --git a/WebDoorCreator.UI/Components/DoorMan/DoorList.razor.cs b/WebDoorCreator.UI/Components/DoorMan/DoorList.razor.cs index 29ef427..ddade13 100644 --- a/WebDoorCreator.UI/Components/DoorMan/DoorList.razor.cs +++ b/WebDoorCreator.UI/Components/DoorMan/DoorList.razor.cs @@ -111,9 +111,9 @@ namespace WebDoorCreator.UI.Components.DoorMan { AddFromTemplDict.Add("ADD NEW DOOR FROM TEMPLATE", ""); } - if (!SendOrderDict.ContainsKey("SEND TO ABH")) + if (!SendOrderDict.ContainsKey("SEND TO DCA")) { - SendOrderDict.Add("SEND TO ABH", ""); + SendOrderDict.Add("SEND TO DCA", ""); } if (currOrderId != -1) { @@ -245,7 +245,7 @@ namespace WebDoorCreator.UI.Components.DoorMan } } } - protected async void sendToAbh(int ordId, int orderStat) + protected async void sendToCompany(int ordId, int orderStat) { if (orderStat == 10) { diff --git a/WebDoorCreator.UI/Data/WebDoorCreatorService.cs b/WebDoorCreator.UI/Data/WebDoorCreatorService.cs index e70d574..54f14e1 100644 --- a/WebDoorCreator.UI/Data/WebDoorCreatorService.cs +++ b/WebDoorCreator.UI/Data/WebDoorCreatorService.cs @@ -212,7 +212,7 @@ namespace WebDoorCreator.UI.Data TableName = "All", FieldName = "OrderStep", Value = "20", - Label = "Sent to ABH", + Label = "Sent to DCA", Ordinal = 20, DefaultVal = "#FBC02D", InputType = "" diff --git a/WebDoorCreator.UI/Pages/ApprovedByAbh.razor b/WebDoorCreator.UI/Pages/ApprovedByAbh.razor deleted file mode 100644 index 178a40e..0000000 --- a/WebDoorCreator.UI/Pages/ApprovedByAbh.razor +++ /dev/null @@ -1,9 +0,0 @@ -@page "/abhapprove" - -

Approved by ABH

- - - -@code { - -} diff --git a/WebDoorCreator.UI/Pages/ApprovedByCompany.razor b/WebDoorCreator.UI/Pages/ApprovedByCompany.razor new file mode 100644 index 0000000..025c5ea --- /dev/null +++ b/WebDoorCreator.UI/Pages/ApprovedByCompany.razor @@ -0,0 +1,9 @@ +@page "/ApprovedByCompany" + +

Approved by DCA

+ + + +@code { + +} diff --git a/WebDoorCreator.UI/Pages/Definingdoorsstage.razor b/WebDoorCreator.UI/Pages/Definingdoorsstage.razor deleted file mode 100644 index ada5ab0..0000000 --- a/WebDoorCreator.UI/Pages/Definingdoorsstage.razor +++ /dev/null @@ -1,9 +0,0 @@ -@page "/senttoabh" - -

Sent to ABH

- - - -@code { - -} diff --git a/WebDoorCreator.UI/Pages/Senttoabh.razor b/WebDoorCreator.UI/Pages/DefinitionDoorStage.razor similarity index 74% rename from WebDoorCreator.UI/Pages/Senttoabh.razor rename to WebDoorCreator.UI/Pages/DefinitionDoorStage.razor index 8b58806..c991bd0 100644 --- a/WebDoorCreator.UI/Pages/Senttoabh.razor +++ b/WebDoorCreator.UI/Pages/DefinitionDoorStage.razor @@ -1,4 +1,4 @@ -@page "/definingdoorsstage" +@page "/DefinitionDoorStage"

Order definition stage

diff --git a/WebDoorCreator.UI/Pages/SentToCompany.razor b/WebDoorCreator.UI/Pages/SentToCompany.razor new file mode 100644 index 0000000..10396e3 --- /dev/null +++ b/WebDoorCreator.UI/Pages/SentToCompany.razor @@ -0,0 +1,9 @@ +@page "/SentToCompany" + +

Sent to DCA

+ + + +@code { + +} diff --git a/WebDoorCreator.UI/Shared/LoginDisplay.razor b/WebDoorCreator.UI/Shared/LoginDisplay.razor index 9bf38dd..1b3b244 100644 --- a/WebDoorCreator.UI/Shared/LoginDisplay.razor +++ b/WebDoorCreator.UI/Shared/LoginDisplay.razor @@ -1,96 +1,95 @@ - -@* +@* *@ -
- @if (NavManager.Uri.Contains("DoorDefinition")) - { -
- - -
Sizing definition page
-
-
- -
- - -
Opening definition page
-
-
-
- - -
Edges definition page
-
-
-
- - -
Hardware list page
-
-
-
- - -
New hw page
-
-
- } - else if (NavManager.Uri.Contains("OrdersHomePage")) - { -
- - -
Orders home
-
-
-
- - -
Orders home filtered
-
-
-
- - -
Defining doors
-
-
-
- - -
Sent to abh
-
-
- -
- - -
Approved by ABH
-
-
-
- - -
Approved by user
-
-
-
- - -
In production
-
-
- } + +@* *@ - @if (!NavManager.Uri.Contains("Register") || !NavManager.Uri.Contains("Login")) - { - Register - Log in - } - @* +@if (!NavManager.Uri.Contains("Register") || !NavManager.Uri.Contains("Login")) +{ + Register + Log in +} +@* *@ diff --git a/WebDoorCreator.UI/wwwroot/images/Approved_by_ABH.png b/WebDoorCreator.UI/wwwroot/images/Approved_by_DCA.png similarity index 100% rename from WebDoorCreator.UI/wwwroot/images/Approved_by_ABH.png rename to WebDoorCreator.UI/wwwroot/images/Approved_by_DCA.png diff --git a/WebDoorCreator.UI/wwwroot/images/Sent_to_ABH.png b/WebDoorCreator.UI/wwwroot/images/Sent_to_DCA.png similarity index 100% rename from WebDoorCreator.UI/wwwroot/images/Sent_to_ABH.png rename to WebDoorCreator.UI/wwwroot/images/Sent_to_DCA.png