PAE-845 Enhance prerequisites to allow more flexible configuration #59

anfbermudezme · 2021-10-19T16:48:19Z

This PR is on hold down due to business decisions

Currently prerequisites operate at the course run level, and only one course run can be specified. Which means that course run dependencies are very inflexible. From the example below a learner could pass course-v1:PS+INTRODA+OCT but if course-v1:PS+DATAVIZ+NOV has a prerequisite of course-v1:PS+INTRODA+NOV then the learner could not proceed with the DATAVIZ course even though they passed an earlier run of INTRODA.

PS+INTRODA:

course-v1:PS+INTRODA+Oct
course-v1:PS+INTRODA+Nov
course-v1:PS+INTRODA+Dec

PS+DATAVIZ (dependent on completion of a run of PS+INTRODA):

course-v1:PS+DATAVIZ+Oct
course-v1:PS+DATAVIZ+Nov
course-v1:PS+DATAVIZ+Dec

Ideally, the PS+DATAVIZ runs would be unlocked if a learner had completed any of the PS+INTRODA runs.

It's neccesary to enable 'MILESTONES_APP':True and 'ENABLE_PREREQUISITE_COURSES': True. Also it's neccesary pull the PR https://github.com/Pearson-Advance/pearson-core/pull/25 from pearson_core, then run_extension_point() in used in the edx-platform.

For this, when a prerequisite is selected in studio, It is added to the milestones_milestone table through the course.py module, which in this PR now adds the courses with the same org and number taken from discovery through the course_uuid.

Select the prerequisite course:

Add the courses with same org and number in milestones_milestone table:

For a user to enter the course, the prerequisite must be certified and this is added to a table called milestones_usermilestone, for this the function handle_course_cert_awarded is modified in lms/djangoapps/certificates/models.py

Also, to improve the learner experience, Following the logic:

For this, add backend functionality to sort courses_requirements_not_met variable if the learner is enrolled and if the learnor is not enrolled find the sku for verified mode of the course requirement, to redirect the link:

About course if the learner is enrolled and basket sku if the learner is not enrolled, to show this in the frontend it's neccesary follow the PR Pearson-Advance/openedx-themes#189 from openedx-themes.

IMPORTANT: To active this functionality for an organization it's necessary to add it in CUSTOM_PREREQUISITES_FOR_ORG in site configurations, both in the lms and in the studio. For example: "CUSTOM_PREREQUISITES_FOR_ORG":["PX"] and enable the Feature Flag ENABLE_CUSTOM_PREREQUISITES.

Also in the course about view for the course with prerequisites the links have the same behavior of the learner dashboard, that means, About course if the learner is enrolled and basket sku if the learner is not enrolled.

lms/djangoapps/certificates/models.py

Jacatove · 2021-11-09T15:24:39Z

cms/djangoapps/contentstore/views/course.py

+                        run_extension_point(
+                            'PEARSON_CORE_MILESTONE_PREREQUISITES_MODULE',
+                            course_key = course_key,
+                            prerequisite_course_keys = prerequisite_course_keys,
+                        )
                        if not all(is_valid_course_key(course_key) for course_key in prerequisite_course_keys):
                            return JsonResponseBadRequest({"error": _("Invalid prerequisite course key")})
                        set_prerequisite_courses(course_key, prerequisite_course_keys)


What do you think about moving the run_extension_point part after the validation? @anfbermudezme

Suggested change

run_extension_point(

'PEARSON_CORE_MILESTONE_PREREQUISITES_MODULE',

course_key = course_key,

prerequisite_course_keys = prerequisite_course_keys,

)

if not all(is_valid_course_key(course_key) for course_key in prerequisite_course_keys):

return JsonResponseBadRequest({"error": _("Invalid prerequisite course key")})

set_prerequisite_courses(course_key, prerequisite_course_keys)

if not all(is_valid_course_key(course_key) for course_key in prerequisite_course_keys):

return JsonResponseBadRequest({"error": _("Invalid prerequisite course key")})

run_extension_point(

'PEARSON_CORE_MILESTONE_PREREQUISITES_MODULE',

course_key = course_key,

prerequisite_course_keys = prerequisite_course_keys,

)

set_prerequisite_courses(course_key, prerequisite_course_keys)

What happens if run_extension_point(.. goes after set_prerequisite_courses(..?. Does the order have any impact in the behavior? @anfbermudezme

…rerequisites

…ort courses_requirements_not_met

…g prerequisites from pearson_core

common/djangoapps/student/views/dashboard.py

…se_about view

…ustom functionality

common/djangoapps/student/views/dashboard.py

Jacatove · 2021-12-03T18:48:31Z

lms/djangoapps/courseware/views/views.py

+        sku_not_enrollment_in_requirement = \
+            sku_not_enrollment_in_requirement[course.id] if sku_not_enrollment_in_requirement else None


Please write all the code related to the 'PEARSON_CORE_STUDENT_NOT_ENROLLED_IN_REQUIREMENTS' function in Pearson Core. @anfbermudezme

…ED function in Pearson Core

lms/djangoapps/courseware/views/views.py

cms/djangoapps/contentstore/views/course.py

lms/djangoapps/courseware/views/views.py

…remove magic number un course.py.

Squirrel18 · 2022-02-11T03:22:26Z

cms/djangoapps/contentstore/views/course.py

@@ -1161,6 +1161,13 @@ def settings_handler(request, course_key_string):
                        if not all(is_valid_course_key(course_key) for course_key in prerequisite_course_keys):
                            return JsonResponseBadRequest({"error": _("Invalid prerequisite course key")})
                        set_prerequisite_courses(course_key, prerequisite_course_keys)
+                        # add all courses with same org and number to milestones.


Suggested change

# add all courses with same org and number to milestones.

# Add all courses with the same org and number to milestones.

Squirrel18 · 2022-02-11T03:25:08Z

common/djangoapps/student/views/dashboard.py

@@ -802,8 +803,22 @@ def student_dashboard(request):
        enrollment.course_id for enrollment in course_enrollments
        if enrollment.course_overview.pre_requisite_courses
    )
+


Unnecessary change. @anfbermudezme

Squirrel18 · 2022-02-11T03:25:48Z

common/djangoapps/student/views/dashboard.py

    courses_requirements_not_met = get_pre_requisite_courses_not_completed(user, courses_having_prerequisites)

+    # sort requirements for each course in course_requirements_not_met.


Suggested change

# sort requirements for each course in course_requirements_not_met.

# Sort requirements for each course in course_requirements_not_met.

Squirrel18 · 2022-02-11T03:41:58Z

common/djangoapps/student/views/dashboard.py

+        user=user,
+        courses_requirements_not_met=courses_requirements_not_met,
+    )
+    # get the sku value for the requirements of each course in courses_requirements_not_met.


Suggested change

# get the sku value for the requirements of each course in courses_requirements_not_met.

# Get the SKU value for the requirements of each course in courses_requirements_not_met.

Squirrel18 · 2022-02-11T03:42:51Z

lms/djangoapps/courseware/views/views.py

@@ -956,6 +956,20 @@ def course_about(request, course_id):
        # get prerequisite courses display names
        pre_requisite_courses = get_prerequisite_courses_display(course)

+        courses_requirements_not_met = get_pre_requisite_courses_not_completed(request.user, frozenset({course.id}))
+        # sort requirements for each course in course_requirements_not_met.


Suggested change

# sort requirements for each course in course_requirements_not_met.

# Sort requirements for each course in course_requirements_not_met.

Squirrel18 · 2022-02-11T03:44:38Z

lms/djangoapps/courseware/views/views.py

+            user=request.user,
+            courses_requirements_not_met=courses_requirements_not_met,
+        )
+        # the first prerequisite from courses_requirements_not_met is taken.


I don't think this explains what you are doing here. @anfbermudezme

Squirrel18 · 2022-02-11T03:53:52Z

