improvements

FruitBankHybrid.Shared/Components/GridShippingDocument.razor

@@ -18,13 +18,13 @@
 		<DxGridDataColumn FieldName="PartnerId" Caption="Partner">
 			<EditSettings>
 				<DxComboBoxSettings Data="Partners"
-									ValueFieldName="Id"
+				                    ValueFieldName="Id"
-									TextFieldName="Name"
+				                    TextFieldName="Name"
-									DropDownBodyCssClass="dd-body-class"
+				                    DropDownBodyCssClass="dd-body-class"
-									ListRenderMode="ListRenderMode.Entire"
+				                    ListRenderMode="ListRenderMode.Entire"
-									SearchMode="ListSearchMode.AutoSearch"
+				                    SearchMode="ListSearchMode.AutoSearch"
-									SearchFilterCondition="ListSearchFilterCondition.Contains"
+				                    SearchFilterCondition="ListSearchFilterCondition.Contains"
-									ClearButtonDisplayMode="DataEditorClearButtonDisplayMode.Auto" />
+				                    ClearButtonDisplayMode="DataEditorClearButtonDisplayMode.Auto"/>
 			</EditSettings>
 		</DxGridDataColumn>
 		<DxGridDataColumn FieldName="ShippingId" Caption="Shipping">
@@ -36,7 +36,13 @@
 									ListRenderMode="ListRenderMode.Entire"
 									SearchMode="ListSearchMode.AutoSearch"
 									SearchFilterCondition="ListSearchFilterCondition.Contains"
-									ClearButtonDisplayMode="DataEditorClearButtonDisplayMode.Auto" />
+									ClearButtonDisplayMode="DataEditorClearButtonDisplayMode.Auto">
+				<Columns>
+						<DxListEditorColumn FieldName="@nameof(Shipping.Id)" />
+						<DxListEditorColumn FieldName="@nameof(Shipping.ShippingDate)"/>
+						<DxListEditorColumn FieldName="@nameof(Shipping.LicencePlate)" />
+				</Columns>
+				</DxComboBoxSettings>
 			</EditSettings>
 		</DxGridDataColumn>
 

FruitBankHybrid.Shared/Components/GridShippingItem.razor

@@ -25,7 +25,13 @@
 									ListRenderMode="ListRenderMode.Entire"
 									SearchMode="ListSearchMode.AutoSearch"
 									SearchFilterCondition="ListSearchFilterCondition.Contains"
-									ClearButtonDisplayMode="DataEditorClearButtonDisplayMode.Auto" />
+									ClearButtonDisplayMode="DataEditorClearButtonDisplayMode.Auto">
+					<Columns>
+						<DxListEditorColumn FieldName="@nameof(ShippingDocument.Id)" />
+						<DxListEditorColumn FieldName="@nameof(ShippingDocument.DocumentIdNumber)" />
+						<DxListEditorColumn FieldName="@("Partner.Name")" />
+					</Columns>
+				</DxComboBoxSettings>
 			</EditSettings>
 		</DxGridDataColumn>
 
@@ -39,11 +45,21 @@
 				                    ListRenderMode="ListRenderMode.Entire"
 				                    SearchMode="ListSearchMode.AutoSearch"
 				                    SearchFilterCondition="ListSearchFilterCondition.Contains"
-				                    ClearButtonDisplayMode="DataEditorClearButtonDisplayMode.Auto" />
+				                    ClearButtonDisplayMode="DataEditorClearButtonDisplayMode.Auto" >
+					<Columns>
+						<DxListEditorColumn FieldName="@nameof(ProductDto.Id)" />
+						<DxListEditorColumn FieldName="@nameof(ProductDto.Name)" />
+						<DxListEditorColumn FieldName="@nameof(ProductDto.AvailableQuantity)" />
+						<DxListEditorColumn FieldName="@nameof(ProductDto.StockQuantity)" />
+						<DxListEditorColumn FieldName="@nameof(ProductDto.IncomingQuantity)" />
+						<DxListEditorColumn FieldName="@nameof(ProductDto.NetWeight)" />
+						<DxListEditorColumn FieldName="@nameof(ProductDto.IsMeasurable)" />
+					</Columns>
+				</DxComboBoxSettings>
 			</EditSettings>
 		</DxGridDataColumn>
 
-		<DxGridDataColumn FieldName="Name" MinWidth="120" Caption="Name(OnDoc)" />
+		<DxGridDataColumn FieldName="NameOnDocument" MinWidth="120" Caption="Name(OnDoc)" />
 		<DxGridDataColumn FieldName="PalletsOnDocument" Caption="Raklap(OnDoc)" />
 		<DxGridDataColumn FieldName="QuantityOnDocument" Caption="Mennyiség(OnDoc)" />
 		<DxGridDataColumn FieldName="NetWeightOnDocument" Caption="Net.súly(OnDoc)" />

FruitBankHybrid.Shared/Components/Grids/FruitBankGrid.cs

