From 75a9712e3c6086055d1f15f2a5189eb1617eb80f Mon Sep 17 00:00:00 2001 From: Piotr Kus Date: Sat, 1 Feb 2025 10:46:23 +0100 Subject: [PATCH] * Changed Dates format * Renamed ScheduleOrderDetails to ScheduleOrder * Change header in ScheduleOrders --- .../Components/Pages/EdiCustomerOrder.razor | 16 +- .../Components/Pages/ScheduleOrder.razor | 137 ++++++++++++++++++ .../Pages/ScheduleOrderDetails.razor | 134 ----------------- .../Components/Pages/ScheduleOrders.razor | 4 +- 4 files changed, 147 insertions(+), 144 deletions(-) create mode 100644 OrdersManagement/Components/Pages/ScheduleOrder.razor delete mode 100644 OrdersManagement/Components/Pages/ScheduleOrderDetails.razor diff --git a/OrdersManagement/Components/Pages/EdiCustomerOrder.razor b/OrdersManagement/Components/Pages/EdiCustomerOrder.razor index 6f737dc..c2aefd6 100644 --- a/OrdersManagement/Components/Pages/EdiCustomerOrder.razor +++ b/OrdersManagement/Components/Pages/EdiCustomerOrder.razor @@ -16,10 +16,10 @@ Numer klienta: @context.CustomerNumber
Klient: @context.CustomerName
Numer odbiorcy: @(context.CustomerSequence?.ToString() ?? "N/A")
- Data otrzymania: @(context.RecivedDate?.ToString("dd.MM.yyyy HH:mm:ss") ?? "N/A")
+ Data otrzymania: @(context.RecivedDate?.ToString("dd.MM.yyyy") ?? "N/A")
Wysłano do Syteline?: @((context.Posted?.ToString() ?? "0") == "0" ? "NIE" : "TAK")
- Data wysyłki do Syteline: @(context.PostedDate?.ToString("yyyy-MM-dd HH:mm:ss") ?? "N/A")
- Data zamówienia: @(context.OrderDate?.ToString("yyyy-MM-dd HH:mm:ss") ?? "N/A")
+ Data wysyłki do Syteline: @(context.PostedDate?.ToString("dd.MM.yyyy") ?? "N/A")
+ Data zamówienia: @(context.OrderDate?.ToString("dd.MM.yyyy") ?? "N/A")
@@ -107,7 +107,7 @@ Cena: @(context.ContPrice?.ToString("F2") ?? "N/A")
- Ważne Od: @(context.EffectiveDate?.ToString("yyyy-MM-dd HH:mm:ss") ?? "N/A")
+ Ważne Od: @(context.EffectiveDate?.ToString("dd.MM.yyyy") ?? "N/A")
J/M: @context.Uom
BoxType: @context.BoxType
Address: @context.Address
@@ -149,7 +149,7 @@ @context.QtyOrdered - @context.DueDate?.ToString("yyyy-MM-dd") + @context.DueDate?.ToString("dd.MM.yyyy") @context.TranslatedStatus @@ -166,7 +166,7 @@
- Data Otrzymania: @(context.ReceivedDate?.ToString("yyyy-MM-dd HH:mm:ss") ?? "N/A")
+ Data Otrzymania: @(context.ReceivedDate?.ToString("dd.MM.yyyy") ?? "N/A")
Numer Zamówienia: @context.CustomerOrderNumber
Linia: @context.CustomerOrderLine
Zwolnienie: @context.CustomerOrderRelease
@@ -174,8 +174,8 @@ Pozycja Klienta: @context.CustomerItem
Łączna Ilość Sztuk: @(context.QtyOrdered?.ToString("F2") ?? "N/A")
Cena: @(context.Price?.ToString("F2") ?? "N/A")
- Data Wykonania: @(context.DueDate?.ToString("yyyy-MM-dd HH:mm:ss") ?? "N/A")
- Data Rejestracji: @(context.ReleaseDate?.ToString("yyyy-MM-dd HH:mm:ss") ?? "N/A")
+ Data Wykonania: @(context.DueDate?.ToString("dd.MM.yyyy") ?? "N/A")
+ Data Rejestracji: @(context.ReleaseDate?.ToString("dd.MM.yyyy") ?? "N/A")
Magazyn: @context.Warehouse
 diff --git a/OrdersManagement/Components/Pages/ScheduleOrder.razor b/OrdersManagement/Components/Pages/ScheduleOrder.razor new file mode 100644 index 0000000..ae9c267 --- /dev/null +++ b/OrdersManagement/Components/Pages/ScheduleOrder.razor @@ -0,0 +1,137 @@ +@page "/ScheduleOrder/{ScheduleOrderId:int}" + +@inject ScheduleOrderDetailsService ScheduleOrderDetailsService + +
+

Indeksy

