Revize e75c5129

Updated UserShortDto, methods in DomainUserRepository for fetching users with different roles, UI fixes

src/Core/Application/Leuze.Core.Application.UI/Pages/Users/Components/UserAside.razor

@@ -312 +312 @@
 
     private async Task FetchUsers()
     {
-        var result = await _mediator.Send(new GetUsersList.Query(false, Role));
+        var result = await _mediator.Send(new GetUsersList.Query(false, "TL"));
         if (result.IsSuccess && result.Result is not null)
         {
             if (UserId == default(Guid)) Users = result.Result.List;

src/Core/Application/Leuze.Core.Application.UI/Pages/Users/List.razor

@@ -19 +19 @@
             <th>@T["Email"]</th>
             <th>@T["Role"]</th>
             <th>@T["Type"]</th>
+            <th>@T["Senior"]</th>
             <th>@T["Actions"]</th>
         </tr>
         @foreach (var user in Users)
         {
-            <tr>
-                <td>@user.Name</td>
-                <td>@user.Email</td>
-                <td>@user.Role</td>
-                <td>@(user.IsAdUser ? "AD" : "Lokální")</td>
-                <td>
-                    <div class="button-ui" @onclick="() => SetUserAsideId(user.Id)">
-                        <i class="fal fa-edit"></i>
-                        @T["Edit"]
-                    </div>
-                </td>
-            </tr>
+    <tr>
+        <td>@user.Name</td>
+        <td>@user.Email</td>
+        <td>@user.Role</td>
+        <td>@(user.IsAdUser ? "AD" : "Lokální")</td>
+        <td>@(user.SeniorName is not null ? user.SeniorName : "Bez nadřízeného")</td>
+        <td>
+            <div class="button-ui" @onclick="() => SetUserAsideId(user.Id)">
+                <i class="fal fa-edit"></i>
+                @T["Edit"]
+            </div>
+        </td>
+    </tr>
         }
     </table>
     @if (Users.Count > 0)

src/Core/Application/Leuze.Core.Application/CQRS/Users/Queries/GetUsersList.cs

@@ -1 +1 @@
 using Leuze.Core.Domain.Domains.Users.DTOs;
 using Leuze.Core.Domain.Repositories;
-using Microsoft.AspNetCore.Components.Authorization;
-using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Security.Claims;
 using System.Threading;
 using System.Threading.Tasks;
 using Leuze.Core.Application.Authentication;
@@ -19 +16 @@
         /// <summary>
         /// 
         /// </summary>
-        public record Query(bool ExcludeMyself, Guid LimitForRole) : IBaseRequest<Response>;
+        public record Query(bool ExcludeMyself, string? LimitForRole) : IBaseRequest<Response>;
 
         /// <summary>
         /// 

src/Core/Domain/Leuze.Core.Domain/Domains/Users/DTOs/UserDto.cs

@@ -5 +5 @@
     /// <summary>
     /// 
     /// </summary>
-    public record UserDto(Guid Id, string Name, string Email, string Role, bool IsAdUser);
+    public record UserDto(Guid Id, string Name, string? SeniorName, string Email, string Role, bool IsAdUser);
 }

src/Core/Domain/Leuze.Core.Domain/Domains/Users/DTOs/UserShortDto.cs

@@ -5 +5 @@
     /// <summary>
     /// 
     /// </summary>
-    public record UserShortDto(Guid Id, string Name);
+    public record UserShortDto(Guid Id, string Name, Guid? SeniorId, Guid RoleId, string RoleName);
 }

src/Core/Domain/Leuze.Core.Domain/Repositories/IDomainUserRepository.cs

@@ -52 +52 @@
         /// 
         /// </summary>
         /// <returns></returns>
-        Task<List<UserShortDto>> GetListAsync(Guid limitForRole);
+        Task<List<UserShortDto>> GetListAsync(string? limitForRole);
 
         /// <summary>
         /// 
@@ -60 +60 @@
         /// <param name="id"></param>
         /// <returns></returns>
         Task<UserDetailDto> GetDetailByIdAsync(Guid id);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <returns></returns>
+        Task<List<UserShortDto>> GetAllNonAdminUsers();
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <returns></returns>
+        Task<List<UserShortDto>> GetAllTLUsers();
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        Task<List<UserShortDto>> GetAllMAUsersFromTL(Guid id);
+
     }
 }

src/Core/Infrastructure/Leuze.Core.Infrastructure.Persistence/Repository/DomainUserRepository.cs

