diff --git a/Wonky.Client/Components/ReportTableComponent.razor b/Wonky.Client/Components/ReportTableComponent.razor index 225d13ab..c9842e2e 100644 --- a/Wonky.Client/Components/ReportTableComponent.razor +++ b/Wonky.Client/Components/ReportTableComponent.razor @@ -1,5 +1,69 @@ -

ReportTableComponent

- -@code { - +@if (ReportList != null) +{ +
+
+
+
+ Dato +
+
+ Dag +
+
+ Start +
+
+ Slut +
+
+ Resultat +
+
+
+ @foreach (var report in ReportList) + { + +
+
+ @report.ReportDate +
+
+ @{ + switch (report.DayTypeEnum) + { + case "Sales": + Salgsdag + break; + case "SickLeave": + Sygdom + break; + case "Office": + Kontordag + break; + case "Meeting": + Salgsmøde + break; + case "Leave": + Ferie + break; + } + } +
+
+ @report.FromDateTime +
+
+ @report.ToDateTime +
+
+ @report.Turnover +
+
+ + } +
+} +else +{ + } \ No newline at end of file diff --git a/Wonky.Client/Components/ReportTableComponent.razor.cs b/Wonky.Client/Components/ReportTableComponent.razor.cs index b3fc1781..35e3309b 100644 --- a/Wonky.Client/Components/ReportTableComponent.razor.cs +++ b/Wonky.Client/Components/ReportTableComponent.razor.cs @@ -1,6 +1,9 @@ +using Microsoft.AspNetCore.Components; +using Wonky.Entity.Views; + namespace Wonky.Client.Components; -public class ReportTableComponent_razor +public partial class ReportTableComponent { - + [Parameter] public List ReportList { get; set; } } \ No newline at end of file diff --git a/Wonky.Client/HttpRepository/IReportHttpRepository.cs b/Wonky.Client/HttpRepository/IReportHttpRepository.cs index f936fd56..aa0af04c 100644 --- a/Wonky.Client/HttpRepository/IReportHttpRepository.cs +++ b/Wonky.Client/HttpRepository/IReportHttpRepository.cs @@ -7,7 +7,7 @@ namespace Wonky.Client.HttpRepository; public interface IReportHttpRepository { Task ReportExist(string workDate); - Task> GetReports(); + Task> GetReports(); Task GetReport(string workDate); Task InitializeReportData(string workDate); Task PostReport(string workDate, ReportDto reportDto); diff --git a/Wonky.Client/HttpRepository/ReportHttpRepository.cs b/Wonky.Client/HttpRepository/ReportHttpRepository.cs index 5520a631..0d290418 100644 --- a/Wonky.Client/HttpRepository/ReportHttpRepository.cs +++ b/Wonky.Client/HttpRepository/ReportHttpRepository.cs @@ -30,13 +30,9 @@ public class ReportHttpRepository :IReportHttpRepository _apiConfig = configuration.Value; } - public async Task> GetReports() + public async Task> GetReports() { - var response = await _client.GetStringAsync($"{_apiConfig.ReportEndpoint}"); - Console.WriteLine(response); - - return new List(); - + return await _client.GetFromJsonAsync>($"{_apiConfig.ReportEndpoint}"); } public async Task ReportExist(string workDate) { diff --git a/Wonky.Client/Pages/ReportCreate.razor.cs b/Wonky.Client/Pages/ReportCreate.razor.cs index e2f9bbf4..72996fd8 100644 --- a/Wonky.Client/Pages/ReportCreate.razor.cs +++ b/Wonky.Client/Pages/ReportCreate.razor.cs @@ -16,6 +16,7 @@ using System.Runtime.Intrinsics; using System.Text.Json; using Blazored.Toast.Services; +using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Components; using Microsoft.AspNetCore.Components.Forms; using Wonky.Client.HttpInterceptors; @@ -27,7 +28,7 @@ using Wonky.Entity.Views; namespace Wonky.Client.Pages; -public partial class ReportCreate +public partial class ReportCreate : IDisposable { [Inject] private HttpInterceptorService Interceptor { get; set; } [Inject] private UserPreferenceService UserPrefs { get; set; } diff --git a/Wonky.Client/Pages/SalesReportList.razor b/Wonky.Client/Pages/SalesReportList.razor index 2816827d..6dbfdb9a 100644 --- a/Wonky.Client/Pages/SalesReportList.razor +++ b/Wonky.Client/Pages/SalesReportList.razor @@ -14,17 +14,17 @@ // along with this program. If not, see [https://www.gnu.org/licenses/agpl-3.0.en.html] // *@ - +@using Wonky.Client.Components @page "/sales-reports" -

SalesReportList

-@if (_reports != null) -{ - foreach (var report in _reports) - { - @report.Name - } -} -else -{ - -} +
+
+
+
+

Rapport Arkiv

+
+
+
+
+ +
+
diff --git a/Wonky.Client/Pages/SalesReportList.razor.cs b/Wonky.Client/Pages/SalesReportList.razor.cs index 7ee85589..39b63096 100644 --- a/Wonky.Client/Pages/SalesReportList.razor.cs +++ b/Wonky.Client/Pages/SalesReportList.razor.cs @@ -1,19 +1,28 @@ using Microsoft.AspNetCore.Components; using Toolbelt.Blazor; +using Wonky.Client.HttpInterceptors; using Wonky.Client.HttpRepository; using Wonky.Entity.Views; namespace Wonky.Client.Pages; -public partial class SalesReportList +public partial class SalesReportList : IDisposable { [Inject] public IReportHttpRepository ReportRepo { get; set; } - [Inject] public IHttpClientInterceptor Interceport { get; set; } + [Inject] public HttpInterceptorService Interceptor { get; set; } - private List _reports { get; set; } + private List _reports { get; set; } protected override async Task OnInitializedAsync() { + Interceptor.RegisterEvent(); + Interceptor.RegisterBeforeSendEvent(); + _reports = await ReportRepo.GetReports(); } + + public void Dispose() + { + Interceptor.DisposeEvent(); + } } \ No newline at end of file diff --git a/Wonky.Client/wwwroot/appsettings.json b/Wonky.Client/wwwroot/appsettings.json index b13007ce..6c944eab 100644 --- a/Wonky.Client/wwwroot/appsettings.json +++ b/Wonky.Client/wwwroot/appsettings.json @@ -23,7 +23,7 @@ "image": "grumpy-coder.png" }, "apiConfig": { - "baseAddress": "https://dev.innotec.dk", + "baseAddress": "https://staging.innotec.dk", "tokenPath": "token", "userInfo": "api/auth/userinfo", "customerEndpoint": "api/v2/crm/companies", diff --git a/Wonky.Entity/Views/NgSalesReportListView.cs b/Wonky.Entity/Views/NgSalesReportListView.cs index 1df9e551..c5aabce4 100644 --- a/Wonky.Entity/Views/NgSalesReportListView.cs +++ b/Wonky.Entity/Views/NgSalesReportListView.cs @@ -2,5 +2,15 @@ namespace Wonky.Entity.Views; public class NgSalesReportListView { - + public string ReportId { get; set; } = ""; + public string Name { get; set; } = ""; + public string Description { get; set; } = ""; + public string ReportDate { get; set; } = ""; + public string DayTypeEnum { get; set; } = ""; + public string FromDateTime { get; set; } = ""; + public string ToDateTime { get; set; } = ""; + public decimal Turnover { get; set; } + public int VisitCount { get; set; } + public int DemoCount { get; set; } + public int SaleCount { get; set; } } \ No newline at end of file