Skip to content

Commit

Permalink
fix: get users for leaderboard (#23739)
Browse files Browse the repository at this point in the history
(cherry picked from commit 2f7b9f8)

Co-authored-by: barredterra <14891507+barredterra@users.noreply.github.com>
  • Loading branch information
mergify[bot] and barredterra committed Dec 11, 2023
1 parent 2bc4261 commit 33b7066
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions frappe/desk/leaderboard.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,17 @@ def get_leaderboards():

@frappe.whitelist()
def get_energy_point_leaderboard(date_range, company=None, field=None, limit=None):
all_users = frappe.get_all(
users = frappe.get_list(
"User",
filters={
"name": ["not in", ["Administrator", "Guest"]],
"enabled": 1,
"user_type": ["!=", "Website User"],
},
order_by="name ASC",
pluck="name",
)
all_users_list = list(map(lambda x: x["name"], all_users))

filters = [["type", "!=", "Review"], ["user", "in", all_users_list]]
filters = [["type", "!=", "Review"], ["user", "in", users]]
if date_range:
date_range = frappe.parse_json(date_range)
filters.append(["creation", "between", [date_range[0], date_range[1]]])
Expand All @@ -40,7 +39,7 @@ def get_energy_point_leaderboard(date_range, company=None, field=None, limit=Non
)

energy_point_users_list = list(map(lambda x: x["name"], energy_point_users))
for user in all_users_list:
for user in users:
if user not in energy_point_users_list:
energy_point_users.append({"name": user, "value": 0})

Expand Down

0 comments on commit 33b7066

Please sign in to comment.