From 8ccc1bee3fb2639929ea3d7d87e35c8d020bcae2 Mon Sep 17 00:00:00 2001
From: Horilla <teamhorilla@gmail.com>
Date: Tue, 30 Apr 2024 12:42:52 +0530
Subject: [PATCH] [FIX] PMS: Fixed today and yesterday filter in feedback

---
 pms/filters.py                                | 14 +++++++++-----
 pms/templates/feedback/feedback_creation.html |  2 +-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/pms/filters.py b/pms/filters.py
index 84590a25d..7c22a04c6 100644
--- a/pms/filters.py
+++ b/pms/filters.py
@@ -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):
diff --git a/pms/templates/feedback/feedback_creation.html b/pms/templates/feedback/feedback_creation.html
index fcd81acda..3284273cf 100644
--- a/pms/templates/feedback/feedback_creation.html
+++ b/pms/templates/feedback/feedback_creation.html
@@ -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}}