Status in TicketSearch nach Auswahl wird jetzt korrekt angezeigt

Author: Zinoberous

WorklogManagement.API/Tickets/Ticket.cs

@@ -32,7 +32,9 @@ internal static Ticket Map(DB.Ticket ticket)
         return new()
         {
             Id = ticket.Id,
-            Ref = ticket.Ref is null ? null : new() { Id = ticket.Ref.Id, Title = ticket.Ref.Title },
+            Ref = ticket.Ref is not null
+                ? new() { Id = ticket.Ref.Id, Title = ticket.Ref.Title, Status = (TicketStatus)ticket.Ref.TicketStatusId }
+                : null,
             Title = ticket.Title,
             Description = ticket.Description,
             Status = (TicketStatus)ticket.TicketStatusId,

WorklogManagement.API/Worklogs/Worklog.cs

@@ -1,5 +1,6 @@
-using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore;
 using WorklogManagement.Data.Context;
+using WorklogManagement.Shared.Enums;
 using DB = WorklogManagement.Data.Models;
 using DTO = WorklogManagement.Shared.Models;
 
@@ -29,8 +30,12 @@ internal static Worklog Map(DB.Worklog worklog)
         {
             Id = worklog.Id,
             Date = worklog.Date,
-            TicketId = worklog.TicketId,
-            TicketTitle = worklog.Ticket.Title,
+            Ticket = new()
+            {
+                Id = worklog.TicketId,
+                Title = worklog.Ticket.Title,
+                Status = (TicketStatus)worklog.Ticket.TicketStatusId
+            },
             Description = worklog.Description,
             TimeSpent = worklog.TimeSpent,
             Attachments = [.. worklog.WorklogAttachments.Select(WorklogAttachment.Map)]
@@ -46,7 +51,7 @@ internal async Task SaveAsync(WorklogManagementContext context)
             worklog = new()
             {
                 Date = Date,
-                TicketId = TicketId,
+                TicketId = Ticket.Id,
                 Description = Description,
                 TimeSpent = TimeSpent
             };
@@ -60,7 +65,7 @@ internal async Task SaveAsync(WorklogManagementContext context)
         else
         {
             worklog.Date = Date;
-            worklog.TicketId = TicketId;
+            worklog.TicketId = Ticket.Id;
             worklog.Description = Description;
             worklog.TimeSpent = TimeSpent;
 

WorklogManagement.Shared/Models/RefTicket.cs

@@ -1,7 +1,10 @@
+using WorklogManagement.Shared.Enums;
+
 namespace WorklogManagement.Shared.Models;
 
 public record RefTicket
 {
     public required int Id { get; init; }
     public required string Title { get; init; }
+    public required TicketStatus Status { get; init; }
 }

WorklogManagement.Shared/Models/Worklog.cs

@@ -1,4 +1,4 @@
-namespace WorklogManagement.Shared.Models;
+namespace WorklogManagement.Shared.Models;
 
 public record Worklog : IDataModel
 {
@@ -12,9 +12,7 @@ public record Worklog : IDataModel
 
     // TODO: uri ticket
 
-    public required int TicketId { get; init; }
-
-    public required string TicketTitle { get; init; }
+    public required RefTicket Ticket { get; init; }
 
     public string? Description { get; init; }
 

WorklogManagement.UI/Components/Pages/TicketForm/TicketFormViewModel.cs

@@ -82,8 +82,8 @@ public IEnumerable<Ticket> SubTickets
 
     public Ticket? Ref
     {
-        get => _ticket.Ref is not null ? new Ticket { Id = _ticket.Ref.Id, Title = _ticket.Ref.Title } : null;
-        set => _ = SaveTicketAsync(_ticket with { Ref = value is not null ? new RefTicket { Id = value.Id, Title = value.Title } : null });
+        get => _ticket.Ref is not null ? new Ticket { Id = _ticket.Ref.Id, Title = _ticket.Ref.Title, Status = _ticket.Ref.Status } : null;
+        set => _ = SaveTicketAsync(_ticket with { Ref = value is not null ? new RefTicket { Id = value.Id, Title = value.Title, Status = value.Status } : null });
     }
 
     public string? Description
@@ -164,8 +164,12 @@ public async Task<bool> SaveWorklogAsync(Worklog? worklog = null)
         worklog ??= new Worklog
         {
             Date = DateOnly.FromDateTime(DateTimeOffset.Now.Date),
-            TicketId = _ticket.Id,
-            TicketTitle = _ticket.Title,
+            Ticket = new()
+            {
+                Id = _ticket.Id,
+                Title = _ticket.Title,
+                Status = _ticket.Status,
+            },
             TimeSpent = TimeSpan.Zero,
         };
 

WorklogManagement.UI/Components/Pages/Tracking/TrackingEntry.razor.cs

@@ -25,8 +25,8 @@ private DateOnly Date
 
     private Ticket Ticket
     {
-        get => new() { Id = Worklog.TicketId, Title = Worklog.TicketTitle };
-        set => _ = UpdateWorklogAsync(Worklog with { TicketId = value.Id, TicketTitle = value.Title });
+        get => new() { Id = Worklog.Ticket.Id, Title = Worklog.Ticket.Title, Status = Worklog.Ticket.Status };
+        set => _ = UpdateWorklogAsync(Worklog with { Ticket = new() { Id = value.Id, Title = value.Title, Status = value.Status } });
     }
 
     private TimeSpan TimeSpent

WorklogManagement.UI/Components/Pages/Tracking/TrackingViewModel.cs

@@ -115,8 +115,12 @@ public async Task<bool> SaveWorklogAsync(Worklog? worklog = null)
                 worklog = new()
                 {
                     Date = SelectedDate,
-                    TicketId = defaultTicket.Id,
-                    TicketTitle = defaultTicket.Title,
+                    Ticket = new()
+                    {
+                        Id = defaultTicket.Id,
+                        Title = defaultTicket.Title,
+                        Status = defaultTicket.Status,
+                    },
                     TimeSpent = TimeSpan.Zero,
                 };
             }

WorklogManagement.UI/Components/Shared/TicketNewDialog.razor.cs

@@ -23,8 +23,8 @@ public partial class TicketNewDialog
 
     private Ticket? RefTicketSearch
     {
-        get => Ref is not null ? new Ticket { Id = Ref.Id, Title = Ref.Title } : null;
-        set => Ref = value is not null ? new RefTicket { Id = value.Id, Title = value.Title } : null;
+        get => Ref is not null ? new Ticket { Id = Ref.Id, Title = Ref.Title, Status = Ref.Status } : null;
+        set => Ref = value is not null ? new RefTicket { Id = value.Id, Title = value.Title, Status = value.Status } : null;
     }
 
     private string? Description { get; set; }

WorklogManagement.UI/WorklogManagement.UI.csproj

@@ -9,7 +9,7 @@
     <PackageReference Include="Elastic.Serilog.Sinks" Version="9.0.0" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="10.0.2" />
     <PackageReference Include="OneOf" Version="3.0.271" />
-    <PackageReference Include="Radzen.Blazor" Version="8.7.5" />
+    <PackageReference Include="Radzen.Blazor" Version="9.0.0" />
     <PackageReference Include="Serilog" Version="4.3.0" />
     <PackageReference Include="Serilog.Enrichers.UtcTime" Version="1.0.0" />
     <PackageReference Include="Serilog.Expressions" Version="5.0.0" />