lms/djangoapps/courseware/views/views.py

@@ -994,6 +1008,10 @@ def course_about(request, course_id):
            # context. This value is therefor explicitly set to render the appropriate header.
            'disable_courseware_header': True,
            'pre_requisite_courses': pre_requisite_courses,
+            'course_requirements': course_requirements if course_requirements else None,


course_requirements_for_courseware_views returns {} in case things don't go as expected, so you don't need to return None. @anfbermudezme

Squirrel18 · 2022-02-11T03:58:25Z

lms/djangoapps/courseware/views/views.py

@@ -994,6 +1008,10 @@ def course_about(request, course_id):
            # context. This value is therefor explicitly set to render the appropriate header.
            'disable_courseware_header': True,
            'pre_requisite_courses': pre_requisite_courses,
+            'course_requirements': course_requirements if course_requirements else None,
+            'student_not_enrollment_in_requirement': \
+                skus_not_enrollment_in_requirements.get(course.id) if skus_not_enrollment_in_requirements else None,


sku_not_enrollment_in_requirements returns {} in case things don't go as expected, so you don't need to return None. @anfbermudezme

Squirrel18 · 2022-02-11T03:59:14Z

lms/djangoapps/courseware/views/views.py

+            'course_requirements': course_requirements if course_requirements else None,
+            'student_not_enrollment_in_requirement': \
+                skus_not_enrollment_in_requirements.get(course.id) if skus_not_enrollment_in_requirements else None,
+            "ecommerce_payment_page": EcommerceService().payment_page_url(),


Why do you need this? @anfbermudezme

To pass the context variable to the theme.

anfbermudezme requested review from diegomillan, Jacatove and Squirrel18 October 19, 2021 17:15

anfbermudezme force-pushed the pearson/PAE-845 branch from 3981e47 to a488f94 Compare October 19, 2021 22:22

anfbermudezme marked this pull request as ready for review October 19, 2021 22:34

anfbermudezme changed the base branch from pearson-release/juniper.master to pearson-release/juniper.stage October 20, 2021 14:04

anfbermudezme marked this pull request as draft October 22, 2021 21:38

anfbermudezme force-pushed the pearson/PAE-845 branch from e5410e7 to 85e0961 Compare October 22, 2021 21:52

anfbermudezme requested a review from ivanvgh October 27, 2021 13:37

anfbermudezme force-pushed the pearson/PAE-845 branch from 85e0961 to 7f620a7 Compare November 1, 2021 00:44

Jacatove reviewed Nov 2, 2021

View reviewed changes

lms/djangoapps/certificates/models.py Outdated Show resolved Hide resolved

anfbermudezme force-pushed the pearson/PAE-845 branch from 2e0c4f2 to 1b5d580 Compare November 4, 2021 03:49

Jacatove suggested changes Nov 9, 2021

View reviewed changes

feat: add run_extension_point to use pearson_core functionality for p…

afaef49

…rerequisites

anfbermudezme force-pushed the pearson/PAE-845 branch from 1b5d580 to afaef49 Compare November 11, 2021 19:22

feat: add run_extension_point to use pearson_core functionality for s…

7fbd18d

…ort courses_requirements_not_met

anfbermudezme force-pushed the pearson/PAE-845 branch from 5d6b84e to 7fbd18d Compare November 22, 2021 14:42

feat: add custom functionality to improve learner experience regardin…

7f5577a

…g prerequisites from pearson_core

anfbermudezme mentioned this pull request Nov 22, 2021

PAE-845 Add custom prerequisites functionality to improve learner experience Pearson-Advance/openedx-themes#189

Open

anfbermudezme marked this pull request as ready for review November 23, 2021 23:56

Jacatove suggested changes Nov 30, 2021

View reviewed changes

common/djangoapps/student/views/dashboard.py Outdated Show resolved Hide resolved

anfbermudezme added 2 commits November 30, 2021 10:57

feat: add custom behavior for prerequisites to redirect links in cour…

