Skip to content

Commit 9c6ed4f

Browse files
committedMar 2, 2025·
revert changes in the past month
1 parent 49c8589 commit 9c6ed4f

File tree

4 files changed

+12
-7
lines changed

4 files changed

+12
-7
lines changed
 

‎portal/portal/__init__.py

+7-1
Original file line numberDiff line numberDiff line change
@@ -1 +1,7 @@
1-
1+
__version__ = "0.1.0"
2+
__version_info__ = tuple(
3+
[
4+
int(num) if num.isdigit() else num
5+
for num in __version__.replace("-", ".", 1).split(".")
6+
],
7+
)

‎portal/portal/academy/views.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -140,8 +140,7 @@ class StudentUnitDetailView(StudentViewsMixin, BaseUnitDetailView):
140140

141141
class InstructorUserListView(InstructorViewsMixin, ListView):
142142
model = get_user_model()
143-
queryset = model.objects.filter(is_student=True, failed_or_dropped=False)
144-
143+
queryset = get_user_model().objects.filter(is_student=True, failed_or_dropped=False)
145144
template_name = "academy/instructor/user_list.html"
146145

147146
def get_queryset(self):

‎portal/portal/grading/services.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,7 @@ def get_command(self, image, name, env):
7979
"run",
8080
name,
8181
"--restart=Never",
82-
"--requests='cpu=250m,memory=512Mi'",
83-
"--limits='cpu=1,memory=1Gi'",
82+
# "--requests='cpu=100m,memory=512Mi'",
8483
"--rm",
8584
"-i", # "--tty",
8685
f"--image={image}",

‎portal/portal/templates/academy/instructor/user_list.html

+3-2
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ <h1><a href="{% url 'academy:instructor-user-list' %}" class="text-dark" title="
1818
<thead>
1919
<tr>
2020
<th scope="col" rowspan="2">Name</th>
21+
<th scope="col" rowspan="2">Slack</th>
2122
<th scope="col" rowspan="2">Submission Date</th>
2223
<th scope="col" rowspan="2">Total</th>
2324
<th scope="col" rowspan="2">Eligible for graduation</th>
@@ -36,8 +37,8 @@ <h1><a href="{% url 'academy:instructor-user-list' %}" class="text-dark" title="
3637
<tbody>
3738
{% for obj in object_list %}
3839
<tr>
39-
<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>
40-
<td><a href="{% add_query_param 'submission_date' obj.submission_date %}" class="text-dark"> {{ obj.submission_date }} </a></td>
40+
<th><a href="{% add_query_param 'user_id' obj.user.id %}" class="text-dark" title="Filter by student">{{ obj.user.username }}</a></th>
41+
<td><a href="{{ workspace_url }}{{ obj.user.slack_member_id }}" target="_blank" class="text-dark">{{ obj.user.slack_member_id }}</a></td> <td><a href="{% add_query_param 'submission_date' obj.submission_date %}" class="text-dark"> {{ obj.submission_date }} </a></td>
4142
<td><a href="{% add_query_param 'score__gte' obj.total_score %}" class="text-dark">{{ obj.total_score }}&#47;{{ max_score }}</a></td>
4243
<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>
4344
{% for grade in obj.grades %}

0 commit comments

Comments
 (0)
Please sign in to comment.