From d76357981b4817f492345beccbbe4c33b77c267f Mon Sep 17 00:00:00 2001 From: 0xflotus <0xflotus@gmail.com> Date: Tue, 29 Oct 2024 19:28:14 +0100 Subject: [PATCH 1/3] fix: small bug in course_progress_summary.py This is a small logical fix. Otherwise if `row.progress == 10 or row.progress == 40 or row.progress == 70` wouldn't have an effect. --- .../course_progress_summary/course_progress_summary.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lms/lms/report/course_progress_summary/course_progress_summary.py b/lms/lms/report/course_progress_summary/course_progress_summary.py index cb39e9242..604d773b7 100644 --- a/lms/lms/report/course_progress_summary/course_progress_summary.py +++ b/lms/lms/report/course_progress_summary/course_progress_summary.py @@ -93,11 +93,11 @@ def get_charts(data): for row in data: if row.progress == 100: completed += 1 - elif row.progress < 100 and row.progress > 70: + elif row.progress < 100 and row.progress >= 70: less_than_hundred += 1 - elif row.progress < 70 and row.progress > 40: + elif row.progress < 70 and row.progress >= 40: less_than_seventy += 1 - elif row.progress < 40 and row.progress > 10: + elif row.progress < 40 and row.progress >= 10: less_than_forty += 1 elif row.progress < 10: less_than_ten += 1 From 01bd017bdaf8a858b9f7e20ee2920bd893a0d138 Mon Sep 17 00:00:00 2001 From: 0xflotus <0xflotus@gmail.com> Date: Tue, 29 Oct 2024 19:33:22 +0100 Subject: [PATCH 2/3] fix: fixed labels --- .../report/course_progress_summary/course_progress_summary.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lms/lms/report/course_progress_summary/course_progress_summary.py b/lms/lms/report/course_progress_summary/course_progress_summary.py index 604d773b7..388e60404 100644 --- a/lms/lms/report/course_progress_summary/course_progress_summary.py +++ b/lms/lms/report/course_progress_summary/course_progress_summary.py @@ -104,7 +104,7 @@ def get_charts(data): charts = { "data": { - "labels": ["0-10", "10-40", "40-70", "70-99", "100"], + "labels": ["0-9", "10-39", "40-69", "70-99", "100"], "datasets": [ { "name": "Progress (%)", From 7aab449502d377a3d475f3cc68e4a0447f1230f8 Mon Sep 17 00:00:00 2001 From: 0xflotus <0xflotus@gmail.com> Date: Wed, 30 Oct 2024 18:47:36 +0100 Subject: [PATCH 3/3] fix: changed ranges --- .../course_progress_summary.py | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/lms/lms/report/course_progress_summary/course_progress_summary.py b/lms/lms/report/course_progress_summary/course_progress_summary.py index 388e60404..61c8f870c 100644 --- a/lms/lms/report/course_progress_summary/course_progress_summary.py +++ b/lms/lms/report/course_progress_summary/course_progress_summary.py @@ -86,32 +86,32 @@ def get_charts(data): completed = 0 less_than_hundred = 0 - less_than_seventy = 0 - less_than_forty = 0 - less_than_ten = 0 + less_than_seventy_one = 0 + less_than_forty_one = 0 + less_than_eleven = 0 for row in data: if row.progress == 100: completed += 1 - elif row.progress < 100 and row.progress >= 70: + elif row.progress < 100 and row.progress > 70: less_than_hundred += 1 - elif row.progress < 70 and row.progress >= 40: - less_than_seventy += 1 - elif row.progress < 40 and row.progress >= 10: - less_than_forty += 1 - elif row.progress < 10: - less_than_ten += 1 + elif row.progress < 71 and row.progress > 40: + less_than_seventy_one += 1 + elif row.progress < 41 and row.progress > 10: + less_than_forty_one += 1 + elif row.progress < 11: + less_than_eleven += 1 charts = { "data": { - "labels": ["0-9", "10-39", "40-69", "70-99", "100"], + "labels": ["0-10", "11-40", "41-70", "71-99", "100"], "datasets": [ { "name": "Progress (%)", "values": [ - less_than_ten, - less_than_forty, - less_than_seventy, + less_than_eleven, + less_than_forty_one, + less_than_seventy_one, less_than_hundred, completed, ],