Compare commits

..

2 Commits

Author SHA1 Message Date
Loretta 2c0e1567cb MgGridBase... 2025-11-06 15:06:10 +01:00
Loretta 987c6146bf ??? 2025-09-25 14:16:24 +02:00
65 changed files with 521 additions and 577 deletions

View File

@ -6,6 +6,10 @@ namespace TIAM.Core.Consts;
public static class TiamConstClient
{
public static string DefaultLocale = "en-US";
public static string DevAdminHubName = "DevAdminHub";
public static string LoggerHubName = "TiamLoggerHub";
public static Guid TransferProductId = Guid.Parse("814b5495-c2e9-4f1d-a73f-37cd5d353078");
public static Guid[] DevAdminIds = new Guid[2] { Guid.Parse("dcf451d2-cc4c-4ac2-8c1f-da00041be1fd"), Guid.Parse("4cbaed43-2465-4d99-84f1-c8bc6b7025f7") };
public static Guid[] SysAdmins = new Guid[3]

View File

@ -1,6 +1,7 @@
using System.Net.Http.Json;
using System.Text;
using System.Text.Json;
using AyCode.Core.Loggers;
using AyCode.Interfaces.StorageHandlers;
using AyCode.Services.Loggers;
using Newtonsoft.Json;

View File

@ -5,6 +5,7 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using AyCode.Core.Loggers;
using TIAM.Core.Loggers;
using TIAMSharedUI.Shared.Components;
using TIAMWebApp.Shared.Application.Interfaces;

View File

@ -4,6 +4,7 @@
@using AyCode.Services.Loggers
@using System.Reflection
@using AyCode.Blazor.Components.Components
@using AyCode.Core.Loggers
@using TIAM.Entities.Products
@using TIAM.Entities.Transfers
@using TIAM.Models.Dtos.Users

View File

@ -15,6 +15,7 @@ using System.Text.RegularExpressions;
using AyCode.Core.Consts;
using TIAM.Core.Loggers;
using AyCode.Services.Loggers;
using AyCode.Core.Loggers;
namespace TIAMSharedUI.Pages.Components

View File

@ -1,4 +1,5 @@
@page "/formulaone"
@using AyCode.Core.Loggers
@using AyCode.Interfaces.StorageHandlers;
@using TIAM.Entities.Transfers
@using TIAMSharedUI.Shared.Components

View File

@ -1,4 +1,5 @@
@page "/"
@using AyCode.Core.Loggers
@using AyCode.Interfaces.StorageHandlers;
@using BlazorAnimation
@using TIAMSharedUI.Shared.Components

View File

@ -3,6 +3,7 @@
@using TIAMWebApp.Shared.Application.Utility
@using Newtonsoft.Json
@using System.IdentityModel.Tokens.Jwt
@using AyCode.Core.Loggers
@using AyCode.Interfaces.StorageHandlers;
@using AyCode.Services.Loggers
@using TIAM.Core.Loggers

View File

@ -3,6 +3,7 @@ using System.IdentityModel.Tokens.Jwt;
using System.Text.Json;
using AyCode.Core.Extensions;
using AyCode.Core.Helpers;
using AyCode.Core.Loggers;
using TIAMWebApp.Shared.Application.Models.ClientSide;
using TIAMWebApp.Shared.Application.Models;
using TIAMWebApp.Shared.Application.Interfaces;

View File

@ -14,6 +14,7 @@
@using TIAMWebApp.Shared.Application.Services
@using TIAMWebApp.Shared.Application.Utility
@using AyCode.Core.Extensions
@using AyCode.Core.Loggers
@layout AdminLayout
@inject IPopulationStructureDataProvider DataProvider
@inject ISessionServiceClient SessionService

View File

@ -1,6 +1,7 @@
@page "/sumuppayment/{checkoutId}"
@using AyCode.Services.Loggers
@using System.Text.Json.Serialization
@using AyCode.Core.Loggers
@using TIAMWebApp.Shared.Application.Services
@using TIAMWebApp.Shared.Application.Utility
@inject IEnumerable<IAcLogWriterClientBase> LogWriters

View File

@ -1,4 +1,5 @@
@page "/dbtest"
@using AyCode.Core.Loggers
@using TIAMSharedUI.Pages.Components
@using TIAMWebApp.Shared.Application.Interfaces
@using TIAMWebApp.Shared.Application.Models.ClientSide.UI.WizardModels

View File

@ -1,4 +1,5 @@
@page "/tictactoe"
@using AyCode.Core.Loggers
@using Microsoft.AspNetCore.SignalR.Client
@using AyCode.Services.Loggers
@using TIAMWebApp.Shared.Application.Utility

View File

@ -1,6 +1,7 @@
@page "/book-a-tour/{TransferDestinationId}/{PriceCategory:int}"
@using AyCode.Core.Consts
@using AyCode.Core.Helpers
@using AyCode.Core.Loggers
@using TIAM.Models.Dtos.Users
@using TIAM.Services
@using TIAMSharedUI.Pages.Components

View File

@ -1,6 +1,7 @@
@page "/transfer"
@using AyCode.Core.Consts
@using AyCode.Core.Helpers
@using AyCode.Core.Loggers
@using TIAM.Models.Dtos.Users
@using TIAM.Services
@using TIAMSharedUI.Pages.Components

View File

@ -1,4 +1,5 @@
@using AyCode.Core.Enums
@using AyCode.Core.Loggers
@using AyCode.Services.Loggers
@using BlazorAnimation
@using TIAM.Core.Consts

View File

@ -1,4 +1,5 @@
@page "/driver/cars/{driverId:guid}"
@using AyCode.Core.Loggers
@using BlazorAnimation
@using TIAM.Entities.Drivers
@using TIAM.Models.Dtos.Users

View File

@ -22,6 +22,7 @@
@using AyCode.Core.Consts
@using AyCode.Core
@using AyCode.Core.Helpers
@using AyCode.Core.Loggers
@using AyCode.Services.SignalRs
@using DevExpress.Data.Filtering
@using TIAM.Entities.Emails

View File

@ -1,6 +1,7 @@
@page "/user/createAndManageTransfer"
@using AyCode.Core.Consts
@using AyCode.Core.Helpers
@using AyCode.Core.Loggers
@using TIAM.Entities.Products
@using TIAM.Entities.ServiceProviders
@using TIAM.Entities.Transfers

View File

@ -16,6 +16,7 @@ using TIAMWebApp.Shared.Application.Models.ClientSide.UI;
using TIAMWebApp.Shared.Application.Services;
using TIAMWebApp.Shared.Application.Utility;
using System.Collections.Generic;
using AyCode.Core.Loggers;
namespace TIAMSharedUI.Pages.User.Hotels
{

View File

@ -1,29 +1,30 @@
@page "/hotel/transfers/{HotelId:guid}"
@using AyCode.Blazor.Components.Components.Grids
@using AyCode.Core
@using AyCode.Core.Consts
@using AyCode.Core.Enums
@using AyCode.Core.Extensions
@using AyCode.Core.Helpers
@using BlazorAnimation
@using DevExpress.Data.Filtering
@using TIAM.Core.Consts
@using TIAM.Core.Enums
@using TIAM.Entities.Emails
@using TIAM.Entities.Emails
@using TIAM.Entities.Transfers
@using TIAM.Resources
@using TIAM.Services
@using TIAMSharedUI.Pages.Components
@using TIAMSharedUI.Pages.User.SysAdmins
@using TIAMSharedUI.Shared
@using TIAMSharedUI.Shared.Components.BaseComponents
@using TIAMSharedUI.Shared.Components.Grids
@using TIAMWebApp.Shared.Application.Interfaces
@using TIAMWebApp.Shared.Application.Models.ClientSide.UI
@using TIAMWebApp.Shared.Application.Models.ClientSide.UI.WizardModels
@using TIAMWebApp.Shared.Application.Models.PageModels
@using TIAMWebApp.Shared.Application.Utility
@using TIAMWebApp.Shared.Application.Services
@using TIAMSharedUI.Shared.Components.Grids
@using AyCode.Core.Enums
@using AyCode.Core.Extensions
@using AyCode.Core.Consts
@using AyCode.Core
@using AyCode.Core.Helpers
@using DevExpress.Data.Filtering
@using TIAM.Entities.Emails
@using TIAMSharedUI.Shared.Components.BaseComponents
@using TIAMWebApp.Shared.Application.Utility
@inherits UserBasePageComponent
@layout AdminLayout
@inject IWizardProcessor wizardProcessor

View File

@ -20,6 +20,7 @@
@using AyCode.Core.Consts
@using AyCode.Core
@using AyCode.Core.Helpers
@using AyCode.Core.Loggers
@using DevExpress.Data.Filtering
@using TIAM.Entities.Emails
@using TIAMSharedUI.Shared.Components.BaseComponents

View File

@ -24,6 +24,7 @@
@using AyCode.Core.Consts
@using AyCode.Core
@using AyCode.Core.Helpers
@using AyCode.Core.Loggers
@using DevExpress.Data.Filtering
@using TIAMSharedUI.Shared.Components.BaseComponents
@inherits BasePageComponent

View File

@ -1,5 +1,6 @@
@page "/user/serviceprovider/{id}"
@using AyCode.Core
@using AyCode.Core.Loggers
@using AyCode.Services.Loggers
@using BlazorAnimation
@using TIAM.Entities.ServiceProviders

View File

@ -36,6 +36,7 @@
@rendermode RenderMode.InteractiveWebAssembly
@page "/user/media"
@using System.Net.Http.Headers
@using AyCode.Core.Loggers
@using AyCode.Services.Loggers
@using TIAMSharedUI.Shared
@using TIAMWebApp.Shared.Application.Interfaces

View File

@ -13,6 +13,7 @@
@using AyCode.Services.Loggers
@using TIAMWebApp.Shared.Application.Services
@using AyCode.Core.Helpers
@using AyCode.Core.Loggers
@using TIAMSharedUI.Shared.Components.Grids
@using TIAMSharedUI.Pages.User.CardComponents
@inherits BasePageComponent

View File

@ -1,5 +1,6 @@
@page "/user/serviceproviderold/{id}"
@using AyCode.Core
@using AyCode.Core.Loggers
@using AyCode.Services.Loggers
@using TIAM.Entities.ServiceProviders
@using TIAM.Resources

View File

@ -1,19 +1,21 @@
@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.Blazor.Components.Components.Grids
@using AyCode.Core
@using AyCode.Core.Loggers
@using AyCode.Interfaces.Addresses
@using AyCode.Services.Loggers
@using TIAM.Core.Loggers
@using TIAM.Entities.Addresses
@using TIAMSharedUI.Shared.Components.Grids
@using TIAM.Entities.Drivers
@using TIAM.Entities.Products
@using TIAM.Entities.ServiceProviders
@using TIAM.Entities.Transfers
@using TIAM.Entities.Users
@using TIAM.Models.Dtos.Users
@using TIAMSharedUI.Pages.Components.EditComponents
@using TIAMSharedUI.Shared.Components.Grids
@using TIAMWebApp.Shared.Application.Interfaces
@using TIAMWebApp.Shared.Application.Services
@using AyCode.Interfaces.Addresses
@using AyCode.Core
@using TIAMWebApp.Shared.Application.Utility
@inject IServiceProviderDataService serviceProviderDataService
@inject IUserDataService userDataService
@inject ITransferDataService transferDataService

View File

@ -12,6 +12,7 @@
@using TIAMSharedUI.Shared.Components.Grids
@using TIAMSharedUI.Pages.Components.EditComponents
@using AyCode.Core
@using AyCode.Core.Loggers
@inject IServiceProviderDataService serviceProviderDataService
@inject IUserDataService userDataService
@inject ITransferDataService transferDataService

View File

@ -1,4 +1,5 @@
@using TIAM.Entities.ServiceProviders
@using AyCode.Core.Loggers
@using TIAM.Entities.ServiceProviders
@using TIAM.Entities.Users
@using TIAM.Models.Dtos.Users
@using TIAMWebApp.Shared.Application.Interfaces

View File

@ -1,4 +1,5 @@
@page "/sysadmin/logs"
@using AyCode.Core.Loggers
@using BlazorAnimation
@using TIAM.Entities.Users
@using TIAM.Models.Dtos.Users

View File

@ -1,30 +1,31 @@
@page "/sysadmin/transfers"
@using AyCode.Blazor.Components.Components.Grids
@using AyCode.Core
@using AyCode.Core.Consts
@using AyCode.Core.Enums
@using AyCode.Core.Extensions
@using AyCode.Core.Helpers
@using BlazorAnimation
@using DevExpress.Data.Filtering
@using TIAM.Core.Consts
@using TIAM.Core.Enums
@using TIAM.Entities.Drivers
@using TIAM.Entities.Emails
@using TIAM.Entities.Emails
@using TIAM.Entities.Transfers
@using TIAM.Entities.Users
@using TIAM.Resources
@using TIAM.Services
@using TIAMSharedUI.Pages.Components
@using TIAMSharedUI.Shared
@using TIAMSharedUI.Shared.Components.BaseComponents
@using TIAMSharedUI.Shared.Components.Grids
@using TIAMWebApp.Shared.Application.Interfaces
@using TIAMWebApp.Shared.Application.Models.ClientSide.UI
@using TIAMWebApp.Shared.Application.Models.ClientSide.UI.WizardModels
@using TIAMWebApp.Shared.Application.Models.PageModels
@using TIAMWebApp.Shared.Application.Utility
@using TIAMWebApp.Shared.Application.Services
@using TIAMSharedUI.Shared.Components.Grids
@using AyCode.Core.Enums
@using AyCode.Core.Extensions
@using AyCode.Core.Consts
@using AyCode.Core
@using AyCode.Core.Helpers
@using DevExpress.Data.Filtering
@using TIAM.Entities.Drivers
@using TIAM.Entities.Emails
@using TIAMSharedUI.Shared.Components.BaseComponents
@using TIAM.Services
@using TIAMWebApp.Shared.Application.Utility
@inherits UserBasePageComponent
@layout AdminLayout
@inject IWizardProcessor wizardProcessor

View File

@ -20,6 +20,7 @@
@using TIAM.Entities.Emails
@using AyCode.Blazor.Components.Services
@using AyCode.Core.Extensions
@using AyCode.Core.Loggers
@using TIAM.Models
@using TIAM.Services
@inherits UserBasePageComponent

View File

@ -15,6 +15,7 @@
@using AyCode.Interfaces.Addresses
@using TIAM.Entities.Emails
@using AyCode.Core
@using AyCode.Core.Loggers
@inject IServiceProviderDataService serviceProviderDataService
@inject IUserDataService userDataService
@inject ITransferDataService transferDataService

View File

@ -1,24 +1,26 @@
@using AyCode.Core.Helpers
@using Address = TIAM.Entities.Addresses.Address
@using AyCode.Blazor.Components.Components.Grids
@using AyCode.Core
@using AyCode.Core.Extensions
@using AyCode.Core.Helpers
@using AyCode.Core.Loggers
@using AyCode.Interfaces.Addresses
@using AyCode.Services.Loggers
@using Profile = TIAM.Entities.Profiles.Profile
@using TIAM.Core.Loggers
@using TIAM.Entities.Drivers
@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 TIAM.Resources
@using TIAM.Services
@using TIAMWebApp.Shared.Application.Interfaces
@using TIAMWebApp.Shared.Application.Utility
@using AyCode.Services.Loggers
@using TIAM.Core.Loggers
@using Address = TIAM.Entities.Addresses.Address
@using Profile = TIAM.Entities.Profiles.Profile
@using TIAMSharedUI.Shared.Components.Grids
@using TIAMSharedUI.Pages.Components.EditComponents
@using TIAMSharedUI.Shared.Components.Grids
@using TIAMWebApp.Shared.Application.Interfaces
@using TIAMWebApp.Shared.Application.Services
@using AyCode.Interfaces.Addresses
@using AyCode.Core
@using AyCode.Core.Extensions
@using TIAMWebApp.Shared.Application.Utility
@inject IStringLocalizer<TIAMResources> Localizer
@inject IEnumerable<IAcLogWriterClientBase> LogWriters
@inject AdminSignalRClient AdminSignalRClient;

View File

@ -1,23 +1,24 @@
@using AyCode.Core.Helpers
@using Address = TIAM.Entities.Addresses.Address
@using AyCode.Blazor.Components.Components.Grids
@using AyCode.Core
@using AyCode.Core.Helpers
@using AyCode.Core.Loggers
@using AyCode.Interfaces.Addresses
@using AyCode.Services.Loggers
@using Profile = TIAM.Entities.Profiles.Profile
@using TIAM.Core.Loggers
@using TIAM.Entities.Drivers
@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 TIAM.Resources
@using TIAM.Services
@using TIAMWebApp.Shared.Application.Interfaces
@using TIAMWebApp.Shared.Application.Utility
@using AyCode.Services.Loggers
@using TIAM.Core.Loggers
@using Address = TIAM.Entities.Addresses.Address
@using Profile = TIAM.Entities.Profiles.Profile
@using TIAMSharedUI.Shared.Components.Grids
@using TIAMWebApp.Shared.Application.Interfaces
@using TIAMWebApp.Shared.Application.Services
@using AyCode.Interfaces.Addresses
@using AyCode.Core
@using TIAMWebApp.Shared.Application.Utility
@inject IStringLocalizer<TIAMResources> Localizer
@inject IEnumerable<IAcLogWriterClientBase> LogWriters
@inject AdminSignalRClient AdminSignalRClient;

View File

@ -9,6 +9,7 @@
@using TIAM.Core.Loggers
@using AyCode.Core
@using AyCode.Core.Extensions
@using AyCode.Core.Loggers
@using AyCode.Interfaces.Profiles.Dtos
@using TIAM.Entities.Addresses
@using TIAM.Entities.Profiles

View File

@ -10,6 +10,7 @@
@using AyCode.Services.Loggers
@using TIAM.Core.Loggers
@using AyCode.Core
@using AyCode.Core.Loggers
@using TIAMSharedUI.Shared.Components.Grids
@inject IServiceProviderDataService ServiceProviderDataService
@inject IEnumerable<IAcLogWriterClientBase> LogWriters

View File

@ -1,19 +1,20 @@
@using TIAM.Entities.Addresses
@using TIAM.Entities.Transfers
@using AyCode.Blazor.Components.Components.Grids
@using AyCode.Core
@using AyCode.Core.Enums
@using AyCode.Core.Extensions
@using AyCode.Core.Loggers
@using AyCode.Services.Loggers
@using TIAM.Core.Loggers
@using TIAM.Entities.Addresses
@using TIAM.Entities.Drivers
@using TIAM.Entities.Transfers
@using TIAM.Models.Dtos.Users
@using TIAM.Resources
@using TIAM.Services
@using TIAMSharedUI.Shared.Components.Grids
@using TIAMWebApp.Shared.Application.Interfaces
@using TIAMWebApp.Shared.Application.Utility
@using TIAM.Core.Loggers
@using AyCode.Core.Loggers
@using AyCode.Services.Loggers
@using TIAMWebApp.Shared.Application.Services
@using AyCode.Core.Enums
@using AyCode.Core.Extensions
@using AyCode.Core
@using TIAMWebApp.Shared.Application.Utility
@inject IUserDataService UserDataService
@inject IEnumerable<IAcLogWriterClientBase> LogWriters
@inject AdminSignalRClient AdminSignalRClient;

View File

@ -11,6 +11,7 @@
@using AyCode.Services.Loggers
@using TIAM.Core.Loggers
@using AyCode.Core
@using AyCode.Core.Loggers
@using TIAM.Services
@using TIAMSharedUI.Shared.Components.Grids
@inject IServiceProviderDataService ServiceProviderDataService

View File

@ -13,6 +13,7 @@
@using TIAM.Core.Loggers
@using AyCode.Core
@using AyCode.Core.Extensions
@using AyCode.Core.Loggers
@using TIAMSharedUI.Shared.Components.Grids
@inject IServiceProviderDataService ServiceProviderDataService
@inject IEnumerable<IAcLogWriterClientBase> LogWriters

View File

@ -1,22 +1,23 @@
@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
@using AyCode.Core.Loggers
@using AyCode.Services.Loggers
@using TIAMWebApp.Shared.Application.Services
@using AyCode.Blazor.Components.Components.Grids
@using AyCode.Core
@using AyCode.Core.Enums
@using AyCode.Core.Extensions
@using AyCode.Core
@using AyCode.Core.Helpers
@using AyCode.Core.Loggers
@using AyCode.Services.Loggers
@using AyCode.Services.SignalRs
@using AyCode.Utils.Extensions
@using TIAM.Core.Consts
@using TIAM.Core.Loggers
@using TIAM.Entities.Drivers
@using TIAM.Entities.Transfers
@using TIAM.Entities.Users
@using TIAM.Models.Dtos.Users
@using TIAM.Services
@using TIAMSharedUI.Shared.Components.Grids
@using TIAMWebApp.Shared.Application.Interfaces
@using TIAMWebApp.Shared.Application.Services
@using TIAMWebApp.Shared.Application.Utility
@inject IUserDataService UserDataService
@inject IEnumerable<IAcLogWriterClientBase> LogWriters
@inject AdminSignalRClient AdminSignalRClient;

View File

@ -1,23 +1,24 @@
@using TIAM.Entities.Products
@using TIAM.Entities.Transfers
@using AyCode.Blazor.Components.Components.Grids
@using AyCode.Core
@using AyCode.Core.Enums
@using AyCode.Core.Helpers
@using AyCode.Core.Loggers
@using AyCode.Models.Users
@using AyCode.Services.Loggers
@using AyCode.Services.SignalRs
@using TIAM.Core.Consts
@using TIAM.Core.Loggers
@using TIAM.Entities.Drivers
@using TIAM.Entities.Products
@using TIAM.Entities.Transfers
@using TIAM.Entities.Users
@using TIAM.Models.Dtos.Products
@using TIAM.Models.Dtos.Users
@using TIAM.Services
@using TIAMSharedUI.Shared.Components.Grids
@using TIAMWebApp.Shared.Application.Interfaces
@using TIAMWebApp.Shared.Application.Services
@using TIAMWebApp.Shared.Application.Utility
@using TIAM.Core.Loggers
@using AyCode.Core.Loggers
@using AyCode.Services.Loggers
@using AyCode.Core
@using AyCode.Core.Enums
@using AyCode.Core.Helpers
@using AyCode.Models.Users
@using AyCode.Services.SignalRs
@using TIAM.Core.Consts
@using TIAM.Models.Dtos.Products
@inject IServiceProviderDataService ServiceProviderDataService
@inject IEnumerable<IAcLogWriterClientBase> LogWriters
@inject AdminSignalRClient AdminSignalRClient

View File

@ -22,6 +22,7 @@
@using AyCode.Core.Consts
@using AyCode.Core
@using AyCode.Core.Helpers
@using AyCode.Core.Loggers
@using DevExpress.Data.Filtering
@using TIAM.Entities.Emails
@using TIAMSharedUI.Shared.Components.BaseComponents

View File

@ -1,5 +1,6 @@
@inherits LayoutComponentBase
@using AyCode.Core.Loggers
@using Microsoft.AspNetCore.Authorization
@using TIAMSharedUI.Pages
@using TIAMSharedUI.Shared.Users

View File

@ -7,6 +7,7 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using AyCode.Core.Loggers;
using TIAM.Resources;
using TIAMSharedUI.Pages.User;
using TIAMSharedUI.Resources;

View File

@ -0,0 +1,335 @@
//using System.ComponentModel;
//using AyCode.Blazor.Components.Components.Grids;
//using AyCode.Core;
//using AyCode.Core.Enums;
//using AyCode.Core.Extensions;
//using AyCode.Core.Helpers;
//using AyCode.Core.Interfaces;
//using AyCode.Services.Server.SignalRs;
//using AyCode.Services.SignalRs;
//using AyCode.Utils.Extensions;
//using DevExpress.Blazor;
//using Microsoft.AspNetCore.Components;
//using TIAMWebApp.Shared.Application.Utility;
//namespace TIAMSharedUI.Shared.Components.Grids;
//public abstract class MgGridBase<TDataItem> : DxGrid where TDataItem : class, IId<Guid>
//{
// protected bool IsFirstInitializeParameters;
// private SignalRDataSource<TDataItem> _dataSource = null!;
// private IList<TDataItem> _dataSourceParam = [];
// private string _gridLogName;
// public MgGridBase() : base()
// {
// }
// [Parameter] public LoggerClient Logger { get; set; }
// [Parameter] public string GridName { get; set; }
// [Parameter] public object[]? ContextIds { get; set; }
// private string? _filterText = null;
// [Parameter]
// public string? FilterText
// {
// get => _filterText;
// set
// {
// _filterText = value;
// if (_dataSource != null! && _dataSource.FilterText != value)
// {
// _dataSource.FilterText = value;
// ReloadDataSourceAsync().Forget();
// }
// }
// }
// [Parameter] public AcSignalRClientBase SignalRClient { get; set; }
// [Parameter] public int GetAllMessageTag { get; set; }
// [Parameter] public int GetItemMessageTag { get; set; }
// [Parameter] public int AddMessageTag { get; set; }
// [Parameter] public int UpdateMessageTag { get; set; }
// [Parameter] public int RemoveMessageTag { get; set; }
// protected new EventCallback<GridDataItemDeletingEventArgs> DataItemDeleting { get; set; }
// [Parameter] public EventCallback<GridDataItemDeletingEventArgs> OnGridItemDeleting { get; set; }
// protected new EventCallback<GridEditModelSavingEventArgs> EditModelSaving { get; set; }
// [Parameter] public EventCallback<GridEditModelSavingEventArgs> OnGridEditModelSaving { get; set; }
// [Parameter] public EventCallback<IList<TDataItem>> OnDataSourceChanged { get; set; }
// [Parameter] public EventCallback<GridDataItemChangingEventArgs<TDataItem>> OnGridItemChanging { get; set; }
// /// <summary>
// /// After the server has responded!
// /// </summary>
// [Parameter]
// public EventCallback<GridDataItemChangedEventArgs<TDataItem>> OnGridItemChanged { get; set; }
// [Parameter]
// [DefaultValue(null)]
// [System.Diagnostics.CodeAnalysis.SuppressMessage("Usage", "BL0007:Component parameters should be auto properties", Justification = "<Pending>")]
// public IList<TDataItem> DataSource
// {
// get
// {
// if (_dataSource == null && Data != null)
// {
// Logger.Error($"{_gridLogName} Use the DataSource parameter instead of Data!");
// throw new NullReferenceException($"{_gridLogName} Use the DataSource parameter instead of Data!");
// }
// return _dataSource!;
// }
// set
// {
// _dataSourceParam = value;
// if (_dataSource != null! && _dataSourceParam is List<TDataItem> workingReferenceList)
// _dataSource.SetWorkingReferenceList(workingReferenceList);
// }
// }
// protected override async Task OnInitializedAsync()
// {
// if (Logger == null)
// throw new NullReferenceException($"[{GetType().Name}] Logger == null");
// if (SignalRClient == null)
// {
// Logger.Error($"[{GetType().Name}] SignalRClient == null");
// throw new NullReferenceException($"[{GetType().Name}] SignalRClient == null");
// }
// var crudTags = new SignalRCrudTags(GetAllMessageTag, GetItemMessageTag, AddMessageTag, UpdateMessageTag, RemoveMessageTag);
// _dataSource = new SignalRDataSource<TDataItem>(SignalRClient, crudTags, ContextIds) { FilterText = FilterText };
// Data = _dataSource;
// _dataSource.OnDataSourceLoaded += OnDataSourceLoaded;
// _dataSource.OnDataSourceItemChanged += OnDataSourceItemChanged;
// await base.OnInitializedAsync();
// }
// private async Task OnDataSourceItemChanged(ItemChangedEventArgs<TDataItem> args)
// {
// if (args.TrackingState is TrackingState.GetAll or TrackingState.None) return;
// Logger.Debug($"{_gridLogName} OnDataSourceItemChanged; trackingState: {args.TrackingState}");
// var changedEventArgs = new GridDataItemChangedEventArgs<TDataItem>(this, args.Item, args.TrackingState);
// await OnGridItemChanged.InvokeAsync(changedEventArgs);
// if (!changedEventArgs.CancelStateChangeInvoke)
// {
// //BeginUpdate();
// await InvokeAsync(StateHasChanged); //TODO: bezárja a DetailRow-t! pl: az email-nél IsReaded=true update... - J.
// //EndUpdate();
// }
// }
// private Task OnDataSourceLoaded()
// {
// Logger.Debug($"{_gridLogName} OnDataSourceLoaded; Count: {_dataSource.Count}");
// Reload();
// //_dataSource.LoadItem(_dataSource.First().Id).Forget();
// return OnDataSourceChanged.InvokeAsync(_dataSource);
// }
// protected override async Task OnAfterRenderAsync(bool firstRender)
// {
// if (firstRender)
// {
// if (_dataSourceParam != null!) await _dataSource.LoadDataSource(_dataSourceParam, true, true);
// else _dataSource.LoadDataSourceAsync(true).Forget();
// }
// await base.OnAfterRenderAsync(firstRender);
// }
// public Task AddDataItem(TDataItem dataItem)
// {
// if (dataItem.Id.IsNullOrEmpty()) dataItem.Id = Guid.NewGuid();
// return _dataSource.Add(dataItem, true);
// }
// public Task AddDataItemAsync(TDataItem dataItem)
// {
// if (dataItem.Id.IsNullOrEmpty()) dataItem.Id = Guid.NewGuid();
// _dataSource.Add(dataItem);
// return SaveChangesToServerAsync();
// }
// private async Task OnItemSaving(GridEditModelSavingEventArgs e)
// {
// var dataItem = (e.EditModel as TDataItem)!;
// if (e.IsNew && dataItem.Id.IsNullOrEmpty()) dataItem.Id = Guid.NewGuid();
// var logText = e.IsNew ? "add" : "update";
// Logger.Debug($"{_gridLogName} OnItemSaving {logText}; Id: {dataItem.Id}");
// await OnGridEditModelSaving.InvokeAsync(e);
// if (e.Cancel)
// {
// Logger.Debug($"{_gridLogName} OnItemSaving {logText} canceled; Id: {dataItem.Id}");
// return;
// }
// if (e.IsNew) await AddDataItemAsync(dataItem);
// else await UpdateDataItemAsync(dataItem);
// _dataSource.UpdateCollection(dataItem, false);
// }
// private Task SaveChangesToServerAsync()
// {
// try
// {
// return _dataSource.SaveChangesAsync();
// }
// catch (Exception ex)
// {
// Logger.Error($"{_gridLogName} SaveChangesToServerAsync->SaveChangesAsync error!", ex);
// }
// return Task.CompletedTask;
// }
// private async Task<bool> SaveChangesToServer()
// {
// var result = false;
// try
// {
// var unsavedItems = await _dataSource.SaveChanges();
// if ((result = unsavedItems.Count == 0) == false)
// Logger.Error($"{_gridLogName} SaveChangesToServer->SaveChanges error! unsavedCount: {unsavedItems.Count}");
// }
// catch (Exception ex)
// {
// Logger.Error($"{_gridLogName} OnItemSaving", ex);
// }
// return result;
// }
// private async Task OnItemDeleting(GridDataItemDeletingEventArgs e)
// {
// Logger.Debug($"{_gridLogName} OnItemDeleting");
// await OnGridItemDeleting.InvokeAsync(e);
// if (e.Cancel)
// {
// Logger.Debug($"{_gridLogName} OnItemDeleting canceled");
// return;
// }
// var dataItem = (e.DataItem as TDataItem)!;
// await RemoveDataItem(dataItem);
// }
// private void OnCustomizeElement(GridCustomizeElementEventArgs e)
// {
// if (e.ElementType == GridElementType.DetailCell)
// {
// e.Style = "padding: 0.5rem; opacity: 0.75";
// }
// else if (false && e.ElementType == GridElementType.DataCell && e.Column.Name == nameof(IId<Guid>.Id))
// {
// e.Column.Visible = AcDomain.IsDeveloperVersion;
// e.Column.ShowInColumnChooser = AcDomain.IsDeveloperVersion;
// }
// }
// protected override Task SetParametersAsyncCore(ParameterView parameters)
// {
// if (!IsFirstInitializeParameters)
// {
// //if (typeof(TDataItem) is IId<Guid> || typeof(TDataItem) is IId<int>)
// KeyFieldName = "Id";
// base.DataItemDeleting = EventCallback.Factory.Create<GridDataItemDeletingEventArgs>(this, OnItemDeleting);
// base.EditModelSaving = EventCallback.Factory.Create<GridEditModelSavingEventArgs>(this, OnItemSaving);
// CustomizeElement += OnCustomizeElement;
// //ShowFilterRow = true;
// //PageSize = 4;
// //ShowGroupPanel = true;
// //AllowSort = false;
// TextWrapEnabled = false;
// AllowSelectRowByClick = true;
// HighlightRowOnHover = true;
// AutoCollapseDetailRow = true;
// AutoExpandAllGroupRows = false;
// //KeyboardNavigationEnabled = true;
// //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;
// }
// return base.SetParametersAsyncCore(parameters);
// }
// protected override void OnParametersSet()
// {
// base.OnParametersSet();
// if (GridName.IsNullOrWhiteSpace()) GridName = $"{typeof(TDataItem).Name}Grid";
// _gridLogName = $"[{GridName}]";
// }
// //public Task AddDataItem(TDataItem dataItem, int messageTag) => PostDataToServerAsync(dataItem, messageTag, TrackingState.Add);
// public Task UpdateDataItem(TDataItem dataItem) => _dataSource.Update(dataItem, true);
// public Task UpdateDataItemAsync(TDataItem dataItem)
// {
// _dataSource.Update(dataItem, false);
// return SaveChangesToServerAsync();
// }
// //public Task UpdateDataItem(TDataItem dataItem, int messageTag) => PostDataToServerAsync(dataItem, messageTag, TrackingState.Update);
// public Task AddOrUpdateDataItem(TDataItem dataItem) => _dataSource.AddOrUpdate(dataItem, true);
// public Task RemoveDataItem(TDataItem dataItem) => _dataSource.Remove(dataItem, true);
// //public Task RemoveDataItem(TDataItem dataItem, int messageTag) => PostDataToServerAsync(dataItem, messageTag, TrackingState.Remove);
// public Task RemoveDataItem(Guid id) => RemoveDataItem(id, RemoveMessageTag);
// public Task RemoveDataItem(Guid id, int messageTag)
// {
// var dataItem = _dataSource.FirstOrDefault(x => x.Id == id);
// if (dataItem == null) return Task.CompletedTask;
// return _dataSource.Remove(dataItem, true);
// }
// public Task ReloadDataSourceAsync()
// {
// return _dataSource.LoadDataSourceAsync(false);
// }
//}

View File

@ -1,16 +1,8 @@
using System.ComponentModel;
using System.Data.Common;
using AyCode.Blazor.Components.Services;
using AyCode.Core;
using AyCode.Blazor.Components.Components.Grids;
using AyCode.Core.Enums;
using AyCode.Core.Extensions;
using AyCode.Core.Helpers;
using AyCode.Core.Interfaces;
using AyCode.Services.Server.SignalRs;
using AyCode.Services.SignalRs;
using AyCode.Utils.Extensions;
using DevExpress.Blazor;
using Microsoft.AspNetCore.Components;
using DevExpress.Blazor.Internal;
using System.Data.Common;
using TIAM.Core.Enums;
using TIAM.Entities.Transfers;
using TIAM.Services;
@ -19,347 +11,6 @@ using TIAMWebApp.Shared.Application.Utility;
namespace TIAMSharedUI.Shared.Components.Grids
{
public class TiamGrid<TDataItem> : DxGrid where TDataItem : class, IId<Guid>
{
protected bool IsFirstInitializeParameters;
private SignalRDataSource<TDataItem> _dataSource = null!;
private IList<TDataItem> _dataSourceParam = [];
private string _gridLogName;
public TiamGrid() : base()
{
}
[Parameter] public LoggerClient Logger { get; set; }
[Parameter] public string GridName { get; set; }
[Parameter] public object[]? ContextIds { get; set; }
private string? _filterText = null;
[Parameter]
public string? FilterText
{
get => _filterText;
set
{
_filterText = value;
if (_dataSource != null! && _dataSource.FilterText != value)
{
_dataSource.FilterText = value;
ReloadDataSourceAsync().Forget();
}
}
}
[Parameter] public AcSignalRClientBase SignalRClient { get; set; }
[Parameter] public int GetAllMessageTag { get; set; }
[Parameter] public int GetItemMessageTag { get; set; }
[Parameter] public int AddMessageTag { get; set; }
[Parameter] public int UpdateMessageTag { get; set; }
[Parameter] public int RemoveMessageTag { get; set; }
protected new EventCallback<GridDataItemDeletingEventArgs> DataItemDeleting { get; set; }
[Parameter] public EventCallback<GridDataItemDeletingEventArgs> OnGridItemDeleting { get; set; }
protected new EventCallback<GridEditModelSavingEventArgs> EditModelSaving { get; set; }
[Parameter] public EventCallback<GridEditModelSavingEventArgs> OnGridEditModelSaving { get; set; }
[Parameter] public EventCallback<IList<TDataItem>> OnDataSourceChanged { get; set; }
[Parameter] public EventCallback<GridDataItemChangingEventArgs<TDataItem>> OnGridItemChanging { get; set; }
/// <summary>
/// After the server has responded!
/// </summary>
[Parameter]
public EventCallback<GridDataItemChangedEventArgs<TDataItem>> OnGridItemChanged { get; set; }
[Parameter]
[DefaultValue(null)]
[System.Diagnostics.CodeAnalysis.SuppressMessage("Usage", "BL0007:Component parameters should be auto properties", Justification = "<Pending>")]
public IList<TDataItem> DataSource
{
get
{
if (_dataSource == null && Data != null)
{
Logger.Error($"{_gridLogName} Use the DataSource parameter instead of Data!");
throw new NullReferenceException($"{_gridLogName} Use the DataSource parameter instead of Data!");
}
return _dataSource!;
}
set
{
_dataSourceParam = value;
if (_dataSource != null! && _dataSourceParam is List<TDataItem> workingReferenceList)
_dataSource.SetWorkingReferenceList(workingReferenceList);
}
}
protected override async Task OnInitializedAsync()
{
if (Logger == null)
throw new NullReferenceException($"[{GetType().Name}] Logger == null");
if (SignalRClient == null)
{
Logger.Error($"[{GetType().Name}] SignalRClient == null");
throw new NullReferenceException($"[{GetType().Name}] SignalRClient == null");
}
var crudTags = new SignalRCrudTags(GetAllMessageTag, GetItemMessageTag, AddMessageTag, UpdateMessageTag, RemoveMessageTag);
_dataSource = new SignalRDataSource<TDataItem>(SignalRClient, crudTags, ContextIds) { FilterText = FilterText };
Data = _dataSource;
_dataSource.OnDataSourceLoaded += OnDataSourceLoaded;
_dataSource.OnDataSourceItemChanged += OnDataSourceItemChanged;
await base.OnInitializedAsync();
}
private async Task OnDataSourceItemChanged(ItemChangedEventArgs<TDataItem> args)
{
if (args.TrackingState is TrackingState.GetAll or TrackingState.None) return;
Logger.Debug($"{_gridLogName} OnDataSourceItemChanged; trackingState: {args.TrackingState}");
var changedEventArgs = new GridDataItemChangedEventArgs<TDataItem>(this, args.Item, args.TrackingState);
await OnGridItemChanged.InvokeAsync(changedEventArgs);
if (!changedEventArgs.CancelStateChangeInvoke)
{
//BeginUpdate();
await InvokeAsync(StateHasChanged); //TODO: bezárja a DetailRow-t! pl: az email-nél IsReaded=true update... - J.
//EndUpdate();
}
}
private Task OnDataSourceLoaded()
{
Logger.Debug($"{_gridLogName} OnDataSourceLoaded; Count: {_dataSource.Count}");
Reload();
//_dataSource.LoadItem(_dataSource.First().Id).Forget();
return OnDataSourceChanged.InvokeAsync(_dataSource);
}
protected override async Task OnAfterRenderAsync(bool firstRender)
{
if (firstRender)
{
if (_dataSourceParam != null!) await _dataSource.LoadDataSource(_dataSourceParam, true, true);
else _dataSource.LoadDataSourceAsync(true).Forget();
}
await base.OnAfterRenderAsync(firstRender);
}
public Task AddDataItem(TDataItem dataItem)
{
if (dataItem.Id.IsNullOrEmpty()) dataItem.Id = Guid.NewGuid();
return _dataSource.Add(dataItem, true);
}
public Task AddDataItemAsync(TDataItem dataItem)
{
if (dataItem.Id.IsNullOrEmpty()) dataItem.Id = Guid.NewGuid();
_dataSource.Add(dataItem);
return SaveChangesToServerAsync();
}
private async Task OnItemSaving(GridEditModelSavingEventArgs e)
{
var dataItem = (e.EditModel as TDataItem)!;
if (e.IsNew && dataItem.Id.IsNullOrEmpty()) dataItem.Id = Guid.NewGuid();
var logText = e.IsNew ? "add" : "update";
Logger.Debug($"{_gridLogName} OnItemSaving {logText}; Id: {dataItem.Id}");
await OnGridEditModelSaving.InvokeAsync(e);
if (e.Cancel)
{
Logger.Debug($"{_gridLogName} OnItemSaving {logText} canceled; Id: {dataItem.Id}");
return;
}
if (e.IsNew) await AddDataItemAsync(dataItem);
else await UpdateDataItemAsync(dataItem);
_dataSource.UpdateCollection(dataItem, false);
}
private Task SaveChangesToServerAsync()
{
try
{
return _dataSource.SaveChangesAsync();
}
catch (Exception ex)
{
Logger.Error($"{_gridLogName} SaveChangesToServerAsync->SaveChangesAsync error!", ex);
}
return Task.CompletedTask;
}
private async Task<bool> SaveChangesToServer()
{
var result = false;
try
{
var unsavedItems = await _dataSource.SaveChanges();
if ((result = unsavedItems.Count == 0) == false)
Logger.Error($"{_gridLogName} SaveChangesToServer->SaveChanges error! unsavedCount: {unsavedItems.Count}");
}
catch (Exception ex)
{
Logger.Error($"{_gridLogName} OnItemSaving", ex);
}
return result;
}
private async Task OnItemDeleting(GridDataItemDeletingEventArgs e)
{
Logger.Debug($"{_gridLogName} OnItemDeleting");
await OnGridItemDeleting.InvokeAsync(e);
if (e.Cancel)
{
Logger.Debug($"{_gridLogName} OnItemDeleting canceled");
return;
}
var dataItem = (e.DataItem as TDataItem)!;
await RemoveDataItem(dataItem);
}
private void OnCustomizeElement(GridCustomizeElementEventArgs e)
{
if (e.ElementType == GridElementType.DetailCell)
{
e.Style = "padding: 0.5rem; opacity: 0.75";
}
else if (false && e.ElementType == GridElementType.DataCell && e.Column.Name == nameof(IId<Guid>.Id))
{
e.Column.Visible = AcDomain.IsDeveloperVersion;
e.Column.ShowInColumnChooser = AcDomain.IsDeveloperVersion;
}
}
protected override Task SetParametersAsyncCore(ParameterView parameters)
{
if (!IsFirstInitializeParameters)
{
//if (typeof(TDataItem) is IId<Guid> || typeof(TDataItem) is IId<int>)
KeyFieldName = "Id";
base.DataItemDeleting = EventCallback.Factory.Create<GridDataItemDeletingEventArgs>(this, OnItemDeleting);
base.EditModelSaving = EventCallback.Factory.Create<GridEditModelSavingEventArgs>(this, OnItemSaving);
CustomizeElement += OnCustomizeElement;
//ShowFilterRow = true;
//PageSize = 4;
//ShowGroupPanel = true;
//AllowSort = false;
TextWrapEnabled = false;
AllowSelectRowByClick = true;
HighlightRowOnHover = true;
AutoCollapseDetailRow = true;
AutoExpandAllGroupRows = false;
//KeyboardNavigationEnabled = true;
//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;
}
return base.SetParametersAsyncCore(parameters);
}
protected override void OnParametersSet()
{
base.OnParametersSet();
if (GridName.IsNullOrWhiteSpace()) GridName = $"{typeof(TDataItem).Name}Grid";
_gridLogName = $"[{GridName}]";
}
//public Task AddDataItem(TDataItem dataItem, int messageTag) => PostDataToServerAsync(dataItem, messageTag, TrackingState.Add);
public Task UpdateDataItem(TDataItem dataItem) => _dataSource.Update(dataItem, true);
public Task UpdateDataItemAsync(TDataItem dataItem)
{
_dataSource.Update(dataItem, false);
return SaveChangesToServerAsync();
}
//public Task UpdateDataItem(TDataItem dataItem, int messageTag) => PostDataToServerAsync(dataItem, messageTag, TrackingState.Update);
public Task AddOrUpdateDataItem(TDataItem dataItem) => _dataSource.AddOrUpdate(dataItem, true);
public Task RemoveDataItem(TDataItem dataItem) => _dataSource.Remove(dataItem, true);
//public Task RemoveDataItem(TDataItem dataItem, int messageTag) => PostDataToServerAsync(dataItem, messageTag, TrackingState.Remove);
public Task RemoveDataItem(Guid id) => RemoveDataItem(id, RemoveMessageTag);
public Task RemoveDataItem(Guid id, int messageTag)
{
var dataItem = _dataSource.FirstOrDefault(x => x.Id == id);
if (dataItem == null) return Task.CompletedTask;
return _dataSource.Remove(dataItem, true);
}
public Task ReloadDataSourceAsync()
{
return _dataSource.LoadDataSourceAsync(false);
}
}
public class GridDataItemChangingEventArgs<TDataItem> : GridDataItemChangedEventArgs<TDataItem> where TDataItem : class, IId<Guid>
{
internal GridDataItemChangingEventArgs(TiamGrid<TDataItem> grid, TDataItem dataItem, TrackingState trackingState) : base(grid, dataItem, trackingState)
{
}
public bool IsCanceled { get; set; }
}
public class GridDataItemChangedEventArgs<TDataItem> where TDataItem : class, IId<Guid>
{
internal GridDataItemChangedEventArgs(TiamGrid<TDataItem> grid, TDataItem dataItem, TrackingState trackingState)
{
Grid = grid;
DataItem = dataItem;
TrackingState = trackingState;
}
public TiamGrid<TDataItem> Grid { get; }
public TDataItem DataItem { get; }
public TrackingState TrackingState { get; }
public bool CancelStateChangeInvoke { get; set; }
}
public class TiamGrid<TDataItem> : MgGridBase<SignalRDataSource<TDataItem>, TDataItem, LoggerClient> where TDataItem : class, IId<Guid>
{}
}

View File

@ -1,5 +1,6 @@
@using TIAMWebApp.Shared.Application.Utility
@using AyCode.Core.Extensions
@using AyCode.Core.Loggers
@using AyCode.Services.Loggers
@using AyCode.Utils.Extensions
@inject IJSRuntime jsRuntime

View File

@ -1,4 +1,5 @@
@inherits LayoutComponentBase
@using AyCode.Core.Loggers
@using AyCode.Interfaces.StorageHandlers;
@using AyCode.Services.Loggers
@using TIAMSharedUI.Pages

View File

@ -1,4 +1,5 @@
@using AyCode.Services.Loggers
@using AyCode.Core.Loggers
@using AyCode.Services.Loggers
@using Microsoft.AspNetCore.Components.Authorization
@using Newtonsoft.Json
@using TIAM.Core.Loggers

View File

@ -12,6 +12,7 @@ using TIAMWebApp.Shared.Application.Services;
using TIAMWebApp.Shared.Application.Utility;
using AyCode.Services.Loggers;
using System.Net;
using AyCode.Core.Loggers;
using Microsoft.AspNetCore.Components.Authorization;
using TIAM.Models;
using TIAM.Models.PageViewModels;

View File

@ -1,6 +1,7 @@
using AyCode.Services.Loggers;
using System.Net.Http.Json;
using System.Text.Json;
using AyCode.Core.Loggers;
using TIAM.Entities.Permissions;
using TIAM.Models.Dtos.Products;
using TIAMWebApp.Shared.Application.Interfaces;

View File

@ -14,6 +14,7 @@ using AyCode.Core.Extensions;
using System.Text.Json;
using TIAM.Models;
using AyCode.Blazor.Components.Services;
using AyCode.Core.Loggers;
using TIAMWebApp.Shared.Application.Services;

View File

@ -1,9 +1,19 @@
using Microsoft.AspNetCore.Authentication.JwtBearer;
using Microsoft.AspNetCore.Http.Features;
using Microsoft.IdentityModel.Tokens;
using Microsoft.OpenApi.Models;
using System.Text;
using AyCode.Core.Loggers;
using Microsoft.AspNetCore.Authentication.JwtBearer;
using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
using Microsoft.AspNetCore.Http.Features;
using Microsoft.AspNetCore.Http.Json;
using Microsoft.AspNetCore.ResponseCompression;
using Microsoft.AspNetCore.Server.Kestrel.Core;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.IdentityModel.Tokens;
using Microsoft.OpenApi;
using Microsoft.OpenApi.Models;
using System.IO.Compression;
using System.Text;
using System.Text.Json.Serialization;
using TIAM.Core.Consts;
using TIAM.Core.Loggers;
using TIAM.Database;
using TIAM.Database.DataLayers.Admins;
@ -14,15 +24,6 @@ using TIAM.Entities.Emails;
using TIAM.Services.Server;
using TIAMWebApp.Server.Controllers;
using TIAMWebApp.Server.Services;
using Microsoft.AspNetCore.Server.Kestrel.Core;
using Microsoft.AspNetCore.ResponseCompression;
using System.IO.Compression;
using System.Text.Json.Serialization;
using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
using Microsoft.AspNetCore.Http.Json;
using Microsoft.EntityFrameworkCore;
using Microsoft.OpenApi;
using Microsoft.Extensions.DependencyInjection;
var builder = WebApplication.CreateBuilder(args);
@ -216,8 +217,8 @@ app.MapControllers();
app.MapBlazorHub();
app.MapHub<SignalRHub>("/TiamChatHub");
app.MapHub<LoggerSignalRHub>("/TiamLoggerHub");
app.MapHub<DevAdminSignalRHub>("/DevAdminHub");
app.MapHub<LoggerSignalRHub>($"/{TiamConstClient.LoggerHubName}");
app.MapHub<DevAdminSignalRHub>($"/{TiamConstClient.DevAdminHubName}");
app.MapHub<GameHub>("/gamehub");
app.MapFallbackToFile("index.html");

View File

@ -1,35 +1,10 @@
using AyCode.Core.Consts;
using AyCode.Entities.Server.LogItems;
using AyCode.Services.Server.SignalRs;
using Microsoft.AspNetCore.SignalR;
namespace TIAMWebApp.Server.Services;
public class LoggerSignalRHub(LoggerToLoggerApiController logger) : Hub
{
public void AddLogItem(AcLogItem? logItem)
{
try
{
if (logItem == null)
{
logger.Error("AddLogItem; LogItem == null");
//_logger.Writer<ConsoleLogWriter>().Detail("");
return;
}
//logItem.LogHeaderId = ???
logItem.TimeStampUtc = DateTime.UtcNow;
logger.Write(logItem);
//_logger.Writer<IAcConsoleLogWriter>()?.Write(logItem.AppType, logItem.LogLevel, logItem.Text, logItem.CallerName, logItem.CategoryName, logItem.ErrorType, logItem.Exception);
//_logger.Writer<DbLogItemWriter>().WriteLogItemAsync(logItem);
}
catch (Exception ex)
{
Console.WriteLine($@"ERROR!!! {nameof(LoggerSignalRHub)}->AddLogItem; ex: {ex.Message}{AcEnv.NL}{AcEnv.NL}{ex}");
}
}
}
public class LoggerSignalRHub(LoggerToLoggerApiController logger) : AcLoggerSignalRHub<LoggerToLoggerApiController>(logger)
{ }

View File

@ -1,10 +1,12 @@
using AyCode.Blazor.Components.Services;
using AyCode.Core.Consts;
using AyCode.Core.Helpers;
using AyCode.Core.Loggers;
using AyCode.Services.Loggers;
using AyCode.Services.Server.SignalRs;
using AyCode.Services.SignalRs;
using Microsoft.Extensions.DependencyInjection;
using TIAM.Core.Consts;
using TIAM.Entities.Drivers;
using TIAM.Entities.Transfers;
using TIAM.Entities.Users;
@ -18,7 +20,7 @@ namespace TIAMWebApp.Shared.Application.Services
{
public class AdminSignalRClient : AcSignalRClientBase, IUserApiControllerClient, ITransferApiControllerClient
{
public AdminSignalRClient(/*IServiceProvider serviceProvider, */IEnumerable<IAcLogWriterClientBase> logWriters) : base($"{Setting.BaseUrl}/DevAdminHub", new LoggerClient(nameof(AdminSignalRClient), logWriters.ToArray()))
public AdminSignalRClient(/*IServiceProvider serviceProvider, */IEnumerable<IAcLogWriterClientBase> logWriters) : base($"{Setting.BaseUrl}/{TiamConstClient.DevAdminHubName}", new LoggerClient(nameof(AdminSignalRClient), logWriters.ToArray()))
{
//var a = ActivatorUtilities.GetServiceOrCreateInstance<TransferDataService>(serviceProvider);
ConstHelper.NameByValue<SignalRTags>(0);

View File

@ -3,6 +3,7 @@ using DevExpress.Office;
using System.Net.Http;
using System.Net.Http.Json;
using System.Threading.Tasks;
using AyCode.Core.Loggers;
using TIAM.Core.Loggers;
using TIAMWebApp.Shared.Application.Models;
using TIAMWebApp.Shared.Application.Models.ClientSide;

View File

@ -1,6 +1,7 @@
using AyCode.Interfaces.StorageHandlers;
using Newtonsoft.Json;
using System.Net.Http.Json;
using AyCode.Core.Loggers;
using AyCode.Services.Loggers;
using AyCode.Services.SignalRs;
using TIAM.Entities.Products;

View File

@ -7,6 +7,7 @@ using TIAMWebApp.Shared.Application.Utility;
using TIAM.Core.Loggers;
using System.Text.Json;
using System.Text.Json.Serialization;
using AyCode.Core.Loggers;
namespace TIAMWebApp.Shared.Application.Services
{

View File

@ -1,6 +1,7 @@
using AyCode.Services.Loggers;
using System.Net.Http.Json;
using System.Text.Json;
using AyCode.Core.Loggers;
using TIAM.Core.Loggers;
using TIAM.Entities.Transfers;
using TIAMWebApp.Shared.Application.Interfaces;

View File

@ -2,6 +2,7 @@
using System.Text;
using System.Text.Json;
using AyCode.Core.Extensions;
using AyCode.Core.Loggers;
using AyCode.Interfaces.StorageHandlers;
using AyCode.Services.Loggers;
using AyCode.Utils.Extensions;

View File

@ -2,6 +2,7 @@
using AyCode.Core.Loggers;
using AyCode.Services.Loggers;
using Microsoft.JSInterop;
using TIAM.Core.Consts;
namespace TIAMWebApp.Shared.Application.Utility;
@ -14,34 +15,6 @@ namespace TIAMWebApp.Shared.Application.Utility;
// { }
//}
public class BrowserConsoleLogWriter : AcTextLogWriterBase, IAcLogWriterClientBase
public class BrowserConsoleLogWriter(IJSRuntime jsRuntime) : AcBrowserConsoleLogWriter(jsRuntime, AppType.Web, TiamConstClient.DefaultLogLevelClient)
{
private readonly IJSRuntime _jsRuntime;
private readonly Dictionary<LogLevel, string> _invokeConsoleNames = new()
{
[LogLevel.Detail] = "console.info", //trace
[LogLevel.Trace] = "console.info",
[LogLevel.Debug] = "console.info",
[LogLevel.Info] = "console.info",
[LogLevel.Suggest] = "console.info",
[LogLevel.Warning] = "console.warn",
[LogLevel.Error] = "console.error"
};
public BrowserConsoleLogWriter(IJSRuntime jsRuntime) : base(AppType.Web, LogLevel.Info)
{
_jsRuntime = jsRuntime;
}
protected override void WriteText(string? logText, LogLevel logLevel)
{
_jsRuntime.InvokeVoidAsync(_invokeConsoleNames[logLevel], logText); //logText?.Replace(Environment.NewLine, "<br />"));
}
//public void Info(string message)
//{
// ((AcLogWriterBase)this).Info(message);
// //jsRuntime.InvokeVoidAsync("console.log", logText);
//}
}

View File

@ -1,18 +0,0 @@
namespace TIAMWebApp.Shared.Application.Utility
{
//public class LogToBrowserConsole
//{
// private readonly IJSRuntime jsRuntime;
// public LogToBrowserConsole(IJSRuntime jsRuntime)
// {
// this.jsRuntime = jsRuntime;
// }
// public void LogToBC(string message)
// {
// jsRuntime.InvokeVoidAsync("console.log", message);
// }
//}
}

View File

@ -5,55 +5,18 @@ using AyCode.Entities;
using AyCode.Entities.LogItems;
using AyCode.Services.Loggers;
using Microsoft.AspNetCore.SignalR.Client;
using TIAM.Core.Consts;
using TIAMWebApp.Shared.Application.Models.ClientSide;
namespace TIAMWebApp.Shared.Application.Utility
{
public class SignaRClientLogItemWriter : AcLogItemWriterBase<AcLogItemClient>, IAcLogWriterClientBase
public class SignaRClientLogItemWriter : AcSignaRClientLogItemWriter
{
private readonly HubConnection _hubConnection = new HubConnectionBuilder()
.WithUrl($"{Setting.BaseUrl}/TiamLoggerHub")
//.AddMessagePackProtocol(options => options.SerializerOptions = MessagePackSerializerOptions.Standard.WithSecurity(MessagePackSecurity.UntrustedData))
.Build();
public SignaRClientLogItemWriter() : this(AppType.Web, LogLevel.Detail)
{ }
public SignaRClientLogItemWriter(AppType appType, LogLevel logLevel, string? categoryName = null) : base(appType, logLevel, categoryName)
public SignaRClientLogItemWriter() : this(AppType.Web, LogLevel.Detail, null)
{
_hubConnection.StartAsync().Forget();
}
public async Task StartConnection()
public SignaRClientLogItemWriter(AppType appType, LogLevel logLevel, string? categoryName = null) : base($"{Setting.BaseUrl}/{TiamConstClient.LoggerHubName}", appType, logLevel, categoryName)
{
if (_hubConnection.State == HubConnectionState.Disconnected)
await _hubConnection.StartAsync();
if (_hubConnection.State != HubConnectionState.Connected)
await TaskHelper.WaitToAsync(() => _hubConnection.State == HubConnectionState.Connected, 10000, 10, 25);
}
public async Task StopConnection()
{
await _hubConnection.StopAsync();
await _hubConnection.DisposeAsync();
}
public override void Write(AppType appType, LogLevel logLevel, string? logText, string? callerMemberName, string? categoryName, string? errorType, string? exMessage)
=> WriteLogItem(CreateLogItem(DateTime.UtcNow, appType, Environment.CurrentManagedThreadId, logLevel, logText, callerMemberName, categoryName, errorType, exMessage));
protected override async void WriteLogItemCallback(AcLogItemClient logItem)
{
//Ez fontos, mert a signalR nem küldi a DateTime.Kind-ot! A szeró oldalon kap egy utc DateTime-ot, ami a kliens lokális DateTime-ját tartalmazza! - J.
logItem.TimeStampUtc = logItem.TimeStampUtc.ToUniversalTime();
await StartConnection();
if (_hubConnection.State != HubConnectionState.Connected)
return;
//var refreshToken = Setting.UserBasicDetails?.RefreshToken ?? Guid.NewGuid().ToString("N");
_hubConnection.SendAsync("AddLogItem", /*refreshToken,*/ logItem).Forget();
}
}
}