From c939d28ef3cfd82cf423ae16829925fc8fdc2f79 Mon Sep 17 00:00:00 2001 From: Muhammad Sameer Amin <35958006+sameeramin@users.noreply.github.com> Date: Tue, 11 Jun 2024 08:13:58 +0500 Subject: [PATCH 1/5] feat: Add fields to enable learner portal sidebar content. --- ...learner_portal_sidebar_message_and_more.py | 43 +++++++++++++++++++ enterprise/models.py | 16 +++++++ 2 files changed, 59 insertions(+) create mode 100644 enterprise/migrations/0210_enterprisecustomer_enable_learner_portal_sidebar_message_and_more.py diff --git a/enterprise/migrations/0210_enterprisecustomer_enable_learner_portal_sidebar_message_and_more.py b/enterprise/migrations/0210_enterprisecustomer_enable_learner_portal_sidebar_message_and_more.py new file mode 100644 index 0000000000..e1fcd0db6b --- /dev/null +++ b/enterprise/migrations/0210_enterprisecustomer_enable_learner_portal_sidebar_message_and_more.py @@ -0,0 +1,43 @@ +# Generated by Django 4.2.10 on 2024-06-11 03:12 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('enterprise', '0209_alter_enterprisecustomer_disable_expiry_messaging_for_learner_credit_and_more'), + ] + + operations = [ + migrations.AddField( + model_name='enterprisecustomer', + name='enable_learner_portal_sidebar_message', + field=models.BooleanField(default=False, help_text='If checked, learners will be able to see content in the Learner Portal Sidebar found in the HTML box.', verbose_name='Enable learner portal sidebar message'), + ), + migrations.AddField( + model_name='enterprisecustomer', + name='learner_portal_sidebar_content', + field=models.TextField(blank=True, help_text='Text shown on the learner portal dashboard for customer specific purposes. Open HTML field.'), + ), + migrations.AddField( + model_name='historicalenterprisecustomer', + name='enable_learner_portal_sidebar_message', + field=models.BooleanField(default=False, help_text='If checked, learners will be able to see content in the Learner Portal Sidebar found in the HTML box.', verbose_name='Enable learner portal sidebar message'), + ), + migrations.AddField( + model_name='historicalenterprisecustomer', + name='learner_portal_sidebar_content', + field=models.TextField(blank=True, help_text='Text shown on the learner portal dashboard for customer specific purposes. Open HTML field.'), + ), + migrations.AlterField( + 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.', null=True, verbose_name='Allow navigation to career engagement network from learner portal dashboard'), + ), + migrations.AlterField( + 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.', null=True, verbose_name='Allow navigation to career engagement network from learner portal dashboard'), + ), + ] diff --git a/enterprise/models.py b/enterprise/models.py index ff811c845a..299c2327db 100644 --- a/enterprise/models.py +++ b/enterprise/models.py @@ -386,12 +386,21 @@ class Meta: enable_career_engagement_network_on_learner_portal = models.BooleanField( verbose_name="Allow navigation to career engagement network from learner portal dashboard", + null=True, default=False, help_text=_( "If checked, the learners will be able to see the link to CEN on the learner portal dashboard." ) ) + enable_learner_portal_sidebar_message = models.BooleanField( + verbose_name="Enable learner portal sidebar message", + default=False, + help_text=_( + "If checked, learners will be able to see content in the Learner Portal Sidebar found in the HTML box." + ) + ) + enable_pathways = models.BooleanField( verbose_name="Display pathways screen", default=True, @@ -516,6 +525,13 @@ class Meta: ), ) + learner_portal_sidebar_content = models.TextField( + blank=True, + help_text=_( + 'Text shown on the learner portal dashboard for customer specific purposes. Open HTML field.' + ), + ) + @property def enterprise_customer_identity_provider(self): """ From a32c58aff2d982faa8d39c76690f6fa5abe8ea4a Mon Sep 17 00:00:00 2001 From: Muhammad Sameer Amin <35958006+sameeramin@users.noreply.github.com> Date: Tue, 11 Jun 2024 08:40:54 +0500 Subject: [PATCH 2/5] chore: bumped version to 4.19.15 and updated changelog --- CHANGELOG.rst | 4 ++++ enterprise/__init__.py | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 5acc35a2be..a2b1036a40 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -17,6 +17,10 @@ Unreleased ---------- * nothing unreleased +[4.19.15] +--------- +* feat: adds new fields EnterpriseCustomer to replace the ``career_engagement_network_message`` field + [4.19.14] --------- * feat: reverts an errant 4.19.12 diff --git a/enterprise/__init__.py b/enterprise/__init__.py index 0c885a8e30..5bbae2e8ad 100644 --- a/enterprise/__init__.py +++ b/enterprise/__init__.py @@ -2,4 +2,4 @@ Your project description goes here. """ -__version__ = "4.19.14" +__version__ = "4.19.15" From 813d28ef6a5ce5362d72cf68479338cea62e47e6 Mon Sep 17 00:00:00 2001 From: Muhammad Sameer Amin <35958006+sameeramin@users.noreply.github.com> Date: Tue, 11 Jun 2024 08:49:31 +0500 Subject: [PATCH 3/5] test: updated test utillities to accomodate new fields --- tests/test_utilities.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/test_utilities.py b/tests/test_utilities.py index dca646fd92..78654339fd 100644 --- a/tests/test_utilities.py +++ b/tests/test_utilities.py @@ -162,6 +162,7 @@ def setUp(self): "enable_executive_education_2U_fulfillment", "enable_integrated_customer_learner_portal_search", "enable_career_engagement_network_on_learner_portal", + "enable_learner_portal_sidebar_message", "enable_analytics_screen", "enable_slug_login", "contact_email", @@ -174,6 +175,7 @@ def setUp(self): "chat_gpt_prompts", "enable_generation_of_api_credentials", "career_engagement_network_message", + "learner_portal_sidebar_content", "sso_orchestration_records", "enable_pathways", "enable_programs", From a2d80ddeb0985005164284b182836fb1afcb035d Mon Sep 17 00:00:00 2001 From: Muhammad Sameer Amin <35958006+sameeramin@users.noreply.github.com> Date: Tue, 11 Jun 2024 15:23:20 +0500 Subject: [PATCH 4/5] chore: bumped version to 4.19.16 --- CHANGELOG.rst | 6 +++++- enterprise/__init__.py | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index dcd2f7d1cb..b33f7a5ac1 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -17,10 +17,14 @@ Unreleased ---------- * nothing unreleased -[4.19.15] +[4.19.16] --------- * feat: Adds new fields enable_learner_portal_sidebar_message and learner_portal_sidebar_content in EnterpriseCustomer. +[4.19.15] +--------- +* feat: added filtering for transmitted records using the is_transmitted column. + [4.19.14] --------- * feat: reverts an errant 4.19.12 diff --git a/enterprise/__init__.py b/enterprise/__init__.py index 5bbae2e8ad..b428954e9a 100644 --- a/enterprise/__init__.py +++ b/enterprise/__init__.py @@ -2,4 +2,4 @@ Your project description goes here. """ -__version__ = "4.19.15" +__version__ = "4.19.16" From deaa45146fc0caa0303f8543b9793c89714323d6 Mon Sep 17 00:00:00 2001 From: Muhammad Sameer Amin <35958006+sameeramin@users.noreply.github.com> Date: Wed, 12 Jun 2024 09:00:49 +0500 Subject: [PATCH 5/5] chore: bumped version to 4.19.17 --- CHANGELOG.rst | 4 ++++ enterprise/__init__.py | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index a28b8f7744..d8a5687198 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -17,6 +17,10 @@ Unreleased ---------- * nothing unreleased +[4.19.17] +--------- +* feat: Adds new fields enable_learner_portal_sidebar_message and learner_portal_sidebar_content in EnterpriseCustomer. + [4.19.16] --------- * feat: submit ``create_enterprise_enrollment`` task on commit diff --git a/enterprise/__init__.py b/enterprise/__init__.py index b428954e9a..2f047e8969 100644 --- a/enterprise/__init__.py +++ b/enterprise/__init__.py @@ -2,4 +2,4 @@ Your project description goes here. """ -__version__ = "4.19.16" +__version__ = "4.19.17"