diff --git a/FaKrosnoEfDataModel/Dtos/ScheduleOrderDetailDetailDto.cs b/FaKrosnoEfDataModel/Dtos/ScheduleOrderDetailDetailDto.cs index e8faac4..533378b 100644 --- a/FaKrosnoEfDataModel/Dtos/ScheduleOrderDetailDetailDto.cs +++ b/FaKrosnoEfDataModel/Dtos/ScheduleOrderDetailDetailDto.cs @@ -20,6 +20,6 @@ namespace FaKrosnoEfDataModel.Dtos public DateTime? ShipDate { get; set; } public DateTime LastUpdateDate { get; set; } - public IList ScheduleOrderDetailDetailMiscs { get; set; } + public IList? ScheduleOrderDetailDetailMiscs { get; set; } } } diff --git a/FaKrosnoEfDataModel/Dtos/ScheduleOrderDetailDetailMiscDto.cs b/FaKrosnoEfDataModel/Dtos/ScheduleOrderDetailDetailMiscDto.cs index 6603f02..d1f63f7 100644 --- a/FaKrosnoEfDataModel/Dtos/ScheduleOrderDetailDetailMiscDto.cs +++ b/FaKrosnoEfDataModel/Dtos/ScheduleOrderDetailDetailMiscDto.cs @@ -13,5 +13,7 @@ namespace FaKrosnoEfDataModel.Dtos public string Value { get; set; } public string? Label { get; set; } public bool Display { get; set; } + + public string Text => $"{Label}:\t{Value}"; } } diff --git a/FaKrosnoEfDataModel/Dtos/ScheduleOrderDetailDto.cs b/FaKrosnoEfDataModel/Dtos/ScheduleOrderDetailDto.cs index c078a2c..b021576 100644 --- a/FaKrosnoEfDataModel/Dtos/ScheduleOrderDetailDto.cs +++ b/FaKrosnoEfDataModel/Dtos/ScheduleOrderDetailDto.cs @@ -14,6 +14,6 @@ namespace FaKrosnoEfDataModel.Dtos public int? Price { get; set; } public IList ScheduleOrderDetailDetails { get; set; } - public IList ScheduleOrderDetailMiscs { get; set; } + public IList? ScheduleOrderDetailMiscs { get; set; } } } diff --git a/FaKrosnoEfDataModel/Dtos/ScheduleOrderDetailMiscDto.cs b/FaKrosnoEfDataModel/Dtos/ScheduleOrderDetailMiscDto.cs index 404734d..a77da64 100644 --- a/FaKrosnoEfDataModel/Dtos/ScheduleOrderDetailMiscDto.cs +++ b/FaKrosnoEfDataModel/Dtos/ScheduleOrderDetailMiscDto.cs @@ -13,5 +13,7 @@ namespace FaKrosnoEfDataModel.Dtos public string Value { get; set; } public string? Label { get; set; } public bool Display { get; set; } + + public string Text => $"{Label}:\t{Value}"; } } diff --git a/FaKrosnoEfDataModel/Dtos/ScheduleOrderMiscDto.cs b/FaKrosnoEfDataModel/Dtos/ScheduleOrderMiscDto.cs index a536510..45ca494 100644 --- a/FaKrosnoEfDataModel/Dtos/ScheduleOrderMiscDto.cs +++ b/FaKrosnoEfDataModel/Dtos/ScheduleOrderMiscDto.cs @@ -13,5 +13,7 @@ namespace FaKrosnoEfDataModel.Dtos public string Value { get; set; } public string? Label { get; set; } public bool Display { get; set; } + + public string Text => $"{Label}:\t{Value}"; } } diff --git a/OrdersManagement/Components/Layout/MainLayout.razor b/OrdersManagement/Components/Layout/MainLayout.razor index 19c23ff..12352ce 100644 --- a/OrdersManagement/Components/Layout/MainLayout.razor +++ b/OrdersManagement/Components/Layout/MainLayout.razor @@ -32,8 +32,6 @@ @code { private List MenuItems { get; set; } = new(); - Sidebar? _sidebar; - protected override void OnInitialized() { MenuItems = new List diff --git a/OrdersManagement/Components/Pages/CustomerOrder.razor b/OrdersManagement/Components/Pages/CustomerOrder.razor index 016ef67..ee5083c 100644 --- a/OrdersManagement/Components/Pages/CustomerOrder.razor +++ b/OrdersManagement/Components/Pages/CustomerOrder.razor @@ -5,44 +5,40 @@ @using SytelineSaAppEfDataModel.Dtos @using OrdersManagement.Components.Pages.Shared @using Syncfusion.Blazor.Grids +@using Syncfusion.Blazor.Cards @inherits LayoutComponentBase -

Zamówienie klienta nr @CustomerOrders.FirstOrDefault()?.CoNum

-
-
-
- - - Numer Zamówienia: @context.CoNum
- Numer Zamówienia Klienta: @context.CustPo
- Klient: @context.CustNum
- Numer Odbiorcy: @context.CustSeq
- Kontakt: @context.Contact
- Telefon: @context.Phone
- Data Zamówienia: @context.OrderDate.ToString("yyyy-MM-dd HH:mm:ss")
- Warunki: @context.TermsCode
- Wartość Brutto: @(context.Price?.ToString("F2") ?? "N/A")
- Status: @context.TranslatedStatus
-
-
-
-
- - - Magazyn: @context.Whse
- VAT: @context.FrtTaxCode1
- Typ Odbiorcy: @context.EndUserType
- Kurs Wymiany: @(context.ExchRate?.ToString("F4") ?? "N/A")
- Gate: @context.Uf_FKR_EDI_Gate
- RecipientCode: @context.Uf_FKR_EDI_RecipientCode
- SelletCode: @context.Uf_FKR_EDI_SellerCode
- SenderCode: @context.Uf_FKR_EDI_SenderCode
- BuyerCode: @context.Uf_FKR_EDI_BuyerCode
- Typ Dokumentu: @context.Uf_DocType
-
-
-
-
+
Zamówienie klienta nr @CustomerOrderDto?.CoNum
+ + +
+
+ Numer Zamówienia: @CustomerOrderDto?.CoNum
+ Numer Zamówienia Klienta: @CustomerOrderDto?.CustPo
+ Klient: @CustomerOrderDto?.CustNum
+ Numer Odbiorcy: @CustomerOrderDto?.CustSeq
+ Kontakt: @CustomerOrderDto?.Contact
+ Telefon: @CustomerOrderDto?.Phone
+ Data Zamówienia: @CustomerOrderDto?.OrderDate.ToString("yyyy-MM-dd HH:mm:ss")
+ Warunki: @CustomerOrderDto?.TermsCode
+ Wartość Brutto: @(CustomerOrderDto?.Price?.ToString("F2") ?? "N/A")
+ Status: @CustomerOrderDto?.TranslatedStatus
+
+
+ Magazyn: @CustomerOrderDto?.Whse
+ VAT: @CustomerOrderDto?.FrtTaxCode1
+ Typ Odbiorcy: @CustomerOrderDto?.EndUserType
+ Kurs Wymiany: @(CustomerOrderDto?.ExchRate?.ToString("F4") ?? "N/A")
+ Gate: @CustomerOrderDto?.Uf_FKR_EDI_Gate
+ RecipientCode: @CustomerOrderDto?.Uf_FKR_EDI_RecipientCode
+ SelletCode: @CustomerOrderDto?.Uf_FKR_EDI_SellerCode
+ SenderCode: @CustomerOrderDto?.Uf_FKR_EDI_SenderCode
+ BuyerCode: @CustomerOrderDto?.Uf_FKR_EDI_BuyerCode
+ Typ Dokumentu: @CustomerOrderDto?.Uf_DocType
+
+
+
+

@@ -53,7 +49,7 @@ @if (_isVisible) {
-

Zamówienie DELFOR do zamówienia @CustomerOrders.FirstOrDefault()?.CoNum

+
Zamówienie DELFOR do zamówienia @CustomerOrderDto?.CoNum

@@ -61,221 +57,150 @@

} -
-

Indeksy

-
-
- @* *@ - @* *@ - @* *@ - @* @context.CoLine *@ - @* *@ - @* *@ - @* @context.Item *@ - @* *@ - @* *@ - @* @context.CustItem *@ - @* *@ - @* *@ - @* @context.Description *@ - @* *@ - @* *@ - @* @context.BlanketQty *@ - @* *@ - @* *@ - @* @context.UM *@ - @* *@ - @* *@ - @* @context.ContPrice *@ - @* *@ - @* *@ - @* @context.TranslatedStatus *@ - @* *@ - @* *@ - @* *@ - - - - - - - - - - - - - - - - - -
+
Indeksy
+ + + + @{ + var order = context as CustomerOrderLineDto; + + +
+
Szczegóły
+
+ Numer zamówienia:@order?.CoNum
+ Linia:@order?.CoLine
+ Pozycja:@order?.Item
+ Pozycja Klienta:@order?.CustItem
+ Opis:@order?.Description
+ Łączna Ilość:@order?.BlanketQty.ToString("F2")
+ Status:@order?.TranslatedStatus
+
+
+ Cena:@(order?.ContPrice?.ToString("F2") ?? "N/A")
+ Ważne Od:@(order?.EffDate?.ToString("dd.MM.yyyy") ?? "N/A")
+ J/M:@order?.UM
+ BoxType:@order?.Uf_FKR_EDI_BLN_BoxType
+ Address:@order?.Uf_FKR_EDI_BLN_Address
+ FinalDestination:@order?.Uf_FKR_EDI_BLN_FinalDestination
+ QtyPerBox:@(order?.Uf_FKR_EDI_BLN_QtyPerBox?.ToString() ?? "N/A") +
+
+
+
+ } +
+
+ + + + + + + + + + + + + + +
@if (_isVisibleCustomerOrderLine) { -
-

Szczegóły

-
- @*
*@ - @*
*@ - @* *@ - @* *@ - @* Numer zamówienia:@context.CoNum
*@ - @* Linia:@context.CoLine
*@ - @* Pozycja:@context.Item
*@ - @* Pozycja Klienta:@context.CustItem
*@ - @* Opis:@context.Description
*@ - @* Łączna Ilość:@context.BlanketQty.ToString("F2")
*@ - @* Status:@context.TranslatedStatus
*@ - @*
*@ - @*
*@ - @*
*@ - @*
*@ - @* *@ - @* *@ - @* Cena:@(context.ContPrice?.ToString("F2") ?? "N/A")
*@ - @* Ważne Od:@(context.EffDate?.ToString("dd.MM.yyyy") ?? "N/A")
*@ - @* J/M:@context.UM
*@ - @* BoxType:@context.Uf_FKR_EDI_BLN_BoxType
*@ - @* Address:@context.Uf_FKR_EDI_BLN_Address
*@ - @* FinalDestination:@context.Uf_FKR_EDI_BLN_FinalDestination
*@ - @* QtyPerBox:@(context.Uf_FKR_EDI_BLN_QtyPerBox?.ToString() ?? "N/A") *@ - @*
*@ - @*
*@ - @*
*@ - @*
*@
-

Harmonogramy

-
- @* *@ - @* *@ - @* *@ - @* @context.CoLine *@ - @* *@ - @* *@ - @* @context.CoRelease *@ - @* *@ - @* *@ - @* @context.Item *@ - @* *@ - @* *@ - @* @context.CustItem *@ - @* *@ - @* *@ - @* @context.QtyOrdered *@ - @* *@ - @* *@ - @* @context.DueDate?.ToString("dd.MM.yyyy") *@ - @* *@ - @* *@ - @* @context.TranslatedStatus *@ - @* *@ - @* *@ - @* *@ - - - - - - - - - - - - - - - - - -
- @if (_isVisibleCustomerOrderLineItem) - { -
-

Szczegóły

-
- @*
*@ - @*
*@ - @* *@ - @* *@ - @* Numer Zamówienia:@context.CoNum
*@ - @* Linia:@context.CoLine
*@ - @* Zwolnienie:@context.CoRelease
*@ - @* Pozycja:@context.Item
*@ - @* Pozycja Klienta:@context.CustItem
*@ - @* Łączna Ilość Sztuk:@(context.QtyOrdered.ToString("F2") ?? "N/A")
*@ - @* Cena:@(context.Price.ToString("F2") ?? "N/A")
*@ - @* Data Wykonania:@(context.DueDate?.ToString("dd.MM.yyyy") ?? "N/A")
*@ - @* Data *@ - @* Rejestracji:@(context.ReleaseDate?.ToString("dd.MM.yyyy") ?? "N/A")
*@ - @* Magazyn:@context.Whse
*@ - @* Typ Documentu:@context.Uf_FKR_EDI_ITEM_DocumentType
*@ - @*
*@ - @*
*@ - @*
*@ - @*
*@ - @* *@ - @* *@ - @* Kod VAT:@context.TaxCode1
*@ - @* J/M:@context.UM
*@ - @* Numer Klienta:@context.CoCustNum
*@ - @* Opis:@context.Description
*@ - @* Status:@context.TranslatedStatus
*@ - @* RoutingCode:@context.Uf_FKR_EDI_ITEM_RoutingCode
*@ - @* DeliveryCallNumber:@context.Uf_FKR_EDI_ITEM_DeliveryCallNum
*@ - @* UnloadingPoint:@context.Uf_LOC_11_UnloadingPoint
*@ - @* DestinationPoint:@context.Uf_LOC_159_DestinationPoint
*@ - @* PalletCode:@context.Uf_FKR_EDI_ITEM_PalletCode
*@ - @*
*@ - @*
*@ - @*
*@ - @*
*@ - } +
Harmonogramy
+ + + + @{ + var detailLineItem = context as CustomerOrderLineItemDto; + + +
+
Szczegóły
+
+ Numer Zamówienia:@detailLineItem?.CoNum
+ Linia:@detailLineItem?.CoLine
+ Zwolnienie:@detailLineItem?.CoRelease
+ Pozycja:@detailLineItem?.Item
+ Pozycja Klienta:@detailLineItem?.CustItem
+ Łączna Ilość + Sztuk:@(detailLineItem?.QtyOrdered.ToString("F2") ?? "N/A")
+ Cena:@(detailLineItem?.Price.ToString("F2") ?? "N/A")
+ Data + Wykonania:@(detailLineItem?.DueDate?.ToString("dd.MM.yyyy") ?? "N/A")
+ Data + Rejestracji:@(detailLineItem?.ReleaseDate?.ToString("dd.MM.yyyy") ?? "N/A")
+ Magazyn:@detailLineItem?.Whse
+ Typ Documentu:@detailLineItem?.Uf_FKR_EDI_ITEM_DocumentType
+
+
+ Kod VAT:@detailLineItem?.TaxCode1
+ J/M:@detailLineItem?.UM
+ Numer Klienta:@detailLineItem?.CoCustNum
+ Opis:@detailLineItem?.Description
+ Status:@detailLineItem?.TranslatedStatus
+ RoutingCode:@detailLineItem?.Uf_FKR_EDI_ITEM_RoutingCode
+ DeliveryCallNumber:@detailLineItem?.Uf_FKR_EDI_ITEM_DeliveryCallNum
+ UnloadingPoint:@detailLineItem?.Uf_LOC_11_UnloadingPoint
+ DestinationPoint:@detailLineItem?.Uf_LOC_159_DestinationPoint
+ PalletCode:@detailLineItem?.Uf_FKR_EDI_ITEM_PalletCode
+
+
+
+
+ } +
+
+ + + + + + + + + + + + + +
} @code { [Parameter] public Guid CustomerOrderId { get; set; } - private List CustomerOrders { get; set; } = []; + private CustomerOrderDto CustomerOrderDto { get; set; } private List _customerOrderLines = []; private List _customerOrderLineItems = []; @@ -288,7 +213,6 @@ private SfGrid? _customerOrderLineItemsGrid; private bool _isVisibleCustomerOrderLine; - private bool _isVisibleCustomerOrderLineItem; private SfGrid _gridRef = new(); @@ -301,8 +225,8 @@ if (customerOrder != null) { - CustomerOrders = [customerOrder]; - _customerOrderLines = customerOrder.CustomerOrderLines.ToList() ?? []; + CustomerOrderDto = customerOrder; + _customerOrderLines = CustomerOrderDto.CustomerOrderLines.ToList() ?? []; } } @@ -338,12 +262,11 @@ { _gridRef = grid; } - + private async Task> FetchScheduleOrdersAsync() { _scheduleOrders = []; - - IList scheduleOrderDetails = CustomerOrders?.FirstOrDefault()?.EdiCustomerOrderTranslates?.Select(x => x.ScheduleOrderId).Distinct().ToList() ?? []; + IList scheduleOrderDetails = CustomerOrderDto?.EdiCustomerOrderTranslates?.Select(x => x.ScheduleOrderId).Distinct().ToList() ?? []; if (scheduleOrderDetails.Any()) { @@ -364,6 +287,5 @@ private void OnSelectedLineItemRow(RowSelectEventArgs obj) { _selectedCustomerOrderLineItem = obj.Data as CustomerOrderLineItemDto; - _isVisibleCustomerOrderLineItem = _selectedCustomerOrderLineItem != null; } } \ No newline at end of file diff --git a/OrdersManagement/Components/Pages/CustomerOrders.razor b/OrdersManagement/Components/Pages/CustomerOrders.razor index 4259d02..65e9978 100644 --- a/OrdersManagement/Components/Pages/CustomerOrders.razor +++ b/OrdersManagement/Components/Pages/CustomerOrders.razor @@ -2,74 +2,88 @@ @inject CustomerOrderService CustomerOrderService @inject NavigationManager NavigationManager @using SytelineSaAppEfDataModel.Dtos +@using Syncfusion.Blazor.Grids +@using Syncfusion.Blazor.Cards @inherits LayoutComponentBase -
-

Zamówienia Klienta

-
-
-
- +
Zamówienia Klienta
- - - @context.CoNum - - - @context.CustPo - - - @context.CustNum - - - @context.CustSeq - - - @context.CreateDate - - - @context.TranslatedStatus - - -
-
+ + + + + @{ + var order = context as CustomerOrderDto; + + +
+
+ Numer Zamówienia: @order?.CoNum
+ Numer Zamówienia Klienta: @order?.CustPo
+ Klient: @order?.CustNum
+ Numer Odbiorcy: @order?.CustSeq
+ Kontakt: @order?.Contact
+ Telefon: @order?.Phone
+ Data Zamówienia: @order?.OrderDate.ToString("yyyy-MM-dd HH:mm:ss")
+ Warunki: @order?.TermsCode
+ Wartość Brutto: @(order?.Price?.ToString("F2") ?? "N/A")
+ Status: @order?.TranslatedStatus
+
+
+ Magazyn: @order?.Whse
+ VAT: @order?.FrtTaxCode1
+ Typ Odbiorcy: @order?.EndUserType
+ Kurs Wymiany: @(order?.ExchRate?.ToString("F4") ?? "N/A")
+ Gate: @order?.Uf_FKR_EDI_Gate
+ RecipientCode: @order?.Uf_FKR_EDI_RecipientCode
+ SelletCode: @order?.Uf_FKR_EDI_SellerCode
+ SenderCode: @order?.Uf_FKR_EDI_SenderCode
+ BuyerCode: @order?.Uf_FKR_EDI_BuyerCode
+ Typ Dokumentu: @order?.Uf_DocType
+
+
+
+
+ } +
+
+ + + + + + + + + + + + +
@code { - Grid? _grid; + SfGrid? _grid; private IEnumerable? _customerOrders; - private CustomerOrderDto? _selectedCustomerOrder; - - private async Task> CustomerOrdersDataProvider(GridDataProviderRequest request) + protected override async Task OnInitializedAsync() { _customerOrders = await CustomerOrderService.GetCustomerOrdersAsync() ?? new List(); _customerOrders = _customerOrders.OrderByDescending(x => x.CreateDate).ToList(); - + StateHasChanged(); - - return await Task.FromResult(request.ApplyTo(_customerOrders)); } - - private void OnRowDoubleClick(GridRowEventArgs obj) + + private void OnRowDoubleClick(RecordDoubleClickEventArgs obj) { - Guid customerOrderId = obj.Item.RowPointer; + Guid customerOrderId = obj.RowData.RowPointer; NavigationManager.NavigateTo($"/CustomerOrder/{customerOrderId}"); } - - private void SelectedItemsChanged(HashSet obj) - { - _selectedCustomerOrder = obj.FirstOrDefault() ?? null; - } } \ No newline at end of file diff --git a/OrdersManagement/Components/Pages/EdiCustomerOrder.razor b/OrdersManagement/Components/Pages/EdiCustomerOrder.razor index 69eb132..ec55a1a 100644 --- a/OrdersManagement/Components/Pages/EdiCustomerOrder.razor +++ b/OrdersManagement/Components/Pages/EdiCustomerOrder.razor @@ -2,6 +2,7 @@ @inject EdiCustomerOrderService EdiCustomerOrderService @using SytelineSaAppEfDataModel.Dtos +@using BlazorBootstrap @inherits LayoutComponentBase
diff --git a/OrdersManagement/Components/Pages/EdiCustomerOrders.razor b/OrdersManagement/Components/Pages/EdiCustomerOrders.razor index 8be9001..41d857f 100644 --- a/OrdersManagement/Components/Pages/EdiCustomerOrders.razor +++ b/OrdersManagement/Components/Pages/EdiCustomerOrders.razor @@ -4,6 +4,7 @@ @inject NavigationManager NavigationManager @using OrdersManagement.Dtos @using SytelineSaAppEfDataModel.Dtos +@using BlazorBootstrap @inherits LayoutComponentBase
diff --git a/OrdersManagement/Components/Pages/ScheduleOrder.razor b/OrdersManagement/Components/Pages/ScheduleOrder.razor index ae9c267..f6510ab 100644 --- a/OrdersManagement/Components/Pages/ScheduleOrder.razor +++ b/OrdersManagement/Components/Pages/ScheduleOrder.razor @@ -1,137 +1,125 @@ @page "/ScheduleOrder/{ScheduleOrderId:int}" +@using Syncfusion.Blazor.Grids +@using Syncfusion.Blazor.Lists @inject ScheduleOrderDetailsService ScheduleOrderDetailsService -
-

Indeksy

-
-
- - - - @context.Sc_productCode - - - @context.Sh_productCode - - - @context.Price - - - -
+
Indeksy
+ + + + @{ + IList? scheduleOrderDetailMiscs = (@context as ScheduleOrderDetailDto)?.ScheduleOrderDetailMiscs; + + + + + + + + } + + + + + + + + + + + + @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 - - -
+
Harmonogramy
+ + + + @{ + IList? scheduleOrderDetailDetailMiscs = (@context as ScheduleOrderDetailDetailDto)?.ScheduleOrderDetailDetailMiscs; + + + + + + + + } + + + + + + + + + + + + + } @code { [Parameter] public int ScheduleOrderId { get; set; } - private bool _isVisible; - private bool _isVisibleDetailDetail; - Grid? _grid; - Grid? _detailDetailsGrid; + private bool _isVisible; private IEnumerable? _scheduleOrderDetails; private IEnumerable? _scheduleOrderDetailsDetails; - private List? _scheduleOrderDetailMiscs; - private List? _scheduleOrderDetailDetailMiscs; - - private async Task> ScheduleOrderDetailsDataProvider(GridDataProviderRequest request) + protected override async Task OnInitializedAsync() { _scheduleOrderDetails = await ScheduleOrderDetailsService.GetScheduleOrderDetails(ScheduleOrderId) ?? new List(); StateHasChanged(); - - return await Task.FromResult(request.ApplyTo(_scheduleOrderDetails)); } - private void SelectedItemChanged(HashSet obj) + private void OnSelectedLineRow(RowSelectEventArgs obj) { - _isVisible = obj.Any(); - _scheduleOrderDetailMiscs = obj.FirstOrDefault()?.ScheduleOrderDetailMiscs.ToList(); - _scheduleOrderDetailsDetails = obj.FirstOrDefault()?.ScheduleOrderDetailDetails.ToList(); - } + ScheduleOrderDetailDto? scheduleOrderDetail = obj.Data as ScheduleOrderDetailDto; - private void SelectedDetailDetailChanged(HashSet obj) - { - _isVisibleDetailDetail = obj.Any(); - _scheduleOrderDetailDetailMiscs = obj.FirstOrDefault()?.ScheduleOrderDetailDetailMiscs.ToList(); + _isVisible = scheduleOrderDetail != null; + + if (scheduleOrderDetail == null) return; + + _scheduleOrderDetailsDetails = scheduleOrderDetail.ScheduleOrderDetailDetails.ToList(); } } diff --git a/OrdersManagement/Components/Pages/Shared/ScheduleOrdersGrid.razor b/OrdersManagement/Components/Pages/Shared/ScheduleOrdersGrid.razor index 29ca316..6b6fdfe 100644 --- a/OrdersManagement/Components/Pages/Shared/ScheduleOrdersGrid.razor +++ b/OrdersManagement/Components/Pages/Shared/ScheduleOrdersGrid.razor @@ -63,5 +63,4 @@ int scheduleOrderId = obj.RowData.ID; NavigationManager.NavigateTo($"/ScheduleOrder/{scheduleOrderId}"); } - } \ No newline at end of file diff --git a/OrdersManagement/Components/_Imports.razor b/OrdersManagement/Components/_Imports.razor index 5b8f82c..df30274 100644 --- a/OrdersManagement/Components/_Imports.razor +++ b/OrdersManagement/Components/_Imports.razor @@ -6,6 +6,5 @@ @using static Microsoft.AspNetCore.Components.Web.RenderMode @using Microsoft.AspNetCore.Components.Web.Virtualization @using Microsoft.JSInterop -@using BlazorBootstrap; @using FaKrosnoEfDataModel.Dtos @using OrdersManagement.Services diff --git a/OrdersManagement/OrdersManagement.csproj b/OrdersManagement/OrdersManagement.csproj index 59a3245..e68683d 100644 --- a/OrdersManagement/OrdersManagement.csproj +++ b/OrdersManagement/OrdersManagement.csproj @@ -8,6 +8,7 @@ +