Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Open sidebar
MOOC packages by hacklab
django-courses
Commits
d9d182b6
Commit
d9d182b6
authored
May 13, 2020
by
Fernando Ribeiro
Browse files
Fix: Change all occurrences of 'coursestudent_set' to 'course_students'
parent
2db36364
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
courses/models.py
courses/models.py
+2
-2
courses/reports/serializers.py
courses/reports/serializers.py
+1
-1
courses/reports/views.py
courses/reports/views.py
+1
-1
No files found.
courses/models.py
View file @
d9d182b6
...
...
@@ -196,10 +196,10 @@ class Course(models.Model):
def
avg_lessons_users_progress
(
self
,
classes
=
None
):
if
classes
:
student_enrolled
=
self
.
coursestudent
_set
.
filter
(
student_enrolled
=
self
.
course
_
student
s
.
filter
(
user__classes__in
=
classes
).
count
()
else
:
student_enrolled
=
self
.
coursestudent
_set
.
all
().
count
()
student_enrolled
=
self
.
course
_
student
s
.
all
().
count
()
progress_list
=
[]
for
lesson
in
self
.
lessons
.
all
():
lesson_progress
=
{}
...
...
courses/reports/serializers.py
View file @
d9d182b6
...
...
@@ -43,7 +43,7 @@ class UserInDetailSerializer(serializers.ModelSerializer):
# 'has_certificate': x.certificate.type == 'certificate',
'has_certificate'
:
False
,
'class_name'
:
x
.
get_current_class
().
name
}
for
x
in
obj
.
coursestudent
_set
.
all
()]
}
for
x
in
obj
.
course
_
student
s
.
all
()]
return
needed_stuff
def
get_topics_created
(
self
,
obj
):
...
...
courses/reports/views.py
View file @
d9d182b6
...
...
@@ -212,7 +212,7 @@ class UsersByGroupViewSet(PandasViewSet):
if
groups
is
not
None
:
self
.
queryset
=
self
.
queryset
.
filter
(
groups__name__in
=
groups
.
split
(
','
))
self
.
queryset
=
self
.
queryset
.
prefetch_related
(
'groups'
,
'coursestudent
_set
'
)
self
.
queryset
=
self
.
queryset
.
prefetch_related
(
'groups'
,
'course
_
student
s
'
)
return
self
.
queryset
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment