Added due date logic for tasks due filters.
This commit is contained in:
parent
e730de3887
commit
2fb82917b4
1 changed files with 5 additions and 1 deletions
|
|
@ -1,4 +1,5 @@
|
||||||
import frappe
|
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.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
|
from custom_ui.services import DbService
|
||||||
|
|
||||||
|
|
@ -46,23 +47,26 @@ def get_task_status_options():
|
||||||
def get_tasks_due(subject_filter, current_company):
|
def get_tasks_due(subject_filter, current_company):
|
||||||
"""Return the number of items due today of the type of subject_filter"""
|
"""Return the number of items due today of the type of subject_filter"""
|
||||||
try:
|
try:
|
||||||
|
today = datetime.date.today()
|
||||||
due_filters = {
|
due_filters = {
|
||||||
'subject': ['like', f'%{subject_filter}%'],
|
'subject': ['like', f'%{subject_filter}%'],
|
||||||
'status': ['not in', ["Template", "Completed", "Cancelled"]],
|
'status': ['not in', ["Template", "Completed", "Cancelled"]],
|
||||||
'company': current_company,
|
'company': current_company,
|
||||||
|
'exp_end_date': today,
|
||||||
# Add due date filter here
|
# Add due date filter here
|
||||||
}
|
}
|
||||||
completed_filters = {
|
completed_filters = {
|
||||||
'subject': ['like', f'%{subject_filter}%'],
|
'subject': ['like', f'%{subject_filter}%'],
|
||||||
'status': ['not in', ["Template", "Cancelled"]],
|
'status': ['not in', ["Template", "Cancelled"]],
|
||||||
'company': current_company,
|
'company': current_company,
|
||||||
|
'exp_end_date': today,
|
||||||
# Add due date filter here
|
# Add due date filter here
|
||||||
}
|
}
|
||||||
overdue_filters = {
|
overdue_filters = {
|
||||||
'subject': ['like', f'%{subject_filter}%'],
|
'subject': ['like', f'%{subject_filter}%'],
|
||||||
'status': ['not in', ["Template", "Completed", "Cancelled"]],
|
'status': ['not in', ["Template", "Completed", "Cancelled"]],
|
||||||
'company': current_company,
|
'company': current_company,
|
||||||
|
'exp_end_date': ["<", today]
|
||||||
# Add overdue date filtering here
|
# Add overdue date filtering here
|
||||||
}
|
}
|
||||||
due_count = frappe.db.count("Task", filters=due_filters)
|
due_count = frappe.db.count("Task", filters=due_filters)
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue