Merge pull request #320 from LDSSA/feature/card#319

Modify column Name content from username to first_name + last_name. A…

Author: brunodaemon2

__init__.py

@@ -140,7 +140,8 @@ class StudentUnitDetailView(StudentViewsMixin, BaseUnitDetailView):
 
 class InstructorUserListView(InstructorViewsMixin, ListView):
     model = get_user_model()
-    queryset = get_user_model().objects.filter(is_student=True, failed_or_dropped=False)
+    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):

portal/__init__.py

@@ -18,7 +18,9 @@ <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>
@@ -37,8 +39,10 @@ <h1><a href="{% url 'academy:instructor-user-list' %}" class="text-dark" title="
         <tbody>
         {% 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.username }}</a></th>
+            <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>