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
pull/2487/head
jmontoyaa 9 years ago
parent a81e67425e
commit 4912f69c5b
4 changed files with 49 additions and 26 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. 11
      main/inc/lib/exercise.lib.php
  2. 2
      main/mySpace/course.php
  3. 53
      main/mySpace/student.php
  4. 1
      main/work/work.php

11
main/inc/lib/exercise.lib.php
Unescape View File

@ -1546,8 +1546,7 @@ HOTSPOT;
$exercise_id,
$extra_where_conditions = null,
$get_count = false
)
{
) {
//@todo replace all this globals
global $documentPath, $filter;
@ -1618,7 +1617,6 @@ HOTSPOT;
}
if (strpos($extra_where_conditions, 'group_all')) {
$extra_where_conditions = str_replace(
"AND ( group_id = 'group_all' )",
'',
@ -1733,7 +1731,8 @@ HOTSPOT;
WHERE
te.status != 'incomplete' AND
te.c_id = " . $course_id . " $session_id_and AND
ce.active <>-1 AND ce.c_id = " . $course_id . "
ce.active <>-1 AND
ce.c_id = " . $course_id . "
$exercise_where
$extra_where_conditions
";
@ -1763,9 +1762,7 @@ HOTSPOT;
AND tth.c_id = " . $course_id . "
$hotpotatoe_where
$sqlWhereOption
AND user.status NOT IN(" . api_get_users_status_ignored_in_reports(
'string'
) . ")
AND user.status NOT IN(" . api_get_users_status_ignored_in_reports('string') . ")
ORDER BY
tth.c_id ASC,
tth.exe_date DESC";

2
main/mySpace/course.php
Unescape View File

@ -242,6 +242,8 @@ function get_courses($from, $limit, $column, $direction)
$assignmentsInCourse = 0;
$avgTimeSpentInCourse = 0;
$avgProgressInCourse = 0;
$countStudents = 0;
$avgScoreInCourse = 0;
if (count($userIdList) > 0) {
$countStudents = count($userIdList);

53
main/mySpace/student.php
Unescape View File

@ -19,21 +19,27 @@ api_block_anonymous_users();
$this_section = SECTION_TRACKING;
$interbreadcrumb[] = array ("url" => api_is_student_boss()?"#":"index.php", "name" => get_lang('MySpace'));
$interbreadcrumb[] = array(
"url" => api_is_student_boss() ? "#" : "index.php",
"name" => get_lang('MySpace')
);
if (isset($_GET["user_id"]) && $_GET["user_id"] != "" && !isset($_GET["type"])) {
$interbreadcrumb[] = array ("url" => "teachers.php", "name" => get_lang('Teachers'));
$interbreadcrumb[] = array(
"url" => "teachers.php",
"name" => get_lang('Teachers')
);
}
if (isset($_GET["user_id"]) && $_GET["user_id"]!="" && isset($_GET["type"]) && $_GET["type"] == "coach") {
$interbreadcrumb[] = array ("url" => "coaches.php", "name" => get_lang('Tutors'));
$interbreadcrumb[] = array("url" => "coaches.php", "name" => get_lang('Tutors'));
}
function get_count_users()
{
$keyword = isset($_GET['keyword']) ? Security::remove_XSS($_GET['keyword']) : null;
$active = isset($_GET['active']) ? intval($_GET['active']) : 1;
$sleepingDays = isset($_GET['sleeping_days']) ? intval($_GET['sleeping_days']) : null;
$active = isset($_GET['active']) ? (int) $_GET['active'] : 1;
$sleepingDays = isset($_GET['sleeping_days']) ? (int) $_GET['sleeping_days'] : null;
$lastConnectionDate = null;
if (!empty($sleepingDays)) {
@ -55,7 +61,7 @@ function get_users($from, $limit, $column, $direction)
{
$active = isset($_GET['active']) ? $_GET['active'] : 1;
$keyword = isset($_GET['keyword']) ? Security::remove_XSS($_GET['keyword']) : null;
$sleepingDays = isset($_GET['sleeping_days']) ? intval($_GET['sleeping_days']) : null;
$sleepingDays = isset($_GET['sleeping_days']) ? (int) $_GET['sleeping_days'] : null;
$sessionId = isset($_GET['id_session']) ? (int) $_GET['id_session'] : 0;
$lastConnectionDate = null;
@ -108,7 +114,6 @@ function get_users($from, $limit, $column, $direction)
}
$all_datas = array();
foreach ($students as $student_data) {
$student_id = $student_data['user_id'];
if (isset($_GET['id_session'])) {
@ -191,11 +196,26 @@ $actionsLeft = '';
if (api_is_drh()) {
$menu_items = array(
Display::url(Display::return_icon('stats.png', get_lang('MyStats'), '', ICON_SIZE_MEDIUM), api_get_path(WEB_CODE_PATH)."auth/my_progress.php" ),
Display::url(Display::return_icon('user_na.png', get_lang('Students'), array(), ICON_SIZE_MEDIUM), '#'),
Display::url(Display::return_icon('teacher.png', get_lang('Trainers'), array(), ICON_SIZE_MEDIUM), 'teachers.php'),
Display::url(Display::return_icon('course.png', get_lang('Courses'), array(), ICON_SIZE_MEDIUM), 'course.php'),
Display::url(Display::return_icon('session.png', get_lang('Sessions'), array(), ICON_SIZE_MEDIUM), 'session.php'),
Display::url(
Display::return_icon('stats.png', get_lang('MyStats'), '', ICON_SIZE_MEDIUM),
api_get_path(WEB_CODE_PATH)."auth/my_progress.php"
),
Display::url(
Display::return_icon('user_na.png', get_lang('Students'), array(), ICON_SIZE_MEDIUM),
'#'
),
Display::url(
Display::return_icon('teacher.png', get_lang('Trainers'), array(), ICON_SIZE_MEDIUM),
'teachers.php'
),
Display::url(
Display::return_icon('course.png', get_lang('Courses'), array(), ICON_SIZE_MEDIUM),
'course.php'
),
Display::url(
Display::return_icon('session.png', get_lang('Sessions'), array(), ICON_SIZE_MEDIUM),
'session.php'
),
Display::url(
Display::return_icon('skills.png', get_lang('Skills'), array(), ICON_SIZE_MEDIUM),
'skills.php'
@ -234,7 +254,8 @@ if (api_is_drh()) {
$actionsRight = '';
$actionsRight .= Display::url(
Display::return_icon('printer.png', get_lang('Print'), array(), ICON_SIZE_MEDIUM), 'javascript: void(0);',
Display::return_icon('printer.png', get_lang('Print'), array(), ICON_SIZE_MEDIUM),
'javascript: void(0);',
array('onclick'=>'javascript: window.print();')
);
$actionsRight .= Display::url(
@ -289,7 +310,11 @@ if ($export_csv) {
}
}
$form = new FormValidator('search_user', 'get', api_get_path(WEB_CODE_PATH).'mySpace/student.php');
$form = new FormValidator(
'search_user',
'get',
api_get_path(WEB_CODE_PATH).'mySpace/student.php'
);
$form = Tracking::setUserSearchForm($form);
$form->setDefaults($params);

1
main/work/work.php
Unescape View File

@ -177,7 +177,6 @@ switch ($action) {
$form->addButtonCreate(get_lang('CreateDirectory'));
if ($form->validate()) {
$result = addDir(
$_POST,
$user_id,

Write Preview
Loading…
Cancel
Save