>?> VocLemmaTEMPGetAll()
{
diff --git a/WebDoorCreator.UI/Components/Order/OrderList.razor b/WebDoorCreator.UI/Components/Order/OrderList.razor
index 3bc44ec..914e2ef 100644
--- a/WebDoorCreator.UI/Components/Order/OrderList.razor
+++ b/WebDoorCreator.UI/Components/Order/OrderList.razor
@@ -63,7 +63,6 @@ else
}
- @**@
}
@@ -72,14 +71,23 @@ else
|
@if (isEdit && item.OrderId == currOrderId)
{
-
- Cod
-
-
-
- Desc
-
-
+ @if (item.OrderStatus < 20)
+ {
+
+ Cod
+
+
+
+ Desc
+
+
+ }
+ else
+ {
+ @item.OrderExtCode
+ @item.OrderDescript
+ }
+
}
else
{
@@ -89,19 +97,38 @@ else
|
- Created on: @($"{item.DateIns:yyyy-MM-dd}")
-
-
- Started on: @($"{item.DateOrd:yyyy-MM-dd}")
+ Created: @($"{item.DateIns:yyyy-MM-dd}")
+ @if (item.DateOrd > dateLimit)
+ {
+
+ Confirmed: @($"{item.DateOrd:yyyy-MM-dd}")
+
+ }
|
-
- Delivered on: @($"{item.DateDelivery:yyyy-MM-dd}")
-
-
- Promised date: @($"{item.DateProm:yyyy-MM-dd}")
-
+ @if (item.OrderStatus == 20 && isEdit && item.OrderId == currOrderId)
+ {
+
+ Promise
+
+
+ }
+ else
+ {
+ @if (item.DateProm > dateLimit)
+ {
+
+ Promised: @($"{item.DateProm:yyyy-MM-dd}")
+
+ }
+ }
+ @if (item.DateDelivery > dateLimit)
+ {
+
+ Delivered: @($"{item.DateDelivery:yyyy-MM-dd}")
+
+ }
|
diff --git a/WebDoorCreator.UI/Components/Order/OrderList.razor.cs b/WebDoorCreator.UI/Components/Order/OrderList.razor.cs
index 1c4d45b..72d4be6 100644
--- a/WebDoorCreator.UI/Components/Order/OrderList.razor.cs
+++ b/WebDoorCreator.UI/Components/Order/OrderList.razor.cs
@@ -130,8 +130,16 @@ namespace WebDoorCreator.UI.Components.Order
{
if (currOrder != null)
{
- // salvo
- var done = await WDService.OrderUpdateDescript(currOrder.OrderId, currOrder.OrderExtCode, currOrder.OrderDescript);
+ bool done = false;
+ // salvo verificando status...
+ if (currOrder.OrderStatus == 10)
+ {
+ done = await WDService.OrderUpdateDescript(currOrder.OrderId, currOrder.OrderExtCode, currOrder.OrderDescript);
+ }
+ else
+ {
+ done = await WDService.OrderUpdatePromDate(currOrder.OrderId, currOrder.DateProm);
+ }
// resetto info
currOrder = null;
isEdit = false;
@@ -455,5 +463,8 @@ namespace WebDoorCreator.UI.Components.Order
}
#endregion Private Methods
+
+ private DateTime dateLimit = new DateTime(2000, 1, 1);
+
}
}
\ No newline at end of file
diff --git a/WebDoorCreator.UI/WebDoorCreator.UI.csproj b/WebDoorCreator.UI/WebDoorCreator.UI.csproj
index 8d74508..82ce0f0 100644
--- a/WebDoorCreator.UI/WebDoorCreator.UI.csproj
+++ b/WebDoorCreator.UI/WebDoorCreator.UI.csproj
@@ -3,7 +3,7 @@
net6.0
enable
- 0.9.2306.2715
+ 0.9.2306.2716
enable
aspnet-WebDoorCreator.UI-dfe95fed-1398-4144-bd43-8b3a765d6608