diff --git a/FaKrosnoEfDataModel/Dtos/ScheduleOrderDto.cs b/FaKrosnoEfDataModel/Dtos/ScheduleOrderDto.cs index b8769bb..d67f1e2 100644 --- a/FaKrosnoEfDataModel/Dtos/ScheduleOrderDto.cs +++ b/FaKrosnoEfDataModel/Dtos/ScheduleOrderDto.cs @@ -15,8 +15,10 @@ namespace FaKrosnoEfDataModel.Dtos public int DocNumber { get; set; } public string? DocType { get; set; } - public string? RecipientCode => Recipient.RecipientCode; + public string RecipientCode => Recipient.RecipientCode; public string? PurchaserCode => Recipient.Purchaser?.PurchaserCode; + public string RecipientName => Recipient.RecipientDesc; + public string? PurchaserName => Recipient.Purchaser?.PurchaserDesc; public RecipientDto Recipient { get; set; } public IList ScheduleOrderDetails { get; set; } diff --git a/OrdersManagement/Components/Pages/ScheduleOrder.razor b/OrdersManagement/Components/Pages/ScheduleOrder.razor index f6510ab..759a468 100644 --- a/OrdersManagement/Components/Pages/ScheduleOrder.razor +++ b/OrdersManagement/Components/Pages/ScheduleOrder.razor @@ -38,13 +38,11 @@ - - + @if (_isVisible) { @@ -111,10 +109,15 @@ StateHasChanged(); } - private void OnSelectedLineRow(RowSelectEventArgs obj) + private void OnSelectedLineRow(RowSelectEventArgs obj) { - ScheduleOrderDetailDto? scheduleOrderDetail = obj.Data as ScheduleOrderDetailDto; + ScheduleOrderDetailDto? scheduleOrderDetail = obj.Data; + + SelectOrderDetail(scheduleOrderDetail); + } + private void SelectOrderDetail(ScheduleOrderDetailDto? scheduleOrderDetail) + { _isVisible = scheduleOrderDetail != null; if (scheduleOrderDetail == null) return; @@ -122,4 +125,11 @@ _scheduleOrderDetailsDetails = scheduleOrderDetail.ScheduleOrderDetailDetails.ToList(); } + private void OnDetailsExpanding(DetailsExpandingEventArgs obj) + { + ScheduleOrderDetailDto? scheduleOrderDetail = obj.Data; + + SelectOrderDetail(scheduleOrderDetail); + } + } diff --git a/OrdersManagement/Components/Pages/Shared/ScheduleOrdersGrid.razor b/OrdersManagement/Components/Pages/Shared/ScheduleOrdersGrid.razor index 6b6fdfe..a1107f0 100644 --- a/OrdersManagement/Components/Pages/Shared/ScheduleOrdersGrid.razor +++ b/OrdersManagement/Components/Pages/Shared/ScheduleOrdersGrid.razor @@ -14,21 +14,42 @@ SelectionMode="GridSelectionMode.Single" QueryCellInfo="OnQueryCellInfo" RowSelected="OnRowSelected"> - - - - - - - - + + + + + + + + + + @{ + IList? scheduleOrderDetails = (@context as ScheduleOrderDto)?.ScheduleOrderDetails; + + + + + + + + + + } + +