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

Merge

Browse Source
skala
Julio Montoya 15 years ago
parent c83cfe135c 280fd7ed6e
commit dc590b736f
11 changed files with 455 additions and 291 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. 31
      index.php
  2. 92
      main/attendance/attendance_controller.php
  3. 467
      main/attendance/attendance_sheet.php
  4. 2
      main/course_progress/thematic_controller.php
  5. 5
      main/css/chamilo/default.css
  6. 6
      main/css/chamilo_electric_blue/default.css
  7. 7
      main/css/chamilo_green/default.css
  8. 7
      main/css/chamilo_orange/default.css
  9. 7
      main/css/chamilo_red/default.css
  10. 118
      main/inc/lib/attendance.lib.php
  11. 4
      main/inc/lib/document.lib.php

31
index.php
Unescape View File

@ -199,19 +199,20 @@ if (!empty($_GET['include']) && preg_match('/^[a-zA-Z0-9_-]*\.html$/', $_GET['in
echo $open;
}
// Display System announcements
$announcement = isset($_GET['announcement']) ? $_GET['announcement'] : -1;
$announcement = intval($announcement);
if (isset($_user['user_id'])) {
$visibility = api_is_allowed_to_create_course() ? VISIBLE_TEACHER : VISIBLE_STUDENT;
SystemAnnouncementManager :: display_announcements($visibility, $announcement);
} else {
SystemAnnouncementManager :: display_announcements(VISIBLE_GUEST, $announcement);
}
// Display courses and category list
if (!$page_included) {
// Display System announcements
$announcement = isset($_GET['announcement']) ? $_GET['announcement'] : -1;
$announcement = intval($announcement);
if (isset($_user['user_id'])) {
$visibility = api_is_allowed_to_create_course() ? VISIBLE_TEACHER : VISIBLE_STUDENT;
SystemAnnouncementManager :: display_announcements($visibility, $announcement);
} else {
SystemAnnouncementManager :: display_announcements(VISIBLE_GUEST, $announcement);
}
if (api_get_setting('display_categories_on_homepage') == 'true') {
echo '<div class="home_cats">';
display_anonymous_course_list();
@ -225,14 +226,10 @@ echo '<div class="menu" id="menu">';
display_anonymous_right_menu();
echo '</div>';
/*
Footer
*/
/* Footer */
Display :: display_footer();
/*
Functions
*/
/* Functions */
/**
* This function handles the logout and is called whenever there is a $_GET['logout']

92
main/attendance/attendance_controller.php
Unescape View File

@ -185,7 +185,10 @@
$data['attendance_id'] = $attendance_id;
$data['users_in_course'] = $attendance->get_users_rel_course($attendance_id);
$data['attendant_calendar'] = $attendance->get_attendance_calendar($attendance_id);
$filter_type = 'today';
if (!empty($_REQUEST['filter'])) {
$filter_type = $_REQUEST['filter'];
}
if (api_is_allowed_to_edit(null, true)) {
$data['users_presence'] = $attendance->get_users_attendance_sheet($attendance_id);
@ -216,10 +219,12 @@
}
$data['users_in_course'] = $attendance->get_users_rel_course($attendance_id);
$data['attendant_calendar'] = $attendance->get_attendance_calendar($attendance_id);
$data['attendant_calendar'] = $attendance->get_attendance_calendar($attendance_id, $filter_type);
$data['users_presence'] = $attendance->get_users_attendance_sheet($attendance_id);
$data['next_attendance_calendar_id'] = $attendance->get_next_attendance_calendar_id($attendance_id);
$data['next_attendance_calendar_datetime'] = $attendance->get_next_attendance_calendar_datetime($attendance_id);
} else {
$data['attendant_calendar'] = $attendance->get_attendance_calendar($attendance_id,$filter_type);
}
$this->view->set_data($data);
@ -243,50 +248,49 @@
$data['attendance_id'] = $attendance_id;
$attendance_id = intval($attendance_id);
if ($action == 'calendar_add') {
if ($action == 'calendar_add') {
if (strtoupper($_SERVER['REQUEST_METHOD']) == "POST") {
if (!isset($_POST['cancel'])) {
if (isset($_POST['repeat'])) {
$start_datetime = api_strtotime($attendance->build_datetime_from_array($_POST['date_time']));
$_POST['end_date_time']['H'] = $_POST['date_time']['H'];
$_POST['end_date_time']['i'] = $_POST['date_time']['i'];
$end_datetime = api_strtotime($attendance->build_datetime_from_array($_POST['end_date_time']));
$checkdate = checkdate($_POST['end_date_time']['F'], $_POST['end_date_time']['d'], $_POST['end_date_time']['Y']);
$repeat_type = $_POST['repeat_type'];
if (($end_datetime > $start_datetime) && $checkdate) {
$affected_rows = $attendance->attendance_repeat_calendar_add($attendance_id, $start_datetime, $end_datetime, $repeat_type);
$action = 'calendar_list';
} else {
if (!$checkdate) {
$data['error_checkdate'] = true;
} else {
$data['error_repeat_date'] = true;
}
$data['repeat'] = true;
$action = 'calendar_add';
}
} else {
$datetime = $attendance->build_datetime_from_array($_POST['date_time']);
$datetimezone = api_get_utc_datetime($datetime);
if (!empty($datetime)) {
$attendance->set_date_time($datetimezone);
$affected_rows = $attendance->attendance_calendar_add($attendance_id);
$action = 'calendar_list';
} else {
$data['error_date'] = true;
$action = 'calendar_add';
}
}
if (!isset($_POST['cancel'])) {
if (isset($_POST['repeat'])) {
error_log($attendance->build_datetime_from_array($_POST['date_time']));
//$start_datetime = api_strtotime($attendance->build_datetime_from_array($_POST['date_time']));
$start_datetime = api_strtotime(api_get_utc_datetime($attendance->build_datetime_from_array($_POST['date_time'])),'UTC');
error_log('$start_datetime '.$start_datetime);
$_POST['end_date_time']['H'] = $_POST['date_time']['H'];
$_POST['end_date_time']['i'] = $_POST['date_time']['i'];
error_log($attendance->build_datetime_from_array($_POST['end_date_time']));
$end_datetime = api_strtotime(api_get_utc_datetime($attendance->build_datetime_from_array($_POST['end_date_time'])),'UTC');
error_log('$end_datetime '.$end_datetime);
$checkdate = checkdate($_POST['end_date_time']['F'], $_POST['end_date_time']['d'], $_POST['end_date_time']['Y']);
$repeat_type = $_POST['repeat_type'];
if (($end_datetime > $start_datetime) && $checkdate) {
$affected_rows = $attendance->attendance_repeat_calendar_add($attendance_id, $start_datetime, $end_datetime, $repeat_type);
$action = 'calendar_list';
} else {
if (!$checkdate) {
$data['error_checkdate'] = true;
} else {
$data['error_repeat_date'] = true;
}
$data['repeat'] = true;
$action = 'calendar_add';
}
} else {
$datetime = $attendance->build_datetime_from_array($_POST['date_time']);
$datetimezone = api_get_utc_datetime($datetime);
if (!empty($datetime)) {
$attendance->set_date_time($datetimezone);
$affected_rows = $attendance->attendance_calendar_add($attendance_id);
$action = 'calendar_list';
} else {
$data['error_date'] = true;
$action = 'calendar_add';
}
}
} else {
$action = 'calendar_list';
}

467
main/attendance/attendance_sheet.php
Unescape View File

@ -2,8 +2,9 @@
/* For licensing terms, see /license.txt */
/**
* View (MVC patter) for attendance sheet (list, edit, add)
* View (MVC patter) for attendance sheet (list, edit, add)
* @author Christian Fasanando <christian1827@gmail.com>
* @author Julio Montoya reworked 2010
* @package chamilo.attendance
*/
@ -11,198 +12,300 @@
api_protect_course_script(true);
if (api_is_allowed_to_edit(null, true)) {
$param_gradebook = '';
if (isset($_SESSION['gradebook'])) {
$param_gradebook = '&gradebook='.$_SESSION['gradebook'];
}
echo '<div class="actions" style="margin-bottom:30px">';
echo '<a href="index.php?'.api_get_cidreq().'&action=calendar_list&attendance_id='.$attendance_id.$param_gradebook.'">'.Display::return_icon('calendar_up.gif',get_lang('AttendanceCalendar')).' '.get_lang('AttendanceCalendar').'</a>';
echo '</div>';
$param_gradebook = '';
if (isset($_SESSION['gradebook'])) {
$param_gradebook = '&gradebook='.$_SESSION['gradebook'];
}
if (!$is_locked_attendance || api_is_platform_admin()) {
echo '<div class="actions" style="margin-bottom:30px">';
echo '<a href="index.php?'.api_get_cidreq().'&action=calendar_list&attendance_id='.$attendance_id.$param_gradebook.'">'.Display::return_icon('calendar_up.gif',get_lang('AttendanceCalendar')).' '.get_lang('AttendanceCalendar').'</a>';
echo '</div>';
}
$message_information = get_lang('AttendanceSheetDescription');
if (!empty($message_information)) {
$message = '<strong>'.get_lang('Information').'</strong><br />';
$message .= $message_information;
Display::display_normal_message($message, false);
}
$message_information = get_lang('AttendanceSheetDescription');
if (!empty($message_information)) {
$message = '<strong>'.get_lang('Information').'</strong><br />';
$message .= $message_information;
Display::display_normal_message($message, false);
}
?>
<?php
if (count($users_in_course) > 0) {
?>
<form method="post" action="index.php?action=attendance_sheet_add&<?php echo api_get_cidreq().$param_gradebook ?>&attendance_id=<?php echo $attendance_id?>" >
if ($is_locked_attendance) {
Display::display_warning_message(get_lang('TheAttendanceSheetIsLocked'), false);
}
$form = new FormValidator('filter', 'post', 'index.php?action=attendance_sheet_add&'.api_get_cidreq().$param_gradebook.'&attendance_id='.$attendance_id);
$values = array('all'=>get_lang('All'), 'today'=>get_lang('Today'),'all_done'=>get_lang('AllDone'), 'all_not_done'=>get_lang('AllNotDone'));
$form->addElement('select', 'filter', 'Filter', $values);
$form->addElement('style_submit_button', null, get_lang('Filter'), 'class="filter"');
if (isset($_REQUEST['filter'])) {
if (in_array($_REQUEST['filter'],array_keys($values))) {
$default_filter = $_REQUEST['filter'];
}
} else {
$default_filter = 'today';
}
$form->setDefaults(array('filter'=>$default_filter));
$param_filter = '&filter='.Security::remove_XSS($default_filter);
<div class="attendance-sheet-content" style="width:100%;background-color:#E1E1E1;border:1px solid gray;margin-top:20px;">
if (count($users_in_course) > 0) {
$form->display();
?>
<script type="text/javascript">
function UpdateTableHeaders() {
$("div.divTableWithFloatingHeader").each(function() {
var originalHeaderRow = $(".tableFloatingHeaderOriginal", this);
var floatingHeaderRow = $(".tableFloatingHeader", this);
var offset = $(this).offset();
var scrollTop = $(window).scrollTop();
if ((scrollTop > offset.top) && (scrollTop < offset.top + $(this).height())) {
floatingHeaderRow.css("visibility", "hidden");
floatingHeaderRow.css("top", Math.min(scrollTop - offset.top, $(this).height() - floatingHeaderRow.height()) + "px");
<div class="attendance-users-table" style="width:40%;float:left;margin:0px;padding:0px;">
<table class="data_table" width="100%">
<tr class="row_odd" >
<th height="65px" width="25px" ><?php echo get_lang('DisplayOrder')?></th>
<th width="30px" ><?php echo get_lang('Photo')?></th>
<?php if (api_is_western_name_order()) { ?>
<th><?php echo get_lang('FirstName')?></th>
<th><?php echo get_lang('LastName')?></th>
<?php } else { ?>
<th><?php echo get_lang('LastName')?></th>
<th><?php echo get_lang('FirstName')?></th>
<?php } ?>
<th width="100px"><?php echo get_lang('AttendancesFaults')?></th>
</tr>
<?php
$i = 1;
$class = '';
// Copy cell widths from original header
$("th", floatingHeaderRow).each(function(index) {
var cellWidth = $("th", originalHeaderRow).eq(index).css('width');
$(this).css('width', cellWidth);
});
foreach ($users_in_course as $data) {
$faults = 0;
if ($i%2 == 0) {$class='row_odd';}
else {$class='row_even';}
?>
<tr class="<?php echo $class ?>">
<td height="50px"><center><?php echo $i ?></center></td>
<td><?php echo $data['photo'] ?></td>
<?php if (api_is_western_name_order()) { ?>
<td><?php echo $data['firstname'] ?></td>
<td><?php echo $data['lastname'] ?></td>
<?php } else { ?>
<td><?php echo $data['lastname'] ?></td>
<td><?php echo $data['firstname'] ?></td>
<?php } ?>
<td><center><div class="attendance-faults-bar" style="background-color:<?php echo (!empty($data['result_color_bar'])?$data['result_color_bar']:'none') ?>"><?php echo $data['attendance_result'] ?></div></center></td>
</tr>
<?php
$i++;
}
?>
</table>
</div>
// Copy row width from whole table
floatingHeaderRow.css("width", $(this).css("width"));
floatingHeaderRow.css("visibility", "visible");
} else {
floatingHeaderRow.css("visibility", "hidden");
floatingHeaderRow.css("top", "0px");
}
});
}
<div class="attendance-calendar-table" style="margin:0px;padding:0px;float:right;width:60%;overflow:auto;overflow-y:hidden;">
<table class="data_table" width="100%">
<tr class="row_odd">
<?php
if (count($attendant_calendar) > 0 ) {
foreach ($attendant_calendar as $calendar) {
$date = $calendar['date'];
$time = $calendar['time'];
$datetime = $date.'<br />'.$time;
$(document).ready(function() {
$("table.tableWithFloatingHeader").each(function() {
$(this).wrap("<div class=\"divTableWithFloatingHeader\" style=\"position:relative\"></div>");
$img_lock = Display::return_icon('lock.gif',get_lang('DateUnLock'),array('class'=>'img_lock','id'=>'datetime_column_'.$calendar['id']));
if (!empty($calendar['done_attendance'])){
$datetime = '<font color="blue">'.$date.'<br />'.$time.'</font>';
}
$disabled_check = 'disabled';
$input_hidden = '<input type="hidden" id="hidden_input_'.$calendar['id'].'" name="hidden_input[]" value="" disabled />';
if ($next_attendance_calendar_id == $calendar['id']) {
$input_hidden = '<input type="hidden" id="hidden_input_'.$calendar['id'].'" name="hidden_input[]" value="'.$calendar['id'].'" />';
$disabled_check = '';
$img_lock = Display::return_icon('unlock.gif',get_lang('DateLock'),array('class'=>'img_unlock','id'=>'datetime_column_'.$calendar['id']));
}
?>
<th height="65px" style="padding:1px 5px;" ><?php echo '<center><div style="font-size:10px;min-width:80px;width:80px;">'.$datetime.'&nbsp;<span id="attendance_lock" style="cursor:pointer">'.$img_lock.'</span><br /><input type="checkbox" id="checkbox_head_'.$calendar['id'].'" '.$disabled_check.' checked />'.$input_hidden.'</div></center>' ?></th>
<?php }
} else { ?>
<th height="65px" style="padding:5px;"><span><a href="index.php?<?php echo api_get_cidreq() ?>&action=calendar_list&attendance_id=<?php echo $attendance_id.$param_gradebook ?>">
<?php echo Display::return_icon('calendar_up.gif',get_lang('AttendanceCalendar')).' '.get_lang('GoToAttendanceCalendar') ?></a></span></th>
<?php } ?>
</tr>
<?php
$i = 0;
foreach ($users_in_course as $user) {
$class = '';
if ($i%2==0) {$class = 'row_even';}
else {$class = 'row_odd';}
?>
<tr class="<?php echo $class ?>">
<?php
if (count($attendant_calendar) > 0 ) {
foreach ($attendant_calendar as $key => $calendar) {
//error_log(print_r($calendar,1));
$checked = 'checked';
// if the
if (isset($users_presence[$user['user_id']][$calendar['id']]['presence'])) {
$presence = $users_presence[$user['user_id']][$calendar['id']]['presence'];
if (intval($presence) == 1) {
$checked = 'checked';
} else {
$checked = '';
}
} else {
//if the user wasn't registered at that time, consider unchecked
if ($next_attendance_calendar_datetime == 0 || $calendar['date_time'] < $next_attendance_calendar_datetime) {
$checked = '';
}
}
$disabled = 'disabled';
$style_td = '';
// if this is the active column, then set it to darker background and enable it
if ($next_attendance_calendar_id == $calendar['id']) {
$style_td = 'background-color:#e1e1e1';
$disabled = '';
}
?>
<td height="50px" style="<?php echo $style_td ?>" class="checkboxes_col_<?php echo $calendar['id'] ?>"><center><input type="checkbox" name="check_presence[<?php echo $calendar['id'] ?>][]" value="<?php echo $user['user_id'] ?>" <?php echo $disabled.' '.$checked ?> /><span class="<?php echo 'anchor_'.$calendar['id'] ?>"></span></center></td>
var originalHeaderRow = $("tr:first", this)
originalHeaderRow.before(originalHeaderRow.clone());
var clonedHeaderRow = $("tr:first", this)
<?php }
} else { ?>
<td height="50px" class="checkboxes_col_<?php echo $calendar['id'] ?>"><center>&nbsp;</center></td>
<?php } ?>
</tr>
<?php $i++ ;
}
?>
</table>
</div>
clonedHeaderRow.addClass("tableFloatingHeader");
clonedHeaderRow.css("position", "absolute");
clonedHeaderRow.css("top", "0px");
clonedHeaderRow.css("left", $(this).css("margin-left"));
clonedHeaderRow.css("visibility", "hidden");
originalHeaderRow.addClass("tableFloatingHeaderOriginal");
});
UpdateTableHeaders();
$(window).scroll(UpdateTableHeaders);
$(window).resize(UpdateTableHeaders);
});
</script>
</div>
<div class="clear"></div>
<div style="margin-top:20px;"><button type="submit" class="save"><?php echo get_lang('Save') ?></button></div>
</form>
<form method="post" action="index.php?action=attendance_sheet_add&<?php echo api_get_cidreq().$param_gradebook.$param_filter ?>&attendance_id=<?php echo $attendance_id?>" >
<div class="attendance-sheet-content" style="width:100%;background-color:#E1E1E1;border:1px solid gray;margin-top:20px;">
<div class="divTableWithFloatingHeader attendance-users-table" style="width:45%;float:left;margin:0px;padding:0px;">
<table class="tableWithFloatingHeader data_table" width="100%">
<thead>
<tr class="tableFloatingHeader" style="position: absolute; top: 0px; left: 0px; visibility: hidden; margin:0px;padding:0px" >
<th height="65px" width="10px"><?php echo '#'; ?></th>
<th width="10px"><?php echo get_lang('Photo')?></th>
<th width="100px"><?php echo get_lang('LastName')?></th>
<th width="100px"><?php echo get_lang('FirstName')?></th>
<th width="100px"><?php echo get_lang('AttendancesFaults')?></th>
</tr>
<tr class="tableFloatingHeaderOriginal" >
<th height="65px" width="10px"><?php echo '#';?></th>
<th width="10px"><?php echo get_lang('Photo')?></th>
<th width="150px"><?php echo get_lang('LastName')?></th>
<th width="140px"><?php echo get_lang('FirstName')?></th>
<th width="100px"><?php echo get_lang('AttendancesFaults')?></th>
</tr>
</thead>
<tbody>
<?php
$i = 1;
$class = '';
foreach ($users_in_course as $data) {
$faults = 0;
if ($i%2 == 0) {$class='row_odd';}
else {$class='row_even';}
?>
<tr class="<?php echo $class ?>">
<td><center><?php echo $i ?></center></td>
<td><?php echo $data['photo'] ?></td>
<td><?php echo $data['lastname'] ?></td>
<td><?php echo $data['firstname'] ?></td>
<td>
<div style="height:56px">
<center>
<div class="attendance-faults-bar" style="background-color:<?php echo (!empty($data['result_color_bar'])?$data['result_color_bar']:'none') ?>">
<?php echo $data['attendance_result'] ?></div>
</center>
</div>
</td>
</tr>
<?php
$i++;
}
?>
</tbody>
</table>
</div>
<?php } else {
echo '<div><a href="'.api_get_path(WEB_CODE_PATH).'user/user.php?'.api_get_cidreq().'">'.get_lang('ThereAreNoRegisteredLearnersInsidetheCourse').'</a></div>';
}
<div class="divTableWithFloatingHeader attendance-calendar-table" style="margin:0px;padding:0px;float:left;width:55%;overflow:auto;overflow-y:hidden;">
<table class="tableWithFloatingHeader data_table" width="100%">
<thead>
<?php
if (count($attendant_calendar) > 0 ) {
foreach ($attendant_calendar as $calendar) {
$date = $calendar['date'];
$time = $calendar['time'];
$datetime = $date.'<br />'.$time;
$img_lock = Display::return_icon('lock.gif',get_lang('DateUnLock'),array('class'=>'img_lock','id'=>'datetime_column_'.$calendar['id']));
if (!empty($calendar['done_attendance'])){
$datetime = '<font color="blue">'.$date.'<br />'.$time.'</font>';
}
$disabled_check = 'disabled';
$input_hidden = '<input type="hidden" id="hidden_input_'.$calendar['id'].'" name="hidden_input[]" value="" disabled />';
if ($next_attendance_calendar_id == $calendar['id']) {
$input_hidden = '<input type="hidden" id="hidden_input_'.$calendar['id'].'" name="hidden_input[]" value="'.$calendar['id'].'" />';
$disabled_check = '';
$img_lock = Display::return_icon('unlock.gif',get_lang('DateLock'),array('class'=>'img_unlock','id'=>'datetime_column_'.$calendar['id']));
}
$result .= '<th height="65px" width="500px" style="padding:1px 5px;" >';
$result .= '<center><div style="font-size:10px;width:80px;">'.$datetime.'&nbsp;';
$result .= '<span id="attendance_lock" style="cursor:pointer">'.(!$is_locked_attendance || api_is_platform_admin()?$img_lock:'').'</span>';
$result .= '<br /><input type="checkbox" id="checkbox_head_'.$calendar['id'].'" '.$disabled_check.' checked />'.$input_hidden.'</div></center></th>';
}
} else {
$result = '<th height="65px" width="2000px"><span><a href="index.php?'.api_get_cidreq().'&action=calendar_list&attendance_id='.$attendance_id.$param_gradebook.'">';
$result .=Display::return_icon('calendar_up.gif',get_lang('AttendanceCalendar')).' '.get_lang('GoToAttendanceCalendar').'</a></span></th>';
}
?>
<tr class="tableFloatingHeader row_odd" style="position: absolute; top: 0px; left: 0px; visibility: hidden; margin:0px;padding:0px" >
<?php echo $result; ?>
</tr>
<tr class="tableWithFloatingHeader row_odd">
<?php echo $result; ?>
</tr>
</thead>
<tbody>
<?php
$i = 0;
foreach ($users_in_course as $user) {
$class = '';
if ($i%2==0) {$class = 'row_even';}
else {$class = 'row_odd';}
?>
<tr class="<?php echo $class ?>">
<?php
if (count($attendant_calendar) > 0 ) {
foreach ($attendant_calendar as $calendar) {
$checked = 'checked';
if (isset($users_presence[$user['user_id']][$calendar['id']]['presence'])) {
$presence = $users_presence[$user['user_id']][$calendar['id']]['presence'];
if (intval($presence) == 1) {
$checked = 'checked';
} else {
$checked = '';
}
} else {
//if the user wasn't registered at that time, consider unchecked
if ($next_attendance_calendar_datetime == 0 || $calendar['date_time'] < $next_attendance_calendar_datetime) {
$checked = '';
}
}
$disabled = 'disabled';
$style_td = '';
if ($next_attendance_calendar_id == $calendar['id']) {
$style_td = 'background-color:#e1e1e1';
$disabled = '';
}
?>
<td style="<?php echo $style_td ?>" class="checkboxes_col_<?php echo $calendar['id'] ?>">
<div style="height:56px">
<center>
<?php if (!$is_locked_attendance || api_is_platform_admin()) { ?>
<input type="checkbox" name="check_presence[<?php echo $calendar['id'] ?>][]" value="<?php echo $user['user_id'] ?>" <?php echo $disabled.' '.$checked ?> /><span class="<?php echo 'anchor_'.$calendar['id'] ?>"></span>
<?php } else {
echo $presence?Display::return_icon('checkbox_on.gif',get_lang('Presence')):Display::return_icon('checkbox_off.gif',get_lang('Presence'));
} ?>
</center>
</div>
</td>
<?php }
} else { ?>
<td class="checkboxes_col_<?php echo $calendar['id'] ?>">
<div style="height:56px">
<center>&nbsp;</center>
</div>
</td>
<?php } ?>
</tr>
<?php $i++ ;
}
?>
</tbody>
</table>
</div>
</div>
<div class="clear"></div>
<div style="margin-top:20px;"><?php if (!$is_locked_attendance || api_is_platform_admin()) { ?><button type="submit" class="save"><?php echo get_lang('Save') ?></button><?php } ?></div>
</form>
<?php } else {
echo '<div><a href="'.api_get_path(WEB_CODE_PATH).'user/user.php?'.api_get_cidreq().'">'.get_lang('ThereAreNoRegisteredLearnersInsidetheCourse').'</a></div>';
}
} else {
// View for students
?>
<h3><?php echo get_lang('AttendanceSheetReport') ?></h3>
<?php if(!empty($users_presence)) { ?>
<div>
<table width="250px;">
<tr>
<td><?php echo get_lang('ToAttend').': ' ?></td>
<td><center><div class="attendance-faults-bar" style="background-color:<?php echo (!empty($faults['color_bar'])?$faults['color_bar']:'none') ?>"><?php echo $faults['faults'].'/'.$faults['total'].' ('.$faults['faults_porcent'].'%)' ?></div></center></td>
</tr>
</table>
</div>
<?php } ?>
<div>
<br />
<center>
<table class="data_table">
<tr class="row_odd" >
<th><?php echo get_lang('AttendanceCalendar')?></th>
<th><?php echo get_lang('Attendance')?></th>
</tr>
<?php
if (!empty($users_presence)) {
$i = 0;
foreach($users_presence[$user_id] as $presence) {
$class = '';
if ($i%2==0) {$class = 'row_even';}
else {$class = 'row_odd';}
?>
<tr class="<?php echo $class ?>"><td><?php echo Display::return_icon('lp_calendar_event.png',get_lang('DateTime')).' '.$presence['date_time'] ?></td><td><center><?php echo $presence['presence']?Display::return_icon('checkbox_on.gif',get_lang('Presence')):Display::return_icon('checkbox_off.gif',get_lang('Presence')) ?></center></td></tr>
<?php }
} else { ?>
<tr><td colspan="2"><center><?php echo get_lang('YouDoNotHaveDoneAttendances')?></center></td></tr>
<?php }
?>
</table>
</center>
</div>
// View for students
?>
<h3><?php echo get_lang('AttendanceSheetReport') ?></h3>
<?php if(!empty($users_presence)) { ?>
<div>
<table width="250px;">
<tr>
<td><?php echo get_lang('ToAttend').': ' ?></td>
<td><center><div class="attendance-faults-bar" style="background-color:<?php echo (!empty($faults['color_bar'])?$faults['color_bar']:'none') ?>"><?php echo $faults['faults'].'/'.$faults['total'].' ('.$faults['faults_porcent'].'%)' ?></div></center></td>
</tr>
</table>
</div>
<?php } ?>
<div>
<br />
<center>
<table class="data_table">
<tr class="row_odd" >
<th><?php echo get_lang('AttendanceCalendar')?></th>
<th><?php echo get_lang('Attendance')?></th>
</tr>
<?php
if (!empty($users_presence)) {
$i = 0;
foreach($users_presence[$user_id] as $presence) {
$class = '';
if ($i%2==0) {$class = 'row_even';}
else {$class = 'row_odd';}
?>
<tr class="<?php echo $class ?>"><td><?php echo Display::return_icon('lp_calendar_event.png',get_lang('DateTime')).' '.$presence['date_time'] ?></td><td><center><?php echo $presence['presence']?Display::return_icon('checkbox_on.gif',get_lang('Presence')):Display::return_icon('checkbox_off.gif',get_lang('Presence')) ?></center></td></tr>
<?php }
} else { ?>
<tr><td colspan="2"><center><?php echo get_lang('YouDoNotHaveDoneAttendances')?></center></td></tr>
<?php }
?>
</table>
</center>
</div>
<?php } ?>

2
main/course_progress/thematic_controller.php
Unescape View File

@ -33,7 +33,7 @@ class ThematicController
* render to thematic.php
*/
public function thematic($action) {
var_dump($action);
$thematic= new Thematic();
$data = array();
$error = false;

5
main/css/chamilo/default.css
Unescape View File

@ -4137,7 +4137,6 @@ div.attendance-calendar-add div.row div.formw,div.attendance-calendar-edit div.r
padding:2px;
font-size:120%;
font-weight: bold;
margin:5px;
padding:5px;
}
@ -4328,11 +4327,11 @@ span.form_required {
.attendance-users-table td {
height:66px;
/* height:66px;*/
}
.attendance-calendar-table td {
height:66px;
/*height:66px;*/
}
#contact_registration .label{

6
main/css/chamilo_electric_blue/default.css
Unescape View File

@ -4041,7 +4041,7 @@ div.attendance-calendar-add div.row div.formw,div.attendance-calendar-edit div.r
padding:2px;
font-size:120%;
font-weight: bold;
margin:5px;
/* margin:5px; */
padding:5px;
}
@ -4301,9 +4301,9 @@ span.form_required {
}
.attendance-users-table td {
height:66px;
/* height:66px; */
}
.attendance-calendar-table td {
height:66px;
/* height:66px; */
}

7
main/css/chamilo_green/default.css
Unescape View File

@ -4056,8 +4056,7 @@ div.attendance-calendar-add div.row div.formw,div.attendance-calendar-edit div.r
background-color:none;
padding:2px;
font-size:120%;
font-weight: bold;
margin:5px;
font-weight: bold;
padding:5px;
}
@ -4317,9 +4316,9 @@ span.form_required {
}
.attendance-users-table td {
height:66px;
/* height:66px; */
}
.attendance-calendar-table td {
height:66px;
/* height:66px; */
}

7
main/css/chamilo_orange/default.css
Unescape View File

@ -4034,8 +4034,7 @@ div.attendance-calendar-add div.row div.formw,div.attendance-calendar-edit div.r
background-color:none;
padding:2px;
font-size:120%;
font-weight: bold;
margin:5px;
font-weight: bold;
padding:5px;
}
@ -4295,9 +4294,9 @@ span.form_required {
}
.attendance-users-table td {
height:66px;
/* height:66px; */
}
.attendance-calendar-table td {
height:66px;
/*height:66px; */
}

7
main/css/chamilo_red/default.css
Unescape View File

@ -4044,8 +4044,7 @@ div.attendance-calendar-add div.row div.formw,div.attendance-calendar-edit div.r
background-color:none;
padding:2px;
font-size:120%;
font-weight: bold;
margin:5px;
font-weight: bold;
padding:5px;
}
@ -4305,9 +4304,9 @@ span.form_required {
}
.attendance-users-table td {
height:66px;
/* height:66px; */
}
.attendance-calendar-table td {
height:66px;
/*height:66px;*/
}

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

@ -695,26 +695,53 @@ class Attendance
}
}
return $data;
}
}
/**
* Get all attendance calendar data inside current attendance
* @param int attendance id
* @return array attendance calendar data
*/
public function get_attendance_calendar($attendance_id) {
public function get_attendance_calendar($attendance_id, $type = 'all') {
global $dateFormatShort, $timeNoSecFormat;
$tbl_attendance_calendar = Database::get_course_table(TABLE_ATTENDANCE_CALENDAR);
$attendance_id = intval($attendance_id);
$sql = "SELECT * FROM $tbl_attendance_calendar WHERE attendance_id = '$attendance_id' ORDER BY date_time ";
$attendance_id = intval($attendance_id);
$sql = "SELECT * FROM $tbl_attendance_calendar WHERE attendance_id = '$attendance_id' ";
$filter_where = '';
if (!in_array($type, array('today', 'all', 'all_done', 'all_not_done'))) {
$type = 'all';
}
switch ($type ) {
case 'today':
//$sql .= ' AND DATE_FORMAT(date_time,"%d-%m-%Y") = DATE_FORMAT("'.api_get_utc_datetime().'", "%d-%m-%Y" )';
break;
case 'all_done':
$sql .= " AND done_attendance = 1 ";
break;
case 'all_not_done':
$sql .= " AND done_attendance = 0 ";
break;
case 'all':
default:
break;
}
$sql .= " ORDER BY date_time ";
$rs = Database::query($sql);
$data = array();
if (Database::num_rows($rs) > 0) {
while ($row = Database::fetch_array($rs)) {
$row['date_time'] = api_get_local_time($row['date_time']);
$row['date'] = api_format_date($row['date_time'], DATE_FORMAT_SHORT);
$row['time'] = api_format_date($row['date_time'], TIME_NO_SEC_FORMAT);
$data[] = $row;
while ($row = Database::fetch_array($rs,'ASSOC')) {
$row['db_date_time'] = $row['date_time'];
$row['date_time'] = api_get_local_time($row['date_time']);
$row['date'] = api_format_date($row['date_time'], DATE_FORMAT_SHORT);
$row['time'] = api_format_date($row['date_time'], TIME_NO_SEC_FORMAT);
if ($type == 'today') {
if (date('d-m-Y', api_strtotime($row['date_time'])) == api_strtotime(api_get_local_time())) {
$data[] = $row;
}
} else {
$data[] = $row;
}
}
}
return $data;
@ -742,48 +769,73 @@ class Attendance
/**
* save repeated date inside attendance calendar table
* @param int attendance id
* @param int start date in tms
* @param int end date in tms
* @param string repeat type daily, weekly, monthlyByDate
*/
public function attendance_repeat_calendar_add($attendance_id, $start_date, $end_date, $repeat_type) {
$attendance_id = intval($attendance_id);
// save start date
$datetime = date('Y-m-d H:i:s', $start_date);
$datetimezone = api_get_utc_datetime($datetime);
$datetimezone = api_get_utc_datetime($start_date);
$this->set_date_time($datetimezone);
$res = $this->attendance_calendar_add($attendance_id);
// save repeated dates
//86400 = 24 hours in seconds
//604800 = 1 week in seconds
// Saves repeated dates
switch($repeat_type) {
case 'daily':
$j = 1;
for ($i = $start_date + 86400; ($i <= $end_date); $i += 86400) {
$datetime = date('Y-m-d H:i:s', $i);
$datetimezone = api_get_utc_datetime($datetime);
//$datetimezone = api_get_utc_date_add(api_get_utc_datetime($start_date), 0 , 0, $j); //to support europe timezones
$datetimezone = api_get_utc_datetime($i);
$this->set_date_time($datetimezone);
$res = $this->attendance_calendar_add($attendance_id);
$j++;
}
break;
exit;
case 'weekly':
for ($i = $start_date + 604800; ($i <= $end_date); $i += 604800) {
$datetime = date('Y-m-d H:i:s', $i);
$datetimezone = api_get_utc_datetime($datetime);
$j = 1;
for ($i = $start_date + 604800; ($i <= $end_date); $i += 604800) {
$datetimezone = api_get_utc_datetime($i);
//$datetimezone = api_get_utc_date_add(api_get_utc_datetime($start_date), 0 , 0, $j*7); //to support europe timezones
$this->set_date_time($datetimezone);
$res = $this->attendance_calendar_add($attendance_id);
$j++;
}
break;
case 'monthlyByDate':
$next_start = $this->add_month($start_date);
while($next_start <= $end_date) {
$datetime = date('Y-m-d H:i:s', $next_start);
$datetimezone = api_get_utc_datetime($datetime);
$j = 1;
//@todo fix bug with february
for ($i = $start_date + 2419200; ($i <= $end_date); $i += 2419200) {
$datetimezone = api_get_utc_datetime($i);
//$datetimezone = api_get_utc_date_add(api_get_utc_datetime($start_date), 0 , $j); //to support europe timezones
$this->set_date_time($datetimezone);
$res = $this->attendance_calendar_add($attendance_id);
$next_start = $this->add_month($next_start);
$j++;
}
//$next_start = $this->add_month($start_date);
/*
$next_start = api_strtotime(api_get_utc_date_add(api_get_utc_datetime($start_date), 0 , 1),'UTC');
error_log('22-->$start_date '.$start_date);
error_log('$next_start '.$next_start);
error_log('$end_date '.$end_date);
while($next_start <= $end_date) {
//$datetime = date('Y-m-d H:i:s', $next_start);
$datetimezone = api_get_utc_datetime($next_start);
error_log('$datetimezone n loop '.$datetimezone);
$this->set_date_time($datetimezone);
$res = $this->attendance_calendar_add($attendance_id);
//$next_start = $this->add_month($next_start);
$next_start = api_strtotime(api_get_utc_date_add(api_get_utc_datetime($next_start), 0 , 1),'UTC');
error_log('$next_start in loop '.$next_start);
}*/
break;
}
}
/**
@ -793,14 +845,22 @@ class Attendance
* @return int The new timestamp
*/
private function add_month($timestamp, $num=1) {
list($y, $m, $d, $h, $n, $s) = split('/',date('Y/m/d/h/i/s',$timestamp));
$values = api_get_utc_datetime($timestamp);
$values = str_replace(array(':','-',' '), '/', $values);
list($y, $m, $d, $h, $n, $s) = split('/',$values);
if($m+$num>12) {
$y += floor($num/12);
$m += $num%12;
} else {
$m += $num;
}
return mktime($h, $n, $s, $m, $d, $y);
//date_default_timezone_set('UTC');
// return mktime($h, $n, $s, $m, $d, $y);
$result = api_strtotime($y.'-'.$m.'-'.$d.' '.$h.':'.$n.':'.$s, 'UTC');
if (!empty($result)) {
return $result;
}
return false;
}
/**

4
main/inc/lib/document.lib.php
Unescape View File

@ -484,6 +484,10 @@ class DocumentManager {
//condition for the session
$current_session_id = api_get_session_id();
$condition_session = " AND (id_session = '$current_session_id' OR id_session = '0')";
if( !$can_see_invisible) {
$condition_session = " AND (id_session = '$current_session_id' ) ";
}
//condition for search (get ALL folders and documents)
if($search){

Write Preview
Loading…
Cancel
Save