From 361a2ab5c3529526ca99960d6835da29bbc82908 Mon Sep 17 00:00:00 2001 From: "ashutosh.nehete" Date: Thu, 29 May 2025 11:49:08 +0530 Subject: [PATCH] Sending Is Active in Object Of Contact notes --- Marco.Pms.Model/Mapper/DirectoryMapper.cs | 3 ++- Marco.Pms.Model/ViewModels/Directory/ContactNoteVM.cs | 1 + Marco.Pms.Services/Helpers/DirectoryHelper.cs | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Marco.Pms.Model/Mapper/DirectoryMapper.cs b/Marco.Pms.Model/Mapper/DirectoryMapper.cs index 4732542..381c4b0 100644 --- a/Marco.Pms.Model/Mapper/DirectoryMapper.cs +++ b/Marco.Pms.Model/Mapper/DirectoryMapper.cs @@ -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 }; } } diff --git a/Marco.Pms.Model/ViewModels/Directory/ContactNoteVM.cs b/Marco.Pms.Model/ViewModels/Directory/ContactNoteVM.cs index c3ca209..c00b0de 100644 --- a/Marco.Pms.Model/ViewModels/Directory/ContactNoteVM.cs +++ b/Marco.Pms.Model/ViewModels/Directory/ContactNoteVM.cs @@ -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; } } } diff --git a/Marco.Pms.Services/Helpers/DirectoryHelper.cs b/Marco.Pms.Services/Helpers/DirectoryHelper.cs index a7988ee..2be0f01 100644 --- a/Marco.Pms.Services/Helpers/DirectoryHelper.cs +++ b/Marco.Pms.Services/Helpers/DirectoryHelper.cs @@ -2150,7 +2150,7 @@ namespace Marco.Pms.Services.Helpers if (notes.Any()) { List? noteIds = notes.Select(n => n.Id).ToList(); - List? noteUpdateLogs = await _context.DirectoryUpdateLogs.Include(l => l.Employee).Where(l => noteIds.Contains(l.Id)).OrderByDescending(l => l.UpdateAt).ToListAsync(); + List? noteUpdateLogs = await _context.DirectoryUpdateLogs.Include(l => l.Employee).Where(l => noteIds.Contains(l.RefereanceId)).OrderByDescending(l => l.UpdateAt).ToListAsync(); List? noteVMs = new List(); foreach (var note in notes) {