diff --git a/lms/static/coffee/src/peer_grading/peer_grading.coffee b/lms/static/coffee/src/peer_grading/peer_grading.coffee index 0736057df8..3602f1a030 100644 --- a/lms/static/coffee/src/peer_grading/peer_grading.coffee +++ b/lms/static/coffee/src/peer_grading/peer_grading.coffee @@ -9,5 +9,19 @@ class PeerGrading @message_container = $('.message-container') @message_container.toggle(not @message_container.is(':empty')) + + @problem_list = $('.problem-list') + @construct_progress_bar() + + construct_progress_bar: () => + problems = @problem_list.find('tr').next() + problems.each( (index, element) => + problem = $(element) + progress_bar = problem.find('.progress-bar') + bar_value = parseInt(problem.data('graded')) + bar_max = parseInt(problem.data('required')) + progress_bar.progressbar({value: bar_value, max: bar_max}) + ) + $(document).ready(() -> new PeerGrading()) diff --git a/lms/static/coffee/src/staff_grading/staff_grading.coffee b/lms/static/coffee/src/staff_grading/staff_grading.coffee index 446aafee4a..3a05a4dfec 100644 --- a/lms/static/coffee/src/staff_grading/staff_grading.coffee +++ b/lms/static/coffee/src/staff_grading/staff_grading.coffee @@ -343,9 +343,10 @@ class StaffGrading @problem_list.html(''' Problem Name - Number Graded - Number Pending - Number Required + Graded + Pending + Required + Progress ''') @breadcrumbs.html('') @@ -389,10 +390,15 @@ class StaffGrading render_list: () -> for problem in @problems problem_row = $('') - problem_row.append($('').append(@problem_link(problem))) + problem_row.append($('').append(@problem_link(problem))) problem_row.append($('').append("#{problem.num_graded}")) problem_row.append($('').append("#{problem.num_pending}")) problem_row.append($('').append("#{problem.num_required}")) + row_progress_bar = $('
').addClass('progress-bar') + progress_value = parseInt(problem.num_graded) + progress_max = parseInt(problem.num_pending) + progress_value + row_progress_bar.progressbar({value: progress_value, max: progress_max}) + problem_row.append($('').append(row_progress_bar)) @problem_list.append(problem_row) render_problem: () -> diff --git a/lms/static/sass/course/_staff_grading.scss b/lms/static/sass/course/_staff_grading.scss index 6023c48dfa..347714fcd9 100644 --- a/lms/static/sass/course/_staff_grading.scss +++ b/lms/static/sass/course/_staff_grading.scss @@ -29,11 +29,28 @@ div.peer-grading{ display: none; } - ul + .problem-list { - li + text-align: center; + table-layout: auto; + width:100%; + th { - margin: 16px 0px; + padding: 10px; + } + td + { + padding:10px; + } + td.problem-name + { + text-align:left; + } + .ui-progressbar + { + height:1em; + margin:0px; + padding:0px; } } diff --git a/lms/templates/peer_grading/peer_grading.html b/lms/templates/peer_grading/peer_grading.html index 1ab51f5a19..901d34bf27 100644 --- a/lms/templates/peer_grading/peer_grading.html +++ b/lms/templates/peer_grading/peer_grading.html @@ -30,14 +30,15 @@ - - - + + + + %for problem in problem_list: - - + + %endfor
Problem NameNumber GradedNumber PendingNumber RequiredGradedPendingRequiredProgress
- ${problem['problem_name']} +
+ ${problem['problem_name']} ${problem['num_graded']} @@ -48,6 +49,10 @@ ${problem['num_required']} +
+
+