@@ -0,0 +1,10 @@
+//using AyCode.Blazor.Components.Components.Grids;
+//using AyCode.Core.Interfaces;
+//using AyCode.Interfaces.Entities;
+//using FruitBankHybrid.Shared.Services.Loggers;
+//using FruitBankHybrid.Shared.Services.SignalRs;
+
+//namespace FruitBankHybrid.Shared.Components.Grids;
+
+//public class FruitBankGrid<TDataItem> : MgGridBase<SignalRDataSource<TDataItem>, TDataItem, LoggerClient> where TDataItem : class, IId<int>
+//{}

FruitBankHybrid.Shared/Components/Grids/OrderItems/GridOrderItem.cs

@@ -0,0 +1,32 @@
+using AyCode.Core.Interfaces;
+using FruitBank.Common.Entities;
+using FruitBank.Common.SignalRs;
+using FruitBankHybrid.Shared.Pages;
+using Microsoft.AspNetCore.Components;
+
+namespace FruitBankHybrid.Shared.Components.Grids.OrderItem;
+
+//public class GridOrderItem : FruitBankGrid<OrderItem>
+//{
+//    public GridOrderItem() : base()
+//    {
+//        GetAllMessageTag = SignalRTags.GetAllTransferDestinations;
+//        AddMessageTag = SignalRTags.CreateTransferDestination;
+//        UpdateMessageTag = SignalRTags.UpdateTransferDestination;
+//        RemoveMessageTag = SignalRTags.RemoveTransferDestination;
+//    }
+
+//    protected override Task SetParametersAsyncCore(ParameterView parameters)
+//    {
+//        if (!IsFirstInitializeParameters)
+//        {
+//            //ShowFilterRow = true;
+//            //ShowGroupPanel = true;
+//            //AllowSort = false;
+
+//            //etc...
+//        }
+
+//        return base.SetParametersAsyncCore(parameters);
+//    }
+//}

FruitBankHybrid.Shared/Components/Grids/ShippingItems/GridShippingItem.cs

@@ -0,0 +1,32 @@
+//using AyCode.Core.Interfaces;
+//using FruitBank.Common.Entities;
+//using FruitBank.Common.SignalRs;
+//using FruitBankHybrid.Shared.Pages;
+//using Microsoft.AspNetCore.Components;
+
+//namespace FruitBankHybrid.Shared.Components.Grids.ShippingItems;
+
+//public class GridShippingItem : FruitBankGrid<ShippingItem>
+//{
+//    public GridShippingItem() : base()
+//    {
+//        GetAllMessageTag = SignalRTags.GetShippingItems;
+//        AddMessageTag = SignalRTags.AddShippingItem;
+//        UpdateMessageTag = SignalRTags.UpdateShippingItem;
+//        //RemoveMessageTag = SignalRTags.;
+//    }
+
+//    protected override Task SetParametersAsyncCore(ParameterView parameters)
+//    {
+//        if (!IsFirstInitializeParameters)
+//        {
+//            //ShowFilterRow = true;
+//            //ShowGroupPanel = true;
+//            //AllowSort = false;
+
+//            //etc...
+//        }
+
+//        return base.SetParametersAsyncCore(parameters);
+//    }
+//}

FruitBankHybrid.Shared/FruitBankHybrid.Shared.csproj

@@ -20,6 +20,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\..\..\..\Aycode\Source\AyCode.Blazor\AyCode.Blazor.Components\AyCode.Blazor.Components.csproj" />
     <ProjectReference Include="..\FruitBank.Common\FruitBank.Common.csproj" />
   </ItemGroup>
 

FruitBankHybrid.Shared/Pages/OrdersAdmin.razor.cs

@@ -1,11 +1,16 @@
-using AyCode.Core.Loggers;
+using AyCode.Core.Interfaces;
+using AyCode.Core.Loggers;
+using AyCode.Services.Server.SignalRs;
+using AyCode.Services.SignalRs;
 using DevExpress.Blazor;
 using FruitBank.Common.Dtos;
 using FruitBank.Common.Models;
+using FruitBank.Common.SignalRs;
 using FruitBankHybrid.Shared.Services.Loggers;
 using FruitBankHybrid.Shared.Services.SignalRs;
 using Mango.Nop.Core.Loggers;
 using Microsoft.AspNetCore.Components;
+using System.Diagnostics;
 
 namespace FruitBankHybrid.Shared.Pages;
 

FruitBankHybrid.Shared/Services/SignalRs/SignalRDataSource.cs

@@ -0,0 +1,11 @@
+//using AyCode.Core.Interfaces;
+//using AyCode.Services.Server.SignalRs;
+//using AyCode.Services.SignalRs;
+//using System.Diagnostics;
+
+//namespace FruitBankHybrid.Shared.Services.SignalRs;
+
+//[Serializable]
+//[DebuggerDisplay("Count = {Count}")]
+//public class SignalRDataSource<T>(AcSignalRClientBase signalRClient, SignalRCrudTags signalRCrudTags, params object[]? contextIds)
+//    : AcSignalRDataSource<T>(signalRClient, signalRCrudTags, contextIds) where T : class, IId<int>;