Commit 442f91ed by chrisndodge

Merge pull request #152 from edx/hasnain-naveed/SOL-1221

SOL-1221
parents e34ca44f 16c45369
...@@ -153,6 +153,18 @@ var edx = edx || {}; ...@@ -153,6 +153,18 @@ var edx = edx || {};
end_page = data_json.pagination_info.total_pages; end_page = data_json.pagination_info.total_pages;
} }
_.each(data_json.proctored_exam_attempts, function(proctored_exam_attempt) {
if (proctored_exam_attempt.taking_as_proctored) {
if (proctored_exam_attempt.is_sample_attempt) {
proctored_exam_attempt.exam_attempt_type = gettext('Practice');
} else {
proctored_exam_attempt.exam_attempt_type = gettext('Proctored');
}
} else {
proctored_exam_attempt.exam_attempt_type = gettext('Timed');
}
});
var data = { var data = {
proctored_exam_attempts: data_json.proctored_exam_attempts, proctored_exam_attempts: data_json.proctored_exam_attempts,
pagination_info: data_json.pagination_info, pagination_info: data_json.pagination_info,
......
...@@ -82,6 +82,7 @@ ...@@ -82,6 +82,7 @@
<th class="username"><%- gettext("Username") %></th> <th class="username"><%- gettext("Username") %></th>
<th class="exam-name"><%- gettext("Exam Name") %></th> <th class="exam-name"><%- gettext("Exam Name") %></th>
<th class="attempt-allowed-time"><%- gettext("Time Limit") %> </th> <th class="attempt-allowed-time"><%- gettext("Time Limit") %> </th>
<th class="attempt-type"><%- gettext("Type") %> </th>
<th class="attempt-started-at"><%- gettext("Started At") %></th> <th class="attempt-started-at"><%- gettext("Started At") %></th>
<th class="attempt-completed-at"><%- gettext("Completed At") %> </th> <th class="attempt-completed-at"><%- gettext("Completed At") %> </th>
<th class="attempt-status"><%- gettext("Status") %> </th> <th class="attempt-status"><%- gettext("Status") %> </th>
...@@ -99,6 +100,7 @@ ...@@ -99,6 +100,7 @@
<%- interpolate(gettext(' %(exam_display_name)s '), { exam_display_name: proctored_exam_attempt.proctored_exam.exam_name }, true) %> <%- interpolate(gettext(' %(exam_display_name)s '), { exam_display_name: proctored_exam_attempt.proctored_exam.exam_name }, true) %>
</td> </td>
<td> <%= proctored_exam_attempt.allowed_time_limit_mins %></td> <td> <%= proctored_exam_attempt.allowed_time_limit_mins %></td>
<td> <%= proctored_exam_attempt.exam_attempt_type %></td>
<td> <%= getDateFormat(proctored_exam_attempt.started_at) %></td> <td> <%= getDateFormat(proctored_exam_attempt.started_at) %></td>
<td> <%= getDateFormat(proctored_exam_attempt.completed_at) %></td> <td> <%= getDateFormat(proctored_exam_attempt.completed_at) %></td>
<td> <td>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment