remove total grade tooltip when groups are weighted
fixes CNVS-10777 test plan: - As teacher go to GB2 - When assignment groups are weighted, total grade should not have a tooltip - When assignment groups are not weighted, tooltip should display normally - As a student to to grade summary page - When assignment groups are weighted, total grade should not have a tooltip - When assignment groups are not weighted, tooltip should display normally Change-Id: I80db6ddfff15116a2660e387fc517149cfc0f602 Reviewed-on: https://gerrit.instructure.com/29279 Reviewed-by: Matthew Irish <mirish@instructure.com> Tested-by: Jenkins <jenkins@instructure.com> QA-Review: Caleb Guanzon <cguanzon@instructure.com> Product-Review: Mike Nomitch <mnomitch@instructure.com>
This commit is contained in:
parent
8e5687a45a
commit
46a0cfa0fd
|
@ -498,7 +498,7 @@ define [
|
|||
templateOpts.warning = @totalGradeWarning
|
||||
templateOpts.lastColumn = true
|
||||
templateOpts.showPointsNotPercent = @displayPointTotals()
|
||||
|
||||
templateOpts.hideTooltip = @weightedGroups() and not @totalGradeWarning
|
||||
groupTotalCellTemplate templateOpts
|
||||
|
||||
htmlContentFormatter: (row, col, val, columnDef, student) =>
|
||||
|
|
|
@ -1,19 +1,21 @@
|
|||
<div class="gradebook-cell">
|
||||
<div class="gradebook-tooltip {{#if lastColumn}}gradebook-tooltip-last{{/if}}">
|
||||
{{#if warning}}
|
||||
{{warning}}
|
||||
{{else}}
|
||||
{{#unless showPointsNotPercent}}
|
||||
{{score}} / {{possible}}
|
||||
{{#unless hideTooltip}}
|
||||
<div class="gradebook-tooltip {{#if lastColumn}}gradebook-tooltip-last{{/if}}">
|
||||
{{#if warning}}
|
||||
{{warning}}
|
||||
{{else}}
|
||||
{{#if possible}}
|
||||
{{percentage}}%
|
||||
{{#unless showPointsNotPercent}}
|
||||
{{score}} / {{possible}}
|
||||
{{else}}
|
||||
-
|
||||
{{/if}}
|
||||
{{/unless}}
|
||||
{{/if}}
|
||||
</div>
|
||||
{{#if possible}}
|
||||
{{percentage}}%
|
||||
{{else}}
|
||||
-
|
||||
{{/if}}
|
||||
{{/unless}}
|
||||
{{/if}}
|
||||
</div>
|
||||
{{/unless}}
|
||||
<span class="percentage">
|
||||
{{#if warning}}
|
||||
<i class="icon-warning final-warning"></i>
|
||||
|
|
|
@ -87,6 +87,9 @@ define([
|
|||
var $finalGradeRow = $(".student_assignment.final_grade");
|
||||
$finalGradeRow.find(".grade").text(finalGrade);
|
||||
$finalGradeRow.find(".score_teaser").text(teaserText);
|
||||
if (groupWeightingScheme == "percent") {
|
||||
$finalGradeRow.find(".score_teaser").hide()
|
||||
}
|
||||
|
||||
if(ENV.grading_scheme) {
|
||||
$(".final_letter_grade .grade").text(GradeCalculator.letter_grade(ENV.grading_scheme, scoreAsPercent));
|
||||
|
|
Loading…
Reference in New Issue