From 62eef091cec939fd0cbe35eafef3a9ff623fb725 Mon Sep 17 00:00:00 2001 From: "jozsef.b@aycode.com" <9Rj@D}fVwBaN> Date: Sat, 18 May 2024 19:28:23 +0200 Subject: [PATCH] fixes --- ...erDetail_NestedGrid_ServiceProviders.razor | 18 +++++++++++------- .../Services/ServiceProviderDataService.cs | 19 ++++++++++--------- 2 files changed, 21 insertions(+), 16 deletions(-) diff --git a/TIAMSharedUI/Pages/User/SysAdmins/UserGrid_MasterDetail_NestedGrid_ServiceProviders.razor b/TIAMSharedUI/Pages/User/SysAdmins/UserGrid_MasterDetail_NestedGrid_ServiceProviders.razor index f735d305..560a26a4 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/UserGrid_MasterDetail_NestedGrid_ServiceProviders.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/UserGrid_MasterDetail_NestedGrid_ServiceProviders.razor @@ -6,9 +6,10 @@ @using TIAM.Models.Dtos.Users @using TIAMWebApp.Shared.Application.Interfaces @using TIAMWebApp.Shared.Application.Utility -@inject IUserDataService NwindDataService +@using AyCode.Services.Loggers +@using TIAM.Core.Loggers @inject IServiceProviderDataService serviceProviderDataService -@inject BrowserConsoleLogWriter BrowserConsoleLogWriter +@inject IEnumerable LogWriters
UserProductMapping @@ -66,8 +67,11 @@ public UserModelDtoDetail UserInfo; + ILogger _logger; + protected override async Task OnInitializedAsync() { + _logger = new LoggerClient(LogWriters.ToArray()); //get userproductmappings by customer id if (Customer.ServiceProviders == null) @@ -76,7 +80,7 @@ DetailGridData = Customer.ServiceProviders; AvailableServices = await serviceProviderDataService.GetServiceProvidersAsync(); - BrowserConsoleLogWriter.Info($"DetailGridData: {DetailGridData.Count}"); + _logger.Info($"DetailGridData: {DetailGridData.Count}"); } void CustomizeEditModel(GridCustomizeEditModelEventArgs e) @@ -96,10 +100,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); @@ -109,14 +113,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"); } } \ No newline at end of file diff --git a/TIAMWebApp/Shared/Services/ServiceProviderDataService.cs b/TIAMWebApp/Shared/Services/ServiceProviderDataService.cs index e7d8b80e..27bbb037 100644 --- a/TIAMWebApp/Shared/Services/ServiceProviderDataService.cs +++ b/TIAMWebApp/Shared/Services/ServiceProviderDataService.cs @@ -1,8 +1,11 @@ -using AyCode.Interfaces.StorageHandlers; +using AyCode.Core.Loggers; +using AyCode.Interfaces.StorageHandlers; using Microsoft.JSInterop; using Newtonsoft.Json; using SkiaSharp; using System.Net.Http.Json; +using AyCode.Services.Loggers; +using TIAM.Core.Loggers; using TIAM.Database.DataLayers.Users; using TIAM.Entities.Products; using TIAM.Entities.ServiceProviders; @@ -18,16 +21,14 @@ namespace TIAMWebApp.Shared.Application.Services { private readonly HttpClient http; private readonly ISecureStorageHandler secureStorageHandler; - private readonly IJSRuntime jsRuntime; - private readonly BrowserConsoleLogWriter _browserConsoleLogWriter; + private readonly ILogger _logger; - public ServiceProviderDataService(HttpClient http, ISecureStorageHandler secureStorageHandler, IJSRuntime jSRuntime) + public ServiceProviderDataService(HttpClient http, ISecureStorageHandler secureStorageHandler, IEnumerable logWriters) { this.http = http; this.secureStorageHandler = secureStorageHandler; - this.jsRuntime = jSRuntime; - this._browserConsoleLogWriter = new BrowserConsoleLogWriter(jsRuntime); + _logger = new LoggerClient(logWriters.ToArray()); } //22. @@ -74,7 +75,7 @@ namespace TIAMWebApp.Shared.Application.Services if (response.IsSuccessStatusCode) { var result = await response.Content.ReadFromJsonAsync>(); - _browserConsoleLogWriter.Info(result.FirstOrDefault().Value); + _logger.Debug(result.FirstOrDefault().Value); return result; } else @@ -123,7 +124,7 @@ namespace TIAMWebApp.Shared.Application.Services if (response.IsSuccessStatusCode) { var result = await response.Content.ReadAsStringAsync(); - _browserConsoleLogWriter.Info("SKBitmap width: " + result); + _logger.Debug("SKBitmap width: " + result); return result; } else @@ -139,7 +140,7 @@ namespace TIAMWebApp.Shared.Application.Services if (response.IsSuccessStatusCode) { var result = await response.Content.ReadAsStringAsync(); - _browserConsoleLogWriter.Info("Json: " + result); + //_logger.Detail("Json: " + result); var data = JsonConvert.DeserializeObject>(result); if (data != null) {