Added Company filter for chart data on Home page.
This commit is contained in:
parent
f386edf769
commit
5b2e362100
3 changed files with 53 additions and 34 deletions
|
|
@ -43,33 +43,32 @@ def get_task_status_options():
|
|||
|
||||
|
||||
@frappe.whitelist()
|
||||
def get_tasks_due(subject_filter):
|
||||
def get_tasks_due(subject_filter, current_company):
|
||||
"""Return the number of items due today of the type of subject_filter"""
|
||||
try:
|
||||
filters = {
|
||||
'subject': ['like', f'%{subject_filter}%'],
|
||||
'status': ['not in', ["Template", "Completed", "Cancelled"]]
|
||||
}
|
||||
count = frappe.db.count("Task", filters=filters)
|
||||
return build_success_response(count)
|
||||
except frappe.ValidationError as ve:
|
||||
return build_error_response(str(ve), 400)
|
||||
except Exception as e:
|
||||
return build_error_response(str(e), 500)
|
||||
|
||||
|
||||
@frappe.whitelist()
|
||||
def get_tasks_completed(subject_filter):
|
||||
"""Return the number of items due today marked complete of the type of subject_filter"""
|
||||
try:
|
||||
filters = {
|
||||
due_filters = {
|
||||
'subject': ['like', f'%{subject_filter}%'],
|
||||
'status': ['not in', ["Template", "Cancelled"]]
|
||||
'status': ['not in', ["Template", "Completed", "Cancelled"]],
|
||||
'company': current_company,
|
||||
# Add due date filter here
|
||||
}
|
||||
print("Completed Task filter", filters)
|
||||
count = frappe.db.count("Task", filters=filters)
|
||||
print("Matching Records:", count)
|
||||
return build_success_response(count)
|
||||
completed_filters = {
|
||||
'subject': ['like', f'%{subject_filter}%'],
|
||||
'status': ['not in', ["Template", "Cancelled"]],
|
||||
'company': current_company,
|
||||
# Add due date filter here
|
||||
}
|
||||
overdue_filters = {
|
||||
'subject': ['like', f'%{subject_filter}%'],
|
||||
'status': ['not in', ["Template", "Completed", "Cancelled"]],
|
||||
'company': current_company,
|
||||
# Add overdue date filtering here
|
||||
}
|
||||
due_count = frappe.db.count("Task", filters=due_filters)
|
||||
completed_count = frappe.db.count("Task", filters=completed_filters)
|
||||
overdue_count = frappe.db.count("Task", filters=overdue_filters)
|
||||
return build_success_response([due_count, completed_count, overdue_count])
|
||||
except frappe.ValidationError as ve:
|
||||
return build_error_response(str(ve), 400)
|
||||
except Exception as e:
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue