From 0a3df9ae75f8d257b3852d83e3e67033779529c3 Mon Sep 17 00:00:00 2001 From: Akhil Narang Date: Mon, 1 Dec 2025 18:41:24 +0530 Subject: [PATCH] fix: qb fixes Signed-off-by: Akhil Narang --- eps/eps/leaderboard.py | 2 +- eps/eps/page/user_profile/user_profile.py | 10 +++++----- eps/eps/page/user_profile/user_profile_controller.js | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eps/eps/leaderboard.py b/eps/eps/leaderboard.py index 2818262..24cf91b 100644 --- a/eps/eps/leaderboard.py +++ b/eps/eps/leaderboard.py @@ -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", diff --git a/eps/eps/page/user_profile/user_profile.py b/eps/eps/page/user_profile/user_profile.py index 40fb723..03cd928 100644 --- a/eps/eps/page/user_profile/user_profile.py +++ b/eps/eps/page/user_profile/user_profile.py @@ -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, ) @@ -55,8 +55,8 @@ 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, ) @@ -64,8 +64,8 @@ def get_user_rank(user: str): "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, ) diff --git a/eps/eps/page/user_profile/user_profile_controller.js b/eps/eps/page/user_profile/user_profile_controller.js index 808b4e8..c514f6d 100644 --- a/eps/eps/page/user_profile/user_profile_controller.js +++ b/eps/eps/page/user_profile/user_profile_controller.js @@ -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 = {