+ <%include file='dashboard/_dashboard_program_surveys.html'
+ args='user=user, course_enrollments=course_enrollments'/>
+
From 4a197af1f26b0431c1eb00991ac1a6557eda8c5a Mon Sep 17 00:00:00 2001
From: Zachary Trabookis
% if display_dashboard_courses:
<%include file="learner_dashboard/_dashboard_navigation_courses.html"/>
diff --git a/lms/templates/dashboard/_dashboard_program_surveys.html b/lms/templates/dashboard/_dashboard_program_surveys.html
new file mode 100644
index 000000000000..cfd1dc2bfc84
--- /dev/null
+++ b/lms/templates/dashboard/_dashboard_program_surveys.html
@@ -0,0 +1,86 @@
+<%page expression_filter="h"/>
+<%page args='user, course_enrollments'/>
+<%!
+from openedx.core.djangoapps.content.course_overviews.models import CourseOverview
+from organizations.models import OrganizationInstitution
+from common.djangoapps.student.models import AnonymousUserId
+%>
+
+<%namespace name='static' file='../static_content.html'/>
+
+<% show_program_survey = False
+course_institution = ''%>
+% for enrollment in course_enrollments:
+<% course_overview = CourseOverview.get_from_id(enrollment.course_id) %>
+% if course_overview.org == "CUCWD":
+<% show_program_survey = True %>
+ % if course_overview.course_institution:
+ <% course_institution = course_overview.course_institution %>
+ % endif
+% endif
+% endfor
+
+
+
+% if show_program_survey:
+<% course_institution = OrganizationInstitution.get_by_shortname(short_name=course_overview.course_institution)
+%>
+ % if user.is_anonymous:
+ <% anonymous_user_id = user.id %>
+ % else:
+ <%
+ anonymous_user_id = AnonymousUserId.objects.filter(user=user).order_by('-id')
+ anonymous_user_id = anonymous_user_id[0].anonymous_user_id
+ %>
+ % endif
+<% platform_anonymous_user_id_string = "platform_anonymous_user_id=" + anonymous_user_id
+username_string = "platform_username=" + user.username
+user_email_string = "platform_email=" + user.email
+org_institution_name_string = "org_institution_name=" + course_institution.name
+org_institution_shortname_string = "org_institution_short_name=" + course_institution.short_name
+org_institution_city_string = "org_institution_city=" + course_institution.city
+org_institution_state_string = "org_institution_state=" + course_institution.state
+org_institution_zipcode_string = "org_institution_zipcode=" + course_institution.zipcode
+%>
+
+
Date: Wed, 21 Aug 2024 08:10:59 -0400
Subject: [PATCH 04/11] fix: update survey links for production
---
.../dashboard/_dashboard_program_surveys.html | 123 ++++++++----------
1 file changed, 56 insertions(+), 67 deletions(-)
diff --git a/lms/templates/dashboard/_dashboard_program_surveys.html b/lms/templates/dashboard/_dashboard_program_surveys.html
index cfd1dc2bfc84..3afe1e922ce1 100644
--- a/lms/templates/dashboard/_dashboard_program_surveys.html
+++ b/lms/templates/dashboard/_dashboard_program_surveys.html
@@ -8,79 +8,68 @@
<%namespace name='static' file='../static_content.html'/>
-<% show_program_survey = False
-course_institution = ''%>
-% for enrollment in course_enrollments:
-<% course_overview = CourseOverview.get_from_id(enrollment.course_id) %>
-% if course_overview.org == "CUCWD":
-<% show_program_survey = True %>
- % if course_overview.course_institution:
- <% course_institution = course_overview.course_institution %>
- % endif
-% endif
-% endfor
+
+<%
+show_program_survey = False
+course_institution = ''
-
+for enrollment in course_enrollments:
+ course_overview = CourseOverview.get_from_id(enrollment.course_id)
+ if course_overview.org == "CA":
+ show_program_survey = True
-% if show_program_survey:
-<% course_institution = OrganizationInstitution.get_by_shortname(short_name=course_overview.course_institution)
-%>
- % if user.is_anonymous:
- <% anonymous_user_id = user.id %>
- % else:
- <%
- anonymous_user_id = AnonymousUserId.objects.filter(user=user).order_by('-id')
- anonymous_user_id = anonymous_user_id[0].anonymous_user_id
- %>
- % endif
-<% platform_anonymous_user_id_string = "platform_anonymous_user_id=" + anonymous_user_id
-username_string = "platform_username=" + user.username
-user_email_string = "platform_email=" + user.email
-org_institution_name_string = "org_institution_name=" + course_institution.name
-org_institution_shortname_string = "org_institution_short_name=" + course_institution.short_name
-org_institution_city_string = "org_institution_city=" + course_institution.city
-org_institution_state_string = "org_institution_state=" + course_institution.state
-org_institution_zipcode_string = "org_institution_zipcode=" + course_institution.zipcode
+ if course_overview.course_institution:
+ course_institution = course_overview.course_institution
+ break
%>
-
+
+
+% endif
\ No newline at end of file
From 105209f5736ba3e6c588e0229e211cae2cc73dc4 Mon Sep 17 00:00:00 2001
From: Rebecca David + Aviation Mechanic General +
+
+
+
+ This program of courses equips learners for entry into the FAA mechanic pathway. Upon completion, they gain foundational knowledge in mathematics, aircraft drawings, weight and balance, aircraft materials, processes and tools, physics, electricity, inspection, ground operations, and FAA regulations governing maintenance technician certification and work.
+
+
+
+
+
+
+ Pre-Program Survey
++
Answer this survey prior to taking any course content
+This will help us understand your career awareness and interest, gauge where you are with FAA General maintenance knowledge and skill confidence, career plans, and demographic information.
+ + Provide Feedback +
+
+
+ Post-Program Survey
++
Answer this survey after you have completed most of this program's courses
+This will help us understand your completion of FAA General maintenance program, career awareness and interest, kwowledge and skill confidence, and demographic information.
+ + Provide Feedback +
-
Date: Wed, 11 Sep 2024 12:59:48 -0400
Subject: [PATCH 06/11] feat: Prevent page from crashing when
`OrganizationInstitution` is not assigned to a course.
---
.../dashboard/_dashboard_program_surveys.html | 23 +++++++++++++------
1 file changed, 16 insertions(+), 7 deletions(-)
diff --git a/lms/templates/dashboard/_dashboard_program_surveys.html b/lms/templates/dashboard/_dashboard_program_surveys.html
index 2997f7038293..ee3c8026cace 100644
--- a/lms/templates/dashboard/_dashboard_program_surveys.html
+++ b/lms/templates/dashboard/_dashboard_program_surveys.html
@@ -39,15 +39,24 @@
username_string = "platform_username=" + (user.username or "")
platform_fullname = "platform_fullname=" + (user.profile.name or "")
user_email_string = "platform_email=" + (user.email or "")
- org_institution_name_string = "org_institution_name=" + (course_institution.name or "")
- org_institution_shortname_string = "org_institution_short_name=" + (course_institution.short_name or "")
- org_institution_city_string = "org_institution_city=" + (course_institution.city or "")
- org_institution_state_string = "org_institution_state=" + (course_institution.state or "")
- org_institution_zipcode_string = "org_institution_zipcode=" + (course_institution.zipcode or "")
+
+ org_institution_name_string = "org_institution_name="
+ org_institution_shortname_string = "org_institution_short_name="
+ org_institution_city_string = "org_institution_city="
+ org_institution_state_string = "org_institution_state="
+ org_institution_zipcode_string = "org_institution_zipcode="
+ if course_institution is not None:
+ org_institution_name_string += (course_institution.name or "")
+ org_institution_shortname_string += (course_institution.short_name or "")
+ org_institution_city_string += (course_institution.city or "")
+ org_institution_state_string += (course_institution.state or "")
+ org_institution_zipcode_string += (course_institution.zipcode or "")
+
try:
demographic_zipcode = "demographic_zipcode=" + (ExtraInfo.objects.get(user_id=user.id).zipcode or "")
except:
demographic_zipcode = "demographic_zipcode="
+
demographic_country = "demographic_country=" + (str(user.profile.country) or "")
program_name = "program_name=" + "Aviation Mechanic General"
%>
@@ -66,7 +75,7 @@
@@ -75,7 +84,7 @@ - Aviation Mechanic General -
-
-
+
+% if show_program_survey:
+ <%
+ course_institution = OrganizationInstitution.get_by_shortname(short_name=course_overview.course_institution)
- This program of courses equips learners for entry into the FAA mechanic pathway. Upon completion, they gain foundational knowledge in mathematics, aircraft drawings, weight and balance, aircraft materials, processes and tools, physics, electricity, inspection, ground operations, and FAA regulations governing maintenance technician certification and work.
-
-
From 8d6f9c21e2e4c2739cda93a346be1f31b61f5ad6 Mon Sep 17 00:00:00 2001
From: Zachary Trabookis
-
-
Date: Mon, 9 Sep 2024 22:47:07 -0400
Subject: [PATCH 05/11] feat: Add in `platform: fullname`, `demographic:
zipcode, country`.
---
.../dashboard/_dashboard_program_surveys.html | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/lms/templates/dashboard/_dashboard_program_surveys.html b/lms/templates/dashboard/_dashboard_program_surveys.html
index 3afe1e922ce1..2997f7038293 100644
--- a/lms/templates/dashboard/_dashboard_program_surveys.html
+++ b/lms/templates/dashboard/_dashboard_program_surveys.html
@@ -4,6 +4,7 @@
from openedx.core.djangoapps.content.course_overviews.models import CourseOverview
from organizations.models import OrganizationInstitution
from common.djangoapps.student.models import AnonymousUserId
+from custom_reg_form.models import ExtraInfo
%>
<%namespace name='static' file='../static_content.html'/>
@@ -36,12 +37,19 @@
platform_anonymous_user_id_string = "platform_anonymous_user_id=" + (anonymous_user_id or "")
username_string = "platform_username=" + (user.username or "")
+ platform_fullname = "platform_fullname=" + (user.profile.name or "")
user_email_string = "platform_email=" + (user.email or "")
org_institution_name_string = "org_institution_name=" + (course_institution.name or "")
org_institution_shortname_string = "org_institution_short_name=" + (course_institution.short_name or "")
org_institution_city_string = "org_institution_city=" + (course_institution.city or "")
org_institution_state_string = "org_institution_state=" + (course_institution.state or "")
org_institution_zipcode_string = "org_institution_zipcode=" + (course_institution.zipcode or "")
+ try:
+ demographic_zipcode = "demographic_zipcode=" + (ExtraInfo.objects.get(user_id=user.id).zipcode or "")
+ except:
+ demographic_zipcode = "demographic_zipcode="
+ demographic_country = "demographic_country=" + (str(user.profile.country) or "")
+ program_name = "program_name=" + "Aviation Mechanic General"
%>
Pre-Program Survey
--
Answer this survey prior to taking any course content
-This will help us understand your career awareness and interest, gauge where you are with FAA General maintenance knowledge and skill confidence, career plans, and demographic information.
- - Provide Feedback + if user.is_anonymous: + anonymous_user_id = user.id + else: + anonymous_user_id = AnonymousUserId.objects.filter(user=user, course_id=None).order_by('-id') + anonymous_user_id = anonymous_user_id[0].anonymous_user_id + + platform_anonymous_user_id_string = "platform_anonymous_user_id=" + (anonymous_user_id or "") + username_string = "platform_username=" + (user.username or "") + user_email_string = "platform_email=" + (user.email or "") + org_institution_name_string = "org_institution_name=" + (course_institution.name or "") + org_institution_shortname_string = "org_institution_short_name=" + (course_institution.short_name or "") + org_institution_city_string = "org_institution_city=" + (course_institution.city or "") + org_institution_state_string = "org_institution_state=" + (course_institution.state or "") + org_institution_zipcode_string = "org_institution_zipcode=" + (course_institution.zipcode or "") + %> + +
+
-
-% endif
\ No newline at end of file
+% endif
From c1acfabe1d577404c1e9ea6eede6bd4a3badf6db Mon Sep 17 00:00:00 2001
From: Zachary Trabookis + Aviation Mechanic General +
+
+
- This program of courses equips learners for entry into the FAA mechanic pathway. Upon completion, they gain foundational knowledge in mathematics, aircraft drawings, weight and balance, aircraft materials, processes and tools, physics, electricity, inspection, ground operations, and FAA regulations governing maintenance technician certification and work.
-
-
-Post-Program Survey
--
Answer this survey after you have completed most of this program's courses
-This will help us understand your completion of FAA General maintenance program, career awareness and interest, kwowledge and skill confidence, and demographic information.
- - Provide Feedback +
+
+
+
+
+ Pre-Program Survey
++
Answer this survey prior to taking any course content
+This will help us understand your career awareness and interest, gauge where you are with FAA General maintenance knowledge and skill confidence, career plans, and demographic information.
+ + Provide Feedback +
+
+
Post-Program Survey
++
Answer this survey after you have completed most of this program's courses
+This will help us understand your completion of FAA General maintenance program, career awareness and interest, kwowledge and skill confidence, and demographic information.
+ + Provide Feedback +
@@ -58,7 +66,7 @@
@@ -67,7 +75,7 @@ Pre-Program Survey
Answer this survey prior to taking any course content
This will help us understand your career awareness and interest, gauge where you are with FAA General maintenance knowledge and skill confidence, career plans, and demographic information.
- + Provide FeedbackPost-Program Survey
Answer this survey after you have completed most of this program's courses
This will help us understand your completion of FAA General maintenance program, career awareness and interest, kwowledge and skill confidence, and demographic information.
- + Provide FeedbackPre-Program Survey
Answer this survey prior to taking any course content
This will help us understand your career awareness and interest, gauge where you are with FAA General maintenance knowledge and skill confidence, career plans, and demographic information.
- + Provide FeedbackPost-Program Survey
Answer this survey after you have completed most of this program's courses
This will help us understand your completion of FAA General maintenance program, career awareness and interest, kwowledge and skill confidence, and demographic information.
- + Provide Feedback- Aviation Mechanic General + Aviation Mechanic General Surveys
This program of courses equips learners for entry into the FAA mechanic pathway. Upon completion, they gain foundational knowledge in mathematics, aircraft drawings, weight and balance, aircraft materials, processes and tools, physics, electricity, inspection, ground operations, and FAA regulations governing maintenance technician certification and work.
@@ -71,19 +71,19 @@
- Pre-Program Survey
+ Pre-Program
- Answer this survey prior to taking any course content
+ New Learner: Take this survey upon program entry.
This will help us understand your career awareness and interest, gauge where you are with FAA General maintenance knowledge and skill confidence, career plans, and demographic information.
- Provide Feedback
+ Provide Input
- Post-Program Survey
+ Post-Program
- Answer this survey after you have completed most of this program's courses
- This will help us understand your completion of FAA General maintenance program, career awareness and interest, kwowledge and skill confidence, and demographic information.
+ Continuing Learner: Take this survey upon program exit.
+ This will help us understand your completion of FAA General maintenance program, career awareness and interest, knowledge and skill confidence, and demographic information.
Provide Feedback
From 674e3d903565beb231e3f8709ad9cf550c2de4c2 Mon Sep 17 00:00:00 2001
From: Rebecca David
Date: Thu, 5 Dec 2024 13:18:13 -0500
Subject: [PATCH 08/11] fix: pylint errors
---
.../core/djangoapps/content/course_overviews/models.py | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/openedx/core/djangoapps/content/course_overviews/models.py b/openedx/core/djangoapps/content/course_overviews/models.py
index ee8649c0bf7a..2e2047802a87 100644
--- a/openedx/core/djangoapps/content/course_overviews/models.py
+++ b/openedx/core/djangoapps/content/course_overviews/models.py
@@ -70,11 +70,11 @@ class Meta:
# Course identification
id = CourseKeyField(db_index=True, primary_key=True, max_length=255)
_location = UsageKeyField(max_length=255)
- org = TextField(max_length=255, default='outdated_entry')
- display_name = TextField(null=True)
- display_number_with_default = TextField()
- display_org_with_default = TextField()
- course_institution = TextField(null=True)
+ org = models.TextField(max_length=255, default='outdated_entry')
+ display_name = models.TextField(null=True)
+ display_number_with_default = models.TextField()
+ display_org_with_default = models.TextField()
+ course_institution = models.TextField(null=True)
start = models.DateTimeField(null=True)
end = models.DateTimeField(null=True)
From 3fb532df20fc4a947169cf4082ca2b41559d8ce5 Mon Sep 17 00:00:00 2001
From: Rebecca David
Date: Tue, 10 Dec 2024 09:12:22 -0500
Subject: [PATCH 09/11] fix: update edx-organization requirments
---
requirements/edx/base.txt | 4 ++--
requirements/edx/development.txt | 2 +-
requirements/edx/private.in | 4 ++--
requirements/edx/private.txt | 4 ++--
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt
index 9d8b5949e605..c8c362831128 100644
--- a/requirements/edx/base.txt
+++ b/requirements/edx/base.txt
@@ -1145,9 +1145,9 @@ zipp==3.8.0
# setuptools
# EducateWorkforce specific packages. This was manually added because `make upgrade` was causing a lot of packages to update. This limits the Python package changes for the release.
--e git+https://github.com/CUCWD/bigcommerce-api-python.git@bigcommerce-0.22.2-maple.1#egg=bigcommerce==0.22.2
+-e git+https://github.com/CUCWD/bigcommerce-api-python.git@bigcommerce-0.22.2-nutmeg#egg=bigcommerce==0.22.2
# via -r ./requirements/edx/private.txt
--e git+https://github.com/CUCWD/edx-organizations.git@6.10.0-cucwd-maple.1#egg=edx-organizations==6.10.0-cucwd-maple.1
+-e git+https://github.com/CUCWD/edx-organizations.git@6.11.1.2-cucwd-nutmeg#egg=edx-organizations==6.11.1
# via -r ./requirements/edx/private.txt
-e git+https://github.com/CUCWD/social-auth-backend-bigcommerce.git@0.1.0-maple.1#egg=social-auth-backend-bigcommerce==0.1.0-maple.1
# via -r ./requirements/edx/private.txt
diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt
index 18b9da44ce9a..df119bc4eb97 100644
--- a/requirements/edx/development.txt
+++ b/requirements/edx/development.txt
@@ -1652,7 +1652,7 @@ zipp==3.8.0
# EducateWorkforce specific packages. This was manually added because `make upgrade` was causing a lot of packages to update. This limits the Python package changes for the release.
-e git+https://github.com/CUCWD/bigcommerce-api-python.git@bigcommerce-0.22.2-nutmeg#egg=bigcommerce==0.22.2
# via -r ./requirements/edx/private.txt
- -e git+https://github.com/CUCWD/edx-organizations.git@6.11.1-cucwd-nutmeg#egg=edx-organizations==6.11.1
+ -e git+https://github.com/CUCWD/edx-organizations.git@6.11.1.2-cucwd-nutmeg#egg=edx-organizations==6.11.1
# via -r ./requirements/edx/private.txt
-e git+https://github.com/CUCWD/social-auth-backend-bigcommerce.git@0.1.0-maple.1#egg=social-auth-backend-bigcommerce==0.1.0-maple.1
# via -r ./requirements/edx/private.txt
diff --git a/requirements/edx/private.in b/requirements/edx/private.in
index e350f0ce4616..b65d2a64fec3 100644
--- a/requirements/edx/private.in
+++ b/requirements/edx/private.in
@@ -1,12 +1,12 @@
# BigCommerce
--e git+https://github.com/CUCWD/bigcommerce-api-python.git@bigcommerce-0.22.2-maple.3#egg=bigcommerce==0.22.2
+-e git+https://github.com/CUCWD/bigcommerce-api-python.git@bigcommerce-0.22.2-nutmeg#egg=bigcommerce==0.22.2
-e git+https://github.com/CUCWD/social-auth-backend-bigcommerce.git@0.1.0-maple.3#egg=social-auth-backend-bigcommerce==0.1.0
# Analytics
-e git+https://github.com/CUCWD/figures@0.4.dev17-maple.3#egg=Figures==0.4.dev17
# Organizations (reworked for Figures)
--e git+https://github.com/CUCWD/edx-organizations.git@6.10.0-maple.3-cucwd#egg=edx-organizations==6.10.0
+-e git+https://github.com/CUCWD/edx-organizations.git@6.11.1.2-cucwd-nutmeg#egg=edx-organizations==6.11.1
# XBlocks
-e git+https://github.com/CUCWD/xblock-qualtrics-survey.git@release/v.2.1.0-maple.3-cucwd#egg=xblock_qualtrics_survey==2.1.0
diff --git a/requirements/edx/private.txt b/requirements/edx/private.txt
index e887ffd182d6..54c2cd06048d 100644
--- a/requirements/edx/private.txt
+++ b/requirements/edx/private.txt
@@ -8,13 +8,13 @@
--extra-index-url https://pypi.python.org/simple
--trusted-host edx.devstack.devpi
--e git+https://github.com/CUCWD/bigcommerce-api-python.git@bigcommerce-0.22.2-maple.3#egg=bigcommerce==0.22.2
+-e git+https://github.com/CUCWD/bigcommerce-api-python.git@bigcommerce-0.22.2-nutmeg#egg=bigcommerce==0.22.2
# via -r ./requirements/edx/private.in
-e git+https://github.com/CUCWD/custom-form-app.git@0.1-maple.3-cucwd#egg=custom-form-app==0.1
# via -r ./requirements/edx/private.in
-e git+https://github.com/CUCWD/figures@0.4.dev17-maple.3#egg=Figures==0.4.dev17
# via -r ./requirements/edx/private.in
--e git+https://github.com/CUCWD/edx-organizations.git@6.10.0-maple.3-cucwd#egg=edx-organizations==6.10.0
+-e git+https://github.com/CUCWD/edx-organizations.git@6.11.1.2-cucwd-nutmeg#egg=edx-organizations==6.11.1
# via -r ./requirements/edx/private.in
-e git+https://github.com/CUCWD/social-auth-backend-bigcommerce.git@0.1.0-maple.3#egg=social-auth-backend-bigcommerce==0.1.0
# via -r ./requirements/edx/private.in
From 8ff1b8555753d1cc8caa71f4bee9a823fcf9c1ff Mon Sep 17 00:00:00 2001
From: Rebecca David
Date: Tue, 10 Dec 2024 13:37:49 -0500
Subject: [PATCH 10/11] fix: quality tests and migration errors
---
cms/djangoapps/contentstore/views/course.py | 16 ++++++++++++----
.../migrations/0028_merge_20241210_1837.py | 14 ++++++++++++++
.../tests/test_course_overviews.py | 2 +-
requirements/edx/base.txt | 2 +-
requirements/edx/development.txt | 2 +-
5 files changed, 29 insertions(+), 7 deletions(-)
create mode 100644 openedx/core/djangoapps/content/course_overviews/migrations/0028_merge_20241210_1837.py
diff --git a/cms/djangoapps/contentstore/views/course.py b/cms/djangoapps/contentstore/views/course.py
index 09ac62705ada..e3ac79832461 100644
--- a/cms/djangoapps/contentstore/views/course.py
+++ b/cms/djangoapps/contentstore/views/course.py
@@ -30,7 +30,12 @@
from opaque_keys import InvalidKeyError
from opaque_keys.edx.keys import CourseKey
from opaque_keys.edx.locator import BlockUsageLocator
-from organizations.api import add_organization_course, ensure_organization, get_course_organization, get_organization_institutions
+from organizations.api import (
+ add_organization_course,
+ ensure_organization,
+ get_course_organization,
+ get_organization_institutions
+)
from organizations.exceptions import InvalidOrganizationException
from rest_framework.exceptions import ValidationError
@@ -1184,10 +1189,13 @@ def settings_handler(request, course_key_string): # lint-amnesty, pylint: disab
'upgrade_deadline': upgrade_deadline,
'mfe_proctored_exam_settings_url': get_proctored_exam_settings_url(course_module.id),
}
-
+
course_org = get_course_organization(course_key)
- institutions = get_organization_institutions(course_org)
- settings_context.update({'possible_organization_institutions': list(institutions)})
+ if (course_org):
+ institutions = get_organization_institutions(course_org)
+ settings_context.update({'possible_organization_institutions': list(institutions)})
+ else:
+ settings_context.update({'possible_organization_institutions': []})
if is_prerequisite_courses_enabled():
courses, in_process_course_actions = get_courses_accessible_to_user(request)
diff --git a/openedx/core/djangoapps/content/course_overviews/migrations/0028_merge_20241210_1837.py b/openedx/core/djangoapps/content/course_overviews/migrations/0028_merge_20241210_1837.py
new file mode 100644
index 000000000000..ef6e63016cc5
--- /dev/null
+++ b/openedx/core/djangoapps/content/course_overviews/migrations/0028_merge_20241210_1837.py
@@ -0,0 +1,14 @@
+# Generated by Django 3.2.16 on 2024-12-10 18:37
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('course_overviews', '0027_auto_20240909_1523'),
+ ('course_overviews', '0027_merge_20240123_1603'),
+ ]
+
+ operations = [
+ ]
diff --git a/openedx/core/djangoapps/content/course_overviews/tests/test_course_overviews.py b/openedx/core/djangoapps/content/course_overviews/tests/test_course_overviews.py
index e06064f8f142..5e2a7442c2ab 100644
--- a/openedx/core/djangoapps/content/course_overviews/tests/test_course_overviews.py
+++ b/openedx/core/djangoapps/content/course_overviews/tests/test_course_overviews.py
@@ -380,7 +380,7 @@ def test_malformed_grading_policy(self):
course_overview = CourseOverview._create_or_update(course) # pylint: disable=protected-access
assert course_overview.lowest_passing_grade is None
- @ddt.data((ModuleStoreEnum.Type.mongo, 5, 5), (ModuleStoreEnum.Type.split, 2, 2))
+ @ddt.data((ModuleStoreEnum.Type.mongo, 6, 6), (ModuleStoreEnum.Type.split, 2, 2))
@ddt.unpack
def test_versioning(self, modulestore_type, min_mongo_calls, max_mongo_calls):
"""
diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt
index c8c362831128..1340882baa2e 100644
--- a/requirements/edx/base.txt
+++ b/requirements/edx/base.txt
@@ -1149,7 +1149,7 @@ zipp==3.8.0
# via -r ./requirements/edx/private.txt
-e git+https://github.com/CUCWD/edx-organizations.git@6.11.1.2-cucwd-nutmeg#egg=edx-organizations==6.11.1
# via -r ./requirements/edx/private.txt
--e git+https://github.com/CUCWD/social-auth-backend-bigcommerce.git@0.1.0-maple.1#egg=social-auth-backend-bigcommerce==0.1.0-maple.1
+-e git+https://github.com/CUCWD/social-auth-backend-bigcommerce.git@0.1.0-maple.1#egg=social-auth-backend-bigcommerce==0.1.0
# via -r ./requirements/edx/private.txt
# -e git+https://github.com/CUCWD/edx-ora2.git@4.1.2-nutmeg-cucwd#egg=ora2==4.1.2
-e git+https://github.com/CUCWD/custom-form-app.git@0.1-maple.3-cucwd#egg=custom-form-app==0.1
diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt
index df119bc4eb97..effede1f42bb 100644
--- a/requirements/edx/development.txt
+++ b/requirements/edx/development.txt
@@ -1654,7 +1654,7 @@ zipp==3.8.0
# via -r ./requirements/edx/private.txt
-e git+https://github.com/CUCWD/edx-organizations.git@6.11.1.2-cucwd-nutmeg#egg=edx-organizations==6.11.1
# via -r ./requirements/edx/private.txt
- -e git+https://github.com/CUCWD/social-auth-backend-bigcommerce.git@0.1.0-maple.1#egg=social-auth-backend-bigcommerce==0.1.0-maple.1
+ -e git+https://github.com/CUCWD/social-auth-backend-bigcommerce.git@0.1.0-maple.1#egg=social-auth-backend-bigcommerce==0.1.0
# via -r ./requirements/edx/private.txt
-e git+https://github.com/CUCWD/edx-ora2.git@4.1.2-nutmeg-cucwd#egg=ora2==4.1.2
# via -r ./requirements/edx/private.txt
From 92e16d6f96ee6b60df5ebfa6e91ff0019a4cbd39 Mon Sep 17 00:00:00 2001
From: Rebecca David
Date: Mon, 16 Dec 2024 15:05:02 -0500
Subject: [PATCH 11/11] fix: pylint errors
---
cms/djangoapps/contentstore/views/course.py | 4 ++--
requirements/edx/base.txt | 2 +-
requirements/edx/development.txt | 2 +-
requirements/edx/testing.txt | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/cms/djangoapps/contentstore/views/course.py b/cms/djangoapps/contentstore/views/course.py
index e3ac79832461..792e3ce8999b 100644
--- a/cms/djangoapps/contentstore/views/course.py
+++ b/cms/djangoapps/contentstore/views/course.py
@@ -1189,9 +1189,9 @@ def settings_handler(request, course_key_string): # lint-amnesty, pylint: disab
'upgrade_deadline': upgrade_deadline,
'mfe_proctored_exam_settings_url': get_proctored_exam_settings_url(course_module.id),
}
-
+
course_org = get_course_organization(course_key)
- if (course_org):
+ if course_org:
institutions = get_organization_institutions(course_org)
settings_context.update({'possible_organization_institutions': list(institutions)})
else:
diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt
index 1340882baa2e..f5918405c7d4 100644
--- a/requirements/edx/base.txt
+++ b/requirements/edx/base.txt
@@ -1149,7 +1149,7 @@ zipp==3.8.0
# via -r ./requirements/edx/private.txt
-e git+https://github.com/CUCWD/edx-organizations.git@6.11.1.2-cucwd-nutmeg#egg=edx-organizations==6.11.1
# via -r ./requirements/edx/private.txt
--e git+https://github.com/CUCWD/social-auth-backend-bigcommerce.git@0.1.0-maple.1#egg=social-auth-backend-bigcommerce==0.1.0
+-e git+https://github.com/CUCWD/social-auth-backend-bigcommerce.git@0.1.0-maple.3#egg=social-auth-backend-bigcommerce==0.1.0
# via -r ./requirements/edx/private.txt
# -e git+https://github.com/CUCWD/edx-ora2.git@4.1.2-nutmeg-cucwd#egg=ora2==4.1.2
-e git+https://github.com/CUCWD/custom-form-app.git@0.1-maple.3-cucwd#egg=custom-form-app==0.1
diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt
index effede1f42bb..7b3a7fdf79fb 100644
--- a/requirements/edx/development.txt
+++ b/requirements/edx/development.txt
@@ -1654,7 +1654,7 @@ zipp==3.8.0
# via -r ./requirements/edx/private.txt
-e git+https://github.com/CUCWD/edx-organizations.git@6.11.1.2-cucwd-nutmeg#egg=edx-organizations==6.11.1
# via -r ./requirements/edx/private.txt
- -e git+https://github.com/CUCWD/social-auth-backend-bigcommerce.git@0.1.0-maple.1#egg=social-auth-backend-bigcommerce==0.1.0
+ -e git+https://github.com/CUCWD/social-auth-backend-bigcommerce.git@0.1.0-maple.3#egg=social-auth-backend-bigcommerce==0.1.0
# via -r ./requirements/edx/private.txt
-e git+https://github.com/CUCWD/edx-ora2.git@4.1.2-nutmeg-cucwd#egg=ora2==4.1.2
# via -r ./requirements/edx/private.txt
diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt
index 4bcc39103887..b36bc5da5b26 100644
--- a/requirements/edx/testing.txt
+++ b/requirements/edx/testing.txt
@@ -1523,5 +1523,5 @@ zipp==3.8.0
# via -r ./requirements/edx/private.txt
-e git+https://github.com/CUCWD/bigcommerce-api-python.git@bigcommerce-0.22.2-maple.1#egg=bigcommerce==0.22.2
# via -r ./requirements/edx/private.in
--e git+https://github.com/CUCWD/social-auth-backend-bigcommerce.git@0.1.0-maple.1#egg=social-auth-backend-bigcommerce==0.1.0-maple.1
+-e git+https://github.com/CUCWD/social-auth-backend-bigcommerce.git@0.1.0-maple.3#egg=social-auth-backend-bigcommerce==0.1.0
# via -r ./requirements/edx/private.in
\ No newline at end of file
-
-
Pre-Program Survey
+Pre-Program
-
Answer this survey prior to taking any course content
+New Learner: Take this survey upon program entry.
This will help us understand your career awareness and interest, gauge where you are with FAA General maintenance knowledge and skill confidence, career plans, and demographic information.
- Provide Feedback + Provide Input
-
-
From 674e3d903565beb231e3f8709ad9cf550c2de4c2 Mon Sep 17 00:00:00 2001
From: Rebecca David Post-Program Survey
+Post-Program
-
Answer this survey after you have completed most of this program's courses
-This will help us understand your completion of FAA General maintenance program, career awareness and interest, kwowledge and skill confidence, and demographic information.
+Continuing Learner: Take this survey upon program exit.
+This will help us understand your completion of FAA General maintenance program, career awareness and interest, knowledge and skill confidence, and demographic information.
Provide Feedback