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

[UPDT] PMS: Updated column width for meetings detail view column

Browse Source
This commit is contained in:
Horilla
2025-10-09 11:48:39 +05:30
parent b627c268a4
commit 2c78893dac
2 changed files with 23 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
pms/cbv/meetings.py
View File

@@ -49,6 +49,14 @@ class MeetingsList(HorillaListView):
def get_queryset(self):
queryset = super().get_queryset()
active = (
True
if self.request.GET.get("is_active", True)
in ["unknown", "True", "true", True]
else False
)
queryset = queryset.filter(is_active=active)
if not self.request.user.has_perm("pms.view_meetings"):
employee_id = self.request.user.employee_get
queryset = queryset.filter(
@@ -118,6 +126,9 @@ class MeetingsDetailedView(HorillaDetailedView):
cols = {
"mom_detail_col": 12,
"employ_detail_col": 12,
"manager_detail_col": 12,
"answerable_col": 12,
}
def __init__(self, **kwargs: Any) -> None:
@@ -125,8 +136,8 @@ class MeetingsDetailedView(HorillaDetailedView):
self.body = [
(_("Date"), "date"),
(_("Question Template"), "question_template"),
(_("Employees"), "employ_detail_col"),
(_("Managers"), "manager_detail_col"),
(_("Employees"), "employ_detail_col"),
(_("Answerable employees"), "answerable_col"),
(_("Minutes of Meeting"), "mom_detail_col"),
]

19
pms/models.py
View File

@@ -493,7 +493,7 @@ class EmployeeObjective(HorillaModel):
"""
Return subtitle containing both department and job position information.
"""
return f"{self.employee_id.employee_work_info.department_id} / {self.employee_id.employee_work_info.job_position_id}"
return f"{self.employee_id.get_department()} / {self.employee_id.get_job_position()}"
def manager_col(self):
"""
@@ -1321,9 +1321,12 @@ class AnonymousFeedback(models.Model):
This method to get individual feedback
"""
url = reverse_lazy("single-anonymous-feedback-view", kwargs={"obj_id": self.pk})
url = reverse_lazy("single-anonymous-feedback-view", kwargs={"pk": self.pk})
return url
def detail_view_subtitle(self):
return "Anonymous Feedback"
class Answer(models.Model):
"""feedback answer model"""
@@ -1430,8 +1433,8 @@ class Meetings(HorillaModel):
"""
employees = self.answer_employees.all()
if employees:
employee_names_string = "<br>".join(
[str(employee.get_full_name()) for employee in employees]
employee_names_string = ", ".join(
str(employee.get_full_name()) for employee in employees
)
return employee_names_string
else:
@@ -1493,8 +1496,8 @@ class Meetings(HorillaModel):
"""
employees = self.employee_id.all()
if employees:
employee_names_string = "<br>".join(
[str(employee.get_full_name()) for employee in employees]
employee_names_string = ", ".join(
str(employee.get_full_name()) for employee in employees
)
return employee_names_string
else:
@@ -1506,8 +1509,8 @@ class Meetings(HorillaModel):
"""
employees = self.manager.all()
if employees:
employee_names_string = "<br>".join(
[str(employee.get_full_name()) for employee in employees]
employee_names_string = ", ".join(
str(employee.get_full_name()) for employee in employees
)
return employee_names_string
else: