nestict/ihrm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[UPDT] PMS: Updated meetings detail employee, manager and answerable employee columns

Browse Source
This commit is contained in:
Horilla
2025-09-03 10:55:53 +05:30
parent d3761ca713
commit 63ccc3fd05
2 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pms/cbv/meetings.py
View File

@@ -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"

23
pms/models.py
View File

@@ -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):