diff --git a/Wonky.Client/HttpRepository/EvaluationRepository.cs b/Wonky.Client/HttpRepository/EvaluationRepository.cs index ac750548..f4fa8b81 100644 --- a/Wonky.Client/HttpRepository/EvaluationRepository.cs +++ b/Wonky.Client/HttpRepository/EvaluationRepository.cs @@ -4,6 +4,7 @@ using Microsoft.AspNetCore.Components; using Microsoft.Extensions.Options; using Wonky.Entity.Configuration; using Wonky.Entity.DTO; +using Wonky.Entity.Views; namespace Wonky.Client.HttpRepository; @@ -28,39 +29,61 @@ public class EvaluationRepository : IEvaluationRepository _navigation = navigation; _api = configuration.Value; } + + + public async Task GetManagerByUserId(string userId) + { + var result = await _client + .GetFromJsonAsync($"{_api.MemberEvaluation}", _options); + + return result ?? new ManagerView(); + } + + + public async Task GetMemberByUserId(string userId) + { + var result = await _client + .GetFromJsonAsync($"{_api.MemberEvaluation}", _options); + + return result ?? new MemberView(); + } + public async Task> GetByManager(string managerId) { var result = await _client .GetFromJsonAsync>( - $"{_api.UserEvaluations}/manager/{managerId}", _options); + $"{_api.MemberEvaluation}/manager/{managerId}", _options); return result ?? new List(); } + public async Task> GetByMember(string memberId) { var result = await _client .GetFromJsonAsync>( - $"{_api.UserEvaluations}/member/{memberId}", _options); + $"{_api.MemberEvaluation}/member/{memberId}", _options); return result ?? new List(); } + public async Task GetById(string evaluationId) { var result = await _client .GetFromJsonAsync( - $"{_api.UserEvaluations}/id/{evaluationId}", _options); + $"{_api.MemberEvaluation}/id/{evaluationId}", _options); return result ?? new EvaluationEditView(); } - public async Task CreateEvaluation(EvaluationEditView evaluation) + + public async Task CreateEvaluation(EvaluationEditView evaluationEditView) { var result = await _client - .PostAsJsonAsync($"{_api.UserEvaluations}", evaluation, _options); + .PostAsJsonAsync($"{_api.MemberEvaluation}", evaluationEditView, _options); if (!result.IsSuccessStatusCode) { @@ -75,10 +98,11 @@ public class EvaluationRepository : IEvaluationRepository } - public async Task UpdateEvaluation(string evaluationId, EvaluationEditView evaluation) + + public async Task UpdateEvaluation(string evaluationId, EvaluationEditView evaluationEditView) { var result = await _client - .PutAsJsonAsync($"{_api.UserEvaluations}/{evaluationId}", evaluation, _options); + .PutAsJsonAsync($"{_api.MemberEvaluation}/{evaluationId}", evaluationEditView, _options); if (!result.IsSuccessStatusCode) { @@ -92,8 +116,9 @@ public class EvaluationRepository : IEvaluationRepository : JsonSerializer.Deserialize(content, _options))!; } + public async Task DeleteEvaluation(string evaluationId) { - await _client.DeleteAsync($"{_api.UserEvaluations}/{evaluationId}"); + await _client.DeleteAsync($"{_api.MemberEvaluation}/{evaluationId}"); } } \ No newline at end of file diff --git a/Wonky.Client/HttpRepository/IEvaluationRepository.cs b/Wonky.Client/HttpRepository/IEvaluationRepository.cs index 57af07b0..acc93398 100644 --- a/Wonky.Client/HttpRepository/IEvaluationRepository.cs +++ b/Wonky.Client/HttpRepository/IEvaluationRepository.cs @@ -1,13 +1,16 @@ using Wonky.Entity.DTO; +using Wonky.Entity.Views; namespace Wonky.Client.HttpRepository; public interface IEvaluationRepository { + Task GetManagerByUserId(string userId); + Task GetMemberByUserId(string userId); Task> GetByManager(string managerId); Task> GetByMember(string memberId); Task GetById(string evaluationId); - Task CreateEvaluation(EvaluationEditView evaluation); - Task UpdateEvaluation(string evaluationId, EvaluationEditView evaluation); + Task CreateEvaluation(EvaluationEditView evaluationEditView); + Task UpdateEvaluation(string evaluationId, EvaluationEditView evaluationEditView); Task DeleteEvaluation(string evaluationId); } \ No newline at end of file diff --git a/Wonky.Client/HttpRepository/OfficeUserInfoRepository.cs b/Wonky.Client/HttpRepository/OfficeUserInfoRepository.cs index eb13b77b..cf1f08ca 100644 --- a/Wonky.Client/HttpRepository/OfficeUserInfoRepository.cs +++ b/Wonky.Client/HttpRepository/OfficeUserInfoRepository.cs @@ -43,41 +43,40 @@ public class OfficeUserInfoRepository : IOfficeUserInfoRepository _api = configuration.Value; } - /// - /// Get Users - /// - /// + public async Task> GetUsers() { - return await _client.GetFromJsonAsync>($"{_api.UserData}/list"); + var result = await _client + .GetFromJsonAsync>($"{_api.UserInfoClient}/list", _options); + + return result ?? new List(); } - /// - /// Get Users in role - /// - /// + public async Task> GetUsers(string role) { - return await _client.GetFromJsonAsync>($"{_api.UserData}/role/{role}"); + var result = await _client + .GetFromJsonAsync>($"{_api.UserInfoClient}/role/{role}", _options); + + return result ?? new List(); } - /// - /// Get users for logged in supervisor - /// - /// + public async Task> GetSupervisorUsers() { - return await _client.GetFromJsonAsync>($"{_api.UserData}/supervisor"); + var result = await _client + .GetFromJsonAsync>($"{_api.UserInfoClient}/supervisor", _options); + + return result ?? new List(); } - /// - /// Get Advisor Info for given userId - /// - /// - /// + public async Task GetUserInfo(string userId) { - return await _client.GetFromJsonAsync($"{_api.UserData}/{userId}"); + var result = await _client + .GetFromJsonAsync($"{_api.UserInfoClient}/{userId}", _options); + + return result ?? new UserInfoAdvisorView(); } } \ No newline at end of file diff --git a/Wonky.Client/Local.Services/AuthenticationService.cs b/Wonky.Client/Local.Services/AuthenticationService.cs index 2da6e93d..5786472c 100644 --- a/Wonky.Client/Local.Services/AuthenticationService.cs +++ b/Wonky.Client/Local.Services/AuthenticationService.cs @@ -135,7 +135,7 @@ public class AuthenticationService : IAuthenticationService public async Task UserInfo(bool write = false) { - var response = await _client.GetAsync(_apiConfig.Value.UserInfo).ConfigureAwait(true); + var response = await _client.GetAsync(_apiConfig.Value.UserInfoAuth).ConfigureAwait(true); var content = await response.Content.ReadAsStringAsync(); var userInfo = JsonSerializer.Deserialize(content, _options); if(write) diff --git a/Wonky.Client/Local.Services/IUserInfoService.cs b/Wonky.Client/Local.Services/IUserInfoService.cs index 567a3780..5c169379 100644 --- a/Wonky.Client/Local.Services/IUserInfoService.cs +++ b/Wonky.Client/Local.Services/IUserInfoService.cs @@ -20,6 +20,7 @@ namespace Wonky.Client.Local.Services; public interface IUserInfoService { + Task GetUserId(); Task GetUserInfo(); Task SetUserInfo(UserManagerEditView userInfo); Task IsSupervisor(); diff --git a/Wonky.Client/Local.Services/UserInfoService.cs b/Wonky.Client/Local.Services/UserInfoService.cs index a0f843af..bfe0dbb1 100644 --- a/Wonky.Client/Local.Services/UserInfoService.cs +++ b/Wonky.Client/Local.Services/UserInfoService.cs @@ -38,6 +38,11 @@ public class UserInfoService : IUserInfoService } + public async Task GetUserId() + { + var x = await GetUserInfo(); + return x.UserId; + } public async Task IsSupervisor() { var x = await GetUserInfo(); diff --git a/Wonky.Client/Pages/ManagerEvaluationListPage.razor b/Wonky.Client/Pages/ManagerEvaluationListPage.razor index 5cb831a7..3b684cea 100644 --- a/Wonky.Client/Pages/ManagerEvaluationListPage.razor +++ b/Wonky.Client/Pages/ManagerEvaluationListPage.razor @@ -14,12 +14,35 @@ *@ @using Microsoft.AspNetCore.Authorization -@using Wonky.Client.Components @attribute [Authorize(Roles = "Management,Supervisor")] -@page "/ManagerEvaluationListPage" -

