Skip to content

Commit

Permalink
feat: Added enable_career_engagement_network_on_learner_portal field …
Browse files Browse the repository at this point in the history
…to EnterpriseCustomer
  • Loading branch information
IrfanUddinAhmad committed Sep 21, 2023
1 parent 8d4eb32 commit 3eb07dc
Show file tree
Hide file tree
Showing 10 changed files with 72 additions and 3 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ Change Log
Unreleased
----------
[4.3.0]
--------
feat: Added the ``enable_career_engagement_network_on_learner_portal`` field for EnterpriseCustomer

[4.2.0]
--------
Expand Down
2 changes: 1 addition & 1 deletion enterprise/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
Your project description goes here.
"""

__version__ = "4.2.0"
__version__ = "4.3.0"
4 changes: 3 additions & 1 deletion enterprise/admin/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,9 @@ class EnterpriseCustomerAdmin(DjangoObjectActions, SimpleHistoryAdmin):
'enable_integrated_customer_learner_portal_search',
'enable_analytics_screen', 'enable_audit_enrollment',
'enable_audit_data_reporting', 'enable_learner_portal_offers',
'enable_executive_education_2U_fulfillment'),
'enable_executive_education_2U_fulfillment',
'enable_career_engagement_network_on_learner_portal',
'career_engagement_network_message'),
'description': ('The following default settings should be the same for '
'the majority of enterprise customers, '
'and are either rarely used, unlikely to be sold, '
Expand Down
2 changes: 2 additions & 0 deletions enterprise/admin/forms.py
Original file line number Diff line number Diff line change
Expand Up @@ -403,6 +403,8 @@ class Meta:
"enable_executive_education_2U_fulfillment",
"hide_labor_market_data",
"enable_integrated_customer_learner_portal_search",
"enable_career_engagement_network_on_learner_portal",
"career_engagement_network_message",
"enable_analytics_screen",
"enable_portal_reporting_config_screen",
"enable_portal_saml_configuration_screen",
Expand Down
3 changes: 2 additions & 1 deletion enterprise/api/v1/serializers.py
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,8 @@ class Meta:
'enable_integrated_customer_learner_portal_search', 'enable_generation_of_api_credentials',
'enable_portal_lms_configurations_screen', 'sender_alias', 'identity_providers',
'enterprise_customer_catalogs', 'reply_to', 'enterprise_notification_banner', 'hide_labor_market_data',
'modified', 'enable_universal_link', 'enable_browse_and_request', 'admin_users'
'modified', 'enable_universal_link', 'enable_browse_and_request', 'admin_users',
'enable_career_engagement_network_on_learner_portal', 'career_engagement_network_message'
)

identity_providers = EnterpriseCustomerIdentityProviderSerializer(many=True, read_only=True)
Expand Down
33 changes: 33 additions & 0 deletions enterprise/migrations/0185_auto_20230921_1007.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
# Generated by Django 3.2.21 on 2023-09-21 10:07

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('enterprise', '0184_auto_20230914_2057'),
]

operations = [
migrations.AddField(
model_name='enterprisecustomer',
name='career_engagement_network_message',
field=models.TextField(blank=True, help_text='Message text shown on the learner portal dashboard for career engagement network.'),
),
migrations.AddField(
model_name='enterprisecustomer',
name='enable_career_engagement_network_on_learner_portal',
field=models.BooleanField(default=False, help_text='If checked, the learners will be able to see the link to CEN on the learner portal dashboard.', verbose_name='Allow navigation to career engagement network from learner portal dashboard'),
),
migrations.AddField(
model_name='historicalenterprisecustomer',
name='career_engagement_network_message',
field=models.TextField(blank=True, help_text='Message text shown on the learner portal dashboard for career engagement network.'),
),
migrations.AddField(
model_name='historicalenterprisecustomer',
name='enable_career_engagement_network_on_learner_portal',
field=models.BooleanField(default=False, help_text='If checked, the learners will be able to see the link to CEN on the learner portal dashboard.', verbose_name='Allow navigation to career engagement network from learner portal dashboard'),
),
]
15 changes: 15 additions & 0 deletions enterprise/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -366,6 +366,14 @@ class Meta:
)
)

enable_career_engagement_network_on_learner_portal = models.BooleanField(
verbose_name="Allow navigation to career engagement network from learner portal dashboard",
default=False,
help_text=_(
"If checked, the learners will be able to see the link to CEN on the learner portal dashboard."
)
)

enable_analytics_screen = models.BooleanField(
verbose_name="Display analytics page",
default=True,
Expand Down Expand Up @@ -445,6 +453,13 @@ class Meta:
default=False,
)

career_engagement_network_message = models.TextField(
blank=True,
help_text=_(
'Message text shown on the learner portal dashboard for career engagement network.'
),
)

@property
def enterprise_customer_identity_provider(self):
"""
Expand Down
1 change: 1 addition & 0 deletions test_utils/factories.py
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@ class Meta:
hide_labor_market_data = False
auth_org_id = factory.LazyAttribute(lambda x: FAKER.lexify(text='??????????'))
enable_generation_of_api_credentials = False
career_engagement_network_message = 'Test message'


