Revize 15a93f2c

Area addon

src/Modules/Goal/Application/Leuze.Modules.Goal.Application.UI/Pages/Components/CreateDefinitionRangeAside.razor

@@ -1 @@
-
+@inject IMediator _mediator
+@inject IToastService toastService
+
 <aside class="@_aside review_detail">
     <div class="review_detail_header">
         <div>
@@ -12 +14 @@
     </div>
     <div class="review_detail_body">
         <div class="review_description_title">Datum začátku oblasti</div>
-        <input type="date" />
+        <input type="date" @bind-value="From" />
         <div class="review_description_title">Datum konce oblasti</div>
-        <input type="date" />
+        <input type="date" @bind-value="To" />
         <div class="review_description_title">Firemní výsledek oblasti</div>
-        <input type="number" />
+        <input type="number" @bind-value="VariCompanySuccess" />
     </div>
     <div class="review_detail_footer">
-        <button>Uložit</button>
+        <button @onclick="Create">Uložit</button>
         <button @onclick="Close">Zrušit</button>
     </div>
 </aside>
@@ -88 +90 @@
 
     private string _aside;
 
+    public DateTime From { get; set; } = DateTime.Now;
+    public DateTime To { get; set; } = DateTime.Now.AddDays(1);
+    public double VariCompanySuccess { get; set; }
+
     [Parameter]
     public bool Show { get; set; } = false;
 
     [Parameter]
     public EventCallback CloseAside { get; set; }
 
