Feature_Directory #90

Merged
vikas.nale merged 501 commits from Feature_Directory into main 2025-06-10 14:44:36 +00:00
3 changed files with 4 additions and 2 deletions
Showing only changes of commit 361a2ab5c3 - Show all commits

View File

@ -234,7 +234,8 @@ namespace Marco.Pms.Model.Mapper
Note = note.Note,
ContactId = note.ContactId,
CreatedAt = note.CreatedAt,
CreatedBy = note.Createdby != null ? note.Createdby.ToBasicEmployeeVMFromEmployee() : null
CreatedBy = note.Createdby != null ? note.Createdby.ToBasicEmployeeVMFromEmployee() : null,
IsActive = note.IsActive
};
}
}

View File

@ -11,5 +11,6 @@ namespace Marco.Pms.Model.ViewModels.Directory
public DateTime? UpdatedAt { get; set; }
public BasicEmployeeVM? UpdatedBy { get; set; }
public Guid ContactId { get; set; }
public bool IsActive { get; set; }
}
}

View File

@ -2150,7 +2150,7 @@ namespace Marco.Pms.Services.Helpers
if (notes.Any())
{
List<Guid>? noteIds = notes.Select(n => n.Id).ToList();
List<DirectoryUpdateLog>? noteUpdateLogs = await _context.DirectoryUpdateLogs.Include(l => l.Employee).Where(l => noteIds.Contains(l.Id)).OrderByDescending(l => l.UpdateAt).ToListAsync();
List<DirectoryUpdateLog>? noteUpdateLogs = await _context.DirectoryUpdateLogs.Include(l => l.Employee).Where(l => noteIds.Contains(l.RefereanceId)).OrderByDescending(l => l.UpdateAt).ToListAsync();
List<ContactNoteVM>? noteVMs = new List<ContactNoteVM>();
foreach (var note in notes)
{