diff --git a/SqlSchemaCompare_Dev_to_DevRelease.scmp b/SqlSchemaCompare_Dev_to_DevRelease.scmp index 28697846..ae44c336 100644 --- a/SqlSchemaCompare_Dev_to_DevRelease.scmp +++ b/SqlSchemaCompare_Dev_to_DevRelease.scmp @@ -8,7 +8,7 @@ - Data Source=185.51.190.197;Initial Catalog=TIAM_DEVRELEASE;Persist Security Info=True;User ID=Anata_Development_Team;Pooling=False;Multiple Active Result Sets=False;Connect Timeout=60;Encrypt=True;Trust Server Certificate=True;Command Timeout=0 + Data Source=185.51.190.197;Initial Catalog=TIAM_PROD;Persist Security Info=True;User ID=Anata_Development_Team;Pooling=False;Multiple Active Result Sets=False;Connect Timeout=60;Encrypt=True;Trust Server Certificate=True;Command Timeout=0 @@ -345,11 +345,11 @@ TargetDatabaseName - TIAM_DEVRELEASE + TIAM_PROD TargetConnectionString - Data Source=185.51.190.197;Initial Catalog=TIAM_DEVRELEASE;Persist Security Info=True;User ID=Anata_Development_Team;Pooling=False;Multiple Active Result Sets=False;Connect Timeout=60;Encrypt=True;Trust Server Certificate=True;Application Name="Microsoft SQL Server Data Tools, Schema Compare";Command Timeout=0 + Data Source=185.51.190.197;Initial Catalog=TIAM_PROD;Persist Security Info=True;User ID=Anata_Development_Team;Pooling=False;Multiple Active Result Sets=False;Connect Timeout=60;Encrypt=True;Trust Server Certificate=True;Application Name="Microsoft SQL Server Data Tools, Schema Compare";Command Timeout=0 TreatVerificationErrorsAsWarnings @@ -942,5 +942,17 @@ Anata_Development_Team + + TIAM_DEV + + + TIAM_DEV_log + + + TIAM_DEVRELEASE + + + TIAM_DEVRELEASE_log + \ No newline at end of file diff --git a/TIAM.Database.Test/AdminDalTest.cs b/TIAM.Database.Test/AdminDalTest.cs index 1cd116c0..35c3f2cb 100644 --- a/TIAM.Database.Test/AdminDalTest.cs +++ b/TIAM.Database.Test/AdminDalTest.cs @@ -371,7 +371,7 @@ namespace TIAM.Database.Test Assert.IsTrue(company.Id == companyId); company.OwnerId = userId; - Assert.IsTrue(await Dal.UpdateCompanyAsync(company)); + Assert.IsNotNull(await Dal.UpdateCompanyAsync(company)); company = await Dal.GetCompanyByIdAsync(companyId); @@ -380,7 +380,7 @@ namespace TIAM.Database.Test Assert.IsTrue(company.UserToServiceProviders.Any(x=>x.UserId == userId && x.ServiceProviderId == companyId)); company.CommissionPercent = 5; - Assert.IsTrue(await Dal.UpdateCompanyAsync(company)); + Assert.IsNotNull(await Dal.UpdateCompanyAsync(company)); var addressId = company.Profile.AddressId; Assert.IsTrue(await Dal.RemoveCompanyAsync(company.Id)); //mielőbb kitöröljük, h ne maradjon szemét a db-ben - J. diff --git a/TIAM.Database/DataLayers/Admins/AdminDal.cs b/TIAM.Database/DataLayers/Admins/AdminDal.cs index bd65c46f..6cf1a95f 100644 --- a/TIAM.Database/DataLayers/Admins/AdminDal.cs +++ b/TIAM.Database/DataLayers/Admins/AdminDal.cs @@ -30,6 +30,7 @@ using DevExpress.Data.Linq; using DevExpress.Data.Linq.Helpers; using TIAM.Database.DbSets.Drivers; using AyCode.Entities.Server.LogItems; +using AyCode.Interfaces.Entities; namespace TIAM.Database.DataLayers.Admins { @@ -56,6 +57,9 @@ namespace TIAM.Database.DataLayers.Admins public Task> GetTransfersByFilterAsync(CriteriaOperator criteriaOperator) => SessionAsync(ctx => (ctx.GetTransfers().AppendWhere(new CriteriaToExpressionConverter(), criteriaOperator) as IQueryable)!.ToList()); + public Task> GetTransfersByUserProductMappingIdAsync(Guid userProductMappingId) + => SessionAsync(ctx => ctx.GetTransfers().Where(x => x.TransferToDrivers.Any(ttd => ttd.UserProductMappingId == userProductMappingId)).ToList()); + public Task> GetTransfersAsync() => SessionAsync(ctx => ctx.GetTransfers().OrderBy(x => x.TransferStatusType).ThenByDescending(x => x.OrderId).ToList()); public Task GetTransfersJsonAsync() => SessionAsync(ctx => ctx.GetTransfers().OrderBy(x => x.TransferStatusType).ThenByDescending(x => x.OrderId).ToJson()); public Task GetTransfersByUserIdJsonAsync(Guid userId) => SessionAsync(ctx => ctx.GetTransfers().Where(x => x.UserId == userId).OrderBy(x => x.TransferStatusType).ThenByDescending(x => x.OrderId).ToJson()); @@ -346,29 +350,26 @@ namespace TIAM.Database.DataLayers.Admins //} //14. (IserviceProviderDataService) Update service provider - public Task UpdateCompanyAsync(Company company) - { - var result = NewUpdateCompanyAsync(company); - if (result.Result != null || (result.Result).Id != Guid.Empty) - { - return Task.FromResult(true); - } - else - { - return Task.FromResult(false); - } - } + //public Task UpdateCompanyAsync(Company company) + //{ + // var result = NewUpdateCompanyAsync(company); + // return Task.FromResult(result.Result != null && !result.Result.Id.IsNullOrEmpty()); + //} - public Task NewUpdateCompanyAsync(Company company) => UpdateSafeAsync(company, (ctx, safeCompany) => ctx.UpdateCompany(safeCompany)); + public Task UpdateCompanyAsync(Company company) => UpdateSafeAsync(company, (ctx, safeCompany) => + { + ctx.Entry(safeCompany.Profile).CurrentValues.SetValues(company.Profile); + return ctx.UpdateCompany(safeCompany); + }); - public Task UpdateCompanyAsync(Company company, Profile profile) - => TransactionAsync(ctx => - { - ctx.UpdateProfile(profile); - ctx.SaveChanges(); + //public Task UpdateCompanyAsync(Company company, Profile profile) + // => TransactionAsync(ctx => + // { + // ctx.UpdateProfile(profile); + // ctx.SaveChanges(); - return ctx.UpdateCompany(company); - }); + // return ctx.UpdateCompany(company); + // }); //13. (IserviceProviderDataService) delete service provider public Task RemoveCompanyAsync(Guid companyId) => TransactionAsync(ctx => ctx.RemoveProductsByCompanyId(companyId) && ctx.RemoveCompany(companyId)); @@ -685,8 +686,8 @@ namespace TIAM.Database.DataLayers.Admins #region Logs - public Task> GetLogItemsAsync(int takeCount = 500) => SessionAsync(ctx => ctx.LogItems.Take(takeCount).ToList()); - public Task> GetLogItemsByFilterAsync(CriteriaOperator criteriaOperator, int takeCount = 500) => SessionAsync(ctx => (ctx.LogItems.AppendWhere(new CriteriaToExpressionConverter(), criteriaOperator).Take(takeCount) as IQueryable)!.ToList()); + public Task> GetLogItemsAsync(int takeCount, DateTime utcFromDate, DateTime utcToDate) => SessionAsync(ctx => ctx.LogItems.Where(x => x.TimeStampUtc.Date >= utcFromDate.Date && x.TimeStampUtc.Date <= utcToDate.Date).Take(takeCount).ToList()); + public Task> GetLogItemsByFilterAsync(CriteriaOperator criteriaOperator, int takeCount, DateTime utcFromDate, DateTime utcToDate) => SessionAsync(ctx => (ctx.LogItems.Where(x => x.TimeStampUtc.Date >= utcFromDate.Date && x.TimeStampUtc.Date <= utcToDate.Date).AppendWhere(new CriteriaToExpressionConverter(), criteriaOperator).Take(takeCount) as IQueryable)!.ToList()); #endregion } diff --git a/TIAMSharedUI/Pages/User/MyServiceProviders.razor b/TIAMSharedUI/Pages/User/MyServiceProviders.razor index dc276b43..6cd1fcb2 100644 --- a/TIAMSharedUI/Pages/User/MyServiceProviders.razor +++ b/TIAMSharedUI/Pages/User/MyServiceProviders.razor @@ -41,7 +41,7 @@
- - + @{ @@ -52,7 +52,8 @@ - + diff --git a/TIAMSharedUI/Pages/User/SysAdmins/DriverGridComponent.razor b/TIAMSharedUI/Pages/User/SysAdmins/DriverGridComponent.razor index 76791779..dda2ea58 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/DriverGridComponent.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/DriverGridComponent.razor @@ -43,9 +43,10 @@ - + +@* - + *@ @@ -60,7 +61,7 @@ LogWriters @@ -27,6 +29,7 @@ @* VirtualScrollingEnabled="true" *@

@($"{a.CategoryName}->{a.CallerName}")

-

@($"{a.Text}")


-
Exception:
-

@a.Exception

+
+
@($"{a.CategoryName}->{a.CallerName}")
+

@($"{a.Text}")

+
+
+
Exception:
+

@a.Exception

+
-
- -
+ + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -73,6 +124,13 @@ [Parameter] public GridDetailExpandButtonDisplayMode DetailExpandButtonDisplayMode { get; set; } = GridDetailExpandButtonDisplayMode.Never; private LogViewerGrid _logViewerGrid; + + private static DateTime _fromDate = DateTime.Today.AddDays(-2); + private static DateTime _toDate = DateTime.Today; + + private static int _takeCount = 250; + private object[] _contextParams = new object[3] { _takeCount, _fromDate, _toDate }; + private LoggerClient _logger; private static List _selectedLogLevels = [LogLevel.Error, LogLevel.Warning, LogLevel.Suggest]; private static string _filterText = GetFilterText(_selectedLogLevels); @@ -104,6 +162,39 @@ _logViewerGrid.SetFieldFilterCriteria(nameof(LogLevel), filterCriteria); } + private async Task OnValueChangedTakeCount(int value) + { + if (_takeCount == value) return; + + _takeCount = value; + _contextParams[0] = _takeCount; + await _logViewerGrid.LoadDataSourceAsync(); + } + + private async Task OnValueChangedStartDate(DateTime value) + { + if (_fromDate == value) return; + + _fromDate = value; + if (_fromDate.Date > DateTime.Today.Date) _fromDate = DateTime.Today; + + _contextParams[1] = _fromDate; + + if (_fromDate.Date > _toDate.Date) return; + await _logViewerGrid.LoadDataSourceAsync(); + } + + private async Task OnValueChangedEndDate(DateTime value) + { + if (_toDate == value) return; + + _toDate = value; + _contextParams[2] = _toDate; + + if (_fromDate.Date > _toDate.Date) return; + await _logViewerGrid.LoadDataSourceAsync(); + } + void Grid_CustomizeElement(GridCustomizeElementEventArgs e) { if (e.ElementType != GridElementType.DataRow) return; diff --git a/TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor b/TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor index 53926462..231f37db 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor @@ -92,7 +92,7 @@ CustomizeEditModel="Grid_CustomizeEditModel" EditMode="GridEditMode.EditForm" ColumnResizeMode="GridColumnResizeMode.NextColumn" - AllowSelectRowByClick="false" + AllowSelectRowByClick="true" PageSize="13" ShowFilterRow="true"> diff --git a/TIAMSharedUI/Pages/User/SysAdmins/ServiceProviderGridComponent.razor b/TIAMSharedUI/Pages/User/SysAdmins/ServiceProviderGridComponent.razor index cca7bb45..dc432bbd 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/ServiceProviderGridComponent.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/ServiceProviderGridComponent.razor @@ -18,7 +18,7 @@ LogWriters @inject AdminSignalRClient AdminSignalRClient; - - + + @@ -33,7 +33,7 @@ @* @{ - var destinationNameFieldName = $"{nameof(TransferDestinationToProduct.TransferDestination.Name)}.{nameof(TransferDestination.Name)}"; + var destinationNameFieldName = $"{nameof(TransferDestinationToProduct.TransferDestination.Name)}.{nameof(TransferDestination.Name)}"; } *@ @@ -43,20 +43,20 @@ - + - + - + @{ - var serviceProvider = (Company)editFormContext.EditModel; + var transferDestinationToProduct = (TransferDestinationToProduct)editFormContext.EditModel; } @@ -68,7 +68,7 @@ @editFormContext.GetEditor("Price3") - + @editFormContext.GetEditor("ProductCommis") diff --git a/TIAMSharedUI/Pages/User/SysAdmins/UserProductMappingGridComponent.razor b/TIAMSharedUI/Pages/User/SysAdmins/UserProductMappingGridComponent.razor index 24992f34..3902cf96 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/UserProductMappingGridComponent.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/UserProductMappingGridComponent.razor @@ -18,7 +18,7 @@ - + @{ @@ -80,6 +80,7 @@ @code { + [Parameter] public bool NewButtonVisible { get; set; } = true; [Parameter] public IProductRelation ParentData { get; set; } = null!; [Parameter] public int GetAllTag { get; set; } = SignalRTags.GetAllUserProductMappings; diff --git a/TIAMSharedUI/Shared/Components/Grids/TiamGrid.cs b/TIAMSharedUI/Shared/Components/Grids/TiamGrid.cs index a57ee379..34521061 100644 --- a/TIAMSharedUI/Shared/Components/Grids/TiamGrid.cs +++ b/TIAMSharedUI/Shared/Components/Grids/TiamGrid.cs @@ -31,7 +31,7 @@ namespace TIAMSharedUI.Shared.Components.Grids [Parameter] public LoggerClient Logger { get; set; } [Parameter] public string GridName { get; set; } - [Parameter] public Guid[]? ContextIds { get; set; } + [Parameter] public object[]? ContextIds { get; set; } private string? _filterText = null; diff --git a/TIAMWebApp/Server/Controllers/LoggerApiController.cs b/TIAMWebApp/Server/Controllers/LoggerApiController.cs index 7841f59a..6c602410 100644 --- a/TIAMWebApp/Server/Controllers/LoggerApiController.cs +++ b/TIAMWebApp/Server/Controllers/LoggerApiController.cs @@ -57,13 +57,13 @@ namespace TIAMWebApp.Server.Controllers [HttpGet] [Route(APIUrls.GetAllLogItemsRouteName)] [SignalR(SignalRTags.GetAllLogItemsByFilterText)] - public async Task> GetAllLogItems(string? criteriaOperatorText) //(int takeCount, string filterText) + public async Task> GetAllLogItems(int takeCount, DateTime fromDate, DateTime toDate, string? criteriaOperatorText) //(int takeCount, string filterText) { - //public Task> GetTransfersByFilterAsync(CriteriaOperator criteriaOperator) => SessionAsync(ctx => (ctx.GetTransfers().AppendWhere(new CriteriaToExpressionConverter(), criteriaOperator) as IQueryable)!.ToList()); + logger.Debug($"GetAllLogItems; takeCount: {takeCount}; fromDate: {fromDate}; toDate: {toDate}; criteriaOperatorText: {criteriaOperatorText}"); List logItemList; - if (criteriaOperatorText.IsNullOrWhiteSpace()) logItemList = await adminDal.GetLogItemsAsync(1000); - else logItemList = await adminDal.GetLogItemsByFilterAsync(CriteriaOperator.Parse(criteriaOperatorText),1000); + if (criteriaOperatorText.IsNullOrWhiteSpace()) logItemList = await adminDal.GetLogItemsAsync(takeCount, fromDate, toDate); + else logItemList = await adminDal.GetLogItemsByFilterAsync(CriteriaOperator.Parse(criteriaOperatorText), takeCount, fromDate, toDate); var resultList = new List(logItemList.Count); //logItemList[0].ToModelDto(); diff --git a/TIAMWebApp/Server/Controllers/ServiceProviderAPIController.cs b/TIAMWebApp/Server/Controllers/ServiceProviderAPIController.cs index 94e50288..3c73a0d4 100644 --- a/TIAMWebApp/Server/Controllers/ServiceProviderAPIController.cs +++ b/TIAMWebApp/Server/Controllers/ServiceProviderAPIController.cs @@ -31,14 +31,14 @@ namespace TIAMWebApp.Server.Controllers [NonAction] [ApiExplorerSettings(IgnoreApi = true)] - private async Task CompanyDataChanging(Company company, TrackingState trackingState) + private async Task CompanyDataChanging(Company company, TrackingState trackingState) { var logText = $"[{trackingState.ToString().ToUpper()}] CompanyDataChanging called; Id: {company.Id}; OwnerId: {company.OwnerId}; Name: {company.Name}"; if (company.Name.IsNullOrEmpty()) { _logger.Error(logText); - return false; + return null; } _logger.Info(logText); @@ -53,12 +53,12 @@ namespace TIAMWebApp.Server.Controllers //company.SetProfile(new Profile(Guid.NewGuid(), company.Name)); //company.Profile.SetAddress(new Address(Guid.NewGuid(), "Controller AddCompanyAsync; address text...")); - return await adminDal.AddCompanyAsync(company); + return (await adminDal.AddCompanyAsync(company)) ? company : null; case TrackingState.Update: return await adminDal.UpdateCompanyAsync(company); case TrackingState.Remove: - return await adminDal.RemoveCompanyAsync(company.Id); + return (await adminDal.RemoveCompanyAsync(company.Id)) ? company : null; case TrackingState.Get: case TrackingState.GetAll: @@ -71,21 +71,21 @@ namespace TIAMWebApp.Server.Controllers [ApiExplorerSettings(IgnoreApi = true)] [SignalR(SignalRTags.AddCompany)] public async Task AddCompanyAsync(Company company) - => await CompanyDataChanging(company, TrackingState.Add) ? company.ToJson() : string.Empty; + => (await CompanyDataChanging(company, TrackingState.Add))?.ToJson() ?? string.Empty; [AllowAnonymous] [HttpPost] [Route(APIUrls.UpdateServiceProviderRouteName)] [SignalR(SignalRTags.UpdateCompany)] public async Task UpdateServiceProvider(Company company) - => await CompanyDataChanging(company, TrackingState.Update) ? company.ToJson() : string.Empty; + => (await CompanyDataChanging(company, TrackingState.Update))?.ToJson() ?? string.Empty; [AllowAnonymous] [HttpPost] [Route(APIUrls.RemoveServiceProviderRouteName)] [SignalR(SignalRTags.RemoveCompany)] public async Task RemoveServiceProvider(Company company) - => await CompanyDataChanging(company, TrackingState.Remove) ? company.ToJson() : string.Empty; + => (await CompanyDataChanging(company, TrackingState.Remove))?.ToJson() ?? string.Empty; //15. [AllowAnonymous] diff --git a/TIAMWebApp/Server/Services/DevAdminSignalRhub.cs b/TIAMWebApp/Server/Services/DevAdminSignalRhub.cs index 020d3e7b..e5ff3710 100644 --- a/TIAMWebApp/Server/Services/DevAdminSignalRhub.cs +++ b/TIAMWebApp/Server/Services/DevAdminSignalRhub.cs @@ -162,7 +162,7 @@ public class DevAdminSignalRHub : Hub, IAcSignalRHubServe paramValues = new object[methodInfoModel.ParamInfos.Length]; var firstParamType = methodInfoModel.ParamInfos[0].ParameterType; - if (methodInfoModel.ParamInfos.Length > 1 || firstParamType == typeof(string) || firstParamType.IsEnum || firstParamType.IsValueType) + if (methodInfoModel.ParamInfos.Length > 1 || firstParamType == typeof(string) || firstParamType.IsEnum || firstParamType.IsValueType || firstParamType == typeof(DateTime)) { var msg = message!.MessagePackTo>(); diff --git a/TIAMWebApp/Shared/Utility/SignalRDataSource.cs b/TIAMWebApp/Shared/Utility/SignalRDataSource.cs index 3a2eb0fc..b3a5e755 100644 --- a/TIAMWebApp/Shared/Utility/SignalRDataSource.cs +++ b/TIAMWebApp/Shared/Utility/SignalRDataSource.cs @@ -17,6 +17,6 @@ namespace TIAMWebApp.Shared.Application.Utility { [Serializable] [DebuggerDisplay("Count = {Count}")] - public class SignalRDataSource(AcSignalRClientBase signalRClient, SignalRCrudTags signalRCrudTags, params Guid[]? contextIds) + public class SignalRDataSource(AcSignalRClientBase signalRClient, SignalRCrudTags signalRCrudTags, params object[]? contextIds) : AcSignalRDataSource(signalRClient, signalRCrudTags, contextIds) where T : class, IId; }