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

Compare commits

base: Adam:e65a91d9314c243890aa7bed2e12cc4fef962f82
Branches Tags
Adam:master
Adam:TIAM_v0.0.6.0
Adam:v0.0.5.1
Adam:Fullepi_Sandbox
..
compare: Adam:60dfdd89be08c653d993d2f4f229daaecab0ac61
Branches Tags
Adam:TIAM_v0.0.6.0
Adam:v0.0.5.1
Adam:master
Adam:Fullepi_Sandbox

No commits in common. "e65a91d9314c243890aa7bed2e12cc4fef962f82" and "60dfdd89be08c653d993d2f4f229daaecab0ac61" have entirely different histories.
e65a91d931 ... 60dfdd89be

11 changed files with 73 additions and 113 deletions
Show Stats Expand all files Collapse all files

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

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

25
TIAMSharedUI/Pages/LaunchAdmin.razor
View File

@ -7,29 +7,28 @@
@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 override async Task OnInitializedAsync()
protected async override Task OnInitializedAsync()
{
_logger = new LoggerClient<LaunchAdmin>(LogWriters.ToArray());
BrowserConsoleLogWriter = new BrowserConsoleLogWriter(JSRuntime);
//wait for 5 seconds
//await Task.Delay(5000);
await Task.Delay(5000);
string userDetailsStr = await SecureStorageHandler.GetFromSecureStorageAsync(nameof(Setting.UserBasicDetails));
_logger.Info(userDetailsStr);
BrowserConsoleLogWriter.Info(userDetailsStr);
if (!string.IsNullOrWhiteSpace(userDetailsStr))
{
var userBasicDetail = JsonConvert.DeserializeObject<UserBasicDetails>(userDetailsStr);
@ -42,30 +41,30 @@ Loading....
if (jsontoken?.ValidTo < DateTime.UtcNow)
{
_logger.Info("Token needs to be refreshed");
BrowserConsoleLogWriter.Info("Token needs to be refreshed");
bool isTokenRefreshed = await UserDataService.RefreshToken();
if (isTokenRefreshed)
{
_logger.Info("Token refreshed");
BrowserConsoleLogWriter.Info("Token refreshed");
NavManager.NavigateTo("/home");
}
else
{
_logger.Info("Couldn't refresh token");
BrowserConsoleLogWriter.Info("Couldn't refresh token");
NavManager.NavigateTo("/login");
}
}
else
{
_logger.Info("Valid token found");
BrowserConsoleLogWriter.Info("Valid token found");
NavManager.NavigateTo("/home");
}
}
else
{
_logger.Info("No token stored yet");
BrowserConsoleLogWriter.Info("No token stored yet");
NavManager.NavigateTo("/login");
}

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

@ -3,11 +3,8 @@
@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 IEnumerable<IAcLogWriterBase> LogWriters
@inject BrowserConsoleLogWriter BrowserConsoleLogWriter
<div class="mb-2">
Contact Phone: @PhoneNumber
@ -41,7 +38,6 @@
[Parameter]
public Transfer Customer { get; set; }
private ILogger _logger;
List<TransferToDriver> DetailGridData { get; set; }
public UserModelDtoDetail UserInfo;
@ -50,13 +46,11 @@
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;
_logger.Info($"DetailGridData: {DetailGridData.Count}");
BrowserConsoleLogWriter.Info($"DetailGridData: {DetailGridData.Count}");
}
void CustomizeEditModel(GridCustomizeEditModelEventArgs e)
@ -79,10 +73,10 @@
{
if (e.IsNew)
//add new orderData to orderData array
_logger.Info("New orderData added");
BrowserConsoleLogWriter.Info("New orderData added");
//await NwindDataService.InsertEmployeeAsync((EditableEmployee)e.EditModel);
else
_logger.Info("orderData updated");
BrowserConsoleLogWriter.Info("orderData updated");
//await NwindDataService.UpdateEmployeeAsync((EditableEmployee)e.DataItem, (EditableEmployee)e.EditModel);
@ -92,14 +86,14 @@
{
//await NwindDataService.RemoveEmployeeAsync((EditableEmployee)e.DataItem);
//remove orderData from orderData array
_logger.Info("orderData deleted");
BrowserConsoleLogWriter.Info("orderData deleted");
//await UpdateDataAsync();
}
async Task UpdateDataAsync()
{
//DataSource = await NwindDataService.GetEmployeesEditableAsync();
//refresh grid
_logger.Info("orderData grid refreshed");
BrowserConsoleLogWriter.Info("orderData grid refreshed");
}
}

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

