Userdataservice remove call serviceprovider api

TIAMMobileApp/Services/UserDataServiceMobile.cs

@@ -43,14 +43,24 @@ namespace TIAMMobileApp.Services
 
             if (userModelDto != null)
             {
+                Dictionary<Guid, string> userProperties = new Dictionary<Guid, string>();
                 //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)
+                    //var Properties = await serviceProviderDataService.GetPropertiesByOwnerIdAsync(userModelDto.Id);
-                    _logger.Info($"{hasProperties.Count} properties found");
+                    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

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<IAcLogWriterClientBase> LogWriters
+
+<div class="mb-2">
+    UserProductMapping
+</div>
+<DxGrid Data="_detailGridData"
+        PageSize="5"
+        AutoExpandAllGroupRows="true"
+        KeyboardNavigationEnabled="KeyboardNavigationEnabled"
+        KeyFieldName="Id"
+        ValidationEnabled="false"
+        CustomizeEditModel="CustomizeEditModel"
+        EditModelSaving="EditModelSaving"
+        DataItemDeleting="DataItemDeleting"
+        EditMode="GridEditMode.EditForm"
+        ColumnResizeMode="GridColumnResizeMode.NextColumn"
+        ShowFilterRow="true">
+    <Columns>
+        <DxGridCommandColumn NewButtonVisible="true" Width="8%" FixedPosition="GridColumnFixedPosition.Left" />
+        <DxGridDataColumn FieldName="Id" GroupIndex="0" />
+        <DxGridDataColumn FieldName="UserId" />
+        <DxGridDataColumn FieldName="ProductId" Width="40%" />
+        <DxGridDataColumn FieldName="Permissions" />
+    </Columns>
+    <EditFormTemplate Context="EditFormContext">
+        @{
+            var transfer2 = (UserProductMapping)EditFormContext.EditModel;
+        }
+        <DxFormLayout CssClass="w-100">
+            <DxFormLayoutItem Caption="UserId" ColSpanMd="4">
+                @EditFormContext.GetEditor("UserId")
+            </DxFormLayoutItem>
+            <DxFormLayoutItem Caption="Product:" ColSpanMd="4">
+                <DxComboBox Data="@_availableServices" TextFieldName="Name" @bind-Value="((UserProductMapping)EditFormContext.EditModel).ProductId" />
+            </DxFormLayoutItem>
+            <DxFormLayoutItem Caption="Permissions" ColSpanMd="4">
+                @EditFormContext.GetEditor("Permissions")
+            </DxFormLayoutItem>
+
+
+
+        </DxFormLayout>
+    </EditFormTemplate>
+
+</DxGrid>
+
+@code {
+    [Parameter]
+    public bool KeyboardNavigationEnabled { get; set; }
+    [Parameter]
+    public UserModelDtoDetail UserModelDtoDetail { get; set; }
+
+    List<Company> _detailGridData;
+
+    List<Company> _availableServices;
+
+    public UserModelDtoDetail UserInfo;
+
+    ILogger _logger;
+
+    protected override async Task OnInitializedAsync()
+    {
+        _logger = new LoggerClient<UserGrid_MasterDetail_NestedGrid_ServiceProviders>(LogWriters.ToArray());
+
+        _detailGridData = UserModelDtoDetail.ServiceProviders ?? new List<Company>();
+        _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");
+    }
+
+}

TIAMSharedUI/Pages/User/SysAdmins/ManageServiceProviders.razor

@@ -99,11 +99,11 @@
 
                         </Columns>
                         <DetailRowTemplate>
-                            <Grid_MasterDetail_NestedGrid_DetailContent Customer="(TIAM.Entities.Transfers.Transfer)context.DataItem" KeyboardNavigationEnabled="true" />
+                            <CompaniesNestedUserProductMapping Customer="(TIAM.Entities.ServiceProviders.Company)context.DataItem" KeyboardNavigationEnabled="true" />
                         </DetailRowTemplate>
                         <EditFormTemplate Context="EditFormContext">
                             @{
-                                var transfer2 = (Transfer)EditFormContext.EditModel;
+                                var transfer2 = (Company)EditFormContext.EditModel;
                             }
                             <DxFormLayout CssClass="w-100">
                                 <DxFormLayoutItem Caption=@localizer.GetString(ResourceKeys.LastName) ColSpanMd="6" ColSpanLg="6" ColSpanSm="12">
@@ -147,25 +147,10 @@
         "SenderFullName",
         "SenderId",
         "ContextId",
-    ];
+    ];    
-
-    public List<TransferStatusModel> 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<AppointmentModel> 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)
+        //TODO mark non active partners
-        {
+
-            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";
-        }
     }
 
     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)

TIAMSharedUI/Shared/Users/AdminNavMenu.razor

@@ -66,6 +66,11 @@
                     Transfers
                 </NavLink>
             </div>
+            <div class="nav-item px-3">
+                <NavLink class="nav-link" href="user/companies">
+                    Destinations
+                </NavLink>
+            </div>
             <div class="nav-item px-3">
                 <NavLink class="nav-link" href="user/users">
                     Users

TIAMWebApp/Client/Services/UserDataServiceWeb.cs

@@ -52,14 +52,24 @@ namespace TIAMWebApp.Client.Services
 
             if (userModelDto != null)
             {
+                Dictionary<Guid, string> userProperties = new Dictionary<Guid, string>();
                 //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)
+                    //var Properties = await serviceProviderDataService.GetPropertiesByOwnerIdAsync(userModelDto.Id);
-                    _logger.Info($"{hasProperties.Count} properties found");
+                    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