ManagerEvaluationListPage

+@page "/management/members/{UserId}/evaluations" -@code { +Evalueringer + +
+
+

Evalueringer

+
+
+
+ Opret Evaluering + @* +
+
+ Loading... +
+
+ *@ +
+
+
+ +@if (Evaluations.Any()) +{ -} \ No newline at end of file +} +else +{ +
Ingen data
+} diff --git a/Wonky.Client/Pages/ManagerEvaluationListPage.razor.cs b/Wonky.Client/Pages/ManagerEvaluationListPage.razor.cs index 09530835..81d2fa94 100644 --- a/Wonky.Client/Pages/ManagerEvaluationListPage.razor.cs +++ b/Wonky.Client/Pages/ManagerEvaluationListPage.razor.cs @@ -13,16 +13,60 @@ // along with this program. If not, see [https://www.gnu.org/licenses/agpl-3.0.en.html] // +using System.Text.Json; using Microsoft.AspNetCore.Components; using Wonky.Client.HttpInterceptors; using Wonky.Client.HttpRepository; +using Wonky.Entity.DTO; using Wonky.Entity.Views; namespace Wonky.Client.Pages; #pragma warning disable CS8618 -public partial class ManagerEvaluationListPage +public partial class ManagerEvaluationListPage : IDisposable { + // ######################################################### + [Inject] public IEvaluationRepository EvaluationRepo { get; set; } + [Inject] public HttpInterceptorService Interceptor { get; set; } + [Inject] public ILogger Logger { get; set; } + + // ######################################################### + [Parameter] public string UserId { get; set; } = ""; + + // ######################################################### + private List Evaluations { get; set; } = new(); + private MemberView Member { get; set; } = new(); + private bool _working = true; + + protected override async Task OnParametersSetAsync() + { + Interceptor.RegisterEvent(); + Interceptor.RegisterBeforeSendEvent(); + + Member = await EvaluationRepo.GetMemberByUserId(UserId); + while (string.IsNullOrWhiteSpace(Member.MemberId)) + { + await Task.Delay(250); + } + + Logger.LogDebug("Member => {}",JsonSerializer.Serialize(Member)); + } + + protected override async Task OnInitializedAsync() + { + + Evaluations = await EvaluationRepo.GetByMember(Member.MemberId); + + Logger.LogDebug("{}",JsonSerializer.Serialize(Evaluations)); + + _working = false; + + } + + public void Dispose() + { + Interceptor.DisposeEvent(); + } } \ No newline at end of file diff --git a/Wonky.Client/Pages/ManagerEvaluationNewPage.razor b/Wonky.Client/Pages/ManagerEvaluationNewPage.razor index 55ba2f2b..5f1fbd00 100644 --- a/Wonky.Client/Pages/ManagerEvaluationNewPage.razor +++ b/Wonky.Client/Pages/ManagerEvaluationNewPage.razor @@ -17,9 +17,22 @@ @attribute [Authorize(Roles = "Management,Supervisor")] -@page "/ManagerEvaluationNewPage" -

