Skip to content

Fix/dashboard role visibility and status #138

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Rishabh-Rahangdale merged 3 commits into from
May 21, 2026
Merged

Fix/dashboard role visibility and status #138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f2b59ad
fix: update dashboard status to 'Closed' and implement role-based vis…
Rishabh-Rahangdale May 21, 2026
ad72400
fix: improve risk filtering for 'Normal' and enable Admin dashboard a…
Rishabh-Rahangdale May 21, 2026
2616d27
feat: add report selection menu to dashboard
Rishabh-Rahangdale May 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions audit_management/audit_management/dashboard.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,10 @@ def get_dashboard_stats(pending_start=0, recent_start=0, status=None, risk=None)
p_filters["status"] = ["in", actual_statuses]

if risk_list:
p_filters["risk"] = ["in", risk_list]
if "Normal" in risk_list:
p_filters["risk"] = ["in", risk_list + [None, ""]]
else:
p_filters["risk"] = ["in", risk_list]

pending_for_me_list = frappe.get_all(
"My Audits",
Expand Down Expand Up @@ -108,19 +111,21 @@ def get_dashboard_stats(pending_start=0, recent_start=0, status=None, risk=None)
filters["emp_division"] = "None"

total_pending = frappe.db.count("My Audits", {**filters, "status": "Pending"})
closed_count = frappe.db.count("My Audits", {**filters, "status": "Close"})
high_risk = frappe.db.count("My Audits", {**filters, "risk": "High"})
closed_count = frappe.db.count("My Audits", {**filters, "status": "Closed"})
draft_count = frappe.db.count("My Audits", {**filters, "status": "Draft"})

recent_list = []
has_more_recent = False
if is_manager or is_member:
if is_admin or is_manager or is_member:
r_filters = filters.copy()
if status_list:
r_filters["status"] = ["in", status_list]
if risk_list:
r_filters["risk"] = ["in", risk_list]
if "Normal" in risk_list:
r_filters["risk"] = ["in", risk_list + [None, ""]]
else:
r_filters["risk"] = ["in", risk_list]

recent_list = frappe.get_all(
"My Audits",
Expand Down Expand Up @@ -162,7 +167,7 @@ def get_dashboard_stats(pending_start=0, recent_start=0, status=None, risk=None)
item.emp_branch = f"{b_name} ({b_sol})" if b_name and b_sol else (b_name or b_sol or s_branch_key)

return {
"role_type": "manager" if is_manager else ("member" if is_member else "stage_user"),
"role_type": "manager" if (is_manager or is_admin) else ("member" if is_member else "stage_user"),
"pending_for_me": pending_for_me_count,
"responded_by_me": responded_by_me_count,
"total_pending": total_pending,
Expand Down
Loading
Loading