Merge branch 'fixAttendance' of https://github.com/jloguercio/chamilo-lms into jloguercio-fixAttendance

10 years ago · 3b216b356f
parent 5c4ff621c7 81f0346b46
commit 3b216b356f
2 changed files with 5 additions and 3 deletions
--- 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");
 		}
 	});

--- 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()
                        ];
                    //}