learning-paths-plugin 0.3.4__tar.gz → 0.3.4rc8__tar.gz

{learning_paths_plugin-0.3.4 → learning_paths_plugin-0.3.4rc8}/CHANGELOG.rst

@@ -16,7 +16,7 @@ Unreleased
 
 *
 
-0.3.4 - 2025-08-02
+0.3.4 - 2025-05-23
 ******************
 
 Added
@@ -24,16 +24,12 @@ Added
 
 * Bulk unenrollment API.
 * Enrollment audit model that tracks the enrollment state transitions.
-* Allow specifying time commitment.
-* Allow duplicating Learning Paths in the Django admin interface.
 
 Changed
 =======
 
 * The Learning Paths API includes start and end dates for its steps.
 * Return enrollment date in the API instead of a boolean.
-* Allow specifying any text for the duration.
-* Make the skill level optional.
 
 0.3.3 - 2025-05-23
 ******************

{learning_paths_plugin-0.3.4/learning_paths_plugin.egg-info → learning_paths_plugin-0.3.4rc8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: learning-paths-plugin
-Version: 0.3.4
+Version: 0.3.4rc8
 Summary: Learning Paths plugin
 Home-page: https://github.com/open-craft/learning-paths-plugin
 Author: OpenCraft
@@ -18,7 +18,6 @@ Requires-Python: >=3.11
 License-File: LICENSE.txt
 Requires-Dist: Django
 Requires-Dist: django-model-utils
-Requires-Dist: django-object-actions
 Requires-Dist: djangorestframework
 Requires-Dist: edx-django-utils
 Requires-Dist: edx-opaque-keys
@@ -121,7 +120,7 @@ Unreleased
 
 *
 
-0.3.4 - 2025-08-02
+0.3.4 - 2025-05-23
 ******************
 
 Added
@@ -129,16 +128,12 @@ Added
 
 * Bulk unenrollment API.
 * Enrollment audit model that tracks the enrollment state transitions.
-* Allow specifying time commitment.
-* Allow duplicating Learning Paths in the Django admin interface.
 
 Changed
 =======
 
 * The Learning Paths API includes start and end dates for its steps.
 * Return enrollment date in the API instead of a boolean.
-* Allow specifying any text for the duration.
-* Make the skill level optional.
 
 0.3.3 - 2025-05-23
 ******************

{learning_paths_plugin-0.3.4 → learning_paths_plugin-0.3.4rc8}/learning_paths/__init__.py

@@ -2,4 +2,4 @@
 Learning Paths plugin.
 """
 
-__version__ = "0.3.4"
+__version__ = "0.3.4-rc8"

{learning_paths_plugin-0.3.4 → learning_paths_plugin-0.3.4rc8}/learning_paths/admin.py

@@ -2,17 +2,11 @@
 Django Admin for learning_paths.
 """
 
-import os
-
 from django import forms
-from django.contrib import admin, auth, messages
+from django.contrib import admin, auth
 from django.core.exceptions import ValidationError
-from django.core.files.base import ContentFile
 from django.db import transaction
-from django.http import HttpResponseRedirect
-from django.urls import reverse
 from django.utils.translation import gettext_lazy as _
-from django_object_actions import DjangoObjectActions, action
 
 from .compat import get_course_keys_with_outlines
 from .models import (
@@ -111,7 +105,6 @@ class LearningPathGradingCriteriaInline(admin.TabularInline):
     """Inline Admin for Learning path grading criteria."""
 
     model = LearningPathGradingCriteria
-    verbose_name = "Certificate Criteria"
 
 
 class BulkEnrollUsersForm(forms.ModelForm):
@@ -145,7 +138,7 @@ class BulkEnrollUsersForm(forms.ModelForm):
 
 
 @admin.register(LearningPath)
-class LearningPathAdmin(DjangoObjectActions, admin.ModelAdmin):
+class LearningPathAdmin(admin.ModelAdmin):
     """Admin for Learning Path."""
 
     model = LearningPath
@@ -159,7 +152,7 @@ class LearningPathAdmin(DjangoObjectActions, admin.ModelAdmin):
         "key",
         "display_name",
         "level",
-        "duration",
+        "duration_in_days",
         "invite_only",
     )
     list_filter = ("invite_only",)
@@ -172,8 +165,6 @@ class LearningPathAdmin(DjangoObjectActions, admin.ModelAdmin):
         LearningPathGradingCriteriaInline,
     ]
 
