Egalware/webdoorcreator
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix vari rename ABH --> DCA

Browse Source
This commit is contained in:
Samuele Locatelli
2023-05-17 18:52:52 +02:00
parent cf7211e08e
commit 4f92e44024
13 changed files with 114 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Docs/ActualToDo.md
+1
View File
@@ -45,6 +45,7 @@ Per completare:
- [x] <del>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)</del>
- [x] <del>delete singola porta da ordine</del>
### DoorDefinition Hardware
Docs/ActualToDo.pdf
BIN
View File
Binary file not shown.
WebDoorCreator.UI/Components/DoorMan/DoorList.razor
+1 -1
View File
@@ -10,7 +10,7 @@
<DoorSvgObj LineColor="rgb(39, 174, 96)" LineWidth="8" ObjH="200" ObjW="900" LeftTextClass="col-10 fs-1 fw-bold" RightTextClass="col-2" EC_ExeFunct="@(()=> setCloneDoorMode(""))" ObjId="-2" TextData="@AddFromTemplDict" ImagePath="images/LogoEgwBlue.png"></DoorSvgObj>
</div>
<div class="col-4 py-1">
<DoorSvgObj LineColor="#8E44AD" LineWidth="8" ObjH="200" ObjW="900" LeftTextClass="col-10 fs-1 fw-bold" RightTextClass="col-2" EC_ExeFunct="@(()=> sendToAbh(currOrderId, orderStatus))" ObjId="-3" TextData="@SendOrderDict" Message1="@currOrderId.ToString()" Message2="@orderStatus.ToString()" ImagePath="images/LogoEgwWhite.png"></DoorSvgObj>
<DoorSvgObj LineColor="#8E44AD" LineWidth="8" ObjH="200" ObjW="900" LeftTextClass="col-10 fs-1 fw-bold" RightTextClass="col-2" EC_ExeFunct="@(()=> sendToCompany(currOrderId, orderStatus))" ObjId="-3" TextData="@SendOrderDict" Message1="@currOrderId.ToString()" Message2="@orderStatus.ToString()" ImagePath="images/LogoEgwWhite.png"></DoorSvgObj>
</div>
</div>
}
WebDoorCreator.UI/Components/DoorMan/DoorList.razor.cs
+3 -3
View File
@@ -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)
{
WebDoorCreator.UI/Data/WebDoorCreatorService.cs
+1 -1
View File
@@ -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 = ""
WebDoorCreator.UI/Pages/ApprovedByAbh.razor
-9
View File
@@ -1,9 +0,0 @@
@page "/abhapprove"
<h3>Approved by ABH</h3>
<img src="images/Approved_by_ABH.png" />
@code {
}
WebDoorCreator.UI/Pages/ApprovedByCompany.razor
+9
View File
@@ -0,0 +1,9 @@
@page "/ApprovedByCompany"
<h3>Approved by DCA</h3>
<img src="images/Approved_by_DCA.png" />
@code {
}
WebDoorCreator.UI/Pages/Definingdoorsstage.razor
-9
View File
@@ -1,9 +0,0 @@
@page "/senttoabh"
<h3>Sent to ABH</h3>
<img src="images/Sent_to_ABH.png" />
@code {
}
WebDoorCreator.UI/Pages/Senttoabh.razor → WebDoorCreator.UI/Pages/DefinitionDoorStage.razor
+1 -1
View File
@@ -1,4 +1,4 @@
@page "/definingdoorsstage"
@page "/DefinitionDoorStage"
<h3>Order definition stage</h3>
WebDoorCreator.UI/Pages/SentToCompany.razor
+9
View File
@@ -0,0 +1,9 @@
@page "/SentToCompany"
<h3>Sent to DCA</h3>
<img src="images/Sent_to_DCA.png" />
@code {
}
WebDoorCreator.UI/Shared/LoginDisplay.razor
+89 -90
View File
@@ -1,96 +1,95 @@
@*<AuthorizeView>
@*<AuthorizeView>
<Authorized>*@
<div class="text-start d-flex justify-content-between w-50" style="height: 70%;">
@if (NavManager.Uri.Contains("DoorDefinition"))
{
<div>
<a href="sizing" target="_blank">
<img src="images/Sizing.png" style="height: 100%;" />
<div class="btn btn-sm btn-info">Sizing definition page</div>
</a>
</div>
<div>
<a href="opening" target="_blank">
<img src="images/Opening.png" style="height: 100%;" />
<div class="btn btn-sm btn-info">Opening definition page</div>
</a>
</div>
<div>
<a href="edges" target="_blank">
<img src="images/Edges.png" style="height: 100%;" />
<div class="btn btn-sm btn-info">Edges definition page</div>
</a>
</div>
<div>
<a href="hwallclosed" target="_blank">
<img src="images/Hardware_all_closed.png" style="height: 100%;" />
<div class="btn btn-sm btn-info">Hardware list page</div>
</a>
</div>
<div>
<a href="hwadd" target="_blank">
<img src="images/Hardware_flush_pull_open_add_one.png" style="height: 100%;" />
<div class="btn btn-sm btn-info">New hw page</div>
</a>
</div>
}
else if (NavManager.Uri.Contains("OrdersHomePage"))
{
<div>
<a href="ordershome" target="_blank">
<img src="images/Home_page_orders.png" style="height: 100%;" />
<div class="btn btn-sm btn-info">Orders home</div>
</a>
</div>
<div>
<a href="ordershomefilter" target="_blank">
<img src="images/Home_page_orders_orange_filter.png" style="height: 100%;" />
<div class="btn btn-sm btn-info">Orders home filtered</div>
</a>
</div>
<div>
<a href="definingdoorsstage" target="_blank">
<img src="images/Defining_Doors_stage.png" style="height: 100%;" />
<div class="btn btn-sm btn-info">Defining doors</div>
</a>
</div>
<div>
<a href="senttoabh" target="_blank">
<img src="images/Sent_to_ABH.png" style="height: 100%;" />
<div class="btn btn-sm btn-info">Sent to abh</div>
</a>
</div>
<div>
<a href="abhapprove" target="_blank">
<img src="images/Approved_by_ABH.png" style="height: 100%;" />
<div class="btn btn-sm btn-info">Approved by ABH</div>
</a>
</div>
<div>
<a href="userapprove" target="_blank">
<img src="images/Approved_by_user.png" style="height: 100%;" />
<div class="btn btn-sm btn-info">Approved by user</div>
</a>
</div>
<div>
<a href="production" target="_blank">
<img src="images/InProduction.png" style="height: 100%;" />
<div class="btn btn-sm btn-info">In production</div>
</a>
</div>
}
<div class="text-start d-flex justify-content-between w-50" style="height: 70%;">
@if (NavManager.Uri.Contains("DoorDefinition"))
{
<div>
<a href="sizing" target="_blank">
<img src="images/Sizing.png" style="height: 100%;" />
<div class="btn btn-sm btn-info">Sizing definition page</div>
</a>
</div>
@*</Authorized>
<div>
<a href="opening" target="_blank">
<img src="images/Opening.png" style="height: 100%;" />
<div class="btn btn-sm btn-info">Opening definition page</div>
</a>
</div>
<div>
<a href="edges" target="_blank">
<img src="images/Edges.png" style="height: 100%;" />
<div class="btn btn-sm btn-info">Edges definition page</div>
</a>
</div>
<div>
<a href="hwallclosed" target="_blank">
<img src="images/Hardware_all_closed.png" style="height: 100%;" />
<div class="btn btn-sm btn-info">Hardware list page</div>
</a>
</div>
<div>
<a href="hwadd" target="_blank">
<img src="images/Hardware_flush_pull_open_add_one.png" style="height: 100%;" />
<div class="btn btn-sm btn-info">New hw page</div>
</a>
</div>
}
else if (NavManager.Uri.Contains("OrdersHomePage"))
{
<div>
<a href="ordershome" target="_blank">
<img src="images/Home_page_orders.png" style="height: 100%;" />
<div class="btn btn-sm btn-info">Orders home</div>
</a>
</div>
<div>
<a href="ordershomefilter" target="_blank">
<img src="images/Home_page_orders_orange_filter.png" style="height: 100%;" />
<div class="btn btn-sm btn-info">Orders home filtered</div>
</a>
</div>
<div>
<a href="definingdoorsstage" target="_blank">
<img src="images/Defining_Doors_stage.png" style="height: 100%;" />
<div class="btn btn-sm btn-info">Defining doors</div>
</a>
</div>
<div>
<a href="SentToCompany" target="_blank">
<img src="images/Sent_to_DCA.png" style="height: 100%;" />
<div class="btn btn-sm btn-info">Sent to DCA</div>
</a>
</div>
<div>
<a href="ApprovedByCompany" target="_blank">
<img src="images/Approved_by_DCA.png" style="height: 100%;" />
<div class="btn btn-sm btn-info">Approved by DCA</div>
</a>
</div>
<div>
<a href="userapprove" target="_blank">
<img src="images/Approved_by_user.png" style="height: 100%;" />
<div class="btn btn-sm btn-info">Approved by user</div>
</a>
</div>
<div>
<a href="production" target="_blank">
<img src="images/InProduction.png" style="height: 100%;" />
<div class="btn btn-sm btn-info">In production</div>
</a>
</div>
}
</div>
@*</Authorized>
<NotAuthorized>*@
@if (!NavManager.Uri.Contains("Register") || !NavManager.Uri.Contains("Login"))
{
<a href="Identity/Account/Register">Register</a>
<a href="Identity/Account/Login">Log in</a>
}
@*</NotAuthorized>
@if (!NavManager.Uri.Contains("Register") || !NavManager.Uri.Contains("Login"))
{
<a href="Identity/Account/Register">Register</a>
<a href="Identity/Account/Login">Log in</a>
}
@*</NotAuthorized>
</AuthorizeView>*@
WebDoorCreator.UI/wwwroot/images/Approved_by_ABH.png → WebDoorCreator.UI/wwwroot/images/Approved_by_DCA.png
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 112 KiB

After

Width:  |  Height:  |  Size: 112 KiB

WebDoorCreator.UI/wwwroot/images/Sent_to_ABH.png → WebDoorCreator.UI/wwwroot/images/Sent_to_DCA.png
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 104 KiB

After

Width:  |  Height:  |  Size: 104 KiB