Skip to content

Commit

Permalink
[course_admin/submissions] get correct count of submissions displayed (
Browse files Browse the repository at this point in the history
…#759)

Get correct count of submissions displayed
  • Loading branch information
Drumor committed Dec 17, 2021
1 parent fc5c657 commit 1b4ab33
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions inginious/frontend/pages/course_admin/submissions.py
Original file line number Diff line number Diff line change
Expand Up @@ -117,13 +117,13 @@ def page(self, course, params, page=1, msgs=None):

users, tutored_users, audiences, tutored_audiences, tasks, limit = self.get_course_params(course, params)

data, pages = self.submissions_from_user_input(course, params, msgs, page, limit)
data, sub_count, pages = self.submissions_from_user_input(course, params, msgs, page, limit)

return self.template_helper.render("course_admin/submissions.html", course=course, users=users,
tutored_users=tutored_users, audiences=audiences,
tutored_audiences=tutored_audiences, tasks=tasks, old_params=params,
data=data, displayed_selection=json.dumps(params),
number_of_pages=pages, page_number=page, msgs=msgs)
number_of_pages=pages, page_number=page, msgs=msgs, sub_count = sub_count)

def submissions_from_user_input(self, course, user_input, msgs, page=None, limit=None, best_only=False):
""" Returns the list of submissions and corresponding aggragations based on inputs """
Expand Down Expand Up @@ -220,6 +220,6 @@ def get_selected_submissions(self, course,

if limit is not None:
number_of_pages = submissions_count // limit + (submissions_count % limit > 0)
return out, number_of_pages
return out, submissions_count, number_of_pages
else:
return out
2 changes: 1 addition & 1 deletion inginious/frontend/templates/course_admin/submissions.html
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ <h2>{{_("Submissions")}}</h2>
{% endfor %}
</div>

<p>{{data|length}} {{_("submissions selected")}}</p>
<p>{{sub_count}} {{_("submissions selected")}}</p>

<!-- Submission table -->
<table class="table">
Expand Down

0 comments on commit 1b4ab33

Please sign in to comment.