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

Compare commits

base: Adam:89376ac2d4f1f93ff5c22a09fadc9ca98a8f8095
Branches Tags
Adam:master
Adam:TIAM_v0.0.6.0
Adam:v0.0.5.1
Adam:Fullepi_Sandbox
..
compare: Adam:21502e324d3af6518047ca70985da3a8dbd7d35b
Branches Tags
Adam:TIAM_v0.0.6.0
Adam:v0.0.5.1
Adam:master
Adam:Fullepi_Sandbox

No commits in common. "89376ac2d4f1f93ff5c22a09fadc9ca98a8f8095" and "21502e324d3af6518047ca70985da3a8dbd7d35b" have entirely different histories.
89376ac2d4 ... 21502e324d

11 changed files with 27 additions and 137 deletions
Show Stats Expand all files Collapse all files

4
TIAM.Entities/Users/User.cs
View File

@ -10,10 +10,10 @@ namespace TIAM.Entities.Users
[Table("Users")]
public class User : AcUser<Profile, Company, UserToCompany, Address>, IUser, IUserDtoDetail
{
public virtual List<Product> Products { get; set; } = new();
public virtual List<Product> Products { get; } = new();
//public virtual ServiceProvider ServiceProvider { get; set; } = new();
public virtual List<UserProductMapping> UserProductMappings { get; set; } = new();
public virtual List<UserProductMapping> UserProductMappings { get; } = new();
public User() { }
public User(string email, string password) : this(Guid.NewGuid(), email, password) { }

29
TIAM.Models/Dtos/Users/UserDto.cs
View File

@ -1,11 +1,10 @@
using AyCode.Interfaces;
using TIAM.Entities.Profiles;
using TIAM.Entities.Profiles;
using TIAM.Entities.ServiceProviders;
using TIAM.Entities.Users;
namespace TIAM.Models.Dtos.Users;
public class UserDto : IUserDto<Profile, Company, UserToCompany>, IAcModelDtoBase<User>
public class UserDto : IUserDto<Profile, Company, UserToCompany>
{
public Guid Id { get; set; }
@ -16,28 +15,4 @@ public class UserDto : IUserDto<Profile, Company, UserToCompany>, IAcModelDtoBas
public List<Company> ServiceProviders { get; set; }
public List<UserToCompany> UserToServiceProviders { get; set; }
public UserDto() {}
public UserDto(User user) : this()
{
//TODO: Models... - J.
throw new NotImplementedException("UserDto(User user)");
Id = user.Id;
ProfileId = user.ProfileId;
AffiliateId = AffiliateId;
}
public virtual User CreateMainEntity()
{
return new User
{
Id = Id,
ProfileId = ProfileId,
AffiliateId = AffiliateId,
ServiceProviders = ServiceProviders.ToList(),
UserToServiceProviders = UserToServiceProviders.ToList()
};
}
}

31
TIAM.Models/Dtos/Users/UserDtoDetail.cs
View File

@ -1,11 +1,10 @@
using AyCode.Interfaces;
using TIAM.Entities.Users;
using TIAM.Entities.Users;
namespace TIAM.Models.Dtos.Users
{
public class UserDtoDetail : UserDto, IUserDtoDetail
{
public string? PhoneNumber { get; set; }
public string PhoneNumber { get; set; }
public string? RefreshToken { get; set; }
public Guid? RefferalId { get; set; }
public string EmailAddress { get; set; }
@ -13,31 +12,5 @@ namespace TIAM.Models.Dtos.Users
public string Password { get; set; }
public DateTime Created { get; set; }
public DateTime Modified { get; set; }
public UserDtoDetail() : base()
{ }
public UserDtoDetail(User user) : base(user)
{
PhoneNumber = user.PhoneNumber;
RefreshToken = user.RefreshToken;
EmailConfirmed = user.EmailConfirmed;
Password = user.Password;
EmailAddress = user.EmailAddress;
EmailConfirmed = user.EmailConfirmed;
}
public override User CreateMainEntity()
{
var user = base.CreateMainEntity();
user.PhoneNumber = PhoneNumber;
user.RefreshToken = RefreshToken;
user.EmailConfirmed = EmailConfirmed;
user.Password = Password;
user.EmailAddress = EmailAddress;
user.EmailConfirmed = EmailConfirmed;
return user;
}
}
}

20
TIAM.Models/Dtos/Users/UserModelDto.cs
View File

@ -1,5 +1,4 @@
using AyCode.Interfaces;
using AyCode.Models.Users;
using AyCode.Models.Users;
using TIAM.Entities.Products;
using TIAM.Entities.Profiles;
using TIAM.Entities.ServiceProviders;
@ -7,7 +6,7 @@ using TIAM.Entities.Users;
namespace TIAM.Models.Dtos.Users;
public class UserModelDto : AcUserModelDtoBase<UserDto, Profile, Company, UserToCompany>, IProductsRelation, IUserModelDtoMinBase, IAcModelDtoBase<User>
public class UserModelDto : AcUserModelDtoBase<UserDto, Profile, Company, UserToCompany>, IProductsRelation, IUserModelDtoMinBase
{
public List<UserProductMapping> UserProductMappings { get; set; }
public List<Product> Products { get; set; }
@ -34,19 +33,4 @@ public class UserModelDto : AcUserModelDtoBase<UserDto, Profile, Company, UserTo
UserProductMappings.Add(new UserProductMapping(userProduct.Id, userProduct.UserId, userProduct.ProductId));
}
}
public virtual User CreateMainEntity()
{
//TODO: Models... - J.
throw new NotImplementedException("CreateMainEntity");
return new User
{
Id = Id,
ProfileId = UserDto.ProfileId,
AffiliateId = UserDto.AffiliateId,
ServiceProviders = ServiceProviders.ToList(),
UserToServiceProviders = UserToServiceProviders.ToList()
};
}
}

