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

[FIX] PMS: Fixed today and yesterday filter in feedback

Browse Source
This commit is contained in:
Horilla
2024-04-30 12:42:52 +05:30
parent 4cc3d4e3e9
commit 8ccc1bee3f
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
pms/filters.py
View File

@@ -33,22 +33,28 @@ class DateRangeFilter(django_filters.Filter):
def filter(self, qs, value):
if value:
if value == "today":
today = datetime.date.today()
qs = qs.filter(created_at=today)
today = datetime.datetime.now().date()
formatted_date = today.strftime('%Y-%m-%d')
qs = qs.filter(created_at__startswith=formatted_date)
if value == "yesterday":
today = datetime.date.today()
yesterday = today - datetime.timedelta(days=1)
qs = qs.filter(created_at=yesterday)
formatted_date = yesterday.strftime('%Y-%m-%d')
qs = qs.filter(created_at__startswith=formatted_date)
if value == "week":
today = datetime.date.today()
start_of_week = today - datetime.timedelta(days=today.weekday())
end_of_week = start_of_week + datetime.timedelta(days=6)
qs = qs.filter(created_at__range=[start_of_week, end_of_week])
elif value == "month":
today = datetime.date.today()
start_of_month = datetime.date(today.year, today.month, 1)
end_of_month = start_of_month + datetime.timedelta(days=31)
qs = qs.filter(created_at__range=[start_of_month, end_of_month])
return qs
@@ -103,9 +109,7 @@ class ActualObjectiveFilter(FilterSet):
"archive",
"assignees",
"duration",
"employee_objective",
"employee_objective__key_result_id",
"employee_objective__progress_percentage",
]
def search_method(self, queryset, _, value: str):

2
pms/templates/feedback/feedback_creation.html
View File

@@ -141,7 +141,7 @@
</div>
<div class="col-12 col-sm-12 col-md-6 col-lg-6" style="display:none" id="cyclic_feedback_period">
<div class="oh-input__group">
<label class="oh-input__label" for="id_employee_key_results_id">{% trans "Cycle Period" %}</label>
<label class="oh-input__label">{% trans "Cycle Period" %}</label>
<div class="w-100 d-flex">
{{feedback_form.cyclic_feedback_days_count}}
{{feedback_form.cyclic_feedback_period}}