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

fixes

This commit is contained in:
jozsef.b@aycode.com 2024-05-14 14:41:17 +02:00
parent c0d9d4fcb2
commit 8251dc0a26
11 changed files with 113 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
TIAMSharedUI/Pages/Components/InputWizard.razor.cs
View File

@ -19,6 +19,7 @@ using DevExpress.Pdf.Native.BouncyCastle.Asn1.Cms;
using System.Text.RegularExpressions;
using AyCode.Core.Consts;
using AyCode.Core.Loggers;
using TIAM.Core.Loggers;
namespace TIAMSharedUI.Pages.Components
@ -26,7 +27,7 @@ namespace TIAMSharedUI.Pages.Components
public partial class InputWizard : ComponentBase
{
[Inject]
public required IAcLogWriterBase BrowserConsoleLogWriter { get; set; }
public required IEnumerable<IAcLogWriterBase> LogWriters { get; set; }
[Inject]
IStringLocalizer<TIAMResources> localizer { get; set; }
@ -61,11 +62,16 @@ namespace TIAMSharedUI.Pages.Components
[Parameter]
public string CssClass { get; set; } = "";
private ILogger _logger;
string _formSubmitResult = "";
private string _spinnerClass = "";
protected override async Task OnInitializedAsync()
{
_logger = new LoggerClient<InputWizard>(LogWriters.ToArray());
}
async Task HandleValidSubmit()
{
_spinnerClass = "spinner-border spinner-border-sm";
@ -97,13 +103,13 @@ namespace TIAMSharedUI.Pages.Components
public void OnNext(MouseEventArgs args)
{
BrowserConsoleLogWriter.Info("OnNext called");
_logger.Info("OnNext called");
CurrentStep++;
}
public void OnPrevious(MouseEventArgs args)
{
BrowserConsoleLogWriter.Info("OnPrev called");
_logger.Info("OnPrev called");
CurrentStep--;
}
@ -111,7 +117,7 @@ namespace TIAMSharedUI.Pages.Components
{
var _type = Data.GetType();
BrowserConsoleLogWriter.Info("Hellooooo " + _type.AssemblyQualifiedName);
_logger.Info("Hellooooo " + _type.AssemblyQualifiedName);
var propertyList = _type.GetProperties();
var _length = propertyList.Length - IgnoreReflection.Count;
@ -137,7 +143,7 @@ namespace TIAMSharedUI.Pages.Components
if (!FormSteps.ContainsKey(k))
{
_stepID = Guid.NewGuid();
BrowserConsoleLogWriter.Info($"Adding step {k}, {_stepID}, for {property.Name}");
_logger.Info($"Adding step {k}, {_stepID}, for {property.Name}");
FormSteps.Add(k, _stepID);
}
else
@ -150,7 +156,7 @@ namespace TIAMSharedUI.Pages.Components
//the following line creates a lambda expression that returns the value of the property
var lambda = Expression.Lambda(typeof(Func<>).MakeGenericType(property.PropertyType), access);
BrowserConsoleLogWriter.Info(lambda.ToString());
_logger.Info(lambda.ToString());
layoutItemBuilder.OpenElement(i++, "div");//open div
layoutItemBuilder.AddAttribute(i++, "id", _stepID.ToString());
@ -163,7 +169,7 @@ namespace TIAMSharedUI.Pages.Components
else
{
//this input should be focused, so we set a flag
BrowserConsoleLogWriter.Info($"Setting focus to {property.Name}");
_logger.Info($"Setting focus to {property.Name}");
}
@ -184,7 +190,7 @@ namespace TIAMSharedUI.Pages.Components
case DataType.Text:
{
editor.OpenComponent<DxTextBox>(j++);
BrowserConsoleLogWriter.Info($"{property.Name}, {property.PropertyType}");
_logger.Info($"{property.Name}, {property.PropertyType}");
editor.AddAttribute(j++, "Text", property.GetValue(Data));
editor.AddAttribute(j++, "TextExpression", lambda);
editor.AddAttribute(j++, "CssClass", "form-field");
@ -359,9 +365,9 @@ namespace TIAMSharedUI.Pages.Components
//editor.AddAttribute(j++, "TExpression", lambda);
editor.AddAttribute(j++, "OnSliderChanged", EventCallback.Factory.Create<string>(this, result =>
{
BrowserConsoleLogWriter.Info($"Slider changed to {result}");
_logger.Info($"Slider changed to {result}");
property.SetValue(Data, result);
BrowserConsoleLogWriter.Info($"bleh: {property.Name} = {property.GetValue(Data)}");
_logger.Info($"bleh: {property.Name} = {property.GetValue(Data)}");
StateHasChanged(); // Add this line to refresh the UI
}));
@ -375,7 +381,7 @@ namespace TIAMSharedUI.Pages.Components
editor.AddAttribute(j++, "TextChanged", EventCallback.Factory.Create<string>(this, str =>
{
property.SetValue(Data, str);
BrowserConsoleLogWriter.Info($"bleh: {property.Name} = {property.GetValue(Data)}");
_logger.Info($"bleh: {property.Name} = {property.GetValue(Data)}");
}));
editor.CloseComponent();
@ -388,7 +394,7 @@ namespace TIAMSharedUI.Pages.Components
editor.AddAttribute(j++, "NullText", "Please tell us your name.");
editor.AddAttribute(j++, "FirstNameChanged", EventCallback.Factory.Create<string>(this, result =>
{
BrowserConsoleLogWriter.Info($"FirstName changed to {result}");
_logger.Info($"FirstName changed to {result}");
//find property with name FirstName
PropertyInfo firstNameProperty = propertyList.FirstOrDefault(p => p.Name == "FirstName");
@ -407,7 +413,7 @@ namespace TIAMSharedUI.Pages.Components
editor.AddAttribute(j++, "LastNameChanged", EventCallback.Factory.Create<string>(this, result =>
{
BrowserConsoleLogWriter.Info($"LastName changed to {result}");
_logger.Info($"LastName changed to {result}");
//find property with name FirstName
PropertyInfo firstNameProperty = propertyList.FirstOrDefault(p => p.Name == "FirstName");
@ -422,7 +428,7 @@ namespace TIAMSharedUI.Pages.Components
string fullName = $"{firstName} {lastName}";
property.SetValue(Data, fullName);
}
BrowserConsoleLogWriter.Info($"bleh: {property.Name} = {property.GetValue(Data)}");
_logger.Info($"bleh: {property.Name} = {property.GetValue(Data)}");
StateHasChanged(); // Add this line to refresh the UI
}));
@ -436,7 +442,7 @@ namespace TIAMSharedUI.Pages.Components
editor.AddAttribute(j++, "TextChanged", EventCallback.Factory.Create<string>(this, str =>
{
property.SetValue(Data, str);
BrowserConsoleLogWriter.Info($"bleh: {property.Name} = {property.GetValue(Data)}");
_logger.Info($"bleh: {property.Name} = {property.GetValue(Data)}");
}));
editor.CloseComponent();
@ -502,7 +508,7 @@ namespace TIAMSharedUI.Pages.Components
layoutItemBuilder.CloseElement();
BrowserConsoleLogWriter.Info($"loop {k}, length: {_length}, formSteps: {FormSteps.Count} ");
_logger.Info($"loop {k}, length: {_length}, formSteps: {FormSteps.Count} ");
k++;
}
@ -511,7 +517,7 @@ namespace TIAMSharedUI.Pages.Components
layoutItemBuilder.AddAttribute(i++, "CssClass", "full-width justify-content-center");
layoutItemBuilder.AddAttribute(i++, "Template", (RenderFragment<object>)((context) => ((editor) =>
{
BrowserConsoleLogWriter.Info($"Submit button {CurrentStep}, {FormSteps.Count}");
_logger.Info($"Submit button {CurrentStep}, {FormSteps.Count}");
editor.OpenElement(i++, "button");
editor.AddAttribute(i++, "type", "submit");
@ -554,7 +560,7 @@ namespace TIAMSharedUI.Pages.Components
private void SetPhoneNumber(PropertyInfo property, object Data, string str)
{
BrowserConsoleLogWriter.Info($"SetPhoneNumber called with {str}");
_logger.Info($"SetPhoneNumber called with {str}");
property.SetValue(Data, str);
}
}

25
TIAMSharedUI/Pages/LaunchAdmin.razor
View File

@ -7,28 +7,29 @@
@using AyCode.Core.Loggers
@using TIAMWebApp.Shared.Application.Models.ClientSide
@using AyCode.Interfaces.StorageHandlers;
@using TIAM.Core.Loggers
@inject NavigationManager NavManager
@inject IJSRuntime JSRuntime
@inject IAcLogWriterBase BrowserConsoleLogWriter
@inject IUserDataService UserDataService
@inject ISecureStorageHandler SecureStorageHandler
@inject HttpClient http;
@inject IEnumerable<IAcLogWriterBase> LogWriters
<h3>AppLaunch</h3>
Loading....
@code {
private ILogger _logger;
protected async override Task OnInitializedAsync()
protected override async Task OnInitializedAsync()
{
BrowserConsoleLogWriter = new BrowserConsoleLogWriter(JSRuntime);
_logger = new LoggerClient<LaunchAdmin>(LogWriters.ToArray());
//wait for 5 seconds
await Task.Delay(5000);
//await Task.Delay(5000);
string userDetailsStr = await SecureStorageHandler.GetFromSecureStorageAsync(nameof(Setting.UserBasicDetails));
BrowserConsoleLogWriter.Info(userDetailsStr);
_logger.Info(userDetailsStr);
if (!string.IsNullOrWhiteSpace(userDetailsStr))
{
var userBasicDetail = JsonConvert.DeserializeObject<UserBasicDetails>(userDetailsStr);
@ -41,30 +42,30 @@ Loading....
if (jsontoken?.ValidTo < DateTime.UtcNow)
{
BrowserConsoleLogWriter.Info("Token needs to be refreshed");
_logger.Info("Token needs to be refreshed");
bool isTokenRefreshed = await UserDataService.RefreshToken();
if (isTokenRefreshed)
{
BrowserConsoleLogWriter.Info("Token refreshed");
_logger.Info("Token refreshed");
NavManager.NavigateTo("/home");
}
else
{
BrowserConsoleLogWriter.Info("Couldn't refresh token");
_logger.Info("Couldn't refresh token");
NavManager.NavigateTo("/login");
}
}
else
{
BrowserConsoleLogWriter.Info("Valid token found");
_logger.Info("Valid token found");
NavManager.NavigateTo("/home");
}
}
else
{
BrowserConsoleLogWriter.Info("No token stored yet");
_logger.Info("No token stored yet");
NavManager.NavigateTo("/login");
}

18
TIAMSharedUI/Pages/User/SysAdmins/Grid_MasterDetail_NestedGrid_DetailContent.razor
View File

@ -3,8 +3,11 @@
@using TIAM.Models.Dtos.Users
@using TIAMWebApp.Shared.Application.Interfaces
@using TIAMWebApp.Shared.Application.Utility
@using TIAM.Core.Loggers
@using AyCode.Core.Loggers
@inject IUserDataService NwindDataService
@inject BrowserConsoleLogWriter BrowserConsoleLogWriter
@inject IEnumerable<IAcLogWriterBase> LogWriters
<div class="mb-2">
Contact Phone: @PhoneNumber
@ -38,6 +41,7 @@
[Parameter]
public Transfer Customer { get; set; }
private ILogger _logger;
List<TransferToDriver> DetailGridData { get; set; }
public UserModelDtoDetail UserInfo;
@ -46,11 +50,13 @@
protected override async Task OnInitializedAsync()
{
_logger = new LoggerClient<Grid_MasterDetail_NestedGrid_DetailContent>(LogWriters.ToArray());
UserInfo = await NwindDataService.GetUserDetailByIdAsync(Customer.UserId);
PhoneNumber = UserInfo.UserDto.PhoneNumber;
EmailAddress = UserInfo.UserDto.EmailAddress;
DetailGridData = Customer.TransferToDrivers;
BrowserConsoleLogWriter.Info($"DetailGridData: {DetailGridData.Count}");
_logger.Info($"DetailGridData: {DetailGridData.Count}");
}
void CustomizeEditModel(GridCustomizeEditModelEventArgs e)
@ -73,10 +79,10 @@
{
if (e.IsNew)
//add new orderData to orderData array
BrowserConsoleLogWriter.Info("New orderData added");
_logger.Info("New orderData added");
//await NwindDataService.InsertEmployeeAsync((EditableEmployee)e.EditModel);
else
BrowserConsoleLogWriter.Info("orderData updated");
_logger.Info("orderData updated");
//await NwindDataService.UpdateEmployeeAsync((EditableEmployee)e.DataItem, (EditableEmployee)e.EditModel);
@ -86,14 +92,14 @@
{
//await NwindDataService.RemoveEmployeeAsync((EditableEmployee)e.DataItem);
//remove orderData from orderData array
BrowserConsoleLogWriter.Info("orderData deleted");
_logger.Info("orderData deleted");
//await UpdateDataAsync();
}
async Task UpdateDataAsync()
{
//DataSource = await NwindDataService.GetEmployeesEditableAsync();
//refresh grid
BrowserConsoleLogWriter.Info("orderData grid refreshed");
_logger.Info("orderData grid refreshed");
}
}

3
TIAMSharedUI/Pages/User/SysAdmins/ManageProducts.razor
View File

@ -7,9 +7,10 @@
@using TIAMWebApp.Shared.Application.Models.ClientSide.UI.WizardModels
@using TIAMWebApp.Shared.Application.Models.ClientSide.Messages
@using TIAMWebApp.Shared.Application.Utility
@using AyCode.Core.Loggers
@layout AdminLayout
@inject BrowserConsoleLogWriter BrowserConsoleLogWriter
@inject IStringLocalizer<TIAMResources> localizer
@inject BrowserConsoleLogWriter BrowserConsoleLogWriter
<!--div class="text-center m-5">
<h1>Service management</h1>

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

@ -14,8 +14,10 @@
@using TIAMWebApp.Shared.Application.Models.ClientSide.Messages
@using TIAMWebApp.Shared.Application.Models.PageModels
@using TIAMWebApp.Shared.Application.Utility
@using AyCode.Core.Loggers
@using TIAM.Core.Loggers
@layout AdminLayout
@inject BrowserConsoleLogWriter BrowserConsoleLogWriter
@inject IEnumerable<IAcLogWriterBase> LogWriters
@inject IStringLocalizer<TIAMResources> localizer
@inject IWizardProcessor wizardProcessor
@inject ITransferDataService transferDataService
@ -195,7 +197,7 @@
@code {
private ILogger _logger;
public Transfer myModel = new Transfer();
@ -223,7 +225,7 @@
void SendMail(Transfer Item)
{
BrowserConsoleLogWriter.Info($"Sending mail to {Item.ContactEmail}");
_logger.Info($"Sending mail to {Item.ContactEmail}");
PopupVisible = true;
}
@ -250,7 +252,7 @@
{
var email = await wizardProcessor.ProcessWizardAsync<MessageWizardModel>(Result.GetType(), Result);
BrowserConsoleLogWriter.Info($"Submitted nested form: {Result.GetType().FullName}");
_logger.Info($"Submitted nested form: {Result.GetType().FullName}");
}
void Grid_CustomizeElement(GridCustomizeElementEventArgs e)
@ -301,12 +303,12 @@
if (e.IsNew)
{
//add new orderData to orderData array
BrowserConsoleLogWriter.Info("New orderData added");
_logger.Info("New orderData added");
//await transferDataService.CreateTransfer((TransferWizardModel)e.EditModel);
}
else
{
BrowserConsoleLogWriter.Info("orderData updated at id " + ((Transfer)e.EditModel).Id);
_logger.Info("orderData updated at id " + ((Transfer)e.EditModel).Id);
success = await transferDataService.UpdateTransferAsync((Transfer)e.EditModel);
@ -329,18 +331,20 @@
{
//await NwindDataService.RemoveEmployeeAsync((EditableEmployee)e.DataItem);
//remove orderData from orderData array
BrowserConsoleLogWriter.Info("orderData deleted");
_logger.Info("orderData deleted");
//await UpdateDataAsync();
}
async Task UpdateDataAsync()
{
//refresh grid
TransferData = await transferDataService.GetTransfersAsync();
BrowserConsoleLogWriter.Info("orderData grid refreshed");
_logger.Info("orderData grid refreshed");
}
protected override async Task OnInitializedAsync()
{
_logger = new LoggerClient<ManageTransfers>(LogWriters.ToArray());
Statuses = new List<TransferStatusModel>
{
new TransferStatusModel(Convert.ToInt16(TransferStatusType.OrderSubmitted), "Order submitted"),

21
TIAMSharedUI/Pages/User/SysAdmins/ManageUsers.razor
View File

@ -17,8 +17,10 @@
@using TIAMWebApp.Shared.Application.Models.ClientSide.Messages
@using TIAMWebApp.Shared.Application.Models.PageModels
@using TIAMWebApp.Shared.Application.Utility
@using AyCode.Core.Loggers
@using TIAM.Core.Loggers
@layout AdminLayout
@inject BrowserConsoleLogWriter BrowserConsoleLogWriter
@inject IEnumerable<IAcLogWriterBase> LogWriters
@inject IStringLocalizer<TIAMResources> localizer
@inject ISessionService sessionService
@inject IWizardProcessor wizardProcessor
@ -149,6 +151,7 @@
</div>
@code {
private ILogger _logger;
public UserModelDtoDetail myModel = new UserModelDtoDetail();
public List<UserModelDtoDetail>? UserData { get; set; }
@ -176,13 +179,13 @@
async void SendMail(UserModelDtoDetail Item)
{
var user = await userDataService.GetUserDetailByIdAsync(Item.Id);
BrowserConsoleLogWriter.Info($"Sending mail to {user.UserDto.EmailAddress}");
_logger.Info($"Sending mail to {user.UserDto.EmailAddress}");
messageWizardModel.ReceiverId = user.Id;
messageWizardModel.ReceiverEmailAddress = user.UserDto.EmailAddress;
messageWizardModel.SenderId = sessionService.User.UserId;
messageWizardModel.SenderEmailAddress = sessionService.User.Email;
BrowserConsoleLogWriter.Info($"Sending mail to {messageWizardModel.ReceiverEmailAddress} from {messageWizardModel.SenderId}");
_logger.Info($"Sending mail to {messageWizardModel.ReceiverEmailAddress} from {messageWizardModel.SenderId}");
PopupVisible = true;
}
@ -209,7 +212,7 @@
{
var email = await wizardProcessor.ProcessWizardAsync<MessageWizardModel>(Result.GetType(), Result);
BrowserConsoleLogWriter.Info($"Submitted nested form: {Result.GetType().FullName}");
_logger.Info($"Submitted nested form: {Result.GetType().FullName}");
}
void Grid_CustomizeElement(GridCustomizeElementEventArgs e)
@ -267,11 +270,11 @@
await userDataService.CreateGuestUser(registration);
BrowserConsoleLogWriter.Info("New user created added");
_logger.Info("New user created added");
}
else
{
BrowserConsoleLogWriter.Info("orderData updated at id " + ((UserModelDtoDetail)e.EditModel).Id);
_logger.Info("orderData updated at id " + ((UserModelDtoDetail)e.EditModel).Id);
//await transferDataService.UpdateTransferAsync((TransferWizardModel)e.EditModel);
//modify transferData where transferData.Id == e.EditModel.Id
@ -294,18 +297,20 @@
{
//await NwindDataService.RemoveEmployeeAsync((EditableEmployee)e.DataItem);
//remove orderData from orderData array
BrowserConsoleLogWriter.Info("orderData deleted");
_logger.Info("orderData deleted");
//await UpdateDataAsync();
}
async Task UpdateDataAsync()
{
//refresh grid
UserData = await userDataService.GetUsersWithDetailsAsync();
BrowserConsoleLogWriter.Info("orderData grid refreshed");
_logger.Info("orderData grid refreshed");
}
protected override async Task OnInitializedAsync()
{
_logger = new LoggerClient<ManageUsers>(LogWriters.ToArray());
UserData = (await userDataService.GetUsersWithDetailsAsync())?.OrderBy(x => x.Profile?.Name).ToList();
base.OnInitialized();
}

3
TIAMSharedUI/Pages/User/SysAdmins/TransferDestinations.razor
View File

@ -8,8 +8,9 @@
@using TIAMWebApp.Shared.Application.Models.ClientSide.UI.WizardModels
@using TIAMWebApp.Shared.Application.Models.ClientSide.Messages
@using TIAMWebApp.Shared.Application.Utility
@using AyCode.Core.Loggers
@layout AdminLayout
@inject BrowserConsoleLogWriter BrowserConsoleLogWriter
@inject IEnumerable<IAcLogWriterBase> LogWriters
@inject IStringLocalizer<TIAMResources> localizer
<PageTitle>Transfers</PageTitle>

25
TIAMSharedUI/Pages/User/SysAdmins/TransferDestinations.razor.cs
View File

@ -8,6 +8,9 @@ using TIAMWebApp.Shared.Application.Models.ClientSide.UI.WizardModels;
using TIAMWebApp.Shared.Application.Models;
using TIAMWebApp.Shared.Application.Interfaces;
using Microsoft.AspNetCore.Components;
using TIAM.Core.Loggers;
using TIAMSharedUI.Pages.Components;
using TIAMWebApp.Shared.Application.Utility;
namespace TIAMSharedUI.Pages.User.SysAdmins
{
@ -42,6 +45,8 @@ namespace TIAMSharedUI.Pages.User.SysAdmins
new TransferDestinationWizardModel(Guid.NewGuid(), "Margaret Island", "Historical site in the heart of Budapest", "1138 Budapest, Margitsziget" ),
};*/
private ILogger _logger;
object? TransferDataFromDb = new TransferDestinationWizardModel[] { };
void CancelCreateClick()
@ -67,7 +72,7 @@ namespace TIAMSharedUI.Pages.User.SysAdmins
public async Task SubmitForm(object Result)
{
//await WizardProcessor.ProcessWizardAsync(Result.GetType(), Result);
BrowserConsoleLogWriter.Info($"Submitted nested form: {Result.GetType().FullName}");
_logger.Info($"Submitted nested form: {Result.GetType().FullName}");
}
@ -114,14 +119,14 @@ namespace TIAMSharedUI.Pages.User.SysAdmins
Price = myModel.Price,
PriceType = myModel.PriceType
});*/
BrowserConsoleLogWriter.Info("New orderData added");
_logger.Info("New orderData added");
//add mymodel to transferData array
TransferDataFromDb = ((TransferDestinationWizardModel[])TransferDataFromDb).Append(myModel).ToArray();
}
else
{
BrowserConsoleLogWriter.Info("orderData updated");
_logger.Info("orderData updated");
//modify transferData where transferData.Id == e.EditModel.Id
//get transfer from TransferData by Id
@ -155,7 +160,7 @@ namespace TIAMSharedUI.Pages.User.SysAdmins
{
//await NwindDataService.RemoveEmployeeAsync((EditableEmployee)e.DataItem);
//remove orderData from orderData array
BrowserConsoleLogWriter.Info("orderData deleted");
_logger.Info("orderData deleted");
//await UpdateDataAsync();
}
async Task UpdateDataAsync()
@ -164,23 +169,27 @@ namespace TIAMSharedUI.Pages.User.SysAdmins
await transferDataService.GetDestinationsAsync();
//refresh grid
BrowserConsoleLogWriter.Info("orderData grid refreshed");
_logger.Info("orderData grid refreshed");
}
protected override async Task OnInitializedAsync()
{
base.OnInitialized();
_logger = new LoggerClient<TransferDestinations>(LogWriters.ToArray());
var a = await transferDataService.GetDestinationsAsync();
BrowserConsoleLogWriter.Info($"TransferDataFromDb: {((TransferDestinationWizardModel[])TransferDataFromDb).Length}");
_logger.Info($"TransferDataFromDb: {((TransferDestinationWizardModel[])TransferDataFromDb).Length}");
foreach (var item in a)
{
//add new transferwizardmodel to transferData array
TransferDataFromDb = ((TransferDestinationWizardModel[])TransferDataFromDb).Append(
new TransferDestinationWizardModel(item.Id, item.Name, item.Description, item.AddressString, item.Price, item.Price2, item.Price3, item.Address)).ToArray();
BrowserConsoleLogWriter.Info($"TransferDataFromDb: {item.Name}");
_logger.Detail($"TransferDataFromDb: {item.Name}");
}
BrowserConsoleLogWriter.Info($"TransferDataFromDb: {((TransferDestinationWizardModel[])TransferDataFromDb).Length}");
_logger.Info($"TransferDataFromDb: {((TransferDestinationWizardModel[])TransferDataFromDb).Length}");
}
void ColumnChooserButton_Click()

16
TIAMSharedUI/Pages/User/SysAdmins/UserGrid_MasterDetail_NestedGrid_UserProductMapping.razor
View File

@ -5,9 +5,11 @@
@using TIAM.Models.Dtos.Users
@using TIAMWebApp.Shared.Application.Interfaces
@using TIAMWebApp.Shared.Application.Utility
@using TIAM.Core.Loggers
@using AyCode.Core.Loggers
@inject IUserDataService NwindDataService
@inject IServiceProviderDataService serviceProviderDataService
@inject BrowserConsoleLogWriter BrowserConsoleLogWriter
@inject IEnumerable<IAcLogWriterBase> LogWriters
<div class="mb-2">
UserProductMapping
@ -59,6 +61,7 @@
[Parameter]
public UserModelDtoDetail Customer { get; set; }
private ILogger _logger;
List<UserProductMapping> DetailGridData;
List<Product> AvailableProducts;
@ -67,6 +70,7 @@
protected override async Task OnInitializedAsync()
{
_logger = new LoggerClient<UserGrid_MasterDetail_NestedGrid_UserProductMapping>(LogWriters.ToArray());
//get userproductmappings by customer id
if (Customer.UserProductMappings == null)
@ -75,7 +79,7 @@
DetailGridData = Customer.UserProductMappings;
AvailableProducts = await serviceProviderDataService.GetAllProductsAsync();
BrowserConsoleLogWriter.Info($"DetailGridData: {DetailGridData.Count}");
_logger.Info($"DetailGridData: {DetailGridData.Count}");
}
void CustomizeEditModel(GridCustomizeEditModelEventArgs e)
@ -95,10 +99,10 @@
{
if (e.IsNew)
//add new orderData to orderData array
BrowserConsoleLogWriter.Info("New orderData added");
_logger.Info("New orderData added");
//await NwindDataService.InsertEmployeeAsync((EditableEmployee)e.EditModel);
else
BrowserConsoleLogWriter.Info("orderData updated");
_logger.Info("orderData updated");
//await NwindDataService.UpdateEmployeeAsync((EditableEmployee)e.DataItem, (EditableEmployee)e.EditModel);
@ -108,14 +112,14 @@
{
//await NwindDataService.RemoveEmployeeAsync((EditableEmployee)e.DataItem);
//remove orderData from orderData array
BrowserConsoleLogWriter.Info("orderData deleted");
_logger.Info("orderData deleted");
//await UpdateDataAsync();
}
async Task UpdateDataAsync()
{
//DataSource = await NwindDataService.GetEmployeesEditableAsync();
//refresh grid
BrowserConsoleLogWriter.Info("orderData grid refreshed");
_logger.Info("orderData grid refreshed");
}
}

3
TIAMWebApp/Client/Program.cs
View File

@ -36,6 +36,9 @@ builder.Services.AddScoped<SessionStorageAccessor>();
builder.Services.AddSingleton(x => new ResourceManager("TIAMWebApp.Client.Resources.MyResources", typeof(Program).Assembly));
builder.Services.AddScoped<IAcLogWriterBase, BrowserConsoleLogWriter>();
builder.Services.AddScoped<IAcLogWriterBase, HttpClientLogItemWriter>();
//builder.Services.AddScoped<BrowserConsoleLogWriter>();
//WebSpecific end

8
TIAMWebApp/Server/Controllers/UserAPIController.cs
View File

@ -61,18 +61,18 @@ namespace TIAMWebApp.Server.Controllers
[AllowAnonymous]
[HttpPost]
[Route(APIUrls.LoggerRouteName)]
public IActionResult AddLogItem(AcLogItem? logItem)
public async Task AddLogItem(AcLogItem? logItem)
{
if (logItem == null)
{
_logger.Debug("AddLogItem; LogItem == null");
_logger.Error("AddLogItem; LogItem == null");
//_logger.Writer<ConsoleLogWriter>().Detail("");
return BadRequest();
//return BadRequest();
}
_logger.Info(logItem.Text, logItem.CategoryName, logItem.CallerName);
return Ok();
//return Ok();
}