@ -7,10 +7,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 IStringLocalizer<TIAMResources> localizer
@inject BrowserConsoleLogWriter BrowserConsoleLogWriter
@inject IStringLocalizer<TIAMResources> localizer
<!--div class="text-center m-5">
<h1>Service management</h1>

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

@ -14,10 +14,8 @@
@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 IEnumerable<IAcLogWriterBase> LogWriters
@inject BrowserConsoleLogWriter BrowserConsoleLogWriter
@inject IStringLocalizer<TIAMResources> localizer
@inject IWizardProcessor wizardProcessor
@inject ITransferDataService transferDataService
@ -197,7 +195,7 @@
@code {
private ILogger _logger;
public Transfer myModel = new Transfer();
@ -225,7 +223,7 @@
void SendMail(Transfer Item)
{
_logger.Info($"Sending mail to {Item.ContactEmail}");
BrowserConsoleLogWriter.Info($"Sending mail to {Item.ContactEmail}");
PopupVisible = true;
}
@ -252,7 +250,7 @@
{
var email = await wizardProcessor.ProcessWizardAsync<MessageWizardModel>(Result.GetType(), Result);
_logger.Info($"Submitted nested form: {Result.GetType().FullName}");
BrowserConsoleLogWriter.Info($"Submitted nested form: {Result.GetType().FullName}");
}
void Grid_CustomizeElement(GridCustomizeElementEventArgs e)
@ -303,12 +301,12 @@
if (e.IsNew)
{
//add new orderData to orderData array
_logger.Info("New orderData added");
BrowserConsoleLogWriter.Info("New orderData added");
//await transferDataService.CreateTransfer((TransferWizardModel)e.EditModel);
}
else
{
_logger.Info("orderData updated at id " + ((Transfer)e.EditModel).Id);
BrowserConsoleLogWriter.Info("orderData updated at id " + ((Transfer)e.EditModel).Id);
success = await transferDataService.UpdateTransferAsync((Transfer)e.EditModel);
@ -331,20 +329,18 @@
{
//await NwindDataService.RemoveEmployeeAsync((EditableEmployee)e.DataItem);
//remove orderData from orderData array
_logger.Info("orderData deleted");
BrowserConsoleLogWriter.Info("orderData deleted");
//await UpdateDataAsync();
}
async Task UpdateDataAsync()
{
//refresh grid
TransferData = await transferDataService.GetTransfersAsync();
_logger.Info("orderData grid refreshed");
BrowserConsoleLogWriter.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,10 +17,8 @@
@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 IEnumerable<IAcLogWriterBase> LogWriters
@inject BrowserConsoleLogWriter BrowserConsoleLogWriter
@inject IStringLocalizer<TIAMResources> localizer
@inject ISessionService sessionService
@inject IWizardProcessor wizardProcessor
@ -151,7 +149,6 @@
</div>
@code {
private ILogger _logger;
public UserModelDtoDetail myModel = new UserModelDtoDetail();
public List<UserModelDtoDetail>? UserData { get; set; }
@ -179,13 +176,13 @@
async void SendMail(UserModelDtoDetail Item)
{
var user = await userDataService.GetUserDetailByIdAsync(Item.Id);
_logger.Info($"Sending mail to {user.UserDto.EmailAddress}");
BrowserConsoleLogWriter.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;
_logger.Info($"Sending mail to {messageWizardModel.ReceiverEmailAddress} from {messageWizardModel.SenderId}");
BrowserConsoleLogWriter.Info($"Sending mail to {messageWizardModel.ReceiverEmailAddress} from {messageWizardModel.SenderId}");
PopupVisible = true;
}
@ -212,7 +209,7 @@
{
var email = await wizardProcessor.ProcessWizardAsync<MessageWizardModel>(Result.GetType(), Result);
_logger.Info($"Submitted nested form: {Result.GetType().FullName}");
BrowserConsoleLogWriter.Info($"Submitted nested form: {Result.GetType().FullName}");
}
void Grid_CustomizeElement(GridCustomizeElementEventArgs e)
@ -270,11 +267,11 @@
await userDataService.CreateGuestUser(registration);
_logger.Info("New user created added");
BrowserConsoleLogWriter.Info("New user created added");
}
else
{
_logger.Info("orderData updated at id " + ((UserModelDtoDetail)e.EditModel).Id);
BrowserConsoleLogWriter.Info("orderData updated at id " + ((UserModelDtoDetail)e.EditModel).Id);
//await transferDataService.UpdateTransferAsync((TransferWizardModel)e.EditModel);
//modify transferData where transferData.Id == e.EditModel.Id
@ -297,20 +294,18 @@
{
//await NwindDataService.RemoveEmployeeAsync((EditableEmployee)e.DataItem);
//remove orderData from orderData array
_logger.Info("orderData deleted");
BrowserConsoleLogWriter.Info("orderData deleted");
//await UpdateDataAsync();
}
async Task UpdateDataAsync()
{
//refresh grid
UserData = await userDataService.GetUsersWithDetailsAsync();
_logger.Info("orderData grid refreshed");
BrowserConsoleLogWriter.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,9 +8,8 @@
@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 IEnumerable<IAcLogWriterBase> LogWriters
@inject BrowserConsoleLogWriter BrowserConsoleLogWriter
@inject IStringLocalizer<TIAMResources> localizer
<PageTitle>Transfers</PageTitle>

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

@ -8,9 +8,6 @@ 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
{
@ -45,8 +42,6 @@ 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()
@ -72,7 +67,7 @@ namespace TIAMSharedUI.Pages.User.SysAdmins
public async Task SubmitForm(object Result)
{
//await WizardProcessor.ProcessWizardAsync(Result.GetType(), Result);
_logger.Info($"Submitted nested form: {Result.GetType().FullName}");
BrowserConsoleLogWriter.Info($"Submitted nested form: {Result.GetType().FullName}");
}
@ -119,14 +114,14 @@ namespace TIAMSharedUI.Pages.User.SysAdmins
Price = myModel.Price,
PriceType = myModel.PriceType
});*/
_logger.Info("New orderData added");
BrowserConsoleLogWriter.Info("New orderData added");
//add mymodel to transferData array
TransferDataFromDb = ((TransferDestinationWizardModel[])TransferDataFromDb).Append(myModel).ToArray();
}
else
{
_logger.Info("orderData updated");
BrowserConsoleLogWriter.Info("orderData updated");
//modify transferData where transferData.Id == e.EditModel.Id
//get transfer from TransferData by Id
@ -160,7 +155,7 @@ namespace TIAMSharedUI.Pages.User.SysAdmins
{
//await NwindDataService.RemoveEmployeeAsync((EditableEmployee)e.DataItem);
//remove orderData from orderData array
_logger.Info("orderData deleted");
BrowserConsoleLogWriter.Info("orderData deleted");
//await UpdateDataAsync();
}
async Task UpdateDataAsync()
@ -169,27 +164,23 @@ namespace TIAMSharedUI.Pages.User.SysAdmins
await transferDataService.GetDestinationsAsync();
//refresh grid
_logger.Info("orderData grid refreshed");
BrowserConsoleLogWriter.Info("orderData grid refreshed");
}
protected override async Task OnInitializedAsync()
{
base.OnInitialized();
_logger = new LoggerClient<TransferDestinations>(LogWriters.ToArray());
var a = await transferDataService.GetDestinationsAsync();
_logger.Info($"TransferDataFromDb: {((TransferDestinationWizardModel[])TransferDataFromDb).Length}");
BrowserConsoleLogWriter.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();
_logger.Detail($"TransferDataFromDb: {item.Name}");
BrowserConsoleLogWriter.Info($"TransferDataFromDb: {item.Name}");
}
_logger.Info($"TransferDataFromDb: {((TransferDestinationWizardModel[])TransferDataFromDb).Length}");
BrowserConsoleLogWriter.Info($"TransferDataFromDb: {((TransferDestinationWizardModel[])TransferDataFromDb).Length}");
}
void ColumnChooserButton_Click()

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

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

3
TIAMWebApp/Client/Program.cs
View File

@ -36,9 +36,6 @@ 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 async Task AddLogItem(AcLogItem? logItem)
public IActionResult AddLogItem(AcLogItem? logItem)
{
if (logItem == null)
{
_logger.Error("AddLogItem; LogItem == null");
_logger.Debug("AddLogItem; LogItem == null");
//_logger.Writer<ConsoleLogWriter>().Detail("");
//return BadRequest();
return BadRequest();
}
_logger.Info(logItem.Text, logItem.CategoryName, logItem.CallerName);
//return Ok();
return Ok();
}