diff --git a/FaKrosnoApi/appsettings.json b/FaKrosnoApi/appsettings.json
index 7604b68..10d8d8d 100644
--- a/FaKrosnoApi/appsettings.json
+++ b/FaKrosnoApi/appsettings.json
@@ -15,6 +15,6 @@
"Audience": "FaKrosnoClient"
},
"Host": {
- "Urls": "http://0.0.0.0:5000"
+ "Urls": "http://0.0.0.0:5555"
}
}
diff --git a/OrdersManagement/Components/Pages/EdiCustomerOrders.razor b/OrdersManagement/Components/Pages/EdiCustomerOrders.razor
index 3a5867b..04d94f8 100644
--- a/OrdersManagement/Components/Pages/EdiCustomerOrders.razor
+++ b/OrdersManagement/Components/Pages/EdiCustomerOrders.razor
@@ -13,7 +13,7 @@
@@ -34,7 +34,7 @@
AllowFiltering="true"
Responsive="true"
AllowPaging="true"
- PageSize="20"
+ PageSize="10"
AllowSelection="true"
AllowRowClick="true"
SelectionMode="GridSelectionMode.Multiple"
@@ -42,32 +42,23 @@
SelectedItemsChanged="SelectedItemsChanged">
-
+
@context.CustomerOrderNumber
-
+
+ @context.CustomerPoNumber
+
+
@context.CustomerNumber
-
+
@context.CustomerSequence
-
+
@context.CreateDate
-
- @context.Gate
-
-
- @context.RecipientCode
-
-
- @context.SellerCode
-
-
- @context.SenderCode
-
-
- @context.BuyerCode
+
+ @context.TranslatedStatus
@@ -106,7 +97,7 @@
private ModalDto _modalDto = new(null, null);
private bool _isVisible;
- private bool _filter = true;
+ private bool _filter;
private string _text = "Księguj bieżący";
@@ -115,13 +106,11 @@
_ediCustomerOrders = (await EdiCustomerOrderService.GetEdiCustomerOrdersAsync() ?? new List()).ToList();
_ediCustomerOrders = _ediCustomerOrders.OrderByDescending(x => x.CreateDate).ToList();
- if (_filter)
+ if (!_filter)
{
_ediCustomerOrders = _ediCustomerOrders.Where(x => x.Posted == 0).ToList();
}
- _filter = true;
-
StateHasChanged();
return await Task.FromResult(request.ApplyTo(_ediCustomerOrders));
diff --git a/OrdersManagement/Program.cs b/OrdersManagement/Program.cs
index 0fec3f3..22da5b1 100644
--- a/OrdersManagement/Program.cs
+++ b/OrdersManagement/Program.cs
@@ -6,7 +6,7 @@ var builder = WebApplication.CreateBuilder(args);
builder.Services.AddBlazorBootstrap();
-string apiUrl = builder.Configuration["ApiUrl"] ?? "http://localhost:5000"; // Ustawienie na adres twojego API
+string apiUrl = builder.Configuration["ApiUrl"] ?? "http://localhost:5555"; // Ustawienie na adres twojego API
builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri(apiUrl) });
// Add services to the container.
diff --git a/SytelineSaAppEfDataModel/Dtos/EdiCustomerOrderDto.cs b/SytelineSaAppEfDataModel/Dtos/EdiCustomerOrderDto.cs
index 8b5cbc9..3e70d30 100644
--- a/SytelineSaAppEfDataModel/Dtos/EdiCustomerOrderDto.cs
+++ b/SytelineSaAppEfDataModel/Dtos/EdiCustomerOrderDto.cs
@@ -101,8 +101,22 @@ namespace SytelineSaAppEfDataModel.Dtos
public string SellerCode { get; set; }
public string DocType { get; set; }
public string BuyerCode { get; set; }
+
+ public string TranslatedStatus => TranslateStatus(Status);
public IEnumerable EdiCustomerOrderLines { get; set; } = new List();
public IEnumerable EdiCustomerOrderTranslates { get; set; } = new List();
+
+ private static string TranslateStatus(string status)
+ {
+ return status switch
+ {
+ "O" => "Zamówione",
+ "S" => "Zatrzymane",
+ "P" => "Planowane",
+ "C" => "Zakończone",
+ _ => status
+ };
+ }
}
}