8
TIAM.Models/Dtos/Users/UserModelDtoDetail.cs
View File

@ -34,12 +34,6 @@ namespace TIAM.Models.Dtos.Users
UserProductMappings.Add(new UserProductMapping(userProduct.Id, userProduct.UserId, userProduct.ProductId));
}
}
public virtual User CreateMainEntity()
{
//TODO: Models... - J.
throw new NotImplementedException("CreateMainEntity");
}
}
}

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

@ -15,8 +15,6 @@
@using TIAMSharedUI.Shared.Components.Grids
@using AyCode.Core.Enums
@using AyCode.Core.Extensions
@using AyCode.Core.Consts
@using AyCode.Core
@layout AdminLayout
@inject IEnumerable<IAcLogWriterClientBase> LogWriters
@inject IStringLocalizer<TIAMResources> localizer
@ -105,17 +103,17 @@
<Columns>
<DxGridCommandColumn NewButtonVisible="false" Width="8%" FixedPosition="GridColumnFixedPosition.Left" />
<DxGridDataColumn FieldName="Id" SortIndex="0" />
<DxGridDataColumn FieldName="OrderId">
<CellDisplayTemplate>
@{
var idKeyField = ((Transfer)context.DataItem).Id as Guid?;
var editUri = $"mytransfers/{idKeyField}";
<NavLink href="@editUri">
<span>@context.Value</span>
</NavLink> }
</CellDisplayTemplate>
</DxGridDataColumn>
<DxGridDataColumn FieldName="Id" ShowInColumnChooser="false" SortIndex="0" Visible="true">
<CellDisplayTemplate>
@{
Guid? idKeyField = context.Value as Guid?;
string editUri = $"mytransfers/{idKeyField}";
<NavLink href="@editUri">
<span>@idKeyField</span>
</NavLink> }
</CellDisplayTemplate>
</DxGridDataColumn>
<DxGridDataColumn FieldName="OrderId" />
<DxGridDataColumn FieldName="PaymentId" />
<DxGridDataColumn FieldName="FromAddress" />
<DxGridDataColumn FieldName="ToAddress" />
@ -153,21 +151,7 @@
</DxTabs>
<DxTabs>
<DxTabPage Text="Messages">
<MessageDetailGrid
Logger="_logger"
SignalRClient="AdminSignalRClient"
ContextId="((Transfer)context.DataItem).Id"
TextWrapEnabled="true">
<Columns>
<DxGridDataColumn FieldName="Id" />
<DxGridDataColumn FieldName="ContextId" ShowInColumnChooser="AcDomain.IsDeveloperVersion" Visible="AcDomain.IsDeveloperVersion" />
<DxGridDataColumn FieldName="EmailAddress" />
<DxGridDataColumn FieldName="Subject" />
<DxGridDataColumn FieldName="Text" />
<DxGridDataColumn FieldName="Created" />
</Columns>
</MessageDetailGrid>
<MessageDetailGrid Logger="_logger" SignalRClient="AdminSignalRClient" ContextId="((Transfer)context.DataItem).Id"></MessageDetailGrid>
</DxTabPage>
</DxTabs>

13
TIAMSharedUI/Shared/Components/Grids/TiamGrid.cs
View File

