Skip to content

E
edx-proctoring
Commit 1a8fde10 by Muhammad Shoaib
Options

1 ) added the condition on the attempts section. If there is no attempts then… 

1 ) added the condition on the attempts section. If there is no attempts then the header section shouldn't be visible.
2) accordion pane content behavior fix
parent 7ab4c451
Showing with 44 additions and 43 deletions
edx_proctoring/static/proctoring/js/views/proctored_exam_allowance_view.js
...@@ -123,7 +123,6 @@ var edx = edx || {}; ...@@ -123,7 +123,6 @@ var edx = edx || {};
if (this.template !== null) { if (this.template !== null) {
var html = this.template({proctored_exam_allowances: this.collection.toJSON()}); var html = this.template({proctored_exam_allowances: this.collection.toJSON()});
this.$el.html(html); this.$el.html(html);
this.$el.show();
} }
}, },
showAddModal: function (event) { showAddModal: function (event) {
......
edx_proctoring/static/proctoring/js/views/proctored_exam_attempt_view.js
...@@ -125,7 +125,6 @@ var edx = edx || {}; ...@@ -125,7 +125,6 @@ var edx = edx || {};
_.extend(data, viewHelper); _.extend(data, viewHelper);
var html = this.template(data); var html = this.template(data);
this.$el.html(html); this.$el.html(html);
this.$el.show();
} }
}, },
onRemoveAttempt: function (event) { onRemoveAttempt: function (event) {
......
edx_proctoring/static/proctoring/templates/student-proctored-exam-attempts.underscore
...@@ -75,47 +75,50 @@ ...@@ -75,47 +75,50 @@
</ul> </ul>
<div class="clearfix"></div> <div class="clearfix"></div>
</div> </div>
<table class="exam-attempts-table"> <% var is_proctored_attempts = proctored_exam_attempts.length !== 0 %>
<thead> <% if (is_proctored_attempts) { %>
<tr class="exam-attempt-headings"> <table class="exam-attempts-table">
<th class="username"><%- gettext("Username") %></th> <thead>
<th class="exam-name"><%- gettext("Exam Name") %></th> <tr class="exam-attempt-headings">
<th class="attempt-allowed-time"><%- gettext("Allowed Time (Minutes)") %> </th> <th class="username"><%- gettext("Username") %></th>
<th class="attempt-started-at"><%- gettext("Started At") %></th> <th class="exam-name"><%- gettext("Exam Name") %></th>
<th class="attempt-completed-at"><%- gettext("Completed At") %> </th> <th class="attempt-allowed-time"><%- gettext("Allowed Time (Minutes)") %> </th>
<th class="attempt-status"><%- gettext("Status") %> </th> <th class="attempt-started-at"><%- gettext("Started At") %></th>
<th class="c_action"><%- gettext("Action") %> </th> <th class="attempt-completed-at"><%- gettext("Completed At") %> </th>
</tr> <th class="attempt-status"><%- gettext("Status") %> </th>
</thead> <th class="c_action"><%- gettext("Action") %> </th>
<tbody>
<% _.each(proctored_exam_attempts, function(proctored_exam_attempt){ %>
<tr class="allowance-items">
<td>
<%- interpolate(gettext(' %(username)s '), { username: proctored_exam_attempt.user.username }, true) %>
</td>
<td>
<%- interpolate(gettext(' %(exam_display_name)s '), { exam_display_name: proctored_exam_attempt.proctored_exam.exam_name }, true) %>
</td>
<td> <%= proctored_exam_attempt.allowed_time_limit_mins %></td>
<td> <%= getDateFormat(proctored_exam_attempt.started_at) %></td>
<td> <%= getDateFormat(proctored_exam_attempt.completed_at) %></td>
<td>
<% if (proctored_exam_attempt.status){ %>
<%= proctored_exam_attempt.status %>
<% } else { %>
N/A
<% } %>
</td>
<td>
<% if (proctored_exam_attempt.status){ %>
<a href="#" class="remove-attempt" data-attempt-id="<%= proctored_exam_attempt.id %>" >[x]</a>
</td>
<% } else { %>
N/A
<% } %>
</tr> </tr>
<% }); %> </thead>
</tbody> <tbody>
</table> <% _.each(proctored_exam_attempts, function(proctored_exam_attempt){ %>
<tr class="allowance-items">
<td>
<%- interpolate(gettext(' %(username)s '), { username: proctored_exam_attempt.user.username }, true) %>
</td>
<td>
<%- interpolate(gettext(' %(exam_display_name)s '), { exam_display_name: proctored_exam_attempt.proctored_exam.exam_name }, true) %>
</td>
<td> <%= proctored_exam_attempt.allowed_time_limit_mins %></td>
<td> <%= getDateFormat(proctored_exam_attempt.started_at) %></td>
<td> <%= getDateFormat(proctored_exam_attempt.completed_at) %></td>
<td>
<% if (proctored_exam_attempt.status){ %>
<%= proctored_exam_attempt.status %>
<% } else { %>
N/A
<% } %>
</td>
<td>
<% if (proctored_exam_attempt.status){ %>
<a href="#" class="remove-attempt" data-attempt-id="<%= proctored_exam_attempt.id %>" >[x]</a>
</td>
<% } else { %>
N/A
<% } %>
</tr>
<% }); %>
</tbody>
</table>
<%} %>
</section> </section>
</div> </div>
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