chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Minor - format code.

Browse Source
1.9.x
Julio Montoya 11 years ago
parent e637608c55
commit a609dbed32
3 changed files with 64 additions and 46 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      main/attendance/attendance_controller.php
  2. 30
      main/attendance/index.php
  3. 78
      main/inc/lib/attendance.lib.php

2
main/attendance/attendance_controller.php
Unescape View File

@ -549,7 +549,7 @@ class AttendanceController
* @param bool $showForm
* @throws ViewException
*/
public function calendarLogins($showForm = false, $exportToPdf = true)
public function getAttendanceBaseInLogin($showForm = false, $exportToPdf = true)
{
$table = null;
$formToDisplay = null;

30
main/attendance/index.php
Unescape View File

@ -92,7 +92,7 @@ if (isset($_GET['calendar_id'])) {
$attendance = new Attendance();
// attendance controller object
$attendance_controller = new AttendanceController();
$attendanceController = new AttendanceController();
$attendance_data = array();
// get attendance data
if (!empty($attendance_id)) {
@ -235,53 +235,53 @@ if ($action == 'calendar_add') {
// delete selected attendance
if (isset($_POST['action']) && $_POST['action'] == 'attendance_delete_select') {
$attendance_controller->attendance_delete($_POST['id']);
$attendanceController->attendance_delete($_POST['id']);
}
// distpacher actions to controller
switch ($action) {
case 'attendance_list':
$attendance_controller->attendance_list();
$attendanceController->attendance_list();
break;
case 'attendance_add':
if (api_is_allowed_to_edit(null, true)) {
$attendance_controller->attendance_add();
$attendanceController->attendance_add();
} else {
api_not_allowed();
}
break;
case 'attendance_edit' :
if (api_is_allowed_to_edit(null, true)) {
$attendance_controller->attendance_edit($attendance_id);
$attendanceController->attendance_edit($attendance_id);
} else {
api_not_allowed();
}
break;
case 'attendance_delete' :
if (api_is_allowed_to_edit(null, true)) {
$attendance_controller->attendance_delete($attendance_id);
$attendanceController->attendance_delete($attendance_id);
} else {
api_not_allowed();
}
break;
case 'attendance_restore':
if (api_is_allowed_to_edit(null, true)) {
$attendance_controller->attendance_restore($attendance_id);
$attendanceController->attendance_restore($attendance_id);
} else {
api_not_allowed();
}
break;
case 'attendance_sheet_list':
$attendance_controller->attendance_sheet($action, $attendance_id, $student_id, true);
$attendanceController->attendance_sheet($action, $attendance_id, $student_id, true);
break;
case 'attendance_sheet_list_no_edit':
$attendance_controller->attendance_sheet($action, $attendance_id, $student_id, false);
$attendanceController->attendance_sheet($action, $attendance_id, $student_id, false);
break;
case 'attendance_sheet_export_to_pdf':
$attendance_controller->attendance_sheet_export_to_pdf($action, $attendance_id, $student_id, $course_id);
$attendanceController->attendance_sheet_export_to_pdf($action, $attendance_id, $student_id, $course_id);
break;
case 'attendance_sheet_add' :
if (api_is_allowed_to_edit(null, true)) {
$attendance_controller->attendance_sheet($action, $attendance_id);
$attendanceController->attendance_sheet($action, $attendance_id);
} else {
api_not_allowed();
}
@ -289,7 +289,7 @@ switch ($action) {
case 'lock_attendance' :
case 'unlock_attendance' :
if (api_is_allowed_to_edit(null, true)) {
$attendance_controller->lock_attendance($action, $attendance_id);
$attendanceController->lock_attendance($action, $attendance_id);
} else {
api_not_allowed();
}
@ -302,13 +302,13 @@ switch ($action) {
api_not_allowed();
}
case 'calendar_list' :
$attendance_controller->attendance_calendar($action, $attendance_id, $calendar_id);
$attendanceController->attendance_calendar($action, $attendance_id, $calendar_id);
break;
case 'calendar_logins':
if (api_is_allowed_to_edit(null, true)) {
$attendance_controller->calendarLogins(false, true);
$attendanceController->getAttendanceBaseInLogin(false, true);
}
break;
default :
$attendance_controller->attendance_list();
$attendanceController->attendance_list();
}

78
main/inc/lib/attendance.lib.php
Unescape View File

@ -272,12 +272,12 @@ class Attendance
$value_calification = 0;
$weight_calification = floatval($this->attendance_weight);
$sql = "INSERT INTO $tbl_attendance SET
c_id = $course_id,
name ='".Database::escape_string($this->name)."',
description = '".Database::escape_string($this->description)."',
attendance_qualify_title = '$title_gradebook',
attendance_weight = '$weight_calification',
session_id = '$session_id'";
c_id = $course_id,
name ='".Database::escape_string($this->name)."',
description = '".Database::escape_string($this->description)."',
attendance_qualify_title = '$title_gradebook',
attendance_weight = '$weight_calification',
session_id = '$session_id'";
Database::query($sql);
$affected_rows = Database::affected_rows();
$last_id = 0;
@ -383,7 +383,8 @@ class Attendance
if (is_array($attendance_id)) {
foreach ($attendance_id as $id) {
$id = intval($id);
$sql = "UPDATE $tbl_attendance SET active = 1 WHERE c_id = $course_id AND id = '$id'";
$sql = "UPDATE $tbl_attendance SET active = 1
WHERE c_id = $course_id AND id = '$id'";
Database::query($sql);
$affected_rows = Database::affected_rows();
if (!empty($affected_rows)) {
@ -393,7 +394,8 @@ class Attendance
}
} else {
$attendance_id = intval($attendance_id);
$sql = "UPDATE $tbl_attendance SET active = 1 WHERE c_id = $course_id AND id = '$attendance_id'";
$sql = "UPDATE $tbl_attendance SET active = 1
WHERE c_id = $course_id AND id = '$attendance_id'";
Database::query($sql);
$affected_rows = Database::affected_rows();
if (!empty($affected_rows)) {
@ -419,7 +421,8 @@ class Attendance
if (is_array($attendance_id)) {
foreach ($attendance_id as $id) {
$id = intval($id);
$sql = "UPDATE $tbl_attendance SET active = 0 WHERE c_id = $course_id AND id = '$id'";
$sql = "UPDATE $tbl_attendance SET active = 0
WHERE c_id = $course_id AND id = '$id'";
Database::query($sql);
$affected_rows = Database::affected_rows();
if (!empty($affected_rows)) {
@ -429,7 +432,8 @@ class Attendance
}
} else {
$attendance_id = intval($attendance_id);
$sql = "UPDATE $tbl_attendance SET active = 0 WHERE c_id = $course_id AND id = '$attendance_id'";
$sql = "UPDATE $tbl_attendance SET active = 0
WHERE c_id = $course_id AND id = '$attendance_id'";
Database::query($sql);
$affected_rows = Database::affected_rows();
if (!empty($affected_rows)) {
@ -685,13 +689,18 @@ class Attendance
if (count($calendar_ids) > 0) {
$sql = "SELECT count(presence) as count_presences
FROM $tbl_attendance_sheet
WHERE c_id = $course_id AND user_id = '$uid' AND attendance_calendar_id IN(".implode(',',$calendar_ids).") AND presence = 1";
WHERE
c_id = $course_id AND
user_id = '$uid' AND
attendance_calendar_id IN(".implode(',',$calendar_ids).") AND
presence = 1";
$rs_count = Database::query($sql);
$row_count = Database::fetch_array($rs_count);
$count_presences = $row_count['count_presences'];
}
// save results
$sql = "SELECT id FROM $tbl_attendance_result WHERE c_id = $course_id AND user_id='$uid' AND attendance_id='$attendance_id'";
$sql = "SELECT id FROM $tbl_attendance_result
WHERE c_id = $course_id AND user_id='$uid' AND attendance_id='$attendance_id'";
$rs_check_result = Database::query($sql);
if (Database::num_rows($rs_check_result) > 0) {
// update result
@ -702,10 +711,10 @@ class Attendance
} else {
// insert new result
$sql = "INSERT INTO $tbl_attendance_result SET
c_id = $course_id ,
user_id = '$uid',
attendance_id = '$attendance_id',
score = '$count_presences'";
c_id = $course_id ,
user_id = '$uid',
attendance_id = '$attendance_id',
score = '$count_presences'";
Database::query($sql);
}
}
@ -746,8 +755,8 @@ class Attendance
}
// save data
$ins = "INSERT INTO $tbl_attendance_sheet_log(c_id, attendance_id, lastedit_date, lastedit_type, lastedit_user_id, calendar_date_value)
VALUES($course_id, $attendance_id, '$lastedit_date', '$lastedit_type', $lastedit_user_id, '$calendar_date_value')";
$ins = "INSERT INTO $tbl_attendance_sheet_log (c_id, attendance_id, lastedit_date, lastedit_type, lastedit_user_id, calendar_date_value)
VALUES ($course_id, $attendance_id, '$lastedit_date', '$lastedit_type', $lastedit_user_id, '$calendar_date_value')";
Database::query($ins);
@ -839,8 +848,12 @@ class Attendance
foreach ($attendances_by_course as $attendance) {
// get total faults and total weight
$total_done_attendance = $attendance['attendance_qualify_max'];
$sql = "SELECT score FROM $tbl_attendance_result
WHERE c_id = $course_id AND user_id = $user_id AND attendance_id = ".$attendance['id'];
$sql = "SELECT score
FROM $tbl_attendance_result
WHERE
c_id = $course_id AND
user_id = $user_id AND
attendance_id = ".$attendance['id'];
$rs = Database::query($sql);
$score = 0;
if (Database::num_rows($rs) > 0) {
@ -884,7 +897,10 @@ class Attendance
// Get total faults and total weight
$total_done_attendance = $attendance['attendance_qualify_max'];
$sql = "SELECT score FROM $tbl_attendance_result
WHERE c_id = {$course_info['real_id']} AND user_id=$user_id AND attendance_id=".$attendance['id'];
WHERE
c_id = {$course_info['real_id']} AND
user_id = $user_id AND
attendance_id=".$attendance['id'];
$rs = Database::query($sql);
$score = 0;
if (Database::num_rows($rs) > 0) {
@ -957,7 +973,7 @@ class Attendance
att.c_id = $course_id AND
cal.c_id = $course_id AND
att.user_id = '$user_id' AND
att.attendance_calendar_id IN(".implode(',',$calendar_ids).")
att.attendance_calendar_id IN (".implode(',',$calendar_ids).")
ORDER BY date_time";
$res = Database::query($sql);
if (Database::num_rows($res) > 0) {
@ -1014,7 +1030,7 @@ class Attendance
attendance_id = '$attendance_id' AND
done_attendance = 0
ORDER BY date_time
limit 1";
LIMIT 1";
$rs = Database::query($sql);
$next_calendar_datetime = 0;
if (Database::num_rows($rs) > 0) {
@ -1331,10 +1347,14 @@ class Attendance
$course_id = api_get_course_int_id();
// check if datetime already exists inside the table
$sql = "SELECT id FROM $tbl_attendance_calendar
WHERE c_id = $course_id AND date_time = '".Database::escape_string($this->date_time)."' AND attendance_id = '$attendance_id'";
WHERE
c_id = $course_id AND
date_time = '".Database::escape_string($this->date_time)."' AND
attendance_id = '$attendance_id'";
$rs = Database::query($sql);
if (Database::num_rows($rs) == 0) {
$sql = "UPDATE $tbl_attendance_calendar SET date_time='".Database::escape_string($this->date_time)."'
$sql = "UPDATE $tbl_attendance_calendar
SET date_time='".Database::escape_string($this->date_time)."'
WHERE c_id = $course_id AND id = '".intval($calendar_id)."'";
Database::query($sql);
$affected_rows = Database::affected_rows();
@ -1361,7 +1381,7 @@ class Attendance
{
$tbl_attendance_calendar = Database::get_course_table(TABLE_ATTENDANCE_CALENDAR);
$tbl_attendance_sheet = Database::get_course_table(TABLE_ATTENDANCE_SHEET);
$session_id = api_get_session_id();
$attendance_id = intval($attendance_id);
// get all registered users inside current course
$users = $this->get_users_rel_course();
@ -1488,7 +1508,7 @@ class Attendance
* @param string $startDate in UTC time
* @param string $endDate in UTC time
*
* @return string
* @return array
*/
public function getAttendanceLogin($startDate, $endDate)
{
@ -1633,7 +1653,7 @@ class Attendance
$table = new HTML_Table(array('class' => 'data_table'));
$table->setHeaderContents(0, 0, get_lang('User'));
$table->setHeaderContents(0, 1, get_lang('Dates'));
$table->setHeaderContents(0, 1, get_lang('Date'));
$row = 1;
foreach ($users as $user) {
@ -1646,8 +1666,6 @@ class Attendance
}
$column = 1;
$results[15]['2010-04-11'] = true;
$results[15]['2010-04-13'] = true;
foreach ($users as $user) {
if (isset($results[$user['user_id']]) &&

Write Preview
Loading…
Cancel
Save