Chnaged the name form presignedUrls to ReportedProsignedUrl
This commit is contained in:
parent
691a670a28
commit
4ccc690560
@ -11,7 +11,7 @@ namespace Marco.Pms.Model.ViewModels.Activities
|
|||||||
public double CompletedTask { get; set; }
|
public double CompletedTask { get; set; }
|
||||||
public BasicEmployeeVM? AssignedBy { get; set; }
|
public BasicEmployeeVM? AssignedBy { get; set; }
|
||||||
public Guid WorkItemId { get; set; }
|
public Guid WorkItemId { get; set; }
|
||||||
public List<string>? PreSignedUrls { get; set; }
|
public List<string>? ReportedPreSignedUrls { get; set; }
|
||||||
public WorkItem? WorkItem { get; set; }
|
public WorkItem? WorkItem { get; set; }
|
||||||
public List<BasicEmployeeVM>? teamMembers { get; set; }
|
public List<BasicEmployeeVM>? teamMembers { get; set; }
|
||||||
public List<CommentVM>? comments { get; set; }
|
public List<CommentVM>? comments { get; set; }
|
||||||
|
@ -317,7 +317,7 @@ namespace MarcoBMS.Services.Controllers
|
|||||||
|
|
||||||
List<Employee> employees = await _context.Employees.Where(e => employeeIdList.Contains(e.Id)).Include(e => e.JobRole).ToListAsync();
|
List<Employee> employees = await _context.Employees.Where(e => employeeIdList.Contains(e.Id)).Include(e => e.JobRole).ToListAsync();
|
||||||
|
|
||||||
List<TaskComment> allComments = await _context.TaskComments.Where(c => taskIdList.Contains(c.TaskAllocationId)).ToListAsync();
|
List<TaskComment> allComments = await _context.TaskComments.Include(c => c.Employee).Where(c => taskIdList.Contains(c.TaskAllocationId)).ToListAsync();
|
||||||
var allCommentIds = allComments.Select(c => c.Id).ToList();
|
var allCommentIds = allComments.Select(c => c.Id).ToList();
|
||||||
|
|
||||||
var taskAttachments = await _context.TaskAttachments.Where(t => taskIdList.Contains(t.ReferenceId) || allCommentIds.Contains(t.ReferenceId)).ToListAsync();
|
var taskAttachments = await _context.TaskAttachments.Where(t => taskIdList.Contains(t.ReferenceId) || allCommentIds.Contains(t.ReferenceId)).ToListAsync();
|
||||||
@ -345,7 +345,7 @@ namespace MarcoBMS.Services.Controllers
|
|||||||
string preSignedUrl = _s3Service.GeneratePreSignedUrlAsync(document.S3Key);
|
string preSignedUrl = _s3Service.GeneratePreSignedUrlAsync(document.S3Key);
|
||||||
taskPreSignedUrls.Add(preSignedUrl);
|
taskPreSignedUrls.Add(preSignedUrl);
|
||||||
}
|
}
|
||||||
response.PreSignedUrls = taskPreSignedUrls;
|
response.ReportedPreSignedUrls = taskPreSignedUrls;
|
||||||
|
|
||||||
foreach (var taskMember in taskMembers)
|
foreach (var taskMember in taskMembers)
|
||||||
{
|
{
|
||||||
|
Loading…
x
Reference in New Issue
Block a user