diff --git a/Wonky.Client/Components/OfficeLandingComponent.razor b/Wonky.Client/Components/OfficeLandingComponent.razor index 80490c94..956344b9 100644 --- a/Wonky.Client/Components/OfficeLandingComponent.razor +++ b/Wonky.Client/Components/OfficeLandingComponent.razor @@ -27,15 +27,15 @@ Sælger Liste - - Åbne ordrer - Telefon Bestilling Produkt Prisliste + + Ubehandlede Bestillinger + @@ -51,15 +51,15 @@ Sælger Liste - - Åbne ordrer - Telefon Bestilling Produkt Prisliste + + Ubehandlede Bestillinger + @@ -75,15 +75,15 @@ Sælger Liste - - Åbne ordrer - Telefon Bestilling Produkt Prisliste + + Ubehandlede Bestillinger + diff --git a/Wonky.Client/HttpRepository/IOfficeOpenOrdersRepository.cs b/Wonky.Client/HttpRepository/IOfficeOpenOrdersRepository.cs deleted file mode 100644 index 6172147b..00000000 --- a/Wonky.Client/HttpRepository/IOfficeOpenOrdersRepository.cs +++ /dev/null @@ -1,9 +0,0 @@ -using Wonky.Entity.Views; - -namespace Wonky.Client.HttpRepository; - -public interface IOfficeOpenOrdersRepository -{ - Task> GetOpenOrders(); - Task> GetOpenOrders(string countryCode); -} \ No newline at end of file diff --git a/Wonky.Client/HttpRepository/IOfficeOrderListRepository.cs b/Wonky.Client/HttpRepository/IOfficeOrderListRepository.cs new file mode 100644 index 00000000..5c7dee35 --- /dev/null +++ b/Wonky.Client/HttpRepository/IOfficeOrderListRepository.cs @@ -0,0 +1,9 @@ +using Wonky.Entity.Views; + +namespace Wonky.Client.HttpRepository; + +public interface IOfficeOrderListRepository +{ + Task> GetOrdersProcessStatusNone(); + Task> GetOrdersProcessStatusNone(string countryCode); +} \ No newline at end of file diff --git a/Wonky.Client/HttpRepository/OfficeOpenOrdersRepository.cs b/Wonky.Client/HttpRepository/OfficeOrderListRepository.cs similarity index 60% rename from Wonky.Client/HttpRepository/OfficeOpenOrdersRepository.cs rename to Wonky.Client/HttpRepository/OfficeOrderListRepository.cs index d5485d3a..57cc55b7 100644 --- a/Wonky.Client/HttpRepository/OfficeOpenOrdersRepository.cs +++ b/Wonky.Client/HttpRepository/OfficeOrderListRepository.cs @@ -8,7 +8,7 @@ using Wonky.Entity.Views; namespace Wonky.Client.HttpRepository; -public class OfficeOpenOrdersRepository : IOfficeOpenOrdersRepository +public class OfficeOrderListRepository : IOfficeOrderListRepository { private readonly JsonSerializerOptions? _options = new JsonSerializerOptions { @@ -16,12 +16,12 @@ public class OfficeOpenOrdersRepository : IOfficeOpenOrdersRepository }; private readonly NavigationManager _navigation; - private readonly ILogger _logger; + private readonly ILogger _logger; private readonly HttpClient _client; private readonly ApiConfig _api; - public OfficeOpenOrdersRepository(HttpClient client, - ILogger logger, + public OfficeOrderListRepository(HttpClient client, + ILogger logger, NavigationManager navigation, IOptions configuration) { @@ -31,22 +31,22 @@ public class OfficeOpenOrdersRepository : IOfficeOpenOrdersRepository _api = configuration.Value; } - public async Task> GetOpenOrders() + public async Task> GetOrdersProcessStatusNone() { var result = await _client - .GetFromJsonAsync>( + .GetFromJsonAsync>( $"{_api.OfficeSales}", _options); - return result ?? new List(); + return result ?? new List(); } - public async Task> GetOpenOrders(string countryCode) + public async Task> GetOrdersProcessStatusNone(string countryCode) { var result = await _client - .GetFromJsonAsync>( + .GetFromJsonAsync>( $"{_api.OfficeSales}/country/{countryCode}", _options); - return result ?? new List(); + return result ?? new List(); } } \ No newline at end of file diff --git a/Wonky.Client/Pages/CommonReportPrintOrderPage.razor.cs b/Wonky.Client/Pages/CommonReportPrintOrderPage.razor.cs index b5c00185..b21c1e48 100644 --- a/Wonky.Client/Pages/CommonReportPrintOrderPage.razor.cs +++ b/Wonky.Client/Pages/CommonReportPrintOrderPage.razor.cs @@ -67,8 +67,8 @@ public partial class CommonReportPrintOrderPage { var current = 0; var orders = Report.ReportItems - .Where(x => x is { StatusTypeEnum: "Order", ProcessStatusEnum: "None" } ); - var count = orders.Count(); + .Where(x => x is { StatusTypeEnum: "Order", ProcessStatusEnum: "None" } ).ToList(); + var count = orders.Count; foreach (var item in orders) { Toaster.ShowInfo($"Behandler {current++} af {count} ordrer. Vent venligst"); @@ -88,10 +88,4 @@ public partial class CommonReportPrintOrderPage await JsModule.InvokeVoidAsync("printInvoke"); Navigator.NavigateTo(ReturnUrl); } - - /* - * await Task.Delay(1000); - * JS.InvokeVoidAsync("invokePrint"); - * InvokeAsync(() => StateHasChanged()); - */ } diff --git a/Wonky.Client/Pages/CommonReportPrintSummaryPage.razor.cs b/Wonky.Client/Pages/CommonReportPrintSummaryPage.razor.cs index 6bb13bc0..12e33d60 100644 --- a/Wonky.Client/Pages/CommonReportPrintSummaryPage.razor.cs +++ b/Wonky.Client/Pages/CommonReportPrintSummaryPage.razor.cs @@ -60,10 +60,4 @@ public partial class CommonReportPrintSummaryPage Navigator.NavigateTo(ReturnUrl); } - - /* - * await Task.Delay(1000); - * JS.InvokeVoidAsync("invokePrint"); - * InvokeAsync(() => StateHasChanged()); - */ } diff --git a/Wonky.Client/Pages/OfficeOpenOrderListPage.razor b/Wonky.Client/Pages/OfficeOrderListPage.razor similarity index 100% rename from Wonky.Client/Pages/OfficeOpenOrderListPage.razor rename to Wonky.Client/Pages/OfficeOrderListPage.razor diff --git a/Wonky.Client/Pages/OfficeOpenOrderListPage.razor.cs b/Wonky.Client/Pages/OfficeOrderListPage.razor.cs similarity index 73% rename from Wonky.Client/Pages/OfficeOpenOrderListPage.razor.cs rename to Wonky.Client/Pages/OfficeOrderListPage.razor.cs index 19e41e45..215f60d4 100644 --- a/Wonky.Client/Pages/OfficeOpenOrderListPage.razor.cs +++ b/Wonky.Client/Pages/OfficeOrderListPage.razor.cs @@ -8,11 +8,11 @@ using Wonky.Entity.Views; namespace Wonky.Client.Pages; -public partial class OfficeOpenOrderListPage : IDisposable +public partial class OfficeOrderListPage : IDisposable { // ############################################################# - [Inject] public ILogger Logger { get; set; } - [Inject] public IOfficeOpenOrdersRepository OpenOrdersRepo { get; set; } + [Inject] public ILogger Logger { get; set; } + [Inject] public IOfficeOrderListRepository OrderListRepo { get; set; } [Inject] public HttpInterceptorService Interceptor { get; set; } [Inject] public NavigationManager Navigator { get; set; } @@ -21,14 +21,14 @@ public partial class OfficeOpenOrderListPage : IDisposable // ############################################################# private bool Working { get; set; } = true; - private List OrderLIst { get; set; } = new(); + private List OrderLIst { get; set; } = new(); protected override async Task OnParametersSetAsync() { Interceptor.RegisterEvent(); Interceptor.RegisterBeforeSendEvent(); Logger.LogInformation("---- CountryCode is '{}'", CountryCode); - OrderLIst = await OpenOrdersRepo.GetOpenOrders(CountryCode); + OrderLIst = await OrderListRepo.GetOrdersProcessStatusNone(CountryCode); Working = false; } diff --git a/Wonky.Client/Program.cs b/Wonky.Client/Program.cs index bc5a399f..e3f16720 100644 --- a/Wonky.Client/Program.cs +++ b/Wonky.Client/Program.cs @@ -81,7 +81,7 @@ builder.Services.AddScoped(); builder.Services.AddScoped(); builder.Services.AddScoped(); -builder.Services.AddScoped(); +builder.Services.AddScoped(); // warehouse repository builder.Services.AddScoped(); // mail service diff --git a/Wonky.Client/wwwroot/appsettings.json b/Wonky.Client/wwwroot/appsettings.json index 313b510a..82252e58 100644 --- a/Wonky.Client/wwwroot/appsettings.json +++ b/Wonky.Client/wwwroot/appsettings.json @@ -1,7 +1,7 @@ { "appInfo": { "name": "Wonky Online", - "version": "257.0", + "version": "258.0", "rc": true, "sandBox": true, "image": "grumpy-coder.png", diff --git a/Wonky.Entity/Views/OpenOrderListView.cs b/Wonky.Entity/Views/OfficeOrderListView.cs similarity index 79% rename from Wonky.Entity/Views/OpenOrderListView.cs rename to Wonky.Entity/Views/OfficeOrderListView.cs index ebb01b86..1036709a 100644 --- a/Wonky.Entity/Views/OpenOrderListView.cs +++ b/Wonky.Entity/Views/OfficeOrderListView.cs @@ -1,6 +1,6 @@ namespace Wonky.Entity.Views; -public class OpenOrderListView +public class OfficeOrderListView { public string CompanyId { get; set; } = ""; public string CompanyName { get; set; } = ""; @@ -8,4 +8,5 @@ public class OpenOrderListView public string SalesHeadId { get; set; } = ""; public string OrderDate { get; set; } = ""; public string SalesRep { get; set; } = ""; + public string CountryCode { get; set; } = ""; } \ No newline at end of file