ManagerEvaluationNewPage

+@page "/management/members/{UserId}/evaluations/new" -@code { - -} \ No newline at end of file +Ny evaluering + +
+
+
+

Ny Evaluering

+
+
+
+ + + +
+ +
\ No newline at end of file diff --git a/Wonky.Client/Pages/ManagerEvaluationNewPage.razor.cs b/Wonky.Client/Pages/ManagerEvaluationNewPage.razor.cs index 076ec3bb..0e14b788 100644 --- a/Wonky.Client/Pages/ManagerEvaluationNewPage.razor.cs +++ b/Wonky.Client/Pages/ManagerEvaluationNewPage.razor.cs @@ -14,15 +14,48 @@ // using Microsoft.AspNetCore.Components; +using Microsoft.AspNetCore.Components.Forms; using Wonky.Client.HttpInterceptors; using Wonky.Client.HttpRepository; +using Wonky.Client.Local.Services; using Wonky.Entity.Views; namespace Wonky.Client.Pages; #pragma warning disable CS8618 -public partial class ManagerEvaluationNewPage +public partial class ManagerEvaluationNewPage : IDisposable { + // ############################################################ + [Inject] public IEvaluationRepository EvaluationRepo { get; set; } + [Inject] public HttpInterceptorService Interceptor { get; set; } + [Inject] public IUserInfoService UserService { get; set; } + // ############################################################ + [Parameter] public string UserId { get; set; } = ""; + + + // ############################################################ + private EditContext EvaluationContext { get; set; } + private MemberView Member { get; set; } = new(); + private ManagerView Manager { get; set; } = new(); + + + protected override async Task OnInitializedAsync() + { + Interceptor.RegisterEvent(); + Interceptor.RegisterBeforeSendEvent(); + + Member = await EvaluationRepo.GetMemberByUserId(UserId); + var managerId = await UserService.GetUserId(); + + Manager = await EvaluationRepo.GetManagerByUserId(managerId); + + } + + + public void Dispose() + { + Interceptor.DisposeEvent(); + } } \ No newline at end of file diff --git a/Wonky.Client/Pages/ManagerEvaluationViewEditPage.razor b/Wonky.Client/Pages/ManagerEvaluationViewEditPage.razor index 18cea0da..d7e79398 100644 --- a/Wonky.Client/Pages/ManagerEvaluationViewEditPage.razor +++ b/Wonky.Client/Pages/ManagerEvaluationViewEditPage.razor @@ -17,8 +17,19 @@ @attribute [Authorize(Roles = "Management,Supervisor")] -

