- @report.FromDateTime
+ @(report.DayTypeEnum == "Sales" ? report.FromDateTime.Split(" ")[1] : report.FromDateTime.Split(" ")[0])
- @report.ToDateTime
+ @(report.DayTypeEnum == "Sales" ? report.ToDateTime.Split(" ")[1] : report.ToDateTime.Split(" ")[0])
@report.Turnover
diff --git a/Wonky.Client/Components/UserTableComponent.razor b/Wonky.Client/Components/UserTableComponent.razor
deleted file mode 100644
index 1497f6f8..00000000
--- a/Wonky.Client/Components/UserTableComponent.razor
+++ /dev/null
@@ -1,67 +0,0 @@
-@*
-// Copyright (C) 2022 FCS Frede's Computer Services.
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as
-// published by the Free Software Foundation, either version 3 of the
-// License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program. If not, see [https://www.gnu.org/licenses/agpl-3.0.en.html]
-//
-*@
-
-@if (UserList.Any())
-{
-
-}
-else
-{
-
-}
\ No newline at end of file
diff --git a/Wonky.Client/HttpRepository/AdminReportHttpRepository.cs b/Wonky.Client/HttpRepository/AdminReportHttpRepository.cs
new file mode 100644
index 00000000..50423b49
--- /dev/null
+++ b/Wonky.Client/HttpRepository/AdminReportHttpRepository.cs
@@ -0,0 +1,43 @@
+using System.Net.Http.Json;
+using System.Text.Json;
+using Microsoft.AspNetCore.Components;
+using Microsoft.Extensions.Options;
+using Wonky.Entity.Configuration;
+using Wonky.Entity.DTO;
+using Wonky.Entity.Views;
+
+namespace Wonky.Client.HttpRepository;
+
+public class AdminReportHttpRepository : IAdminReportHttpRepository
+{
+ private readonly JsonSerializerOptions _options = new JsonSerializerOptions
+ {
+ PropertyNameCaseInsensitive = true
+ };
+
+ private readonly NavigationManager _navigation;
+ private ILogger
_logger;
+ private readonly HttpClient _client;
+ private readonly ApiConfig _apiConfig;
+
+ public AdminReportHttpRepository(HttpClient client,
+ ILogger logger,
+ NavigationManager navigation, IOptions configuration)
+ {
+ _client = client;
+ _logger = logger;
+ _navigation = navigation;
+ _apiConfig = configuration.Value;
+ }
+
+ public async Task> GetReports(string userId)
+ {
+ return await _client.GetFromJsonAsync>($"{_apiConfig.AdminAdviserUri}/{userId}/reports");
+ }
+
+ public async Task GetReport(string userId, string workDate)
+ {
+ return await _client.GetFromJsonAsync($"{_apiConfig.AdminAdviserUri}/{userId}/reports/{workDate}");
+
+ }
+}
\ No newline at end of file
diff --git a/Wonky.Client/HttpRepository/IAdminReportHttpRepository.cs b/Wonky.Client/HttpRepository/IAdminReportHttpRepository.cs
new file mode 100644
index 00000000..62a99fee
--- /dev/null
+++ b/Wonky.Client/HttpRepository/IAdminReportHttpRepository.cs
@@ -0,0 +1,11 @@
+using Wonky.Client.Pages;
+using Wonky.Entity.DTO;
+using Wonky.Entity.Views;
+
+namespace Wonky.Client.HttpRepository;
+
+public interface IAdminReportHttpRepository
+{
+ Task> GetReports(string userId);
+ Task GetReport(string userId, string workDate);
+}
\ No newline at end of file
diff --git a/Wonky.Client/HttpRepository/ReportHttpRepository.cs b/Wonky.Client/HttpRepository/ReportHttpRepository.cs
index 55a67da9..5ec17327 100644
--- a/Wonky.Client/HttpRepository/ReportHttpRepository.cs
+++ b/Wonky.Client/HttpRepository/ReportHttpRepository.cs
@@ -16,12 +16,12 @@ public class ReportHttpRepository :IReportHttpRepository
};
private readonly NavigationManager _navigation;
- private ILogger _logger;
+ private ILogger _logger;
private readonly HttpClient _client;
private readonly ApiConfig _apiConfig;
public ReportHttpRepository(HttpClient client,
- ILogger logger,
+ ILogger logger,
NavigationManager navigation, IOptions configuration)
{
_client = client;
diff --git a/Wonky.Client/Pages/AdminUserList.razor b/Wonky.Client/Pages/AdminAdviserUserList.razor
similarity index 52%
rename from Wonky.Client/Pages/AdminUserList.razor
rename to Wonky.Client/Pages/AdminAdviserUserList.razor
index ceff9089..8c2bb96c 100644
--- a/Wonky.Client/Pages/AdminUserList.razor
+++ b/Wonky.Client/Pages/AdminAdviserUserList.razor
@@ -1,4 +1,6 @@
@using Wonky.Client.Components
+@using Microsoft.AspNetCore.Authorization
+@attribute [Authorize(Roles = "Admin")]
@page "/admin/users"
@@ -6,6 +8,6 @@
Sælgere
\ No newline at end of file
diff --git a/Wonky.Client/Pages/AdminUserList.razor.cs b/Wonky.Client/Pages/AdminAdviserUserList.razor.cs
similarity index 92%
rename from Wonky.Client/Pages/AdminUserList.razor.cs
rename to Wonky.Client/Pages/AdminAdviserUserList.razor.cs
index ac850851..77d6144b 100644
--- a/Wonky.Client/Pages/AdminUserList.razor.cs
+++ b/Wonky.Client/Pages/AdminAdviserUserList.razor.cs
@@ -5,7 +5,7 @@ using Wonky.Entity.DTO;
namespace Wonky.Client.Pages;
-public partial class AdminUserList : IDisposable
+public partial class AdminAdviserUserList : IDisposable
{
[Inject] private HttpInterceptorService _interceptor { get; set; }
[Inject] private IUserHttpRepository _userRepo { get; set; }
diff --git a/Wonky.Client/Pages/AdminUserView.razor b/Wonky.Client/Pages/AdminAdviserView.razor
similarity index 95%
rename from Wonky.Client/Pages/AdminUserView.razor
rename to Wonky.Client/Pages/AdminAdviserView.razor
index f9a4bd88..44d37f0b 100644
--- a/Wonky.Client/Pages/AdminUserView.razor
+++ b/Wonky.Client/Pages/AdminAdviserView.razor
@@ -1,4 +1,6 @@
@page "/admin/users/{UserId}"
+@using Microsoft.AspNetCore.Authorization
+@attribute [Authorize(Roles = "Admin")]