-    change_actions = ("duplicate_learning_path",)
-
     def get_readonly_fields(self, request, obj=None):
         """Make key read-only only for existing objects."""
         if obj:  # Editing an existing object.
@@ -187,62 +178,6 @@ class LearningPathAdmin(DjangoObjectActions, admin.ModelAdmin):
             for user in form.cleaned_data["usernames"]:
                 LearningPathEnrollment.objects.get_or_create(user=user, learning_path=form.instance)
 
-    @action(label="Duplicate Learning Path", description="Create a copy of this Learning Path")
-    def duplicate_learning_path(self, request, obj: LearningPath) -> HttpResponseRedirect:
-        """Duplicate the learning path with a new unique key."""
-        base_new_key = f"{str(obj.key)}_copy"
-        new_key = base_new_key
-        counter = 1
-
-        while LearningPath.objects.filter(key=new_key).exists():
-            new_key = f"{base_new_key}_{counter}"
-            counter += 1
-
-        with transaction.atomic():
-            new_learning_path = LearningPath(
-                key=new_key,
-                display_name=f"{obj.display_name} (Copy)",
-                subtitle=obj.subtitle,
-                description=obj.description,
-                level=obj.level,
-                duration=obj.duration,
-                time_commitment=obj.time_commitment,
-                sequential=obj.sequential,
-                invite_only=obj.invite_only,
-            )
-
-            if obj.image:
-                with obj.image.open("rb") as original_file:
-                    image_content = original_file.read()
-
-                original_filename = os.path.basename(obj.image.name)
-                new_learning_path.image.save(original_filename, ContentFile(image_content), save=False)
-
-            new_learning_path.save()
-
-            new_learning_path.refresh_from_db()
-            new_learning_path.grading_criteria.required_completion = obj.grading_criteria.required_completion
-            new_learning_path.grading_criteria.required_grade = obj.grading_criteria.required_grade
-            new_learning_path.grading_criteria.save()
-
-            for step in obj.steps.all():
-                step.pk = None
-                step.learning_path = new_learning_path
-                step.save()
-
-            for skill in obj.requiredskill_set.all():
-                skill.pk = None
-                skill.learning_path = new_learning_path
-                skill.save()
-
-            for skill in obj.acquiredskill_set.all():
-                skill.pk = None
-                skill.learning_path = new_learning_path
-                skill.save()
-
-        messages.success(request, f"Learning path duplicated successfully. New key: {new_key}")
-        return HttpResponseRedirect(reverse("admin:learning_paths_learningpath_change", args=[new_learning_path.pk]))
-
 
 @admin.register(Skill)
 class SkillAdmin(admin.ModelAdmin):

{learning_paths_plugin-0.3.4 → learning_paths_plugin-0.3.4rc8}/learning_paths/api/v1/serializers.py

@@ -174,8 +174,7 @@ class LearningPathDetailSerializer(LearningPathListSerializer):
             "subtitle",
             "description",
             "level",
-            "duration",
-            "time_commitment",
+            "duration_in_days",
             "required_skills",
             "acquired_skills",
         ]

{learning_paths_plugin-0.3.4 → learning_paths_plugin-0.3.4rc8}/learning_paths/api/v1/views.py

@@ -410,8 +410,7 @@ class BulkEnrollView(APIView):
                 allowed, created = LearningPathEnrollmentAllowed.objects.get_or_create(
                     email=email, learning_path=learning_path
                 )
-                if created or (not allowed.user and not allowed.is_active):
-                    allowed.is_active = True
+                if created:
                     enrollment_allowed_created.append(allowed)
 
                 audit_data = self._create_audit_data(request, LearningPathEnrollmentAudit.UNENROLLED_TO_ALLOWEDTOENROLL)

{learning_paths_plugin-0.3.4 → learning_paths_plugin-0.3.4rc8}/learning_paths/models.py

@@ -5,7 +5,7 @@ Database models for learning_paths.
 import logging
 import os
 import uuid