+
+
+ + + + @context.Sc_productCode + + + @context.Sh_productCode + + + @context.Price + + + +
+@if (_isVisible) +{ +
+

Dodatkowe informacje

+
+
+ + + @context.Label: @context.Value + + +
+
+
+

Harmonogramy

+
+
+ + + + + @context.ID + + + @context.DateFrom.ToString("dd.MM.yyyy") + + + @context.DateTo.ToString("dd.MM.yyyy") + + + @context.Qty + + + @context.QtyType + + + @context.QtyDesc + + + +
+} +@if (_isVisibleDetailDetail) +{ +
+

Dodatkowe informacje

+
+
+ + + @context.Label: @context.Value + + +
+} + +@code { + [Parameter] public int ScheduleOrderId { get; set; } + private bool _isVisible; + private bool _isVisibleDetailDetail; + + Grid? _grid; + Grid? _detailDetailsGrid; + + private IEnumerable? _scheduleOrderDetails; + private IEnumerable? _scheduleOrderDetailsDetails; + + private List? _scheduleOrderDetailMiscs; + private List? _scheduleOrderDetailDetailMiscs; + + private async Task> ScheduleOrderDetailsDataProvider(GridDataProviderRequest request) + { + _scheduleOrderDetails = await ScheduleOrderDetailsService.GetScheduleOrderDetails(ScheduleOrderId) ?? new List(); + StateHasChanged(); + + return await Task.FromResult(request.ApplyTo(_scheduleOrderDetails)); + } + + private void SelectedItemChanged(HashSet obj) + { + _isVisible = obj.Any(); + _scheduleOrderDetailMiscs = obj.FirstOrDefault()?.ScheduleOrderDetailMiscs.ToList(); + _scheduleOrderDetailsDetails = obj.FirstOrDefault()?.ScheduleOrderDetailDetails.ToList(); + } + + private void SelectedDetailDetailChanged(HashSet obj) + { + _isVisibleDetailDetail = obj.Any(); + _scheduleOrderDetailDetailMiscs = obj.FirstOrDefault()?.ScheduleOrderDetailDetailMiscs.ToList(); + } + +} diff --git a/OrdersManagement/Components/Pages/ScheduleOrderDetails.razor b/OrdersManagement/Components/Pages/ScheduleOrderDetails.razor deleted file mode 100644 index 63106b5..0000000 --- a/OrdersManagement/Components/Pages/ScheduleOrderDetails.razor +++ /dev/null @@ -1,134 +0,0 @@ -@page "/ScheduleOrderDetails/{ScheduleOrderId:int}" - -@inject ScheduleOrderDetailsService ScheduleOrderDetailsService - -
-
-

Indeksy:

- - - - @context.Sc_productCode - - - @context.Sh_productCode - - - @context.Price - - - -
- @if (_isVisible) - { -
-

Dodatkowe informacje:

- - - @context.Label: @context.Value - - -
- } - - @if (_isVisible) - { -
-

Harmonogramy:

- - - - - @context.ID - - - @context.DateFrom - - - @context.DateTo - - - @context.Qty - - - @context.QtyType - - - @context.QtyDesc - - - -
- @if (_isVisibleDetailDetail) - { -
-

Dodatkowe informacje:

- - - @context.Label: @context.Value - - -
- } - } -
- -@code { - [Parameter] public int ScheduleOrderId { get; set; } - private bool _isVisible; - private bool _isVisibleDetailDetail; - - Grid? _grid; - Grid? _detailDetailsGrid; - - private IEnumerable? _scheduleOrderDetails; - private IEnumerable? _scheduleOrderDetailsDetails; - - private List? _scheduleOrderDetailMiscs; - private List? _scheduleOrderDetailDetailMiscs; - - private async Task> ScheduleOrderDetailsDataProvider(GridDataProviderRequest request) - { - _scheduleOrderDetails = await ScheduleOrderDetailsService.GetScheduleOrderDetails(ScheduleOrderId) ?? new List(); - StateHasChanged(); - - return await Task.FromResult(request.ApplyTo(_scheduleOrderDetails)); - } - - private void SelectedItemChanged(HashSet obj) - { - _isVisible = obj.Any(); - _scheduleOrderDetailMiscs = obj.FirstOrDefault()?.ScheduleOrderDetailMiscs.ToList(); - _scheduleOrderDetailsDetails = obj.FirstOrDefault()?.ScheduleOrderDetailDetails.ToList(); - } - - private void SelectedDetailDetailChanged(HashSet obj) - { - _isVisibleDetailDetail = obj.Any(); - _scheduleOrderDetailDetailMiscs = obj.FirstOrDefault()?.ScheduleOrderDetailDetailMiscs.ToList(); - } - -} diff --git a/OrdersManagement/Components/Pages/ScheduleOrders.razor b/OrdersManagement/Components/Pages/ScheduleOrders.razor index cd5a0d9..3e15892 100644 --- a/OrdersManagement/Components/Pages/ScheduleOrders.razor +++ b/OrdersManagement/Components/Pages/ScheduleOrders.razor @@ -4,7 +4,7 @@ @inject NavigationManager NavigationManager @inherits LayoutComponentBase -

ScheduleOrders

+

Zamówienia DELFOR