diff --git a/custom_ui/api/db/tasks.py b/custom_ui/api/db/tasks.py index dd6835f..a08ba9b 100644 --- a/custom_ui/api/db/tasks.py +++ b/custom_ui/api/db/tasks.py @@ -1,4 +1,5 @@ import frappe +import datetime from custom_ui.db_utils import process_query_conditions, build_datatable_dict, get_count_or_filters, build_success_response, build_error_response from custom_ui.services import DbService @@ -46,23 +47,26 @@ def get_task_status_options(): def get_tasks_due(subject_filter, current_company): """Return the number of items due today of the type of subject_filter""" try: - + today = datetime.date.today() due_filters = { 'subject': ['like', f'%{subject_filter}%'], 'status': ['not in', ["Template", "Completed", "Cancelled"]], 'company': current_company, + 'exp_end_date': today, # Add due date filter here } completed_filters = { 'subject': ['like', f'%{subject_filter}%'], 'status': ['not in', ["Template", "Cancelled"]], 'company': current_company, + 'exp_end_date': today, # Add due date filter here } overdue_filters = { 'subject': ['like', f'%{subject_filter}%'], 'status': ['not in', ["Template", "Completed", "Cancelled"]], 'company': current_company, + 'exp_end_date': ["<", today] # Add overdue date filtering here } due_count = frappe.db.count("Task", filters=due_filters)