From 63ccc3fd05cc5af05a5c3c2496b595057e39e6ed Mon Sep 17 00:00:00 2001
From: Horilla <support@horilla.com>
Date: Wed, 3 Sep 2025 10:55:53 +0530
Subject: [PATCH] [UPDT] PMS: Updated meetings detail employee, manager and
 answerable employee columns

---
 pms/cbv/meetings.py | 12 ++++++++----
 pms/models.py       | 23 +++++++++++++----------
 2 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/pms/cbv/meetings.py b/pms/cbv/meetings.py
index cb6385f37..be9c55cc5 100644
--- a/pms/cbv/meetings.py
+++ b/pms/cbv/meetings.py
@@ -114,15 +114,19 @@ class MeetingsDetailedView(HorillaDetailedView):
     detail view of page
     """
 
+    cols = {
+        "mom_detail_col": 12,
+    }
+
     def __init__(self, **kwargs: Any) -> None:
         super().__init__(**kwargs)
         self.body = [
             (_("Date"), "date"),
             (_("Question Template"), "question_template"),
-            (_("Employees"), "employ_detail_col", True),
-            (_("Managers"), "manager_detail_col", True),
-            (_("Minutes of Meeting"), "mom_col"),
-            (_("Answerable employees"), "answerable_col", True),
+            (_("Employees"), "employ_detail_col"),
+            (_("Managers"), "manager_detail_col"),
+            (_("Answerable employees"), "answerable_col"),
+            (_("Minutes of Meeting"), "mom_detail_col"),
         ]
 
     action_method = "detail_action"
diff --git a/pms/models.py b/pms/models.py
index f7adbb076..5c23ce366 100644
--- a/pms/models.py
+++ b/pms/models.py
@@ -1431,10 +1431,9 @@ class Meetings(HorillaModel):
         employees = self.answer_employees.all()
         if employees:
             employee_names_string = "<br>".join(
-                [str(employee) for employee in employees]
+                [str(employee.get_full_name()) for employee in employees]
             )
-            employee_title = _("Answerable employees")
-            return f'<span class="oh-timeoff-modal__stat-title">{employee_title}</span><span class="oh-timeoff-modal__stat-count">{employee_names_string}</span>'
+            return employee_names_string
         else:
             return ""
 
@@ -1495,10 +1494,9 @@ class Meetings(HorillaModel):
         employees = self.employee_id.all()
         if employees:
             employee_names_string = "<br>".join(
-                [str(employee) for employee in employees]
+                [str(employee.get_full_name()) for employee in employees]
             )
-            employee_title = _("Employees")
-            return f'<span class="oh-timeoff-modal__stat-title">{employee_title}</span><span class="oh-timeoff-modal__stat-count">{employee_names_string}</span>'
+            return employee_names_string
         else:
             return ""
 
@@ -1509,14 +1507,13 @@ class Meetings(HorillaModel):
         employees = self.manager.all()
         if employees:
             employee_names_string = "<br>".join(
-                [str(employee) for employee in employees]
+                [str(employee.get_full_name()) for employee in employees]
             )
-            employee_title = _("Managers")
-            return f'<span class="oh-timeoff-modal__stat-title">{employee_title}</span><span class="oh-timeoff-modal__stat-count">{employee_names_string}</span>'
+            return employee_names_string
         else:
             return ""
 
-    def mom_col(self):
+    def mom_detail_col(self):
         request = getattr(_thread_locals, "request", None)
         if not self.response:
             return "-"
@@ -1527,6 +1524,12 @@ class Meetings(HorillaModel):
             return self.response
         return "-" if not self.show_response else self.response
 
+    def mom_col(self):
+        return render_template(
+            path="cbv/meetings/mom_col.html",
+            context={"instance": self},
+        )
+
     def diff_cell(self):
         request = getattr(_thread_locals, "request", None)
         if not getattr(self, "request", None):