class EnrollmentNotificationEmailTemplateFactory(factory.django.DjangoModelFactory):
Expand Down
10 changes: 10 additions & 0 deletions tests/test_enterprise/api/test_views.py
Original file line number Diff line number Diff line change
Expand Up @@ -1180,6 +1180,7 @@ class TestEnterpriseCustomerViewSet(BaseTestEnterpriseAPIViews):
'hide_course_original_price': False,
'enable_analytics_screen': True,
'enable_integrated_customer_learner_portal_search': True,
'enable_career_engagement_network_on_learner_portal': False,
'enable_portal_lms_configurations_screen': False,
'sender_alias': 'Test Sender Alias',
'identity_providers': [],
Expand All @@ -1192,6 +1193,7 @@ class TestEnterpriseCustomerViewSet(BaseTestEnterpriseAPIViews):
'enable_browse_and_request': False,
'admin_users': [],
'enable_generation_of_api_credentials': False,
'career_engagement_network_message': 'Test message',
}],
),
(
Expand Down Expand Up @@ -1237,6 +1239,7 @@ class TestEnterpriseCustomerViewSet(BaseTestEnterpriseAPIViews):
'enable_portal_subscription_management_screen': False,
'hide_course_original_price': False, 'enable_analytics_screen': True,
'enable_integrated_customer_learner_portal_search': True,
'enable_career_engagement_network_on_learner_portal': False,
'enable_portal_lms_configurations_screen': False,
'sender_alias': 'Test Sender Alias', 'identity_providers': [],
'enterprise_customer_catalogs': [], 'reply_to': 'fake_reply@example.com',
Expand All @@ -1245,6 +1248,7 @@ class TestEnterpriseCustomerViewSet(BaseTestEnterpriseAPIViews):
'enable_universal_link': False, 'enable_browse_and_request': False,
'admin_users': [],
'enable_generation_of_api_credentials': False,
'career_engagement_network_message': 'Test message',
},
'active': True, 'user_id': 0, 'user': None,
'data_sharing_consent_records': [], 'groups': [],
Expand Down Expand Up @@ -1313,6 +1317,7 @@ class TestEnterpriseCustomerViewSet(BaseTestEnterpriseAPIViews):
'hide_course_original_price': False,
'enable_analytics_screen': True,
'enable_integrated_customer_learner_portal_search': True,
'enable_career_engagement_network_on_learner_portal': False,
'enable_portal_lms_configurations_screen': False,
'sender_alias': 'Test Sender Alias',
'identity_providers': [
Expand All @@ -1330,6 +1335,7 @@ class TestEnterpriseCustomerViewSet(BaseTestEnterpriseAPIViews):
'enable_browse_and_request': False,
'admin_users': [],
'enable_generation_of_api_credentials': False,
'career_engagement_network_message': 'Test message',
}],
),
(
Expand Down Expand Up @@ -1379,6 +1385,7 @@ class TestEnterpriseCustomerViewSet(BaseTestEnterpriseAPIViews):
'hide_course_original_price': False,
'enable_analytics_screen': True,
'enable_integrated_customer_learner_portal_search': True,
'enable_career_engagement_network_on_learner_portal': False,
'enable_portal_lms_configurations_screen': False,
'sender_alias': 'Test Sender Alias',
'identity_providers': [],
Expand All @@ -1391,6 +1398,7 @@ class TestEnterpriseCustomerViewSet(BaseTestEnterpriseAPIViews):
'enable_browse_and_request': False,
'admin_users': [],
'enable_generation_of_api_credentials': False,
'career_engagement_network_message': 'Test message',
}],
),
(
Expand Down Expand Up @@ -1611,6 +1619,7 @@ def test_enterprise_customer_with_access_to(
'hide_course_original_price': False,
'enable_analytics_screen': False,
'enable_integrated_customer_learner_portal_search': True,
'enable_career_engagement_network_on_learner_portal': False,
'enable_portal_lms_configurations_screen': False,
'sender_alias': 'Test Sender Alias',
'identity_providers': [],
Expand All @@ -1623,6 +1632,7 @@ def test_enterprise_customer_with_access_to(
'enable_browse_and_request': False,
'admin_users': [],
'enable_generation_of_api_credentials': False,
'career_engagement_network_message': 'Test message',
}
else:
mock_empty_200_success_response = {
Expand Down
2 changes: 2 additions & 0 deletions tests/test_utilities.py
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,7 @@ def setUp(self):
"enable_portal_learner_credit_management_screen",
"enable_executive_education_2U_fulfillment",
"enable_integrated_customer_learner_portal_search",
"enable_career_engagement_network_on_learner_portal",
"enable_analytics_screen",
"enable_slug_login",
"contact_email",
Expand All @@ -170,6 +171,7 @@ def setUp(self):
"hide_labor_market_data",
"chat_gpt_prompts",
"enable_generation_of_api_credentials",
"career_engagement_network_message",
"sso_orchestration_records",
]
),
Expand Down

0 comments on commit 3eb07dc

Please sign in to comment.