Adam
/
TourIAm
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of http://git2.aycode.com/Adam/TourIAm

This commit is contained in:
jozsef.b@aycode.com 2024-06-01 16:27:05 +02:00
parent a2b291072f a1dc60b94a
commit 3388c6d67a
8 changed files with 97 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
TIAM.Services/SignalRTags.cs
View File

@ -5,8 +5,9 @@ namespace TIAM.Services;
public class SignalRTags : AcSignalRTags
{
public const int GetTransfers = 5;
public const int GetPropertiesByOwnerId = 6;
//[SignalMessageTag(null, typeof(SignalResponseMessage<string>), null, null)]
public const int GetTransfers = 5;
public const int GetPropertiesByOwnerId = 6;
public const int UpdateTransfer = 7;
public const int AddTransfer = 8;
public const int RemoveTransfer = 9;
@ -15,4 +16,15 @@ public class SignalRTags : AcSignalRTags
public const int UpdateCompany = 11;
public const int AddCompany = 12;
public const int RemoveCompany = 13;
public const int GetTransferToDrivers = 14;
public const int AddTransferToDrivers = 15;
public const int UpdateTransferToDrivers = 16;
public const int RemoveTransferToDrivers = 17;
public const int GetAddressesByContextId = 18;
public const int AddAddressToContextId = 19;
public const int UpdateAddressByContextId = 20;
public const int RemoveAddressByContextId = 21;
}

5
TIAMSharedUI/Pages/User/SysAdmins/AddressGridComponent.razor
View File