ManagerEvaluationViewEditPage

+@page "/management/members/{UserId}/evaluations/{EvaluationId}" -@code { - -} \ No newline at end of file +
+
+

Evalueringer

+
+
+
+
+
+ Loading... +
+
+
+
+
\ No newline at end of file diff --git a/Wonky.Client/Pages/ManagerEvaluationViewEditPage.razor.cs b/Wonky.Client/Pages/ManagerEvaluationViewEditPage.razor.cs index 960eef80..0a159360 100644 --- a/Wonky.Client/Pages/ManagerEvaluationViewEditPage.razor.cs +++ b/Wonky.Client/Pages/ManagerEvaluationViewEditPage.razor.cs @@ -16,6 +16,7 @@ using Microsoft.AspNetCore.Components; using Wonky.Client.HttpInterceptors; using Wonky.Client.HttpRepository; +using Wonky.Entity.DTO; using Wonky.Entity.Views; namespace Wonky.Client.Pages; @@ -23,7 +24,36 @@ namespace Wonky.Client.Pages; #pragma warning disable CS8618 -public partial class ManagerEvaluationViewEditPage +public partial class ManagerEvaluationViewEditPage : IDisposable { + // ######################################################### + [Inject] public IEvaluationRepository EvaluationRepo { get; set; } + [Inject] public HttpInterceptorService Interceptor { get; set; } + // ######################################################### + [Parameter] public string UserId { get; set; } = ""; + [Parameter] public string EvaluationId { get; set; } = ""; + + // ######################################################### + private bool Working { get; set; } = true; + private EvaluationEditView Evaluation { get; set; } = new(); + private MemberView Member { get; set; } = new(); + + protected override async Task OnInitializedAsync() + { + Interceptor.RegisterEvent(); + Interceptor.RegisterBeforeSendEvent(); + + Member = await EvaluationRepo.GetMemberByUserId(UserId); + + Evaluation = await EvaluationRepo.GetById(EvaluationId); + + Working = false; + } + + + public void Dispose() + { + Interceptor.DisposeEvent(); + } } \ No newline at end of file diff --git a/Wonky.Client/Pages/ManagerAdvisorReportViewPage.razor b/Wonky.Client/Pages/ManagerMemberActivityViewPage.razor similarity index 96% rename from Wonky.Client/Pages/ManagerAdvisorReportViewPage.razor rename to Wonky.Client/Pages/ManagerMemberActivityViewPage.razor index 754d361e..b558d325 100644 --- a/Wonky.Client/Pages/ManagerAdvisorReportViewPage.razor +++ b/Wonky.Client/Pages/ManagerMemberActivityViewPage.razor @@ -16,7 +16,8 @@ @using Wonky.Client.Components @using Microsoft.AspNetCore.Authorization @attribute [Authorize(Roles = "Management,Supervisor")] -@page "/management/advisors/{UserId}/reports/{ReportDate}" + +@page "/management/members/{UserId}/activities/{ReportDate}"
@if (!string.IsNullOrWhiteSpace(Report.ReportData.DayTypeEnum)) diff --git a/Wonky.Client/Pages/ManagerAdvisorReportViewPage.razor.cs b/Wonky.Client/Pages/ManagerMemberActivityViewPage.razor.cs similarity index 92% rename from Wonky.Client/Pages/ManagerAdvisorReportViewPage.razor.cs rename to Wonky.Client/Pages/ManagerMemberActivityViewPage.razor.cs index 40502a29..9cd3083d 100644 --- a/Wonky.Client/Pages/ManagerAdvisorReportViewPage.razor.cs +++ b/Wonky.Client/Pages/ManagerMemberActivityViewPage.razor.cs @@ -30,13 +30,13 @@ using Wonky.Entity.Views; namespace Wonky.Client.Pages; -public partial class ManagerAdvisorReportViewPage : IDisposable +public partial class ManagerMemberActivityViewPage : IDisposable { // ############################################################# [Inject] public HttpInterceptorService Interceptor { get; set; } [Inject] public ICountryReportRepository ReportRepo { get; set; } [Inject] public NavigationManager Navigator { get; set; } - [Inject] public ILogger Logger { get; set; } + [Inject] public ILogger Logger { get; set; } [Inject] public ILocalStorageService Storage { get; set; } [Inject] public UserPreferenceService PreferenceService { get; set; } [Inject] public IToastService Toaster { get; set; } @@ -45,7 +45,6 @@ public partial class ManagerAdvisorReportViewPage : IDisposable // ############################################################# - [Parameter] public string CountryCode { get; set; } = ""; [Parameter] public string UserId { get; set; } = ""; [Parameter] public string ReportDate { get; set; } = ""; @@ -79,7 +78,7 @@ public partial class ManagerAdvisorReportViewPage : IDisposable { // shoe order/activity document // the supervisor version - Navigator.NavigateTo($"/management/advisors/{UserId}/reports/{ReportDate}/activities/{documentId}"); + Navigator.NavigateTo($"/management/members/{UserId}/activities/{ReportDate}/visits/{documentId}"); } @@ -98,7 +97,7 @@ public partial class ManagerAdvisorReportViewPage : IDisposable ReportDate = workDate; // ensure the browser address bar contains the correct link - Navigator.NavigateTo($"/management/advisors/{UserId}/reports/{workDate}", false, true); + Navigator.NavigateTo($"/management/members/{UserId}/activities/{workDate}", false, true); // return if we are already at it if (Working) diff --git a/Wonky.Client/Pages/ManagerHomePage.razor b/Wonky.Client/Pages/ManagerMemberListPage.razor similarity index 91% rename from Wonky.Client/Pages/ManagerHomePage.razor rename to Wonky.Client/Pages/ManagerMemberListPage.razor index 1528de37..5b992834 100644 --- a/Wonky.Client/Pages/ManagerHomePage.razor +++ b/Wonky.Client/Pages/ManagerMemberListPage.razor @@ -14,8 +14,9 @@ *@ @using Microsoft.AspNetCore.Authorization -@attribute [Authorize(Roles = "Management,Supervisor")] -@page "/supervisor" +@attribute [Authorize(Roles = "Supervisor")] + +@page "/management" Supervisor @@ -39,7 +40,7 @@
@foreach (var user in Users) { -
+
diff --git a/Wonky.Client/Pages/ManagerHomePage.razor.cs b/Wonky.Client/Pages/ManagerMemberListPage.razor.cs similarity index 96% rename from Wonky.Client/Pages/ManagerHomePage.razor.cs rename to Wonky.Client/Pages/ManagerMemberListPage.razor.cs index c9c7e1a9..14b881c7 100644 --- a/Wonky.Client/Pages/ManagerHomePage.razor.cs +++ b/Wonky.Client/Pages/ManagerMemberListPage.razor.cs @@ -22,7 +22,7 @@ namespace Wonky.Client.Pages; #pragma warning disable CS8618 -public partial class ManagerHomePage +public partial class ManagerMemberListPage { // ############################################################# [Inject] public HttpInterceptorService Interceptor { get; set; } @@ -39,6 +39,7 @@ public partial class ManagerHomePage Interceptor.RegisterBeforeSendEvent(); Users = await UserRepo.GetSupervisorUsers(); + if (Users.Any()) { Users = Users @@ -46,6 +47,7 @@ public partial class ManagerHomePage .ThenBy(x => x.CountryCode) .ToList(); } + Working = false; } diff --git a/Wonky.Client/Pages/ManagerAdvisorViewPage.razor b/Wonky.Client/Pages/ManagerMemberViewPage.razor similarity index 97% rename from Wonky.Client/Pages/ManagerAdvisorViewPage.razor rename to Wonky.Client/Pages/ManagerMemberViewPage.razor index 33b29fce..80447d2f 100644 --- a/Wonky.Client/Pages/ManagerAdvisorViewPage.razor +++ b/Wonky.Client/Pages/ManagerMemberViewPage.razor @@ -16,7 +16,8 @@ @using Microsoft.AspNetCore.Authorization @using Wonky.Client.Components @attribute [Authorize(Roles = "Management,Supervisor")] -@page "/management/advisors/{UserId}" + +@page "/management/members/{UserId}" Rapport Arkiv @InfoAdvisor.FirstName @InfoAdvisor.LastName
diff --git a/Wonky.Client/Pages/ManagerAdvisorViewPage.razor.cs b/Wonky.Client/Pages/ManagerMemberViewPage.razor.cs similarity index 89% rename from Wonky.Client/Pages/ManagerAdvisorViewPage.razor.cs rename to Wonky.Client/Pages/ManagerMemberViewPage.razor.cs index 68160713..48a3db25 100644 --- a/Wonky.Client/Pages/ManagerAdvisorViewPage.razor.cs +++ b/Wonky.Client/Pages/ManagerMemberViewPage.razor.cs @@ -7,14 +7,14 @@ using Wonky.Entity.Views; namespace Wonky.Client.Pages; -public partial class ManagerAdvisorViewPage : IDisposable +public partial class ManagerMemberViewPage : IDisposable { // ############################################################# [Inject] public HttpInterceptorService Interceptor { get; set; } [Inject] public IOfficeUserInfoRepository UserRepo { get; set; } [Inject] public ICountryReportRepository ReportRepo { get; set; } [Inject] public NavigationManager Navigator { get; set; } - [Inject] public ILogger Logger { get; set; } + [Inject] public ILogger Logger { get; set; } // ############################################################# @@ -56,8 +56,8 @@ public partial class ManagerAdvisorViewPage : IDisposable var uri = new Uri(Navigator.Uri); var url = uri.AbsoluteUri; Logger.LogDebug("ShowReport\n => {}\n =>{}", reportDate, url); - Logger.LogDebug("ShowReport => NavigateTo => {}",$"{url}/reports/{reportDate}"); - Navigator.NavigateTo($"{url}/reports/{reportDate}"); + Logger.LogDebug("ShowReport => NavigateTo => {}",$"{url}/activities/{reportDate}"); + Navigator.NavigateTo($"{url}/activities/{reportDate}"); } public void Dispose() diff --git a/Wonky.Client/Pages/ManagerVisitViewPage.razor b/Wonky.Client/Pages/ManagerMemberVisitViewPage.razor similarity index 98% rename from Wonky.Client/Pages/ManagerVisitViewPage.razor rename to Wonky.Client/Pages/ManagerMemberVisitViewPage.razor index 420f53ac..5c7fc544 100644 --- a/Wonky.Client/Pages/ManagerVisitViewPage.razor +++ b/Wonky.Client/Pages/ManagerMemberVisitViewPage.razor @@ -17,7 +17,9 @@ @using Microsoft.AspNetCore.Authorization @using Wonky.Client.Components @attribute [Authorize(Roles = "Management,Supervisor")] -@page "/management/advisors/{UserId}/reports/{ReportDate}/activities/{DocumentId}" + +@page "/management/members/{UserId}/activities/{ReportDate}/visits/{DocumentId}" + @ReportItem.ESalesNumber - @ReportItem.Company.Name diff --git a/Wonky.Client/Pages/ManagerVisitViewPage.razor.cs b/Wonky.Client/Pages/ManagerMemberVisitViewPage.razor.cs similarity index 97% rename from Wonky.Client/Pages/ManagerVisitViewPage.razor.cs rename to Wonky.Client/Pages/ManagerMemberVisitViewPage.razor.cs index 784e771b..fb1963ba 100644 --- a/Wonky.Client/Pages/ManagerVisitViewPage.razor.cs +++ b/Wonky.Client/Pages/ManagerMemberVisitViewPage.razor.cs @@ -28,7 +28,7 @@ using Wonky.Entity.Views; namespace Wonky.Client.Pages; -public partial class ManagerVisitViewPage : IDisposable +public partial class ManagerMemberVisitViewPage : IDisposable { // ############################################################# [Inject] public HttpInterceptorService Interceptor { get; set; } diff --git a/Wonky.Client/Pages/ManagerVisitViewPage.razor.css b/Wonky.Client/Pages/ManagerMemberVisitViewPage.razor.css similarity index 100% rename from Wonky.Client/Pages/ManagerVisitViewPage.razor.css rename to Wonky.Client/Pages/ManagerMemberVisitViewPage.razor.css diff --git a/Wonky.Client/Pages/ManagerUserListPage.razor b/Wonky.Client/Pages/ManagerUserListPage.razor deleted file mode 100644 index c00b7616..00000000 --- a/Wonky.Client/Pages/ManagerUserListPage.razor +++ /dev/null @@ -1,81 +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] -*@ - -@using Microsoft.AspNetCore.Authorization -@attribute [Authorize(Roles = "Management,Supervisor")] -@page "/management/advisors" - -Supervisor Sælger Oversigt -
-
-

Supervisor Sælger Oversigt

-
-
-
-
-
- Loading... -
-
-
-
-
- -
-
-
-
-
-
-
Navn
-
-
-
Email
-
-
-
Telefon
-
-
-
- -
-
- - @if (Users.Any()) - { - foreach (var user in Users) - { - -
-
- @user.CountryCode @user.SalesRep -
-
- @user.FullName -
-
- @user.Email -
-
- @user.PhoneNumber -
-
- @user.Description -
-
-
- } - } -
diff --git a/Wonky.Client/Pages/ManagerUserListPage.razor.cs b/Wonky.Client/Pages/ManagerUserListPage.razor.cs deleted file mode 100644 index cf033035..00000000 --- a/Wonky.Client/Pages/ManagerUserListPage.razor.cs +++ /dev/null @@ -1,57 +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] -// - -using Microsoft.AspNetCore.Components; -using Wonky.Client.HttpInterceptors; -using Wonky.Client.HttpRepository; -using Wonky.Entity.Views; - -namespace Wonky.Client.Pages; - -#pragma warning disable CS8618 - -public partial class ManagerUserListPage : IDisposable -{ - // ############################################################# - [Inject] public HttpInterceptorService Interceptor { get; set; } - [Inject] public IOfficeUserInfoRepository UserRepo { get; set; } - - // ############################################################# - private List Users { get; set; } = new(); - private bool Working { get; set; } = true; - - - protected override async Task OnInitializedAsync() - { - Interceptor.RegisterEvent(); - Interceptor.RegisterBeforeSendEvent(); - - Users = await UserRepo.GetSupervisorUsers(); - if (Users.Any()) - { - Users = Users - .OrderBy(x => x.FullName) - .ThenBy(x => x.CountryCode) - .ToList(); - } - Working = false; - } - - - public void Dispose() - { - Interceptor.DisposeEvent(); - } -} \ No newline at end of file diff --git a/Wonky.Client/Pages/OfficeAdvisorCustomerPagedListPage.razor b/Wonky.Client/Pages/OfficeAdvisorCustomerPagedListPage.razor index cb9bfddd..86484b7c 100644 --- a/Wonky.Client/Pages/OfficeAdvisorCustomerPagedListPage.razor +++ b/Wonky.Client/Pages/OfficeAdvisorCustomerPagedListPage.razor @@ -17,6 +17,7 @@ @using Wonky.Client.Components @using Microsoft.AspNetCore.Authorization @attribute [Authorize(Roles = "Admin,Office")] + @page "/office/users/advisors/{CountryCode}/{UserId}/customers" Kundeliste for @SalesRep.FirstName @SalesRep.LastName diff --git a/Wonky.Client/Pages/OfficeAdvisorListPage.razor b/Wonky.Client/Pages/OfficeAdvisorListPage.razor index 7c740407..1c79a614 100644 --- a/Wonky.Client/Pages/OfficeAdvisorListPage.razor +++ b/Wonky.Client/Pages/OfficeAdvisorListPage.razor @@ -17,6 +17,7 @@ @using Wonky.Client.Components @using Microsoft.AspNetCore.Authorization @attribute [Authorize(Roles = "Admin,Office,Management")] + @page "/office/users/advisors/{CountryCode}" Sælger Oversigt @CountryName diff --git a/Wonky.Client/Pages/OfficeAdvisorReportListPage.razor b/Wonky.Client/Pages/OfficeAdvisorReportListPage.razor index 1f2b5d67..72151728 100644 --- a/Wonky.Client/Pages/OfficeAdvisorReportListPage.razor +++ b/Wonky.Client/Pages/OfficeAdvisorReportListPage.razor @@ -17,6 +17,7 @@ @using Wonky.Client.Components @using Microsoft.AspNetCore.Authorization @attribute [Authorize(Roles = "Admin,Office")] + @page "/office/users/advisors/{CountryCode}/{UserId}/reports" Rapport Arkiv @InfoAdvisor.FirstName @InfoAdvisor.LastName diff --git a/Wonky.Client/Pages/OfficeAdvisorReportViewPage.razor b/Wonky.Client/Pages/OfficeAdvisorReportViewPage.razor index c2a69fd2..53e01600 100644 --- a/Wonky.Client/Pages/OfficeAdvisorReportViewPage.razor +++ b/Wonky.Client/Pages/OfficeAdvisorReportViewPage.razor @@ -18,6 +18,7 @@ @using Wonky.Client.Enums @using Wonky.Client.Models @attribute [Authorize(Roles = "Admin,Office,Supervisor")] + @page "/office/users/advisors/{CountryCode}/{UserId}/reports/{ReportDate}"
diff --git a/Wonky.Client/Pages/OfficeLandingPage.razor b/Wonky.Client/Pages/OfficeLandingPage.razor index 633168e8..60c692fa 100644 --- a/Wonky.Client/Pages/OfficeLandingPage.razor +++ b/Wonky.Client/Pages/OfficeLandingPage.razor @@ -17,6 +17,7 @@ @using Microsoft.AspNetCore.Authorization @using Wonky.Client.Components @attribute [Authorize(Roles = "Admin,Office,Warehouse")] + @page "/office/country" Kontor diff --git a/Wonky.Client/Pages/OfficeOrderCreatePage.razor b/Wonky.Client/Pages/OfficeOrderCreatePage.razor index c368996c..1c9189de 100644 --- a/Wonky.Client/Pages/OfficeOrderCreatePage.razor +++ b/Wonky.Client/Pages/OfficeOrderCreatePage.razor @@ -17,6 +17,7 @@ @using Wonky.Client.OverlayOrderCreate @using Microsoft.AspNetCore.Authorization @attribute [Authorize(Roles = "Admin,Office,Supervisor,Warehouse")] + @page "/office/customers/{CountryCode}/{CompanyId}/order" Telefon Ordre - @Company.Name - @Company.Account diff --git a/Wonky.Client/Pages/OfficeOrderViewPage.razor b/Wonky.Client/Pages/OfficeOrderViewPage.razor index ebebe2ec..08153fc2 100644 --- a/Wonky.Client/Pages/OfficeOrderViewPage.razor +++ b/Wonky.Client/Pages/OfficeOrderViewPage.razor @@ -17,7 +17,9 @@ @using Microsoft.AspNetCore.Authorization @using Wonky.Client.Components @attribute [Authorize(Roles = "Admin,Office,Warehouse")] + @page "/office/customers/{CompanyId}/orders/{OrderId}" + @ReportItem.ESalesNumber - @ReportItem.Company.Name
diff --git a/Wonky.Client/Pages/SysDocumentTextsViewEditPage.razor b/Wonky.Client/Pages/SystemDocumentTextsViewEditPage.razor similarity index 100% rename from Wonky.Client/Pages/SysDocumentTextsViewEditPage.razor rename to Wonky.Client/Pages/SystemDocumentTextsViewEditPage.razor diff --git a/Wonky.Client/Pages/SysDocumentTextsViewEditPage.razor.cs b/Wonky.Client/Pages/SystemDocumentTextsViewEditPage.razor.cs similarity index 96% rename from Wonky.Client/Pages/SysDocumentTextsViewEditPage.razor.cs rename to Wonky.Client/Pages/SystemDocumentTextsViewEditPage.razor.cs index 06e10a60..5c48b3d1 100644 --- a/Wonky.Client/Pages/SysDocumentTextsViewEditPage.razor.cs +++ b/Wonky.Client/Pages/SystemDocumentTextsViewEditPage.razor.cs @@ -22,7 +22,7 @@ using Wonky.Entity.DTO; namespace Wonky.Client.Pages; -public partial class SysDocumentTextsViewEditPage +public partial class SystemDocumentTextsViewEditPage { [Inject] public ISystemTextsRepository TextsRepo { get; set; } diff --git a/Wonky.Client/Shared/NavMenu.razor b/Wonky.Client/Shared/NavMenu.razor index faa47d80..101efeac 100644 --- a/Wonky.Client/Shared/NavMenu.razor +++ b/Wonky.Client/Shared/NavMenu.razor @@ -116,17 +116,17 @@ - + - +