Skip to content

Commit

Permalink
Merge pull request #321 from LDSSA/feature/card#319_v2
Browse files Browse the repository at this point in the history
Feature/card#319 v2
  • Loading branch information
brunodaemon2 authored Dec 10, 2024
2 parents 5aae548 + 277cd5a commit a4f31d8
Show file tree
Hide file tree
Showing 5 changed files with 2 additions and 7 deletions.
Empty file removed __init__.py
Empty file.
Empty file removed portal/__init__.py
Empty file.
1 change: 1 addition & 0 deletions portal/portal/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

2 changes: 1 addition & 1 deletion portal/portal/academy/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ class StudentUnitDetailView(StudentViewsMixin, BaseUnitDetailView):
class InstructorUserListView(InstructorViewsMixin, ListView):
model = get_user_model()
queryset = model.objects.filter(is_student=True, failed_or_dropped=False)
#queryset = get_user_model().objects.filter(is_student=True, failed_or_dropped=False)

template_name = "academy/instructor/user_list.html"

def get_queryset(self):
Expand Down
6 changes: 0 additions & 6 deletions portal/portal/templates/academy/instructor/user_list.html
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,6 @@ <h1><a href="{% url 'academy:instructor-user-list' %}" class="text-dark" title="
<thead>
<tr>
<th scope="col" rowspan="2">Name</th>
{% comment %}
<th scope="col" rowspan="2">Slack</th>
{% endcomment %}
<th scope="col" rowspan="2">Submission Date</th>
<th scope="col" rowspan="2">Total</th>
<th scope="col" rowspan="2">Eligible for graduation</th>
Expand All @@ -40,9 +37,6 @@ <h1><a href="{% url 'academy:instructor-user-list' %}" class="text-dark" title="
{% for obj in object_list %}
<tr>
<th><a href="{% add_query_param 'user_id' obj.user.id %}" class="text-dark" title="Filter by student">{{ obj.user.first_name }} {{ obj.user.last_name }}</a></th>
{% comment %}
<td><a href="{{ workspace_url }}{{ obj.user.slack_member_id }}" target="_blank" class="text-dark">{{ obj.user.slack_member_id }}</a></td>
{% endcomment %}
<td><a href="{% add_query_param 'submission_date' obj.submission_date %}" class="text-dark"> {{ obj.submission_date }} </a></td>
<td><a href="{% add_query_param 'score__gte' obj.total_score %}" class="text-dark">{{ obj.total_score }}&#47;{{ max_score }}</a></td>
<th><a href="{% add_query_param 'can_graduate' obj.user.can_graduate %}" class="text-dark" title="Filter by graduation status">{% if obj.user.can_graduate %}Yes{% else %}No{% endif %}</a></th>
Expand Down

0 comments on commit a4f31d8

Please sign in to comment.