+    [Parameter]
+    public EventCallback LoadAreasInView { get; set; }
+
+    private async Task Create()
+    {
+        //TODO: Check data validity
+
+        var response = await _mediator.Send(new CreateNewArea.Command(From, To, VariCompanySuccess));
+
+        if (response.IsSuccess)
+        {
+            toastService.ShowSuccess("Oblast úspěšně vytvořena");
+            await LoadAreasInView.InvokeAsync();
+            await Close();
+        }
+        else toastService.ShowError($"Cíl se nepodařilo vytvořit {response.Errors.FirstOrDefault() ?? ""}");
+    }
+
     private async Task Close()
     {
         //ResetValues();

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

@@ -23 +23 @@
         @foreach (var range in Ranges)
         {
             <tr>
-                <td>24.4.2021</td>
-                <td>23.4.2022</td>
-                <td>-</td>
+                <td>@range.From.ToShortDateString()</td>
+                <td>@range.To.ToShortDateString()</td>
+                <td>@(range.VariCompanySuccess ?? 0)</td>
                 <td>
                     <div class="flex">
-                        <div @onclick='() => _nav.NavigateTo("/goals/overview/test")'>
+                        <div @onclick='() => _nav.NavigateTo($"/goals/overview/{range.Id}")'>
                             <i class="fal fa-eye"></i>
                             Zobrazit
                         </div>
-                        <div @onclick="() => OpenAside(range)">
+                        <div @onclick="() => OpenAside(range.Id)">
                             <i class="fal fa-edit"></i>
                             Upravit
                         </div>
@@ -59 +59 @@
 {
     <div>Loading...</div>
 }
-<Leuze.Modules.Goal.Application.UI.Pages.Components.CreateDefinitionRangeAside Show="ShowAside" CloseAside="CloseAside" />
+<Leuze.Modules.Goal.Application.UI.Pages.Components.CreateDefinitionRangeAside Show="ShowAside" LoadAreasInView="LoadAreas" CloseAside="CloseAside" />
 
 <BlazorStyled.Styled>
     .flex{
@@ -177 +177 @@
     [Parameter]
     public string Id { get; set; } = null!;
 
-    private List<Guid> Ranges { get; set; } = new() { Guid.NewGuid() };
+    private List<GlobalDefinitionArea> Ranges { get; set; } = new() { };
 
     private int PageNumber { get; set; } = 1;
 
@@ -193 +193 @@
 
     private void CloseAside() => (AsideId, ShowAside) = (default(Guid), false);
 
+    private async Task LoadAreas()
+    {
+        var response = await _mediator.Send(new GetAllAreas.Query());
+
+        if (response.IsSuccess)
+        {
+            Ranges = response.Result.list;
+        }
+    }
+
+    protected async override Task OnInitializedAsync()
+    {
+        await base.OnInitializedAsync();
+        await LoadAreas();
+    }
+
 }

src/Modules/Goal/Application/Leuze.Modules.Goal.Application.UI/_Imports.razor

@@ -27 +27 @@
 @using Leuze.Modules.Goal.Application.CQRS.Goals.Commands
 @using Leuze.Modules.Goal.Application.CQRS.Goals.Queries
 @using Leuze.Modules.Goal.Application.CQRS.GoalDefinitions.Queries
+@using Leuze.Modules.Goal.Application.CQRS.GoalDefinitionAreas.Commands
+@using Leuze.Modules.Goal.Application.CQRS.GoalDefinitionAreas.Queries
 @using Leuze.Modules.Goal.Domain.Domains

src/Modules/Goal/Application/Leuze.Modules.Goal.Application/CQRS/GoalDefinitionAreas/Commands/CreateNewArea.cs

@@ +1 @@
+using Leuze.Core.Application.CQRS;
+using Leuze.Core.Domain.Repositories;
+using Leuze.Modules.Goal.Domain.Domains;
+using Leuze.Modules.Goal.Domain.Repositories;
+using Microsoft.AspNetCore.Components.Authorization;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Security.Claims;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Leuze.Modules.Goal.Application.CQRS.GoalDefinitionAreas.Commands
+{
+    public static class CreateNewArea
+    {
+        public record Command(DateTime from, DateTime to, double variCompany) : IBaseRequest<Response>;
+
+        public record Response(GlobalDefinitionArea item);
+
+
+        public class Handler : IBaseRequestHandler<Command, Response>
+        {
+            private readonly IGlobalDefinitionAreaRepository _gdAreaRepo;
+            private readonly AuthenticationStateProvider _authenticationStateProvider;
+            private readonly IDomainUserRepository _domainUserRepo;
+
+            public Handler(IGlobalDefinitionAreaRepository gdAreaRepo, AuthenticationStateProvider authStateProvider, IDomainUserRepository domainUserRepo)
+            {
+                _gdAreaRepo = gdAreaRepo;
+                _authenticationStateProvider = authStateProvider;
+                _domainUserRepo = domainUserRepo;
+            }
+
+            public async Task<RequestResponse<Response>> Handle(Command request, CancellationToken cancellationToken)
+            {
+                //TODO: user muze byt null, ale to my nechceme!!!
+                var state = await _authenticationStateProvider.GetAuthenticationStateAsync();
+                var id = Guid.Parse(state.User!.FindFirst(ClaimTypes.NameIdentifier)!.Value);
+                var user = await _domainUserRepo.GetByIdAsync(id);
+                var allAreas = await _gdAreaRepo.GetAllAsync();
+                var alreadyExistingAreas = await _gdAreaRepo.GetAllWithinTimeRange(request.from, request.to);
+
+                if(alreadyExistingAreas.Count > 0)
+                {
+                    return RequestResponse<Response>.CreateErrorResponse($"V zadaném rozsahu již existuje oblast!");
+                }
+
+                GlobalDefinitionArea item = new GlobalDefinitionArea(user, request.from, request.to);
+
+                await _gdAreaRepo.AddAsync(item);
+
+                return RequestResponse<Response>.CreateSuccessResponse(new(item));
+            }
+        }
+
+    }
+}

src/Modules/Goal/Application/Leuze.Modules.Goal.Application/CQRS/GoalDefinitionAreas/Queries/GetAllAreas.cs

@@ +1 @@
+using Leuze.Core.Application.CQRS;
+using Leuze.Core.Domain.Repositories;
+using Leuze.Modules.Goal.Domain.Domains;
+using Leuze.Modules.Goal.Domain.Repositories;
+using Microsoft.AspNetCore.Components.Authorization;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Security.Claims;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Leuze.Modules.Goal.Application.CQRS.GoalDefinitionAreas.Queries
+{
+    public static class GetAllAreas
+    {
+        public record Query() : IBaseRequest<Response>;
+
+        public record Response(List<GlobalDefinitionArea> list);
+
+
+        public class Handler : IBaseRequestHandler<Query, Response>
+        {
+            private readonly IGlobalDefinitionAreaRepository _gdAreaRepo;
+            private readonly AuthenticationStateProvider _authenticationStateProvider;
+            private readonly IDomainUserRepository _domainUserRepository;
+
+            public Handler(IGlobalDefinitionAreaRepository gdAreaRepo,
+                AuthenticationStateProvider authenticationStateProvider, IDomainUserRepository domainUserRepository)
+            {
+                _gdAreaRepo = gdAreaRepo;
+                _authenticationStateProvider = authenticationStateProvider;
+                _domainUserRepository = domainUserRepository;
+            }
+
+            public async Task<RequestResponse<Response>> Handle(Query request, CancellationToken cancellationToken)
+            {
+                /*
+                var state = await _authenticationStateProvider.GetAuthenticationStateAsync();
+                var id = Guid.Parse(state.User!.FindFirst(ClaimTypes.NameIdentifier)!.Value);
+                */
+                var gdAreas = await _gdAreaRepo.GetAllAsync();
+
+                if (gdAreas == null)
+                {
+                    return RequestResponse<Response>.CreateErrorResponse($"Goal definition areas empty!");
+                }
+
+                return RequestResponse<Response>.CreateSuccessResponse(new(gdAreas));
+            }
+        }
+    }
+}

src/Modules/Goal/Application/Leuze.Modules.Goal.Application/CQRS/GoalDefinitions/Queries/GetGoalDefinitionById.cs

@@ -11 +11 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace Leuze.Modules.Goal.Application.CQRS.Goals.Queries
+namespace Leuze.Modules.Goal.Application.CQRS.GoalDefinitions.Queries
 {
     public static class GetGoalDefinitionById
     {

src/Modules/Goal/Domain/Leuze.Modules.Goal.Domain/Domains/GlobalDefinitionArea.cs

@@ -13 +13 @@
         private GlobalDefinitionArea()
         {
 
+        }
+        public GlobalDefinitionArea(DomainUser creator, DateTime from, DateTime to) : this(creator, from, to, 0)
+        {
         }
 
-        public GlobalDefinitionArea(DomainUser creator, DateTime from, DateTime to)
+        public GlobalDefinitionArea(DomainUser creator, DateTime from, DateTime to, double variCompany)
         {
             this.Creator = creator;
             this.CreatorId = creator.UserId;
             this.From = from;
             this.To = to;
-            this.VariCompanySuccess = 0;
+            this.VariCompanySuccess = variCompany;
         }
 
         public static GlobalDefinitionArea Default()

src/Modules/Goal/Domain/Leuze.Modules.Goal.Domain/Repositories/IGlobalDefinitionAreaRepository.cs

@@ -23 +23 @@
 
         Task<bool> SetCompanyVariSetVariCompanySuccess(Guid id, double vari);
 
+
+        Task<List<GlobalDefinitionArea>> GetAllWithinTimeRange(DateTime from, DateTime to);
+
+
     }
 }

src/Modules/Goal/Infrastructure/Leuze.Modules.Goal.Infrastructure.Persistence/Extensions/RepositoriesExtension.cs

@@ -16 +16 @@
         public static void AddRepositories(this IServiceCollection services)
         {
             services.AddTransient<ICommentRepository,CommentRepository>();
+            services.AddTransient<IGlobalDefinitionAreaRepository,GlobalDefinitionAreaRepository>();
             services.AddTransient<IGoalDefinitionRepository,GoalDefinitionRepository>();
             services.AddTransient<IGoalItemRepository,GoalItemRepository>();
             services.AddTransient<IGoalUpdateRepository,GoalUpdateRepository>();

src/Modules/Goal/Infrastructure/Leuze.Modules.Goal.Infrastructure.Persistence/Repositories/GlobalDefinitionAreaRepository.cs

@@ -1 @@
-using ExtCore.Data.EntityFramework;
+using AutoMapper;
+using ExtCore.Data.Abstractions;
+using Leuze.Core.Infrastructure.Persistence;
 using Leuze.Modules.Goal.Domain.Domains;
 using Leuze.Modules.Goal.Domain.Repositories;
 using Microsoft.EntityFrameworkCore;
@@ -10 +12 @@
 
 namespace Leuze.Modules.Goal.Infrastructure.Persistence.Repositories
 {
-    class GlobalDefinitionAreaRepository : RepositoryBase<GlobalDefinitionArea>, IGlobalDefinitionAreaRepository
+    public class GlobalDefinitionAreaRepository : RepositoryBase<GlobalDefinitionArea>, IGlobalDefinitionAreaRepository
     {
+        public GlobalDefinitionAreaRepository(IStorageContext context, IMapper mapper) : base(context, mapper)
+        {
+        }
+
         public async Task<bool> AddAsync(GlobalDefinitionArea gdArea)
         {
             await dbSet.AddAsync(gdArea);
@@ -67 +73 @@
             await storageContext.SaveChangesAsync();
             return true;
         }
+
+        public async Task<List<GlobalDefinitionArea>> GetAllWithinTimeRange(DateTime from, DateTime to)
+        {
+            //return await dbSet.Where(item => ((item.From >= from && item.From <= to) || (item.To <= to && item.To >= from))).ToListAsync();
+            return await dbSet.Where(item => ((item.From >= from && item.From <= to) || (item.To <= to && item.To >= from))).ToListAsync();
+        }
     }
 }

src/Presentation/Leuze.App/Leuze.App.csproj

@@ -18 +18 @@
     <DocumentationFile>..\..\..\docs\Leuze.App.xml</DocumentationFile>
   </PropertyGroup>
 
-  <ItemGroup>
-    <Content Remove="wwwroot\Resources\Icons\microsoft-logo.svg" />
-  </ItemGroup>
-
   <ItemGroup>
     <Resource Include="wwwroot\Resources\Icons\microsoft-logo.svg">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
@@ -55 +51 @@
     <ProjectReference Include="..\..\Core\Infrastructure\Leuze.Core.Infrastructure.Persistence\Leuze.Core.Infrastructure.Persistence.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Content Update="wwwroot\Resources\Icons\microsoft-logo.svg">
+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+
 </Project>