@ -9,6 +9,7 @@
@using AyCode.Services.Loggers
@using TIAM.Core.Loggers
@using TIAM.Entities.Addresses
@using TIAMSharedUI.Shared.Components.Grids
@using TIAMSharedUI.Pages.Components.EditComponents
@inject IServiceProviderDataService serviceProviderDataService
@inject IUserDataService userDataService
@ -16,7 +17,7 @@
@inject IEnumerable<IAcLogWriterClientBase> LogWriters
<DxGrid @ref="Grid" Data="_detailGridData"
<AddressGrid @ref="Grid" Data="_detailGridData"
PageSize="5"
AutoExpandAllGroupRows="true"
KeyboardNavigationEnabled="KeyboardNavigationEnabled"
@ -47,7 +48,7 @@
<EditAddressComponent Model="@((Address)context.EditModel)" OnAddressChanged="@((Address model) => SaveAddress(model))" />
</EditFormTemplate>
</DxGrid>
</AddressGrid>
@code {
[Parameter]

27
TIAMSharedUI/Pages/User/SysAdmins/Grid_MasterDetail_NestedGrid_DetailContent.razor → TIAMSharedUI/Pages/User/SysAdmins/DriverGridComponent.razor
View File

@ -1,6 +1,7 @@
@using TIAM.Entities.Transfers
@using TIAM.Entities.Drivers
@using TIAM.Models.Dtos.Users
@using TIAMSharedUI.Shared.Components.Grids
@using TIAMWebApp.Shared.Application.Interfaces
@using TIAMWebApp.Shared.Application.Utility
@using TIAM.Core.Loggers
@ -11,7 +12,7 @@
<DxGrid Data="DetailGridData"
<TransferToDriversGrid Data="DetailGridData"
PageSize="5"
AutoExpandAllGroupRows="true"
KeyboardNavigationEnabled="KeyboardNavigationEnabled"
@ -29,28 +30,22 @@
<DxGridDataColumn FieldName="CarId" Width="40%" />
<DxGridDataColumn FieldName="LicencePlate" />
</Columns>
</DxGrid>
</TransferToDriversGrid>
@code {
[Parameter]
public bool KeyboardNavigationEnabled { get; set; }
[Parameter]
public Transfer Customer { get; set; }
public Transfer Transfer { get; set; }
private LoggerClient<Grid_MasterDetail_NestedGrid_DetailContent> _logger;
private LoggerClient<DriverGridComponent> _logger;
List<TransferToDriver> DetailGridData { get; set; }
public UserModelDtoDetail? UserModelDtoDetail;
protected override async Task OnInitializedAsync()
{
_logger = new LoggerClient<Grid_MasterDetail_NestedGrid_DetailContent>(LogWriters.ToArray());
_logger = new LoggerClient<DriverGridComponent>(LogWriters.ToArray());
UserModelDtoDetail = await UserDataService.GetUserDetailByIdAsync(Customer.UserId);
if (UserModelDtoDetail == null) return;
DetailGridData = Customer.TransferToDrivers;
DetailGridData = Transfer.TransferToDrivers;
_logger.Info($"DetailGridData: {DetailGridData.Count}");
}
@ -65,16 +60,16 @@
newDriver.LicencePlate = "";
newDriver.Car = new Car();
newDriver.Price = 0;
newDriver.TransferId = Customer.Id;
newDriver.TransferId = Transfer.Id;
}
async Task EditModelSaving(GridEditModelSavingEventArgs e)
{
if (e.IsNew)
//add new orderData to orderData array
_logger.Info("New orderData added");
_logger.Info("New driver added");
else
_logger.Info("orderData updated");
_logger.Info("Driver updated");
await UpdateDataAsync();
}
@ -82,7 +77,7 @@
async Task DataItemDeleting(GridDataItemDeletingEventArgs e)
{
//remove orderData from orderData array
_logger.Info("orderData deleted");
_logger.Info("driver deleted");
//await UpdateDataAsync();
}

2
TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor
View File

@ -147,7 +147,7 @@
<DxTabs>
<DxTabPage Text="Driver">
<Grid_MasterDetail_NestedGrid_DetailContent Customer="(TIAM.Entities.Transfers.Transfer)context.DataItem" KeyboardNavigationEnabled="true" />
<DriverGridComponent Transfer="(TIAM.Entities.Transfers.Transfer)context.DataItem" KeyboardNavigationEnabled="true" />
</DxTabPage>
</DxTabs>

1
TIAMSharedUI/Pages/User/SysAdmins/ManageUsers.razor
View File

@ -21,6 +21,7 @@
@using AyCode.Services.Loggers
@using TIAM.Core.Loggers
@using TIAM.Entities.Addresses
@using TIAMSharedUI.Shared.Components.Grids
@layout AdminLayout
@inject IEnumerable<IAcLogWriterClientBase> LogWriters
@inject IStringLocalizer<TIAMResources> Localizer

33
TIAMSharedUI/Shared/Components/Grids/AdressGrid.cs Normal file
View File

@ -0,0 +1,33 @@
using Microsoft.AspNetCore.Components;
using TIAM.Entities.Addresses;
using TIAM.Entities.Transfers;
using TIAM.Services;
namespace TIAMSharedUI.Shared.Components.Grids;
public class AddressGrid : TiamGrid<Address>
{
public AddressGrid() : base()
{
GridName = nameof(Address);
GetAllMessageTag = SignalRTags.GetAddressesByContextId;
AddMessageTag = SignalRTags.AddAddressToContextId;
UpdateMessageTag = SignalRTags.UpdateAddressByContextId;
RemoveMessageTag = SignalRTags.RemoveAddressByContextId;
}
protected override Task SetParametersAsyncCore(ParameterView parameters)
{
if (!IsFirstInitializeParameters)
{
//ShowFilterRow = true;
//ShowGroupPanel = true;
//AllowSort = false;
//etc...
}
return base.SetParametersAsyncCore(parameters);
}
}

32
TIAMSharedUI/Shared/Components/Grids/TransferToDriversGrid.cs Normal file
View File

@ -0,0 +1,32 @@
using Microsoft.AspNetCore.Components;
using TIAM.Entities.Transfers;
using TIAM.Services;
namespace TIAMSharedUI.Shared.Components.Grids;
public class TransferToDriversGrid : TiamGrid<TransferToDriver>
{
public TransferToDriversGrid() : base()
{
GridName = nameof(TransferToDriver);
GetAllMessageTag = SignalRTags.GetTransferToDrivers;
AddMessageTag = SignalRTags.AddTransferToDrivers;
UpdateMessageTag = SignalRTags.UpdateTransferToDrivers;
RemoveMessageTag = SignalRTags.RemoveTransferToDrivers;
}
protected override Task SetParametersAsyncCore(ParameterView parameters)
{
if (!IsFirstInitializeParameters)
{
//ShowFilterRow = true;
//ShowGroupPanel = true;
//AllowSort = false;
//etc...
}
return base.SetParametersAsyncCore(parameters);
}
}

2
TIAMSharedUI/Shared/Users/AdminNavMenu.razor
View File

@ -9,6 +9,8 @@
DisplayMode="DisplayMode">
<Items>
<DxMenuItem NavigateUrl="/" Text="Home" IconCssClass="menu-icon-home menu-icon" />
<DxMenuItem NavigateUrl="user/properties" Text="My companies" IconCssClass="menu-icon-home menu-icon" />
<DxMenuItem NavigateUrl="user/media" Text="Media" IconCssClass="menu-icon-home menu-icon" />
<DxMenuItem Text="SysAdmin" IconCssClass="menu-icon-products menu-icon">
<Items>