e-suite/Backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Get my assignments now working

Browse Source
This commit is contained in:
Colin Dawson 2026-03-17 20:13:46 +00:00
parent 9d1498763c
commit 3446e7b19f
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
e-suite.API.Common/e-suite.API.Common/GetMyAssignments.cs
View File

@ -1,4 +1,5 @@
using e_suite.Database.Core.Extensions; using System.Diagnostics;
using e_suite.Database.Core.Extensions;
using e_suite.Database.Core.Models; using e_suite.Database.Core.Models;
using eSuite.Core.Miscellaneous; using eSuite.Core.Miscellaneous;
@ -14,13 +15,18 @@ public class GetMyAssignments : IGeneralId
Role = assignment.Role?.ToGeneralIdRef(); Role = assignment.Role?.ToGeneralIdRef();
TaskType = assignment.Task.TaskType; TaskType = assignment.Task.TaskType;
TaskName = assignment.Task.TaskName; TaskName = assignment.Task.TaskName;
ActivityId = assignment.Task.Activity.ToGeneralIdRef();
ActivityName = assignment.Task.Activity.Name;
StartDateTime = assignment.StartDateTime; StartDateTime = assignment.StartDateTime;
} }
public long Id { get; set; } public long Id { get; set; }
public Guid Guid { get; set; } public Guid Guid { get; set; }
public string TaskType { get; set; } public string TaskType { get; set; }
public string TaskName { get; set; } public string TaskName { get; set; }
public GeneralIdRef ActivityId { get; set; }
public string ActivityName { get; set; }
public GeneralIdRef? User { get; set; } public GeneralIdRef? User { get; set; }
public GeneralIdRef? Role { get; set; } public GeneralIdRef? Role { get; set; }

3
e-suite.Core/eSuite.Core/Miscellaneous/GeneralIdRef.cs
View File

@ -12,7 +12,8 @@ public class GeneralIdRef : IGeneralIdRef, IEquatable<GeneralIdRef>
{ {
[JsonPropertyName("id")] [JsonPropertyName("id")]
public long? Id { get; set; } public long? Id { get; set; }
[JsonPropertyName("Guid")]
[JsonPropertyName("guid")]
public Guid? Guid { get; set; } public Guid? Guid { get; set; }
public bool Equals(GeneralIdRef? other) public bool Equals(GeneralIdRef? other)

3
e-suite.Modules.RunningActivityManager/repository/ActivityRepository.cs
View File

@ -65,6 +65,7 @@ public class ActivityRepository : RepositoryBase, IActivityRepository
.Include(x => x.Role) .Include(x => x.Role)
.ThenInclude(x => x.UserRoles.Where(ur => !ur.Deleted)) .ThenInclude(x => x.UserRoles.Where(ur => !ur.Deleted))
.ThenInclude(x => x.User) .ThenInclude(x => x.User)
.Include(x => x.Task); .Include(x => x.Task)
.ThenInclude( x => x.Activity);
} }
} }