@@ -45 +45 @@
         /// <inheritdoc/>
         public async Task<(List<UserDto> List, int Total)> GetFilteredListAsync(int pageNumber, int pageSize)
         {
-            var query = dbSet.Include(o => o.User).ThenInclude(o => o.Roles).AsNoTracking().AsQueryable();
+            var query = dbSet.Include(o => o.SeniorUser).Include(o => o.User).ThenInclude(o => o.Roles).AsNoTracking().AsQueryable();
 
             var total = await query.CountAsync();
 
-            var list = await query.Select(o => new UserDto(o.UserId, o.Name.FullName, o.EmailAddress.Email, o.User.Roles.Single().Name, o.User.IsAdUser))
+            var list = await query.Select(o => new UserDto(o.UserId, o.Name.FullName, o.SeniorUser != null ? o.SeniorUser.Name.FullName : null!, o.EmailAddress.Email, o.User.Roles.Single().Name, o.User.IsAdUser))
                     .Skip((pageNumber - 1) * pageSize)
                     .Take(pageSize)
                     .ToListAsync();
@@ -71 +71 @@
                 .SingleOrDefaultAsync();
 
         /// <inheritdoc/>
-        public async Task<List<UserShortDto>> GetListAsync(Guid limitForRole)
+        public async Task<List<UserShortDto>> GetListAsync(string? limitForRole)
         {
-            var query = dbSet.AsQueryable();
+            var query = dbSet.Include(o => o.User).ThenInclude(o => o.Roles).AsQueryable();
 
-            return await query.Select(o => new UserShortDto(o.UserId, o.Name.FullName)).ToListAsync();
+            if (limitForRole is not null) query = query.Where(o => o.User.Roles.Any(a => a.NormalizedName == limitForRole.ToUpper()));
+
+            return await query.Select(o => new UserShortDto(o.UserId, o.Name.FullName, o.SeniorUserId, o.User.Roles.First().Id, o.User.Roles.First().Name)).ToListAsync();
         }
+
+        /// <inheritdoc/>
+        public async Task<List<UserShortDto>> GetAllNonAdminUsers()
+            => await dbSet.Include(o => o.User).ThenInclude(o => o.Roles)
+                .Where(o => o.User.Roles.Any(a => a.NormalizedName != "ADMIN"))
+                .Select(o => new UserShortDto(o.UserId, o.Name.FullName, o.SeniorUserId, o.User.Roles.First().Id, o.User.Roles.First().Name)).ToListAsync();
+
+        /// <inheritdoc/>
+        public async Task<List<UserShortDto>> GetAllTLUsers()
+            => await dbSet.Include(o => o.User).ThenInclude(o => o.Roles)
+                .Where(o => o.User.Roles.Any(a => a.NormalizedName == "TL"))
+                .Select(o => new UserShortDto(o.UserId, o.Name.FullName, o.SeniorUserId, o.User.Roles.First().Id, o.User.Roles.First().Name)).ToListAsync();
+
+        /// <inheritdoc/>
+        public async Task<List<UserShortDto>> GetAllMAUsersFromTL(Guid id)
+            => await dbSet.Include(o => o.User).ThenInclude(o => o.Roles)
+                .Where(o => o.SeniorUserId.HasValue && o.SeniorUserId.Value == id && o.User.Roles.Any(a => a.NormalizedName == "MA"))
+                .Select(o => new UserShortDto(o.UserId, o.Name.FullName, o.SeniorUserId, o.User.Roles.First().Id, o.User.Roles.First().Name)).ToListAsync();
     }
 }

src/Modules/Goal/Application/Leuze.Modules.Goal.Application.UI/Pages/GoalDefinitionDetail.razor

@@ -39 +39 @@
     <td>@range.PercentileFinal</td>
     <td>
         <div class="flex">
+            <div></div>
             <div></div>
             <div class="button-ui" @onclick='() => SetDetailId(range.Id)'>
                 <i class="fal fa-eye"></i>
@@ -165 +166 @@
     .flex{
     display: grid;
     align-items: center;
-    grid-template-columns: repeat(3, 100px);
+    grid-template-columns: repeat(4, 120px);
     justify-content: right;
     }
     .flex > div:not(:last-child) {

src/Modules/Goal/Application/Leuze.Modules.Goal.Application.UI/Pages/GoalsManagement.razor

@@ -40 +40 @@
     <td>
         <div class="flex">
             <AuthorizeView Roles="TL">
+                <div></div>
                 <div class="button-ui" @onclick='() => _nav.NavigateTo($"/goals/detail/{range.Id}")'>
                     <i class="fal fa-eye"></i>
                     @T["Open"]
@@ -145 +146 @@
     .flex{
     display: grid;
     align-items: center;
-    grid-template-columns: repeat(3, 100px);
+    grid-template-columns: repeat(4, 120px);
     justify-content: right;
     }
     .flex > div:not(:last-child) {