Browse Source

Minor - UI changes see BT#9421

Julio Montoya 10 years ago
parent
commit
5db9e54046

+ 3 - 3
main/attendance/attendance_controller.php

@@ -452,11 +452,11 @@ class AttendanceController
     {
         $attendance = new Attendance();
         $courseInfo = CourseManager::get_course_information($course_id);
-
         $attendance->set_course_id($courseInfo['code']);
+        $groupId = isset($_REQUEST['group_id']) ? $_REQUEST['group_id'] : null;
         $data_array = array();
         $data_array['attendance_id'] = $attendance_id;
-        $data_array['users_in_course'] = $attendance->get_users_rel_course($attendance_id);
+        $data_array['users_in_course'] = $attendance->get_users_rel_course($attendance_id, $groupId);
 
         $filter_type = 'today';
 
@@ -470,7 +470,7 @@ class AttendanceController
             $filter_type = 'calendar_id';
         }
 
-        $data_array['attendant_calendar'] = $attendance->get_attendance_calendar($attendance_id, $filter_type, $my_calendar_id);
+        $data_array['attendant_calendar'] = $attendance->get_attendance_calendar($attendance_id, $filter_type, $my_calendar_id, $groupId);
 
         if (api_is_allowed_to_edit(null, true) || api_is_drh()) {
             $data_array['users_presence'] = $attendance->get_users_attendance_sheet($attendance_id);

+ 2 - 2
main/attendance/attendance_sheet.php

@@ -109,9 +109,9 @@ if (api_is_allowed_to_edit(null, true) ||
         echo '<div class="actions">';
         echo '<a style="float:left;" href="index.php?'.api_get_cidreq().'&action=calendar_list&attendance_id='.$attendance_id.$param_gradebook.'">'.
             Display::return_icon('attendance_calendar.png',get_lang('AttendanceCalendar'),'',ICON_SIZE_MEDIUM).'</a>';
-        if (count($users_in_course) > 0) {
+        //if (count($users_in_course) > 0) {
             $form->display();
-        }
+        //}
         echo '<a id="pdf_export" style="float:left;"  href="index.php?'.api_get_cidreq().'&action=attendance_sheet_export_to_pdf&attendance_id='.$attendance_id.$param_gradebook.'&filter='.$default_filter.'">'.
             Display::return_icon('pdf.png',get_lang('ExportToPDF'),'',ICON_SIZE_MEDIUM).'</a>';
         echo '</div>';

+ 2 - 1
main/inc/lib/attendance.lib.php

@@ -587,6 +587,7 @@ class Attendance
 				'',
 				'lastname'
 			);
+
 			if (!empty($groupId)) {
 				$students = GroupManager::getStudents($groupId);
 				if (!empty($students)) {
@@ -604,7 +605,7 @@ class Attendance
 			$uid = $user_data['user_id'];
 			$status = $user_data['status'];
 
-			if (!empty($studentInGroup)) {
+			if (!empty($groupId)) {
 				if (!isset($studentInGroup[$uid])) {
 					continue;
 				}