diff --git a/main/attendance/index.php b/main/attendance/index.php index 4ebde100c0..f7b24c27e3 100755 --- a/main/attendance/index.php +++ b/main/attendance/index.php @@ -2,7 +2,8 @@ /* For licensing terms, see /license.txt */ /** - * Template (front controller in MVC pattern) used for distpaching to the controllers depend on the current action + * Template (front controller in MVC pattern) used for dispatching + * to the controllers depend on the current action * @author Christian Fasanando * @author Julio Montoya Bug fixing, sql improvements * @@ -111,7 +112,6 @@ $(function() { $("#hidden_input_"+calendar_id).attr("value",""); $("#hidden_input_"+calendar_id).attr("disabled",true); return false; - } else { //Unlock $(".checkbox_head_"+calendar_id).attr("disabled", false); @@ -269,7 +269,7 @@ switch ($action) { case 'attendance_sheet_export_to_pdf': $attendanceController->attendance_sheet_export_to_pdf($action, $attendance_id, $student_id, $course_id); break; - case 'attendance_sheet_add' : + case 'attendance_sheet_add': if (api_is_allowed_to_edit(null, true)) { $attendanceController->attendance_sheet($action, $attendance_id); } else { diff --git a/main/inc/lib/attendance.lib.php b/main/inc/lib/attendance.lib.php index 7b3070320b..7c497c1cb0 100755 --- a/main/inc/lib/attendance.lib.php +++ b/main/inc/lib/attendance.lib.php @@ -1976,8 +1976,7 @@ class Attendance */ public function getAttendanceLogin($startDate, $endDate) { - if ( - empty($startDate) || $startDate == '0000-00-00' || $startDate == '0000-00-00 00:00:00' || + if (empty($startDate) || $startDate == '0000-00-00' || $startDate == '0000-00-00 00:00:00' || empty($endDate) || $endDate == '0000-00-00' || $endDate == '0000-00-00 00:00:00' ) { return false; @@ -2056,7 +2055,6 @@ class Attendance public function getAttendanceLoginTable($startDate, $endDate) { $data = $this->getAttendanceLogin($startDate, $endDate); - if (!$data) { return null; } @@ -2120,7 +2118,6 @@ class Attendance $results = $data['results']; $table = new HTML_Table(array('class' => 'data_table')); - $table->setHeaderContents(0, 0, get_lang('User')); $table->setHeaderContents(0, 1, get_lang('Date'));