diff --git a/lms/lms/dashboard_chart/certification/certification.json b/lms/lms/dashboard_chart/certification/certification.json index 4314eedd..5714987b 100644 --- a/lms/lms/dashboard_chart/certification/certification.json +++ b/lms/lms/dashboard_chart/certification/certification.json @@ -7,12 +7,12 @@ "doctype": "Dashboard Chart", "document_type": "LMS Certificate", "dynamic_filters_json": "[]", - "filters_json": "[[\"LMS Certificate\",\"published\",\"=\",1,false]]", + "filters_json": "[[\"LMS Certificate\",\"published\",\"=\",1]]", "group_by_type": "Count", "idx": 0, "is_public": 1, "is_standard": 1, - "modified": "2025-04-28 17:47:28.517149", + "modified": "2025-12-07 17:47:28.517150", "modified_by": "sayali@frappe.io", "module": "LMS", "name": "Certification", diff --git a/lms/lms/dashboard_chart/new_signups/new_signups.json b/lms/lms/dashboard_chart/new_signups/new_signups.json index 442fe815..dab054cd 100644 --- a/lms/lms/dashboard_chart/new_signups/new_signups.json +++ b/lms/lms/dashboard_chart/new_signups/new_signups.json @@ -9,19 +9,20 @@ "doctype": "Dashboard Chart", "document_type": "User", "dynamic_filters_json": "[]", - "filters_json": "[[\"User\",\"enabled\",\"=\",1,false]]", + "filters_json": "[[\"User\",\"enabled\",\"=\",1]]", "group_by_type": "Count", "idx": 5, "is_public": 1, "is_standard": 1, - "last_synced_on": "2025-04-28 15:09:52.161688", - "modified": "2025-04-28 17:47:58.168293", + "last_synced_on": "2025-12-08 13:05:16.186243", + "modified": "2025-12-09 13:08:50.049053", "modified_by": "sayali@frappe.io", "module": "LMS", "name": "New Signups", "number_of_groups": 0, "owner": "basawaraj@erpnext.com", "roles": [], + "show_values_over_chart": 0, "source": "", "time_interval": "Daily", "timeseries": 1, diff --git a/lms/lms/utils.py b/lms/lms/utils.py index 19512fd9..44b4cb23 100644 --- a/lms/lms/utils.py +++ b/lms/lms/utils.py @@ -769,17 +769,18 @@ def get_chart_data( datefield = chart.based_on value_field = chart.value_based_on or "1" - filters = [([chart.document_type, "docstatus", "<", 2, False])] + filters = [([chart.document_type, "docstatus", "<", 2])] + print(chart.filters_json) filters = filters + json.loads(chart.filters_json) - filters.append([doctype, datefield, ">=", from_date, False]) - filters.append([doctype, datefield, "<=", to_date, False]) + filters.append([doctype, datefield, ">=", from_date]) + filters.append([doctype, datefield, "<=", to_date]) data = frappe.db.get_all( doctype, - fields=[f"{datefield} as _unit", f"SUM({value_field})", "COUNT(*)"], + fields=[datefield, {"SUM": value_field}, {"COUNT": "*"}], filters=filters, - group_by="_unit", - order_by="_unit asc", + group_by=datefield, + order_by=datefield, as_list=True, ) diff --git a/lms/lms/workspace/lms/lms.json b/lms/lms/workspace/lms/lms.json index f92a845e..1912a7f3 100644 --- a/lms/lms/workspace/lms/lms.json +++ b/lms/lms/workspace/lms/lms.json @@ -1,6 +1,10 @@ { "app": "lms", "charts": [ + { + "chart_name": "Certification", + "label": "Certification" + }, { "chart_name": "New Signups", "label": "Signups" @@ -10,7 +14,7 @@ "label": "Enrollments" } ], - "content": "[{\"id\":\"jNO4sdKxHu\",\"type\":\"header\",\"data\":{\"text\":\"Get Started\",\"col\":12}},{\"id\":\"5s0qRBc4rY\",\"type\":\"paragraph\",\"data\":{\"text\":\"Visit LMS Portal\",\"col\":4}},{\"id\":\"lGMuNLpmv-\",\"type\":\"paragraph\",\"data\":{\"text\":\"Create a Course\",\"col\":4}},{\"id\":\"3TVyc9AkPy\",\"type\":\"paragraph\",\"data\":{\"text\":\"Setup a Home Page\",\"col\":4}},{\"id\":\"9zcbqpu2gm\",\"type\":\"paragraph\",\"data\":{\"text\":\"LMS Settings\",\"col\":4}},{\"id\":\"0ATmnKmXjc\",\"type\":\"paragraph\",\"data\":{\"text\":\"Documentation\",\"col\":4}},{\"id\":\"C128a4abjX\",\"type\":\"spacer\",\"data\":{\"col\":12}},{\"id\":\"5q4sPiv2ci\",\"type\":\"chart\",\"data\":{\"chart_name\":\"Signups\",\"col\":6}},{\"id\":\"8NSaRaEV5u\",\"type\":\"chart\",\"data\":{\"chart_name\":\"Enrollments\",\"col\":6}},{\"id\":\"kMuzko0uAU\",\"type\":\"spacer\",\"data\":{\"col\":12}},{\"id\":\"iuvIOHmztI\",\"type\":\"header\",\"data\":{\"text\":\"Statistics\",\"col\":12}},{\"id\":\"l0VTd66Uy2\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Users\",\"col\":4}},{\"id\":\"wAWZin1KKk\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Course\",\"col\":4}},{\"id\":\"RLrIlFx0Hd\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Enrollments\",\"col\":4}},{\"id\":\"OuhWkhCQmq\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Course Completed\",\"col\":4}},{\"id\":\"3g8QmNqUXG\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Certificate\",\"col\":4}},{\"id\":\"EZsdsujs8N\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Evaluation\",\"col\":4}},{\"id\":\"s-nfsFQbGV\",\"type\":\"spacer\",\"data\":{\"col\":12}},{\"id\":\"jeOBWBzHEa\",\"type\":\"header\",\"data\":{\"text\":\"Master\",\"col\":12}},{\"id\":\"sVhgfS5GIh\",\"type\":\"card\",\"data\":{\"card_name\":\"Course Data\",\"col\":4}},{\"id\":\"Iea0snm4Fg\",\"type\":\"card\",\"data\":{\"card_name\":\"Course Stats\",\"col\":4}},{\"id\":\"bZB7RqOl6a\",\"type\":\"card\",\"data\":{\"card_name\":\"Certification\",\"col\":4}}]", + "content": "[{\"id\":\"jNO4sdKxHu\",\"type\":\"header\",\"data\":{\"text\":\"Get Started\",\"col\":12}},{\"id\":\"5s0qRBc4rY\",\"type\":\"paragraph\",\"data\":{\"text\":\"Visit LMS Portal\",\"col\":4}},{\"id\":\"lGMuNLpmv-\",\"type\":\"paragraph\",\"data\":{\"text\":\"Create a Course\",\"col\":4}},{\"id\":\"3TVyc9AkPy\",\"type\":\"paragraph\",\"data\":{\"text\":\"Setup a Home Page\",\"col\":4}},{\"id\":\"9zcbqpu2gm\",\"type\":\"paragraph\",\"data\":{\"text\":\"LMS Settings\",\"col\":4}},{\"id\":\"0ATmnKmXjc\",\"type\":\"paragraph\",\"data\":{\"text\":\"Documentation\",\"col\":4}},{\"id\":\"C128a4abjX\",\"type\":\"spacer\",\"data\":{\"col\":12}},{\"id\":\"5q4sPiv2ci\",\"type\":\"chart\",\"data\":{\"chart_name\":\"Signups\",\"col\":6}},{\"id\":\"8NSaRaEV5u\",\"type\":\"chart\",\"data\":{\"chart_name\":\"Enrollments\",\"col\":6}},{\"id\":\"_HkvT3xKVi\",\"type\":\"chart\",\"data\":{\"chart_name\":\"Certification\",\"col\":12}},{\"id\":\"kMuzko0uAU\",\"type\":\"spacer\",\"data\":{\"col\":12}},{\"id\":\"iuvIOHmztI\",\"type\":\"header\",\"data\":{\"text\":\"Statistics\",\"col\":12}},{\"id\":\"l0VTd66Uy2\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Users\",\"col\":4}},{\"id\":\"wAWZin1KKk\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Course\",\"col\":4}},{\"id\":\"RLrIlFx0Hd\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Enrollments\",\"col\":4}},{\"id\":\"OuhWkhCQmq\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Course Completed\",\"col\":4}},{\"id\":\"3g8QmNqUXG\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Certificate\",\"col\":4}},{\"id\":\"EZsdsujs8N\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Evaluation\",\"col\":4}},{\"id\":\"s-nfsFQbGV\",\"type\":\"spacer\",\"data\":{\"col\":12}},{\"id\":\"jeOBWBzHEa\",\"type\":\"header\",\"data\":{\"text\":\"Master\",\"col\":12}},{\"id\":\"sVhgfS5GIh\",\"type\":\"card\",\"data\":{\"card_name\":\"Course Data\",\"col\":4}},{\"id\":\"Iea0snm4Fg\",\"type\":\"card\",\"data\":{\"card_name\":\"Course Stats\",\"col\":4}},{\"id\":\"bZB7RqOl6a\",\"type\":\"card\",\"data\":{\"card_name\":\"Certification\",\"col\":4}}]", "creation": "2021-10-21 17:20:01.358903", "custom_blocks": [], "docstatus": 0, @@ -146,8 +150,8 @@ "type": "Link" } ], - "modified": "2024-11-21 12:16:25.886431", - "modified_by": "Administrator", + "modified": "2025-12-08 13:23:09.718683", + "modified_by": "sayali@frappe.io", "module": "LMS", "name": "LMS", "number_cards": [], @@ -215,4 +219,4 @@ ], "title": "LMS", "type": "Workspace" -} \ No newline at end of file +}