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-18 19:28:23 +02:00
parent 439e76e9b0
commit 62eef091ce
2 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,9 +6,10 @@
@using TIAM.Models.Dtos.Users @using TIAM.Models.Dtos.Users
@using TIAMWebApp.Shared.Application.Interfaces @using TIAMWebApp.Shared.Application.Interfaces
@using TIAMWebApp.Shared.Application.Utility @using TIAMWebApp.Shared.Application.Utility
@inject IUserDataService NwindDataService @using AyCode.Services.Loggers
@using TIAM.Core.Loggers
@inject IServiceProviderDataService serviceProviderDataService @inject IServiceProviderDataService serviceProviderDataService
@inject BrowserConsoleLogWriter BrowserConsoleLogWriter @inject IEnumerable<IAcLogWriterClientBase> LogWriters
<div class="mb-2"> <div class="mb-2">
UserProductMapping UserProductMapping
@ -66,8 +67,11 @@
public UserModelDtoDetail UserInfo; public UserModelDtoDetail UserInfo;
ILogger _logger;
protected override async Task OnInitializedAsync() protected override async Task OnInitializedAsync()
{ {
_logger = new LoggerClient<UserGrid_MasterDetail_NestedGrid_ServiceProviders>(LogWriters.ToArray());
//get userproductmappings by customer id //get userproductmappings by customer id
if (Customer.ServiceProviders == null) if (Customer.ServiceProviders == null)
@ -76,7 +80,7 @@
DetailGridData = Customer.ServiceProviders; DetailGridData = Customer.ServiceProviders;
AvailableServices = await serviceProviderDataService.GetServiceProvidersAsync(); AvailableServices = await serviceProviderDataService.GetServiceProvidersAsync();
BrowserConsoleLogWriter.Info($"DetailGridData: {DetailGridData.Count}"); _logger.Info($"DetailGridData: {DetailGridData.Count}");
} }
void CustomizeEditModel(GridCustomizeEditModelEventArgs e) void CustomizeEditModel(GridCustomizeEditModelEventArgs e)
@ -96,10 +100,10 @@
{ {
if (e.IsNew) if (e.IsNew)
//add new orderData to orderData array //add new orderData to orderData array
BrowserConsoleLogWriter.Info("New orderData added"); _logger.Info("New orderData added");
//await NwindDataService.InsertEmployeeAsync((EditableEmployee)e.EditModel); //await NwindDataService.InsertEmployeeAsync((EditableEmployee)e.EditModel);
else else
BrowserConsoleLogWriter.Info("orderData updated"); _logger.Info("orderData updated");
//await NwindDataService.UpdateEmployeeAsync((EditableEmployee)e.DataItem, (EditableEmployee)e.EditModel); //await NwindDataService.UpdateEmployeeAsync((EditableEmployee)e.DataItem, (EditableEmployee)e.EditModel);
@ -109,14 +113,14 @@
{ {
//await NwindDataService.RemoveEmployeeAsync((EditableEmployee)e.DataItem); //await NwindDataService.RemoveEmployeeAsync((EditableEmployee)e.DataItem);
//remove orderData from orderData array //remove orderData from orderData array
BrowserConsoleLogWriter.Info("orderData deleted"); _logger.Info("orderData deleted");
//await UpdateDataAsync(); //await UpdateDataAsync();
} }
async Task UpdateDataAsync() async Task UpdateDataAsync()
{ {
//DataSource = await NwindDataService.GetEmployeesEditableAsync(); //DataSource = await NwindDataService.GetEmployeesEditableAsync();
//refresh grid //refresh grid
BrowserConsoleLogWriter.Info("orderData grid refreshed"); _logger.Info("orderData grid refreshed");
} }
} }

19
TIAMWebApp/Shared/Services/ServiceProviderDataService.cs
View File

@ -1,8 +1,11 @@
using AyCode.Interfaces.StorageHandlers; using AyCode.Core.Loggers;
using AyCode.Interfaces.StorageHandlers;
using Microsoft.JSInterop; using Microsoft.JSInterop;
using Newtonsoft.Json; using Newtonsoft.Json;
using SkiaSharp; using SkiaSharp;
using System.Net.Http.Json; using System.Net.Http.Json;
using AyCode.Services.Loggers;
using TIAM.Core.Loggers;
using TIAM.Database.DataLayers.Users; using TIAM.Database.DataLayers.Users;
using TIAM.Entities.Products; using TIAM.Entities.Products;
using TIAM.Entities.ServiceProviders; using TIAM.Entities.ServiceProviders;
@ -18,16 +21,14 @@ namespace TIAMWebApp.Shared.Application.Services
{ {
private readonly HttpClient http; private readonly HttpClient http;
private readonly ISecureStorageHandler secureStorageHandler; private readonly ISecureStorageHandler secureStorageHandler;
private readonly IJSRuntime jsRuntime; private readonly ILogger _logger;
private readonly BrowserConsoleLogWriter _browserConsoleLogWriter;
public ServiceProviderDataService(HttpClient http, ISecureStorageHandler secureStorageHandler, IJSRuntime jSRuntime) public ServiceProviderDataService(HttpClient http, ISecureStorageHandler secureStorageHandler, IEnumerable<IAcLogWriterClientBase> logWriters)
{ {
this.http = http; this.http = http;
this.secureStorageHandler = secureStorageHandler; this.secureStorageHandler = secureStorageHandler;
this.jsRuntime = jSRuntime; _logger = new LoggerClient<ServiceProviderDataService>(logWriters.ToArray());
this._browserConsoleLogWriter = new BrowserConsoleLogWriter(jsRuntime);
} }
//22. //22.
@ -74,7 +75,7 @@ namespace TIAMWebApp.Shared.Application.Services
if (response.IsSuccessStatusCode) if (response.IsSuccessStatusCode)
{ {
var result = await response.Content.ReadFromJsonAsync<Dictionary<Guid, string>>(); var result = await response.Content.ReadFromJsonAsync<Dictionary<Guid, string>>();
_browserConsoleLogWriter.Info(result.FirstOrDefault().Value); _logger.Debug(result.FirstOrDefault().Value);
return result; return result;
} }
else else
@ -123,7 +124,7 @@ namespace TIAMWebApp.Shared.Application.Services
if (response.IsSuccessStatusCode) if (response.IsSuccessStatusCode)
{ {
var result = await response.Content.ReadAsStringAsync(); var result = await response.Content.ReadAsStringAsync();
_browserConsoleLogWriter.Info("SKBitmap width: " + result); _logger.Debug("SKBitmap width: " + result);
return result; return result;
} }
else else
@ -139,7 +140,7 @@ namespace TIAMWebApp.Shared.Application.Services
if (response.IsSuccessStatusCode) if (response.IsSuccessStatusCode)
{ {
var result = await response.Content.ReadAsStringAsync(); var result = await response.Content.ReadAsStringAsync();
_browserConsoleLogWriter.Info("Json: " + result); //_logger.Detail("Json: " + result);
var data = JsonConvert.DeserializeObject<IEnumerable<Product>>(result); var data = JsonConvert.DeserializeObject<IEnumerable<Product>>(result);
if (data != null) if (data != null)
{ {