- |
+ |
- @**@
+
+
|
- @item.DateIns |
- @item.OrderExtCode |
- @item.OrderDescript |
+ @item.DateIns |
+ @item.OrderExtCode |
+ @item.OrderDescript |
@item.NumDoors |
@item.NumType |
@getOrderStatusLabel(item.OrderStatus) |
- @($"{item.TotCost:C2}") |
+ @($"{item.TotCost:C2}") |
@if (item.OrderStatus <= 10)
{
diff --git a/WebDoorCreator.UI/Components/Order/OrderList.razor.cs b/WebDoorCreator.UI/Components/Order/OrderList.razor.cs
index e7f504e..649d174 100644
--- a/WebDoorCreator.UI/Components/Order/OrderList.razor.cs
+++ b/WebDoorCreator.UI/Components/Order/OrderList.razor.cs
@@ -20,9 +20,10 @@ namespace WebDoorCreator.UI.Components.Order
[Parameter]
public EventCallback E_currOrderStatus { get; set; }
- public int Height { get; set; }
+ [Parameter]
+ public EventCallback E_OrdReqClone { get; set; }
- public string reportBaseUrl { get; set; } = "http://w2019-sql-steam/reportserver?/Test/WebDoor/";
+ public int Height { get; set; }
[Parameter]
public int UserCurrCompany { get; set; }
@@ -229,13 +230,6 @@ namespace WebDoorCreator.UI.Components.Order
{
ListOrdersStatus = null;
var domani = DateTime.Today.AddDays(1);
- //await Task.Delay(1);
- // conf report
- var confData = await WDService.ConfigGetKey("prt_ReportServerUrl");
- if (confData != null)
- {
- reportBaseUrl = confData.valore;
- }
ListValuesAll = await WDService.ListValuesGetAll("All", "OrderStep");
@@ -337,6 +331,17 @@ namespace WebDoorCreator.UI.Components.Order
return $"api/Report/GetOrderReport?OrderId={orderId}&Format=PDF";
}
+ ///
+ /// Richiesta duplicazione ordine
+ ///
+ ///
+ ///
+ protected async Task cloneAndShow(int orderId)
+ {
+ await Task.Delay(1);
+ await E_OrdReqClone.InvokeAsync(orderId);
+ }
+
protected async Task setOrd2Show(int orderId)
{
await Task.Delay(1);
diff --git a/WebDoorCreator.UI/Components/Order/OrderList.razor.css b/WebDoorCreator.UI/Components/Order/OrderList.razor.css
index 040df9b..24edd26 100644
--- a/WebDoorCreator.UI/Components/Order/OrderList.razor.css
+++ b/WebDoorCreator.UI/Components/Order/OrderList.razor.css
@@ -1,7 +1,7 @@
tr {
padding: 0.5rem;
border-bottom: 1px solid;
- font-weight: bold;
+ /*font-weight: bold;*/
background-color: #fff;
color: #000;
}
diff --git a/WebDoorCreator.UI/Components/Order/OrderList.razor.less b/WebDoorCreator.UI/Components/Order/OrderList.razor.less
index fcef000..934bbcd 100644
--- a/WebDoorCreator.UI/Components/Order/OrderList.razor.less
+++ b/WebDoorCreator.UI/Components/Order/OrderList.razor.less
@@ -1,7 +1,7 @@
tr {
padding: 0.5rem;
border-bottom: 1px solid;
- font-weight: bold;
+ /*font-weight: bold;*/
background-color: #fff;
color: #000;
}
diff --git a/WebDoorCreator.UI/Components/Order/OrderList.razor.min.css b/WebDoorCreator.UI/Components/Order/OrderList.razor.min.css
index 349041f..b3f47be 100644
--- a/WebDoorCreator.UI/Components/Order/OrderList.razor.min.css
+++ b/WebDoorCreator.UI/Components/Order/OrderList.razor.min.css
@@ -1 +1 @@
-tr{padding:.5rem;border-bottom:1px solid;font-weight:bold;background-color:#fff;color:#000;}table{width:100%;height:100%;}td{padding:.5rem;}@keyframes slideUp{0%{transform:translate(0,var(--elFirstY));}100%{transform:translate(0,0);}}.slideUp{animation:slideUp .5s;}
\ No newline at end of file
+tr{padding:.5rem;border-bottom:1px solid;background-color:#fff;color:#000;}table{width:100%;height:100%;}td{padding:.5rem;}@keyframes slideUp{0%{transform:translate(0,var(--elFirstY));}100%{transform:translate(0,0);}}.slideUp{animation:slideUp .5s;}
\ No newline at end of file
diff --git a/WebDoorCreator.UI/Pages/OrdersHomePage.razor b/WebDoorCreator.UI/Pages/OrdersHomePage.razor
index e9e3629..1bff393 100644
--- a/WebDoorCreator.UI/Pages/OrdersHomePage.razor
+++ b/WebDoorCreator.UI/Pages/OrdersHomePage.razor
@@ -10,15 +10,18 @@
ORDER LIST
-
-
+
+ @if (userCurrCompany > 0)
+ {
+
+ }
-
+
@@ -154,13 +157,13 @@
{
}
-
-
-
-
-
+ @if (newOrdReq)
+ {
+
-
+ }
diff --git a/WebDoorCreator.UI/Pages/OrdersHomePage.razor.cs b/WebDoorCreator.UI/Pages/OrdersHomePage.razor.cs
index fd5c01a..e8fe008 100644
--- a/WebDoorCreator.UI/Pages/OrdersHomePage.razor.cs
+++ b/WebDoorCreator.UI/Pages/OrdersHomePage.razor.cs
@@ -40,7 +40,6 @@ namespace WebDoorCreator.UI.Pages
public async void OnNewUserCurrComp()
{
await Task.Delay(1);
- userCurrCompany = WDCUService.userCurrComp;
await InvokeAsync(() =>
{
StateHasChanged();
@@ -67,7 +66,7 @@ namespace WebDoorCreator.UI.Pages
protected DoorModel? currDoorModal { get; set; } = null;
protected OrderStatusViewModel ord2Show { get; set; } = new OrderStatusViewModel();
- protected async Task setOrd2Show(OrderStatusViewModel currOrd)
+ protected async Task SetOrd2Show(OrderStatusViewModel currOrd)
{
await Task.Delay(1);
if (currOrd != null)
@@ -76,6 +75,26 @@ namespace WebDoorCreator.UI.Pages
await changeLevel(2);
}
}
+
+ protected async Task ReqNewOrd()
+ {
+ newOrdReq = true;
+ await Task.Delay(1);
+ }
+ protected async Task CloseNewOrd()
+ {
+ newOrdReq = false;
+ await Task.Delay(1);
+ }
+
+ protected async Task SetOrd2Clone(int OrderId)
+ {
+ await Task.Delay(1);
+ newOrdReq = true;
+ cloneReq = true;
+ ordIdOrig = OrderId;
+ }
+
protected async Task setEmpty()
{
await Task.Delay(1);
@@ -150,8 +169,6 @@ namespace WebDoorCreator.UI.Pages
protected List? RolesList { get; set; } = null;
- protected int userCurrCompany { get; set; }
-
protected List? UsersList { get; set; } = null;
[Inject]
@@ -163,7 +180,12 @@ namespace WebDoorCreator.UI.Pages
#endregion Protected Properties
#region Protected Methods
-
+
+ protected int userCurrCompany
+ {
+ get => WDCUService.userCurrComp;
+ }
+
protected async Task addNewOrder(string userName)
{
OrderModel addRec = new OrderModel()
@@ -174,29 +196,35 @@ namespace WebDoorCreator.UI.Pages
UserIdIns = userId,
DateMod = DateTime.Now,
UserIdMod = userId,
- //Status = Core.Enum.OrderStatus.DoorDef,
OrderDescript = orderDescr
};
- var done = await WDService.OrderAdd(addRec);
+ var newOrdId = await WDService.OrderAdd(addRec);
- if (done)
+
+ if (newOrdId > 0)
{
+ // se richiesto eseguo cloning ordine
+ if (cloneReq && ordIdOrig > 0)
+ {
+ var ordCloned = await WDService.OrderDuplicate(ordIdOrig, newOrdId, userName);
+ cloneReq = false;
+ ordIdOrig = 0;
+ }
// flush dati ordine + reload
await WDService.OrdersFlushCache();
orderCodExt = "";
orderDescr = "";
doorChange = true;
+ newOrdReq = false;
}
+ await Task.Delay(1);
}
- protected override async Task OnAfterRenderAsync(bool firstRender)
- {
- //if (firstRender)
- //{
- // await localStorage.RemoveItemAsync("OrderId");
- //}
- }
+ protected bool newOrdReq = false;
+ protected bool cloneReq = false;
+ protected int ordIdOrig = 0;
+
protected async Task addOrModDoor(string userName)
{
diff --git a/WebDoorCreator.UI/Pages/OrdersHomePage.razor.css b/WebDoorCreator.UI/Pages/OrdersHomePage.razor.css
index 364ebcb..fb7fdad 100644
--- a/WebDoorCreator.UI/Pages/OrdersHomePage.razor.css
+++ b/WebDoorCreator.UI/Pages/OrdersHomePage.razor.css
@@ -97,4 +97,47 @@
width: 90%;
background-color: #333333;
}
+}
+/* Background scuro del modale */
+.modalNewOrd {
+ position: fixed;
+ z-index: 9999;
+ left: 0;
+ top: 0;
+ width: 100%;
+ height: 100%;
+ overflow: auto;
+ background-color: #000000;
+ background-color: rgba(0, 0, 0, 0.4);
+}
+/* Modal Content/Box */
+.modalNewOrdContent {
+ background-color: #fefefe;
+ margin: 3% auto;
+ padding: 20px;
+ border: 1px solid #888;
+ width: 50%;
+ border-radius: 1rem;
+ animation: slideDown 0.3s;
+}
+/* The Close Button */
+.closeNewOrd {
+ color: #aaa;
+ float: right;
+ font-size: 2.5rem;
+ font-weight: bold;
+}
+.closeNewOrd:hover,
+.closeNewOrd:focus {
+ color: black;
+ text-decoration: none;
+ cursor: pointer;
+}
+@keyframes slideDown {
+ 0% {
+ transform: translate(0, -500px);
+ }
+ 100% {
+ transform: translate(0, 0);
+ }
}
\ No newline at end of file
diff --git a/WebDoorCreator.UI/Pages/OrdersHomePage.razor.less b/WebDoorCreator.UI/Pages/OrdersHomePage.razor.less
index fb6cb50..e5f7730 100644
--- a/WebDoorCreator.UI/Pages/OrdersHomePage.razor.less
+++ b/WebDoorCreator.UI/Pages/OrdersHomePage.razor.less
@@ -92,3 +92,53 @@
background-color: #333333;
}
}
+
+
+/* Background scuro del modale */
+.modalNewOrd {
+ position: fixed;
+ z-index: 9999;
+ left: 0;
+ top: 0;
+ width: 100%;
+ height: 100%;
+ overflow: auto;
+ background-color: rgb(0,0,0);
+ background-color: rgba(0,0,0,0.4);
+}
+
+/* Modal Content/Box */
+.modalNewOrdContent {
+ background-color: #fefefe;
+ margin: 3% auto;
+ padding: 20px;
+ border: 1px solid #888;
+ width: 50%;
+ border-radius: 1rem;
+ animation: slideDown .3s;
+}
+
+/* The Close Button */
+.closeNewOrd {
+ color: #aaa;
+ float: right;
+ font-size: 2.5rem;
+ font-weight: bold;
+}
+
+.closeNewOrd:hover,
+.closeNewOrd:focus {
+ color: black;
+ text-decoration: none;
+ cursor: pointer;
+}
+
+@keyframes slideDown {
+ 0% {
+ transform: translate(0, -500px);
+ }
+
+ 100% {
+ transform: translate(0, 0);
+ }
+}
\ No newline at end of file
diff --git a/WebDoorCreator.UI/Pages/OrdersHomePage.razor.min.css b/WebDoorCreator.UI/Pages/OrdersHomePage.razor.min.css
index e231ff6..1a336fd 100644
--- a/WebDoorCreator.UI/Pages/OrdersHomePage.razor.min.css
+++ b/WebDoorCreator.UI/Pages/OrdersHomePage.razor.min.css
@@ -1 +1 @@
-.cardOrders{width:100%;border-radius:1.3rem;padding:1rem 2.5rem .5rem 2.5rem;box-shadow:rgba(0,0,0,.45) 0 20px 22px 3px;margin-top:.5rem;margin-bottom:1rem;position:relative;font-size:1rem;}.cardOrders01{width:100%;border-radius:1.3rem;padding:1rem 2.5rem .5rem 2.5rem;box-shadow:rgba(0,0,0,.45) 0 20px 22px 3px;margin-top:.5rem;margin-bottom:1rem;position:relative;font-size:1rem;background-color:#fff;color:#000;z-index:10;}.cardOrders02{width:100%;border-radius:1.3rem;padding:1rem 2.5rem .5rem 2.5rem;box-shadow:rgba(0,0,0,.45) 0 20px 22px 3px;margin-top:.5rem;margin-bottom:1rem;position:relative;font-size:1rem;background-color:#fff;z-index:20;}.cardOrders03{width:100%;border-radius:1.3rem;padding:1rem 2.5rem .5rem 2.5rem;box-shadow:rgba(0,0,0,.45) 0 20px 22px 3px;margin-top:.5rem;margin-bottom:1rem;position:relative;font-size:1rem;background-color:#fff;z-index:30;}.wRed01{width:95%;margin-bottom:-1.5rem;background-color:#696969;color:#fff;animation-name:shrink01;animation-duration:.5s;font-size:.9rem;}.wRed02{width:90%;margin-bottom:-1.5rem;background-color:#333;color:#fff;animation-name:shrink02;animation-duration:.5s;font-size:.8rem;}@keyframes shrink01{0%{width:100%;background-color:#fff;color:#000;}80%{width:95%;background-color:#efefef;color:#000;}100%{width:95%;background-color:#696969;color:#fff;}}@keyframes shrink02{0%{width:95%;background-color:#696969;}80%{width:90%;background-color:#585858;}100%{width:90%;background-color:#333;}}
\ No newline at end of file
+.cardOrders{width:100%;border-radius:1.3rem;padding:1rem 2.5rem .5rem 2.5rem;box-shadow:rgba(0,0,0,.45) 0 20px 22px 3px;margin-top:.5rem;margin-bottom:1rem;position:relative;font-size:1rem;}.cardOrders01{width:100%;border-radius:1.3rem;padding:1rem 2.5rem .5rem 2.5rem;box-shadow:rgba(0,0,0,.45) 0 20px 22px 3px;margin-top:.5rem;margin-bottom:1rem;position:relative;font-size:1rem;background-color:#fff;color:#000;z-index:10;}.cardOrders02{width:100%;border-radius:1.3rem;padding:1rem 2.5rem .5rem 2.5rem;box-shadow:rgba(0,0,0,.45) 0 20px 22px 3px;margin-top:.5rem;margin-bottom:1rem;position:relative;font-size:1rem;background-color:#fff;z-index:20;}.cardOrders03{width:100%;border-radius:1.3rem;padding:1rem 2.5rem .5rem 2.5rem;box-shadow:rgba(0,0,0,.45) 0 20px 22px 3px;margin-top:.5rem;margin-bottom:1rem;position:relative;font-size:1rem;background-color:#fff;z-index:30;}.wRed01{width:95%;margin-bottom:-1.5rem;background-color:#696969;color:#fff;animation-name:shrink01;animation-duration:.5s;font-size:.9rem;}.wRed02{width:90%;margin-bottom:-1.5rem;background-color:#333;color:#fff;animation-name:shrink02;animation-duration:.5s;font-size:.8rem;}@keyframes shrink01{0%{width:100%;background-color:#fff;color:#000;}80%{width:95%;background-color:#efefef;color:#000;}100%{width:95%;background-color:#696969;color:#fff;}}@keyframes shrink02{0%{width:95%;background-color:#696969;}80%{width:90%;background-color:#585858;}100%{width:90%;background-color:#333;}}.modalNewOrd{position:fixed;z-index:9999;left:0;top:0;width:100%;height:100%;overflow:auto;background-color:#000;background-color:rgba(0,0,0,.4);}.modalNewOrdContent{background-color:#fefefe;margin:3% auto;padding:20px;border:1px solid #888;width:50%;border-radius:1rem;animation:slideDown .3s;}.closeNewOrd{color:#aaa;float:right;font-size:2.5rem;font-weight:bold;}.closeNewOrd:hover,.closeNewOrd:focus{color:#000;text-decoration:none;cursor:pointer;}@keyframes slideDown{0%{transform:translate(0,-500px);}100%{transform:translate(0,0);}}
\ No newline at end of file
diff --git a/WebDoorCreator.UI/WebDoorCreator.UI.csproj b/WebDoorCreator.UI/WebDoorCreator.UI.csproj
index aec39de..8c4a500 100644
--- a/WebDoorCreator.UI/WebDoorCreator.UI.csproj
+++ b/WebDoorCreator.UI/WebDoorCreator.UI.csproj
@@ -3,7 +3,7 @@
net6.0
enable
- 0.9.2305.3116
+ 0.9.2305.3119
enable
aspnet-WebDoorCreator.UI-dfe95fed-1398-4144-bd43-8b3a765d6608
|