Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion eps/eps/leaderboard.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ def get_energy_point_leaderboard(date_range, company=None, field=None, limit=Non
filters.append(["creation", "between", [date_range[0], date_range[1]]])
energy_point_users = frappe.get_all(
"Energy Point Log",
fields=["user as name", "sum(points) as value"],
fields=["user as name", {"SUM": "points", "as": "value"}],
filters=filters,
group_by="user",
order_by="value desc",
Expand Down
10 changes: 5 additions & 5 deletions eps/eps/page/user_profile/user_profile.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ def get_energy_points_percentage_chart_data(user: str, field: str):
filters={"user": user, "type": ["!=", "Review"]},
group_by=field,
order_by=field,
fields=[field, "ABS(sum(points)) as points"],
fields=[field, {"ABS": [{"SUM": "points"}], "as": "points"}],
as_list=True,
)

Expand All @@ -55,17 +55,17 @@ def get_user_rank(user: str):
"Energy Point Log",
group_by="`tabEnergy Point Log`.`user`",
filters={"creation": [">", month_start], "type": ["!=", "Review"]},
fields=["user", "sum(points)"],
order_by="sum(points) desc",
fields=["user", {"SUM": "points", "as": "total_points"}],
order_by="total_points desc",
as_list=True,
)

all_time_rank = frappe.get_all(
"Energy Point Log",
group_by="`tabEnergy Point Log`.`user`",
filters={"type": ["!=", "Review"]},
fields=["user", "sum(points)"],
order_by="sum(points) desc",
fields=["user", {"SUM": "points", "as": "total_points"}],
order_by="total_points desc",
as_list=True,
)

Expand Down
4 changes: 2 additions & 2 deletions eps/eps/page/user_profile/user_profile_controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,8 @@ class UserProfile {

render_line_chart() {
this.line_chart_filters = [
["Energy Point Log", "user", "=", this.user_id, false],
["Energy Point Log", "type", "!=", "Review", false],
["Energy Point Log", "user", "=", this.user_id],
["Energy Point Log", "type", "!=", "Review"],
];

this.line_chart_config = {
Expand Down