From d97459ee12bf3b329658871ffa8791cb1d94c551 Mon Sep 17 00:00:00 2001 From: Alejandro Cardenas Date: Mon, 24 Oct 2022 07:49:56 -0500 Subject: [PATCH 1/4] feat: add extra_data setting --- openedx/features/survey_report/application.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/openedx/features/survey_report/application.py b/openedx/features/survey_report/application.py index c54919206d1f..1f46f088d6f3 100644 --- a/openedx/features/survey_report/application.py +++ b/openedx/features/survey_report/application.py @@ -2,6 +2,8 @@ Contains the logic to manage survey report model. """ +from django.conf import settings + from openedx.features.survey_report.queries import ( get_unique_courses_offered, get_currently_learners, @@ -20,11 +22,13 @@ def generate_report() -> None: registered = get_learners_registered() certificates = get_generated_certificates() enrollments = get_course_enrollments() + extra_data = settings.SURVEY_REPORT_EXTRA_DATA SurveyReport( courses_offered=courses_offered, learners=learners, learners_registered=registered, generated_certificates=certificates, - enrollments=enrollments + enrollments=enrollments, + extra_data=extra_data, ) From d7903b93a826514041ec7c3b41f41924dcda529c Mon Sep 17 00:00:00 2001 From: Alejandro Cardenas Date: Mon, 24 Oct 2022 09:07:42 -0500 Subject: [PATCH 2/4] feat: add setting SURVEY_REPORT_EXTRA_DATA --- lms/envs/production.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lms/envs/production.py b/lms/envs/production.py index d1c5a08aa2b0..8455f76948a0 100644 --- a/lms/envs/production.py +++ b/lms/envs/production.py @@ -1080,3 +1080,6 @@ def get_env_setting(setting): "SECRET": ENV_TOKENS.get('BIG_BLUE_BUTTON_GLOBAL_SECRET', None), "URL": ENV_TOKENS.get('BIG_BLUE_BUTTON_GLOBAL_URL', None), } + +############## Settings for survey report ############## +SURVEY_REPORT_EXTRA_DATA = ENV_TOKENS.get('SURVEY_REPORT_EXTRA_DATA', {}) From 1ddf86cd734acd4ca2f8617778c188d63cfa1fc9 Mon Sep 17 00:00:00 2001 From: Alejandro Cardenas Date: Mon, 24 Oct 2022 09:12:03 -0500 Subject: [PATCH 3/4] fix: solve issue with registered learners field name --- openedx/features/survey_report/application.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openedx/features/survey_report/application.py b/openedx/features/survey_report/application.py index 1f46f088d6f3..6ad7b0b39524 100644 --- a/openedx/features/survey_report/application.py +++ b/openedx/features/survey_report/application.py @@ -27,7 +27,7 @@ def generate_report() -> None: SurveyReport( courses_offered=courses_offered, learners=learners, - learners_registered=registered, + registered_learners=registered, generated_certificates=certificates, enrollments=enrollments, extra_data=extra_data, From 1d48efe19a2e66f7a44031f0ee6aecbd94fa63ff Mon Sep 17 00:00:00 2001 From: henrrypg Date: Mon, 24 Oct 2022 09:21:06 -0500 Subject: [PATCH 4/4] fix: save model --- openedx/features/survey_report/application.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/openedx/features/survey_report/application.py b/openedx/features/survey_report/application.py index 6ad7b0b39524..89ee9a2ef2b6 100644 --- a/openedx/features/survey_report/application.py +++ b/openedx/features/survey_report/application.py @@ -24,7 +24,7 @@ def generate_report() -> None: enrollments = get_course_enrollments() extra_data = settings.SURVEY_REPORT_EXTRA_DATA - SurveyReport( + survey_report = SurveyReport( courses_offered=courses_offered, learners=learners, registered_learners=registered, @@ -32,3 +32,5 @@ def generate_report() -> None: enrollments=enrollments, extra_data=extra_data, ) + + survey_report.save()