-from datetime import datetime
+from datetime import datetime, timedelta
 from uuid import uuid4
 
 from django.contrib import auth
@@ -53,11 +53,15 @@ class LearningPathManager(models.Manager):
         enrollment_subquery = LearningPathEnrollment.objects.filter(
             learning_path=OuterRef("pk"), user=user, is_active=True
         ).values("created")[:1]
-        queryset = queryset.annotate(enrollment_date=models.Subquery(enrollment_subquery))
+        queryset = queryset.annotate(
+            enrollment_date=models.Subquery(enrollment_subquery)
+        )
 
         # Apply visibility filtering based on the user role.
         if not user.is_staff:
-            queryset = queryset.filter(Q(invite_only=False) | Q(enrollment_date__isnull=False))
+            queryset = queryset.filter(
+                Q(invite_only=False) | Q(enrollment_date__isnull=False)
+            )
 
         # Order by enrollment date (the most recent first), with null values at the end.
         return queryset.order_by(models.F("enrollment_date").desc(nulls_last=True))
@@ -104,27 +108,27 @@ class LearningPath(TimeStampedModel):
     subtitle = models.TextField(blank=True)
     description = models.TextField(blank=True)
     image = models.ImageField(
-        upload_to=_learning_path_image_upload_path,  # type: ignore
+        upload_to=_learning_path_image_upload_path,
         blank=True,
         null=True,
         verbose_name=_("Image"),
         help_text=_("Image representing this Learning Path."),
     )
     level = models.CharField(max_length=255, blank=True, choices=LEVEL_CHOICES)
