diff --git a/TIAMMobileApp/Services/UserDataServiceMobile.cs b/TIAMMobileApp/Services/UserDataServiceMobile.cs index 3324798f..4ee8cce4 100644 --- a/TIAMMobileApp/Services/UserDataServiceMobile.cs +++ b/TIAMMobileApp/Services/UserDataServiceMobile.cs @@ -43,14 +43,24 @@ namespace TIAMMobileApp.Services if (userModelDto != null) { + Dictionary userProperties = new Dictionary(); //get user's properties - var hasProperties = await serviceProviderDataService.GetPropertiesByOwnerIdAsync(userModelDto.Id); + bool hasProperties = userModelDto.ServiceProviders.Count > 0 ? true : userModelDto.ServiceProviders.Count == 0 ? false : false; + if (hasProperties) + { - if (hasProperties != null) - _logger.Info($"{hasProperties.Count} properties found"); + //var Properties = await serviceProviderDataService.GetPropertiesByOwnerIdAsync(userModelDto.Id); + var Properties = userModelDto.ServiceProviders; + + _logger.Info($"{Properties.Count} properties found"); + foreach ( var property in Properties ) + { + userProperties.Add(property.Id, property.Name); + } + } //create user session model - var user = new UserSessionModel(userModelDto.Id, UserType.User, userModelDto, hasProperties, 1); + var user = new UserSessionModel(userModelDto.Id, UserType.User, userModelDto, userProperties, 1); return user; } else diff --git a/TIAMSharedUI/Pages/User/SysAdmins/CompaniesNestedUserProductMapping.razor b/TIAMSharedUI/Pages/User/SysAdmins/CompaniesNestedUserProductMapping.razor new file mode 100644 index 00000000..1b57b299 --- /dev/null +++ b/TIAMSharedUI/Pages/User/SysAdmins/CompaniesNestedUserProductMapping.razor @@ -0,0 +1,120 @@ +@using TIAM.Entities.Products +@using TIAM.Entities.ServiceProviders +@using TIAM.Entities.Transfers +@using TIAM.Entities.Drivers +@using TIAM.Entities.Users +@using TIAM.Models.Dtos.Users +@using TIAMWebApp.Shared.Application.Interfaces +@using TIAMWebApp.Shared.Application.Utility +@using AyCode.Services.Loggers +@using TIAM.Core.Loggers +@inject IServiceProviderDataService ServiceProviderDataService +@inject IEnumerable LogWriters + +
+ UserProductMapping +
+ + + + + + + + + + @{ + var transfer2 = (UserProductMapping)EditFormContext.EditModel; + } + + + @EditFormContext.GetEditor("UserId") + + + + + + @EditFormContext.GetEditor("Permissions") + + + + + + + + + +@code { + [Parameter] + public bool KeyboardNavigationEnabled { get; set; } + [Parameter] + public UserModelDtoDetail UserModelDtoDetail { get; set; } + + List _detailGridData; + + List _availableServices; + + public UserModelDtoDetail UserInfo; + + ILogger _logger; + + protected override async Task OnInitializedAsync() + { + _logger = new LoggerClient(LogWriters.ToArray()); + + _detailGridData = UserModelDtoDetail.ServiceProviders ?? new List(); + _availableServices = await ServiceProviderDataService.GetServiceProvidersAsync(); + + _logger.Info($"DetailGridData: {_detailGridData.Count}"); + } + + void CustomizeEditModel(GridCustomizeEditModelEventArgs e) + { + if (!e.IsNew) return; + + var newProductMapping = new UserProductMapping + { + ProductId = Guid.NewGuid(), + UserId = UserModelDtoDetail.Id, + Permissions = 1 + }; + + e.EditModel = newProductMapping; + } + + async Task EditModelSaving(GridEditModelSavingEventArgs e) + { + if (e.IsNew) + //add new orderData to orderData array + _logger.Info("New orderData added"); + else + _logger.Info("orderData updated"); + + await UpdateDataAsync(); + } + + async Task DataItemDeleting(GridDataItemDeletingEventArgs e) + { + //remove orderData from orderData array + _logger.Info("orderData deleted"); + //await UpdateDataAsync(); + } + + async Task UpdateDataAsync() + { + //refresh grid + _logger.Info("orderData grid refreshed"); + } + +} \ No newline at end of file diff --git a/TIAMSharedUI/Pages/User/SysAdmins/ManageServiceProviders.razor b/TIAMSharedUI/Pages/User/SysAdmins/ManageServiceProviders.razor index 4d5f3fb0..cbd6b801 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/ManageServiceProviders.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/ManageServiceProviders.razor @@ -99,11 +99,11 @@ - + @{ - var transfer2 = (Transfer)EditFormContext.EditModel; + var transfer2 = (Company)EditFormContext.EditModel; } @@ -147,25 +147,10 @@ "SenderFullName", "SenderId", "ContextId", - ]; - - public List Statuses { get; set; } = - [ - new(Convert.ToInt16(TransferStatusType.OrderSubmitted), "Order submitted"), - new(Convert.ToInt16(TransferStatusType.OrderConfirmed), "Order confirmed"), - new(Convert.ToInt16(TransferStatusType.AssignedToDriver), "Assigned to driver"), - new(Convert.ToInt16(TransferStatusType.DriverConfirmed), "Driver confirmed"), - new(Convert.ToInt16(TransferStatusType.DriverEnRoute), "Driver enroute"), - new(Convert.ToInt16(TransferStatusType.PassengerPickup), "Passenger in car"), - new(Convert.ToInt16(TransferStatusType.Finished), "Finished"), - new(Convert.ToInt16(TransferStatusType.UserCanceled), "User cancelled"), - new(Convert.ToInt16(TransferStatusType.AdminDenied), "Admin cancelled") - ]; + ]; private MessageWizardModel _messageWizardModel = new(); - public List AppointmentModels { get; set; } - DateTime StartDate { get; set; } = DateTime.Today; DxSchedulerDataStorage _dataStorage = new(); @@ -227,43 +212,26 @@ void Grid_CustomizeElement(GridCustomizeElementEventArgs e) { - if (e.ElementType == GridElementType.DataRow && (System.Byte)e.Grid.GetRowValue(e.VisibleIndex, "TransferStatusType") == 5) - { - e.CssClass = "bg-important"; - } - else if (e.ElementType == GridElementType.DataRow && (System.Byte)e.Grid.GetRowValue(e.VisibleIndex, "TransferStatusType") > 5 && (System.Byte)e.Grid.GetRowValue(e.VisibleIndex, "TransferStatusType") < 35) - { - e.CssClass = "bg-attention"; - } - else if (e.ElementType == GridElementType.DataRow && (System.Byte)e.Grid.GetRowValue(e.VisibleIndex, "TransferStatusType") == 35) - { - e.CssClass = "bg-finished"; - } - else if (e.ElementType == GridElementType.DataRow && (System.Byte)e.Grid.GetRowValue(e.VisibleIndex, "TransferStatusType") > 35) - { - e.CssClass = "bg-cancel"; - } - if (e.ElementType == GridElementType.HeaderCell) - { - e.Style = "background-color: rgba(0, 0, 0, 0.08)"; - e.CssClass = "header-bold"; - } + //TODO mark non active partners + } void Grid_CustomizeEditModel(GridCustomizeEditModelEventArgs e) { - if (!e.IsNew) return; + if (!e.IsNew) + { + + } + else + { + var transferEditModel = (Company)e.EditModel; //TODO not valid cast + transferEditModel.Id = Guid.NewGuid(); + transferEditModel.AffiliateId = Guid.NewGuid(); + transferEditModel.Name = "Company name"; + transferEditModel.OwnerId = Guid.Empty; + transferEditModel.ProfileId = Guid.NewGuid(); + } - var transferEditModel = (Transfer)e.EditModel; //TODO not valid cast - transferEditModel.Id = Guid.NewGuid(); - transferEditModel.ToAddress = "Where to?"; - transferEditModel.FromAddress = "From where?"; - transferEditModel.Appointment = DateTime.UtcNow.AddDays(3); - transferEditModel.PassengerCount = 1; - transferEditModel.FirstName = "John"; - transferEditModel.LastName = "Doe"; - transferEditModel.ContactPhone = "+00000000000"; - transferEditModel.ContactEmail = "your@email.address"; } async Task Grid_EditModelSaving(GridEditModelSavingEventArgs e) diff --git a/TIAMSharedUI/Shared/Users/AdminNavMenu.razor b/TIAMSharedUI/Shared/Users/AdminNavMenu.razor index c90cef75..2272dbd8 100644 --- a/TIAMSharedUI/Shared/Users/AdminNavMenu.razor +++ b/TIAMSharedUI/Shared/Users/AdminNavMenu.razor @@ -66,6 +66,11 @@ Transfers +
+ + Destinations + +
Users diff --git a/TIAMWebApp/Client/Services/UserDataServiceWeb.cs b/TIAMWebApp/Client/Services/UserDataServiceWeb.cs index 2b682851..0d33593f 100644 --- a/TIAMWebApp/Client/Services/UserDataServiceWeb.cs +++ b/TIAMWebApp/Client/Services/UserDataServiceWeb.cs @@ -52,14 +52,24 @@ namespace TIAMWebApp.Client.Services if (userModelDto != null) { + Dictionary userProperties = new Dictionary(); //get user's properties - var hasProperties = await serviceProviderDataService.GetPropertiesByOwnerIdAsync(userModelDto.Id); + bool hasProperties = userModelDto.ServiceProviders.Count > 0 ? true : userModelDto.ServiceProviders.Count == 0 ? false : false; + if (hasProperties) + { - if (hasProperties != null) - _logger.Info($"{hasProperties.Count} properties found"); + //var Properties = await serviceProviderDataService.GetPropertiesByOwnerIdAsync(userModelDto.Id); + var Properties = userModelDto.ServiceProviders; + + _logger.Info($"{Properties.Count} properties found"); + foreach ( var property in Properties ) + { + userProperties.Add(property.Id, property.Name); + } + } //create user session model - var user = new UserSessionModel(userModelDto.Id, UserType.User, userModelDto, hasProperties, 1); + var user = new UserSessionModel(userModelDto.Id, UserType.User, userModelDto, userProperties, 1); return user; } else