fd1cb3d

…se_about view

fix: add a general solution instead of particular for prerequisites c…

06d1b0f

…ustom functionality

anfbermudezme force-pushed the pearson/PAE-845 branch from 4dcd971 to 06d1b0f Compare December 2, 2021 23:24

Jacatove suggested changes Dec 3, 2021

View reviewed changes

refactor: add all code related to the PEARSON_CORE_STUDENT_NOT_ENROLL…

4c780d4

…ED function in Pearson Core

Jacatove suggested changes Dec 6, 2021

View reviewed changes

lms/djangoapps/courseware/views/views.py Outdated Show resolved Hide resolved

lms/djangoapps/courseware/views/views.py Outdated Show resolved Hide resolved

lms/djangoapps/courseware/views/views.py Outdated Show resolved Hide resolved

Jacatove suggested changes Dec 6, 2021

View reviewed changes

cms/djangoapps/contentstore/views/course.py Outdated Show resolved Hide resolved

anfbermudezme added 2 commits December 6, 2021 20:02

refactor: remove useless whitespaces

35df324

refactor: correct code with variables used once.

5eb6ccb

Jacatove suggested changes Dec 10, 2021

View reviewed changes

lms/djangoapps/courseware/views/views.py Outdated Show resolved Hide resolved

anfbermudezme added 3 commits December 13, 2021 09:33

refactor: assign variable to make intention clear.

1ac789f

refactor: correct identation.

c3a4646

refactor: remove unnecessary run_extension_point

54599d5

Jacatove approved these changes Jan 14, 2022

View reviewed changes

chore: pass the course string to pearson-core using run_extension_point.

878a61a

anfbermudezme force-pushed the pearson/PAE-845 branch from 2e514c9 to 4fba153 Compare February 1, 2022 15:45

refactor: add entry for run_extension_point in course_about view and …

f8f73be

…remove magic number un course.py.

anfbermudezme force-pushed the pearson/PAE-845 branch from 4fba153 to f8f73be Compare February 1, 2022 18:24

anfbermudezme added 2 commits February 9, 2022 17:26

docs: add inline comments for run_extension_point functions.

d92af02

refactor: add safe getter for key.

abacb35

Squirrel18 requested changes Feb 11, 2022

View reviewed changes

refactor: correct inline comments and code details.

8abfea8

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

PAE-845 Enhance prerequisites to allow more flexible configuration #59

PAE-845 Enhance prerequisites to allow more flexible configuration #59

anfbermudezme commented Oct 19, 2021 •

edited

Loading

Jacatove Nov 9, 2021

Jacatove Nov 9, 2021

Jacatove Dec 3, 2021

Squirrel18 Feb 11, 2022

Squirrel18 Feb 11, 2022

Squirrel18 Feb 11, 2022

Squirrel18 Feb 11, 2022

Squirrel18 Feb 11, 2022

Squirrel18 Feb 11, 2022

Squirrel18 Feb 11, 2022

Squirrel18 Feb 11, 2022

Squirrel18 Feb 11, 2022

anfbermudezme Feb 11, 2022

		sku_not_enrollment_in_requirement = \
		sku_not_enrollment_in_requirement[course.id] if sku_not_enrollment_in_requirement else None

	# add all courses with same org and number to milestones.
	# Add all courses with the same org and number to milestones.

		courses_requirements_not_met = get_pre_requisite_courses_not_completed(user, courses_having_prerequisites)

		# sort requirements for each course in course_requirements_not_met.

	# get the sku value for the requirements of each course in courses_requirements_not_met.
	# Get the SKU value for the requirements of each course in courses_requirements_not_met.

PAE-845 Enhance prerequisites to allow more flexible configuration #59

Are you sure you want to change the base?

PAE-845 Enhance prerequisites to allow more flexible configuration #59

Conversation

anfbermudezme commented Oct 19, 2021 • edited Loading

This PR is on hold down due to business decisions

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

anfbermudezme commented Oct 19, 2021 •

edited

Loading