From 81f0346b46861a87384bec0ef227a086141d9178 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Loguercio?= Date: Mon, 2 Nov 2015 15:28:57 -0500 Subject: [PATCH] Fix warning division by zero in gradebook (scored attendances) and check/uncheck all in attendances --- main/attendance/index.php | 6 ++++-- main/gradebook/lib/gradebook_data_generator.class.php | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/main/attendance/index.php b/main/attendance/index.php index 0a342e0f7d..f8ecde8d10 100755 --- a/main/attendance/index.php +++ b/main/attendance/index.php @@ -150,9 +150,11 @@ $(function() { var calendar_id = col_split[2]; if (this.checked) { - $(".checkboxes_col_"+calendar_id+" input:checkbox").attr("checked",true); + $(".checkboxes_col_"+calendar_id+" input:checkbox").prop("checked",true); + $(".checkboxes_col_"+calendar_id+"").addClass("row_selected"); } else { - $(".checkboxes_col_"+calendar_id+" input:checkbox").attr("checked",false); + $(".checkboxes_col_"+calendar_id+" input:checkbox").prop("checked",false); + $(".checkboxes_col_"+calendar_id+"").removeClass("row_selected"); } }); diff --git a/main/gradebook/lib/gradebook_data_generator.class.php b/main/gradebook/lib/gradebook_data_generator.class.php index 5c6c905419..3186c067dd 100755 --- a/main/gradebook/lib/gradebook_data_generator.class.php +++ b/main/gradebook/lib/gradebook_data_generator.class.php @@ -352,7 +352,7 @@ class GradebookDataGenerator case 'L' : //if ($parentId == 0) { $scoreWeight = [ - $score[0] / $score[1] * $item->get_weight(), + ($score[1] > 0) ? $score[0] / $score[1] * $item->get_weight() : 0, $item->get_weight() ]; //}