-    duration = models.CharField(
-        max_length=255,
-        blank=True,
-        help_text=_("Approximate time it should take to complete this Learning Path. Example: '10 Weeks'."),
-    )
-    time_commitment = models.CharField(
-        max_length=255,
+    duration_in_days = models.PositiveIntegerField(
         blank=True,
-        help_text=_("Approximate time commitment. Example: '4-6 hours/week'."),
+        null=True,
+        verbose_name=_("Duration (days)"),
+        help_text=_(
+            "Approximate time (in days) it should take to complete this Learning Path."
+        ),
     )
     sequential = models.BooleanField(
         default=False,
         verbose_name=_("Is sequential"),
-        help_text=_("Whether the courses in this Learning Path are meant to be taken sequentially."),
+        help_text=_(
+            "Whether the courses in this Learning Path are meant to be taken sequentially."
+        ),
     )
     # Note: the enrolled learners will be able to self-enroll in all courses
     # (steps) of the learning path. To avoid mistakes of making the courses
@@ -133,18 +137,15 @@ class LearningPath(TimeStampedModel):
     invite_only = models.BooleanField(
         default=True,
         verbose_name=_("Invite only"),
-        help_text=_("If enabled, only staff can enroll users and only enrolled users can see the learning path."),
+        help_text=_(
+            "If enabled, only staff can enroll users and only enrolled users can see the learning path."
+        ),
     )
     enrolled_users = models.ManyToManyField(User, through="LearningPathEnrollment")
     tracker = FieldTracker(fields=["image"])
 
     objects = LearningPathManager()
 
-    steps: "models.Manager[LearningPathStep]"
-    requiredskill_set: "models.Manager[RequiredSkill]"
-    acquiredskill_set: "models.Manager[AcquiredSkill]"
-    grading_criteria: "LearningPathGradingCriteria"
-
     def __str__(self):
         """User-friendly string representation of this model."""
         return str(self.key)
@@ -197,12 +198,16 @@ class LearningPathStep(TimeStampedModel):
         unique_together = ("learning_path", "course_key")
 
     course_key = CourseKeyField(max_length=255)
-    learning_path = models.ForeignKey(LearningPath, related_name="steps", on_delete=models.CASCADE)
+    learning_path = models.ForeignKey(
+        LearningPath, related_name="steps", on_delete=models.CASCADE
+    )
     order = models.PositiveIntegerField(
         blank=True,
         null=True,
         verbose_name=_("Sequential order"),
-        help_text=_("Ordinal position of this step in the sequence of the Learning Path, if applicable."),
+        help_text=_(
+            "Ordinal position of this step in the sequence of the Learning Path, if applicable."
+        ),
     )
     weight = models.FloatField(
         default=1.0,
@@ -260,9 +265,7 @@ class LearningPathSkill(TimeStampedModel):
     learning_path = models.ForeignKey(LearningPath, on_delete=models.CASCADE)
     skill = models.ForeignKey(Skill, on_delete=models.CASCADE)
     level = models.PositiveIntegerField(
-        blank=True,
-        null=True,
-        help_text=_("The skill level associated with this course."),
+        help_text=_("The skill level associated with this course.")
     )
 
     def __str__(self):
@@ -310,6 +313,13 @@ class LearningPathEnrollment(TimeStampedModel):
         """User-friendly string representation of this model."""
         return "{}: {}".format(self.user, self.learning_path)
 
+    @property
+    def estimated_end_date(self):
+        """Estimated end date of the learning path."""
+        if self.learning_path.duration_in_days is None:
+            return None
+        return self.created + timedelta(days=self.learning_path.duration_in_days)
+
 
 class LearningPathGradingCriteria(models.Model):
     """
@@ -318,7 +328,9 @@ class LearningPathGradingCriteria(models.Model):
     .. no_pii:
     """
 
-    learning_path = models.OneToOneField(LearningPath, related_name="grading_criteria", on_delete=models.CASCADE)
+    learning_path = models.OneToOneField(
+        LearningPath, related_name="grading_criteria", on_delete=models.CASCADE
+    )
     required_completion = models.FloatField(
         default=0.80,
         help_text=(
@@ -413,7 +425,9 @@ class LearningPathEnrollmentAudit(TimeStampedModel):
         (DEFAULT_TRANSITION_STATE, DEFAULT_TRANSITION_STATE),
     )
 
-    enrolled_by = models.ForeignKey(User, on_delete=models.CASCADE, null=True, related_name="learning_path_audit")
+    enrolled_by = models.ForeignKey(
+        User, on_delete=models.CASCADE, null=True, related_name="learning_path_audit"
+    )
     enrollment = models.ForeignKey(
         LearningPathEnrollment,
         on_delete=models.CASCADE,
@@ -426,7 +440,9 @@ class LearningPathEnrollmentAudit(TimeStampedModel):
         null=True,
         related_name="audit",
     )
-    state_transition = models.CharField(max_length=255, choices=TRANSITION_STATES, default=DEFAULT_TRANSITION_STATE)
+    state_transition = models.CharField(
+        max_length=255, choices=TRANSITION_STATES, default=DEFAULT_TRANSITION_STATE
+    )
     reason = models.TextField(blank=True)
     org = models.CharField(max_length=255, blank=True, db_index=True)
     role = models.CharField(max_length=255, blank=True)

{learning_paths_plugin-0.3.4 → learning_paths_plugin-0.3.4rc8/learning_paths_plugin.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: learning-paths-plugin
-Version: 0.3.4
+Version: 0.3.4rc8
 Summary: Learning Paths plugin
 Home-page: https://github.com/open-craft/learning-paths-plugin
 Author: OpenCraft
@@ -18,7 +18,6 @@ Requires-Python: >=3.11
 License-File: LICENSE.txt
 Requires-Dist: Django
 Requires-Dist: django-model-utils
-Requires-Dist: django-object-actions
 Requires-Dist: djangorestframework
 Requires-Dist: edx-django-utils
 Requires-Dist: edx-opaque-keys
@@ -121,7 +120,7 @@ Unreleased
 
 *
 
-0.3.4 - 2025-08-02
+0.3.4 - 2025-05-23
 ******************
 
 Added
@@ -129,16 +128,12 @@ Added
 
 * Bulk unenrollment API.
 * Enrollment audit model that tracks the enrollment state transitions.
-* Allow specifying time commitment.
-* Allow duplicating Learning Paths in the Django admin interface.
 
 Changed
 =======
 
 * The Learning Paths API includes start and end dates for its steps.
 * Return enrollment date in the API instead of a boolean.
-* Allow specifying any text for the duration.
-* Make the skill level optional.
 
 0.3.3 - 2025-05-23
 ******************

{learning_paths_plugin-0.3.4 → learning_paths_plugin-0.3.4rc8}/learning_paths_plugin.egg-info/SOURCES.txt

@@ -37,8 +37,6 @@ learning_paths/migrations/0010_learningpath_invite_only.py
 learning_paths/migrations/0011_replace_learningpath_image_url_with_image.py
 learning_paths/migrations/0012_alter_learningpath_subtitle.py
 learning_paths/migrations/0013_enrollment_audit.py
-learning_paths/migrations/0014_remove_learningpath_duration_in_days_and_more.py
-learning_paths/migrations/0015_make_skill_level_optional.py
 learning_paths/migrations/__init__.py
 learning_paths/templates/learning_paths/base.html
 learning_paths_plugin.egg-info/PKG-INFO

{learning_paths_plugin-0.3.4 → learning_paths_plugin-0.3.4rc8}/learning_paths_plugin.egg-info/requires.txt

@@ -1,6 +1,5 @@
 Django
 django-model-utils
-django-object-actions
 djangorestframework
 edx-django-utils
 edx-opaque-keys

{learning_paths_plugin-0.3.4 → learning_paths_plugin-0.3.4rc8}/requirements/base.in

@@ -4,7 +4,6 @@
 Django             # Web application framework
 
 django-model-utils
-django-object-actions          # Add action buttons to Django admin
 djangorestframework
 edx-django-utils
 edx-opaque-keys

learning_paths_plugin-0.3.4/learning_paths/migrations/0014_remove_learningpath_duration_in_days_and_more.py

@@ -1,59 +0,0 @@
-# Generated by Django 4.2.20 on 2025-07-14 13:10
-
-from django.db import migrations, models
-
-
-def transfer_duration_data(apps, schema_editor):
-    """Transfer duration_in_days values to duration field with '{x} days' format."""
-    LearningPath = apps.get_model("learning_paths", "LearningPath")
-
-    for learning_path in LearningPath.objects.filter(duration_in_days__isnull=False):
-        learning_path.duration = f"{learning_path.duration_in_days} days"
-        learning_path.save()
-
-
-def reverse_transfer_duration_data(apps, schema_editor):
-    """Reverse operation: extract numeric values from duration field back to duration_in_days."""
-    LearningPath = apps.get_model("learning_paths", "LearningPath")
-
-    for learning_path in LearningPath.objects.filter(duration__endswith=" days"):
-        try:
-            days_str = learning_path.duration.replace(" days", "")
-            learning_path.duration_in_days = int(days_str)
-            learning_path.save()
-        except ValueError:
-            # Skip entries that don't match the expected format.
-            pass
-
-
-class Migration(migrations.Migration):
-    dependencies = [
-        ("learning_paths", "0013_enrollment_audit"),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name="learningpath",
-            name="duration",
-            field=models.CharField(
-                blank=True,
-                help_text="Approximate time it should take to complete this Learning Path. Example: '10 Weeks'.",
-                max_length=255,
-            ),
-        ),
-        migrations.AddField(
-            model_name="learningpath",
-            name="time_commitment",
-            field=models.CharField(
-                blank=True, help_text="Approximate time commitment. Example: '4-6 hours/week'.", max_length=255
-            ),
-        ),
-        migrations.RunPython(
-            transfer_duration_data,
-            reverse_transfer_duration_data,
-        ),
-        migrations.RemoveField(
-            model_name="learningpath",
-            name="duration_in_days",
-        ),
-    ]

learning_paths_plugin-0.3.4/learning_paths/migrations/0015_make_skill_level_optional.py

@@ -1,27 +0,0 @@
-# Generated by Django 4.2.23 on 2025-07-22 22:28
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("learning_paths", "0014_remove_learningpath_duration_in_days_and_more"),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name="acquiredskill",
-            name="level",
-            field=models.PositiveIntegerField(
-                blank=True, help_text="The skill level associated with this course.", null=True
-            ),
-        ),
-        migrations.AlterField(
-            model_name="requiredskill",
-            name="level",
-            field=models.PositiveIntegerField(
-                blank=True, help_text="The skill level associated with this course.", null=True
-            ),
-        ),
-    ]