@ -1,5 +1,4 @@
using System.ComponentModel;
using AyCode.Core;
using AyCode.Core.Enums;
using AyCode.Core.Extensions;
using AyCode.Core.Helpers;
@ -233,18 +232,6 @@ namespace TIAMSharedUI.Shared.Components.Grids
//ShowGroupPanel = true;
//AllowSort = false;
TextWrapEnabled = false;
//var columns = GetColumns();
//var dataColumns = GetDataColumns();
//var idColumn = dataColumns.FirstOrDefault(x => x.FieldName == nameof(IId<Guid>.Id));
//if (idColumn != null)
//{
// idColumn.ShowInColumnChooser = AcDomain.IsDeveloperVersion;
// idColumn.Visible = !AcDomain.IsDeveloperVersion;
//}
IsFirstInitializeParameters = true;
}

2
TIAMWebApp/Server/Controllers/MessageAPIController.cs
View File

@ -86,7 +86,7 @@ namespace TIAMWebApp.Server.Controllers
_logger.Info($@"GetMessagessByContextId called with ownerId: {contextId}");
var messages = await _adminDal.GetEmailMessagesByContextIdAsync(contextId);
var messages = _adminDal.GetEmailMessagesByContextIdAsync(contextId);
//put Company id and name into a dictionary
return messages.ToJson();

1
TIAMWebApp/Server/Controllers/ServiceProviderAPIController.cs
View File

@ -13,7 +13,6 @@ using Product = TIAM.Entities.Products.Product;
using TIAM.Entities.Addresses;
using TIAM.Entities.Profiles;
using AyCode.Core.Loggers;
using AyCode.Entities;
using AyCode.Services.SignalRs;
using AyCode.Utils.Extensions;
using TIAM.Entities.Drivers;

3
TIAMWebApp/Server/Program.cs
View File

@ -17,7 +17,6 @@ using TIAMWebApp.Server.Services;
using Microsoft.AspNetCore.Server.Kestrel.Core;
using Microsoft.AspNetCore.ResponseCompression;
using System.IO.Compression;
using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
var builder = WebApplication.CreateBuilder(args);
@ -155,8 +154,6 @@ builder.Services.AddResponseCompression(options =>
builder.Services.Configure<BrotliCompressionProviderOptions>(options => options.Level = CompressionLevel.Optimal);
builder.Services.Configure<GzipCompressionProviderOptions>(options => options.Level = CompressionLevel.Optimal);
//builder.Services.AddSingleton(sp => (sp.GetRequiredService<IHostEnvironment>() as IWebHostEnvironment)!);
var app = builder.Build();
// Configure the HTTP request pipeline.

13
TIAMWebApp/Server/Services/DevAdminSignalRhub.cs
View File

@ -57,9 +57,6 @@ public class DynamicMethodCallModel<TAttribute> where TAttribute : TagAttribute
public object InstanceObject { get; init; }
public ConcurrentDictionary<int, MethodInfoModel<TAttribute>> MethodsByMessageTag { get; init; } = new();
public DynamicMethodCallModel(Type instanceObjectType) : this(Activator.CreateInstance(instanceObjectType)!)
{ }
public DynamicMethodCallModel(object instanceObject)
{
InstanceObject = instanceObject;
@ -79,14 +76,14 @@ public class DevAdminSignalRHub : Hub<ISignalRHubItemServer>, IAcSignalRHubServe
private readonly TIAM.Core.Loggers.Logger<DevAdminSignalRHub> _logger;
private readonly AdminDal _adminDal;
//private readonly ServiceProviderAPIController _serviceProviderApiController;
//private readonly TransferDataAPIController _transferDataApiController;
private readonly ServiceProviderAPIController _serviceProviderApiController;
private readonly TransferDataAPIController _transferDataApiController;
public DevAdminSignalRHub(AdminDal adminDal, ServiceProviderAPIController serviceProviderApiController, TransferDataAPIController transferDataApiController, MessageAPIController messageApiController, IEnumerable<IAcLogWriterBase> logWriters)
public DevAdminSignalRHub(AdminDal adminDal, ServiceProviderAPIController serviceProviderApiController, TransferDataAPIController transferDataApiController, IEnumerable<IAcLogWriterBase> logWriters, MessageAPIController messageApiController)
{
_adminDal = adminDal;
//_serviceProviderApiController = serviceProviderApiController;
//_transferDataApiController = transferDataApiController;
_serviceProviderApiController = serviceProviderApiController;
_transferDataApiController = transferDataApiController;
_logger = new(logWriters.ToArray());