diff --git a/Resources/ChangeLog.html b/Resources/ChangeLog.html
index 91ddf9c..b2e8a3d 100644
--- a/Resources/ChangeLog.html
+++ b/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
WebDoorCreator - Egalware
- Version: 0.9.2306.0508
+ Version: 0.9.2306.0510
Release note:
-
diff --git a/Resources/VersNum.txt b/Resources/VersNum.txt
index fa6f17d..71f723b 100644
--- a/Resources/VersNum.txt
+++ b/Resources/VersNum.txt
@@ -1 +1 @@
-0.9.2306.0508
+0.9.2306.0510
diff --git a/Resources/manifest.xml b/Resources/manifest.xml
index 841cf44..9172b63 100644
--- a/Resources/manifest.xml
+++ b/Resources/manifest.xml
@@ -1,6 +1,6 @@
-
- 0.9.2306.0508
+ 0.9.2306.0510
http://nexus.steamware.net/repository/SWS/WDC/stable/WDC.API.zip
http://nexus.steamware.net/repository/SWS/WDC/stable/ChangeLog.html
false
diff --git a/WebDoorCreator.API/Controllers/OrderController.cs b/WebDoorCreator.API/Controllers/OrderController.cs
index d6771da..877949f 100644
--- a/WebDoorCreator.API/Controllers/OrderController.cs
+++ b/WebDoorCreator.API/Controllers/OrderController.cs
@@ -28,7 +28,7 @@ namespace WebDoorCreator.API.Controllers
}
///
/// GET: api/Order/GetCurrent
- /// Recupera ordini degli ultimi 6 mesi dato cliente e stato
+ /// Recupera ordini dato id cliente + stato ordini (limitato a ultimi 6 mesi)
///
///
[HttpGet("GetCurrent")]
@@ -36,7 +36,7 @@ namespace WebDoorCreator.API.Controllers
{
List answ = new List();
DateTime dtEnd = DateTime.Now;
- DateTime dtStart = dtEnd.AddMonths(-1);
+ DateTime dtStart = dtEnd.AddMonths(-6);
var rawData = await WDCService.OrderStatusGetFilt(id, ordStatus, dtStart, dtEnd);
if (rawData != null)
{
@@ -49,8 +49,8 @@ namespace WebDoorCreator.API.Controllers
///
///
///
- [HttpGet("OrderDetail")]
- public async Task OrderDetail(int OrderId)
+ [HttpGet("GetDetail")]
+ public async Task GetDetail(int OrderId)
{
OrderDetailsDTO answ = new OrderDetailsDTO()
{
@@ -58,19 +58,65 @@ namespace WebDoorCreator.API.Controllers
};
// recupero info ordine
var rawOrder = await WDCService.OrderGetByKey(OrderId);
- if (rawOrder != null)
+ if (rawOrder != null && rawOrder.CompanyNav!=null)
{
answ.OrderDescript = rawOrder.OrderDescript;
answ.OrderExtCode = rawOrder.OrderExtCode;
- // recupero info customer
+ // recupero info customer
+ CustomerDTO customer = new CustomerDTO()
+ {
+ Address = rawOrder.CompanyNav.Address,
+ City = rawOrder.CompanyNav.City,
+ CompanyExtCode = rawOrder.CompanyNav.CompanyExtCode,
+ CompanyId = rawOrder.CompanyNav.CompanyId,
+ CompanyName = rawOrder.CompanyNav.CompanyName,
+ State = rawOrder.CompanyNav.State,
+ VAT = rawOrder.CompanyNav.VAT,
+ ZipCode = rawOrder.CompanyNav.ZipCode
+ };
+ answ.CustomerInfo = customer;
// recuper elenco porte...
+ List dcDTO = new List();
+ var doorsList = await WDCService.DoorGetByOrderId(OrderId);
+ foreach (var door in doorsList)
+ {
+ // recupero i dato DoorOp
+
+ // creo oggetto DTO
+ var doorDto = new DoorCostingDTO()
+ {
+ DoorId = door.DoorId,
+ Quantity = door.Quantity,
+ EstimatedWorkTime = 0,
+ SizeX = 1,
+ SizeY = 2,
+ SizeZ = 3
+ };
+ dcDTO.Add(doorDto);
+ }
//answ. = rawOrder.OrderDescript;
+ answ.DoorsList = dcDTO;
}
// popolo con dati specifica...
return answ;
}
+ ///
+ /// Door price update for order's cost evaluation
+ ///
+ /// list of DoorPriceDTO with UnitPrices
+ ///
+ [HttpPost("DoorPriceUpdate")]
+ public async Task DoorPriceUpdate(List EvalResults)
+ {
+ await Task.Delay(1);
+ string answ = "NA";
+ //bool fatto = await QDataServ.SaveProcessingResult(EvalResults);
+ //answ = fatto ? "OK" : "NO";
+ return answ;
+ }
+
private static IConfiguration _configuration = null!;
private static Logger Log = LogManager.GetCurrentClassLogger();
diff --git a/WebDoorCreator.Data/Controllers/WebDoorCreatorController.cs b/WebDoorCreator.Data/Controllers/WebDoorCreatorController.cs
index 7936818..3d7dcae 100644
--- a/WebDoorCreator.Data/Controllers/WebDoorCreatorController.cs
+++ b/WebDoorCreator.Data/Controllers/WebDoorCreatorController.cs
@@ -887,6 +887,7 @@ namespace WebDoorCreator.Data.Controllers
var rawData = dbCtx
.DbSetOrders
.Where(x => x.OrderId == orderId)
+ .Include(c => c.CompanyNav)
.AsNoTracking()
.FirstOrDefault();
if (rawData != null)
diff --git a/WebDoorCreator.Data/DTO/CalcResultDTO.cs b/WebDoorCreator.Data/DTO/CalcResultDTO.cs
index 6679dc8..2a3dc41 100644
--- a/WebDoorCreator.Data/DTO/CalcResultDTO.cs
+++ b/WebDoorCreator.Data/DTO/CalcResultDTO.cs
@@ -28,7 +28,7 @@ namespace WebDoorCreator.Data.DTO
///
public string SvgGen { get; set; } = "";
///
- /// Articat path (ex 3d zip/pack)
+ /// Artifats path (ex 3d zip/pack)
///
public string artifactPath { get; set; } = "";
}
diff --git a/WebDoorCreator.Data/DTO/DoorCostingDTO.cs b/WebDoorCreator.Data/DTO/DoorCostingDTO.cs
index d9b3475..f565536 100644
--- a/WebDoorCreator.Data/DTO/DoorCostingDTO.cs
+++ b/WebDoorCreator.Data/DTO/DoorCostingDTO.cs
@@ -13,6 +13,7 @@ namespace WebDoorCreator.Data.DTO
public class DoorCostingDTO
{
public int DoorId { get; set; } = 0;
+ public int Quantity { get; set; } = 1;
public double SizeX { get; set; } = 0;
public double SizeY { get; set; } = 0;
diff --git a/WebDoorCreator.Data/DTO/DoorPriceDTO.cs b/WebDoorCreator.Data/DTO/DoorPriceDTO.cs
new file mode 100644
index 0000000..d80322e
--- /dev/null
+++ b/WebDoorCreator.Data/DTO/DoorPriceDTO.cs
@@ -0,0 +1,35 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WebDoorCreator.Data.DTO
+{
+ ///
+ /// Door cost data DTO
+ ///
+ public class DoorPriceDTO
+ {
+ ///
+ /// Door UID
+ ///
+ public int OrderId { get; set; } = 0;
+ ///
+ /// Door UID
+ ///
+ public int DoorId { get; set; } = 0;
+ ///
+ /// Articat path (ex 3d zip/pack)
+ ///
+ public double UnitCost { get; set; } = 0;
+ ///
+ /// Valid = true / cannot deliver = false
+ ///
+ public bool Valid { get; set; } = true;
+ ///
+ /// Error message (optional)
+ ///
+ public string ErrorMsg { get; set; } = "";
+ }
+}
diff --git a/WebDoorCreator.UI/WebDoorCreator.UI.csproj b/WebDoorCreator.UI/WebDoorCreator.UI.csproj
index a6b330a..4364df2 100644
--- a/WebDoorCreator.UI/WebDoorCreator.UI.csproj
+++ b/WebDoorCreator.UI/WebDoorCreator.UI.csproj
@@ -3,7 +3,7 @@
net6.0
enable
- 0.9.2306.0508
+ 0.9.2306.0510
enable
aspnet-WebDoorCreator.UI-dfe95fed-1398-4144-bd43-8b3a765d6608