Skip to content

Commit 2725429

Browse files
committed
fix: lint errors
1 parent c76bb90 commit 2725429

File tree

4 files changed

+38
-29
lines changed

4 files changed

+38
-29
lines changed

learning_paths/admin.py

+18-9
Original file line numberDiff line numberDiff line change
@@ -122,20 +122,26 @@ class LearningPathAdmin(admin.ModelAdmin):
122122
def save_related(self, request, form, formsets, change):
123123
"""Save related objects and enroll users in the learning path."""
124124
super().save_related(request, form, formsets, change)
125-
enroll_all_in_courses = form.cleaned_data.get('enroll_all_in_courses', False)
125+
enroll_all_in_courses = form.cleaned_data.get("enroll_all_in_courses", False)
126126
with transaction.atomic():
127127
for user in form.cleaned_data["usernames"]:
128-
learning_path_enrollment, created = LearningPathEnrollment.objects.get_or_create(
129-
user=user, learning_path=form.instance
128+
learning_path_enrollment, created = (
129+
LearningPathEnrollment.objects.get_or_create(
130+
user=user, learning_path=form.instance
131+
)
130132
)
131133
if enroll_all_in_courses:
132-
courses = LearningPathStep.objects.filter(learning_path=form.instance).values_list('course_key', flat=True)
134+
courses = LearningPathStep.objects.filter(
135+
learning_path=form.instance
136+
).values_list("course_key", flat=True)
133137
for course_key in courses:
134138
LearningPathCourseEnrollment.objects.create(
135139
course_key=course_key,
136140
learning_path_enrollment=learning_path_enrollment,
137-
course_enrollment=CourseEnrollment.objects.get_or_create(user=user, course_id=course_key)[0],
138-
status=LearningPathCourseEnrollment.ACTIVE
141+
course_enrollment=CourseEnrollment.objects.get_or_create(
142+
user=user, course_id=course_key
143+
)[0],
144+
status=LearningPathCourseEnrollment.ACTIVE,
139145
)
140146

141147

@@ -158,11 +164,14 @@ class EnrolledUsersAdmin(admin.ModelAdmin):
158164
"learning_path__display_name",
159165
]
160166

167+
161168
class LearningPathCourseEnrollmentAdmin(admin.ModelAdmin):
162-
""" Admin for Learning Path Course enrollments."""
169+
"""Admin for Learning Path Course enrollments."""
170+
163171
model = LearningPathCourseEnrollment
164-
list_display = ['learning_path_enrollment', 'course_key', 'status']
165-
list_filter = ['status']
172+
list_display = ["learning_path_enrollment", "course_key", "status"]
173+
list_filter = ["status"]
174+
166175

167176
admin.site.register(LearningPath, LearningPathAdmin)
168177
admin.site.register(Skill, SkillAdmin)

learning_paths/compat.py

+1-4
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,4 @@
1515
except ImportError:
1616
CourseEnrollment = None
1717

18-
__all__ = [
19-
"get_course_keys_with_outlines",
20-
"CourseEnrollment"
21-
]
18+
__all__ = ["get_course_keys_with_outlines", "CourseEnrollment"]

learning_paths/models.py

+9-9
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
from model_utils.models import TimeStampedModel
1212
from opaque_keys.edx.django.models import CourseKeyField
1313
from .compat import CourseEnrollment
14-
# from common.djangoapps.student.models import CourseEnrollment
1514

1615
User = auth.get_user_model()
1716

@@ -193,18 +192,19 @@ class LearningPathCourseEnrollment(TimeStampedModel):
193192
"""
194193
Model to track course enrollments that are part of a learning path
195194
"""
196-
ACTIVE = 'active'
197-
INACTIVE = 'inactive'
198-
STATUS_CHOICES = (
199-
(ACTIVE, 'Active'),
200-
(INACTIVE, 'Inactive')
201-
)
195+
196+
ACTIVE = "active"
197+
INACTIVE = "inactive"
198+
STATUS_CHOICES = ((ACTIVE, "Active"), (INACTIVE, "Inactive"))
199+
202200
class Meta:
203201
"""Model options."""
204202

205-
unique_together = ('learning_path_enrollment', 'course_key')
203+
unique_together = ("learning_path_enrollment", "course_key")
206204

207-
learning_path_enrollment = models.ForeignKey(LearningPathEnrollment, on_delete=models.CASCADE)
205+
learning_path_enrollment = models.ForeignKey(
206+
LearningPathEnrollment, on_delete=models.CASCADE
207+
)
208208
course_key = CourseKeyField(max_length=255)
209209
status = models.CharField(max_length=9, choices=STATUS_CHOICES)
210210
course_enrollment = models.ForeignKey(CourseEnrollment, on_delete=models.CASCADE)

learning_paths/signals.py

+10-7
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
1-
21
import logging
32
from django.db.models.signals import post_save
43
from django.dispatch import receiver
54
from .compat import CourseEnrollment
6-
from .models import LearningPathCourseEnrollment, LearningPathStep, LearningPathEnrollment
5+
from .models import (
6+
LearningPathCourseEnrollment,
7+
LearningPathStep,
8+
LearningPathEnrollment,
9+
)
710

811
logger = logging.getLogger(__name__)
912

13+
1014
@receiver(post_save, sender=CourseEnrollment)
1115
def create_learningpath_course_enrollment(sender, instance, created, **kwargs):
1216
if created: # Only react to new enrollments
@@ -16,23 +20,22 @@ def create_learningpath_course_enrollment(sender, instance, created, **kwargs):
1620
try:
1721
learning_path_step = LearningPathStep.objects.get(course_key=course_key)
1822
except LearningPathStep.DoesNotExist:
19-
logger.info('Course is not part of any Learning Path. Ignoring.')
23+
logger.info("Course is not part of any Learning Path. Ignoring.")
2024
return
2125

2226
# Find the associated LearningPathEnrollment
2327
try:
2428
learning_path_enrollment = LearningPathEnrollment.objects.get(
25-
learning_path=learning_path_step.learning_path,
26-
user=instance.user
29+
learning_path=learning_path_step.learning_path, user=instance.user
2730
)
2831
except LearningPathEnrollment.DoesNotExist:
29-
logger.warning('User is not enrolled in the relevant Learning Path.')
32+
logger.warning("User is not enrolled in the relevant Learning Path.")
3033
return
3134

3235
# Create the LearningPathCourseEnrollment object
3336
LearningPathCourseEnrollment.objects.create(
3437
learning_path_enrollment=learning_path_enrollment,
3538
course_key=course_key,
3639
status=LearningPathCourseEnrollment.ACTIVE,
37-
course_enrollment=instance
40+
course_enrollment=instance,
3841
)

0 commit comments

Comments
 (0)