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

Tracking: Fix php errors

Browse Source
pull/3989/head
Julio 4 years ago
parent 680ed0124b
commit b490fa73ba
5 changed files with 34 additions and 76 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. 7
      public/main/inc/lib/myspace.lib.php
  2. 56
      public/main/inc/lib/tracking.lib.php
  3. 43
      public/main/lp/learnpath.class.php
  4. 2
      public/main/mySpace/admin_view.php
  5. 2
      public/main/tracking/exams.php

7
public/main/inc/lib/myspace.lib.php
Unescape View File

@ -143,11 +143,8 @@ class MySpace
Display::return_icon('quiz.png', get_lang('Exam tracking'), [], 32),
api_get_path(WEB_CODE_PATH).'tracking/exams.php'
);
$menu = '';
foreach ($menuItems as $item) {
$menu .= $item;
}
$menu .= '<br />';
$menu = Display::toolbarAction('myspace', $menuItems);
return $menu;
}

56
public/main/inc/lib/tracking.lib.php
Unescape View File

@ -5398,6 +5398,8 @@ class Tracking
public static function show_course_detail($userId, $courseId, $sessionId = 0, $showDiagram = false)
{
$html = '';
$courseId = (int) $courseId;
if (empty($courseId)) {
return '';
}
@ -5412,10 +5414,10 @@ class Tracking
$html .= '<a name="course_session_data"></a>';
$html .= Display::page_subheader($course->getTitle());
if ($showDiagram && !empty($session_id)) {
$visibility = api_get_session_visibility($session_id);
if ($showDiagram && !empty($sessionId)) {
$visibility = api_get_session_visibility($sessionId);
if (SESSION_AVAILABLE === $visibility) {
$html .= Display::page_subheader2($course_info['title']);
$html .= Display::page_subheader2($course->getTitle());
}
}
@ -5493,7 +5495,7 @@ class Tracking
$html .= '<tr class="row_even">';
$url = api_get_path(WEB_CODE_PATH).
"exercise/overview.php?cid={$courseId}&sid=$session_id&exerciseId={$exercices['id']}";
"exercise/overview.php?cid={$courseId}&sid=$sessionId&exerciseId={$exercices['id']}";
if (true == $visible_return['value']) {
$exercices['title'] = Display::url(
@ -5512,8 +5514,8 @@ class Tracking
//For graphics
$best_exercise_stats = Event::get_best_exercise_results_by_user(
$exercices['id'],
$course_info['real_id'],
$session_id
$courseId,
$sessionId
);
$to_graph_exercise_result[$exercices['id']] = [
@ -5528,8 +5530,8 @@ class Tracking
// Getting best results
$best_score_data = ExerciseLib::get_best_attempt_in_course(
$exercices['id'],
$course_info['real_id'],
$session_id
$courseId,
$sessionId
);
$best_score = '';
@ -5544,8 +5546,8 @@ class Tracking
$exercise_stat = ExerciseLib::get_best_attempt_by_user(
api_get_user_id(),
$exercices['id'],
$course_info['real_id'],
$session_id
$courseId,
$sessionId
);
if (!empty($exercise_stat)) {
// Always getting the BEST attempt
@ -5554,7 +5556,7 @@ class Tracking
$exe_id = $exercise_stat['exe_id'];
$latest_attempt_url .= api_get_path(WEB_CODE_PATH).
'exercise/result.php?id='.$exe_id.'&cid='.$course_info['real_id'].'&show_headers=1&sid='.$session_id;
'exercise/result.php?id='.$exe_id.'&cid='.$courseId.'&show_headers=1&sid='.$sessionId;
$percentage_score_result = Display::url(
ExerciseLib::show_score($score, $weighting),
$latest_attempt_url
@ -5571,8 +5573,8 @@ class Tracking
$my_score,
$exe_id,
$exercices['id'],
$course_info['code'],
$session_id,
$courseCode,
$sessionId,
$user_list
);
@ -5664,8 +5666,8 @@ class Tracking
$list = new LearnpathList(
api_get_user_id(),
$course_info,
$session_id,
['real_id' => $courseId],
$sessionId,
'lp.publicatedOn ASC',
true,
null,
@ -5681,36 +5683,36 @@ class Tracking
}
$progress = self::get_avg_student_progress(
$user_id,
$userId,
$course,
[$lp_id],
$session_id
$session
);
$last_connection_in_lp = self::get_last_connection_time_in_lp(
$user_id,
$userId,
$course,
$lp_id,
$session_id
$sessionId
);
$time_spent_in_lp = self::get_time_spent_in_lp(
$user_id,
$userId,
$course,
[$lp_id],
$session_id
$sessionId
);
$percentage_score = self::get_avg_student_score(
$user_id,
$userId,
$course,
[$lp_id],
$session_id
$session
);
$bestScore = self::get_avg_student_score(
$user_id,
$userId,
$course,
[$lp_id],
$session_id,
$session,
false,
false,
true
@ -5741,7 +5743,7 @@ class Tracking
}
$url = api_get_path(WEB_CODE_PATH).
"lp/lp_controller.php?cid={$course_info['real_id']}&sid=$session_id&lp_id=$lp_id&action=view";
"lp/lp_controller.php?cid={$courseId}&sid=$sessionId&lp_id=$lp_id&action=view";
$html .= '<tr class="row_even">';
if (in_array('lp', $columnHeadersKeys)) {
@ -5794,7 +5796,7 @@ class Tracking
}
$html .= '</tbody></table></div>';
$html .= self::displayUserSkills($user_id, $course_info['id'], $session_id);
$html .= self::displayUserSkills($userId, $courseId, $sessionId);
return $html;
}

43
public/main/lp/learnpath.class.php
Unescape View File

@ -3367,48 +3367,9 @@ class learnpath
return true;
}
$groups = GroupManager::getAllGroupPerUserSubscription($user->getId());
$em = Database::getManager();
/** @var ItemPropertyRepository $itemRepo */
$itemRepo = $em->getRepository('ChamiloCourseBundle:CItemProperty');
/** @var CourseRepository $courseRepo */
$courseRepo = $em->getRepository('ChamiloCoreBundle:Course');
$session = null;
if (!empty($sessionId)) {
$session = $em->getRepository('ChamiloCoreBundle:Session')->find($sessionId);
}
$course = $courseRepo->find($courseId);
if (0 != $courseId) {
// Subscribed groups to a LP
$subscribedGroupsInLp = $itemRepo->getGroupsSubscribedToItem(
TOOL_LEARNPATH_CATEGORY,
$category->getId(),
$course,
$session
);
}
if (!empty($subscribedGroupsInLp)) {
$noGroupSubscribed = false;
if (!empty($groups)) {
$groups = array_column($groups, 'iid');
/** @var CItemProperty $item */
foreach ($subscribedGroupsInLp as $item) {
if ($item->getGroup() &&
in_array($item->getGroup()->getId(), $groups)
) {
return true;
}
}
}
}
$response = $noGroupSubscribed && $noUserSubscribed;
//$groups = GroupManager::getAllGroupPerUserSubscription($user->getId());
return $response;
return $noGroupSubscribed && $noUserSubscribed;
}
/**

2
public/main/mySpace/admin_view.php
Unescape View File

@ -82,9 +82,7 @@ if ($exportCSV) {
}
Display::display_header($nameTools);
echo '<div class="actions">';
echo MySpace::getTopMenu();
echo '</div>';
echo MySpace::getAdminActions();
switch ($display) {

2
public/main/tracking/exams.php
Unescape View File

@ -489,7 +489,7 @@ function processStudentList($filter_score, $global, Cquiz $exercise, $courseInfo
}*/
$exerciseStatsTable = Database::get_main_table(TABLE_STATISTIC_TRACK_E_EXERCISES);
$courseId = api_get_course_int_id($courseInfo['code']);
$courseId = $courseInfo['real_id'];
if (empty($sessionId)) {
$students = CourseManager::get_student_list_from_course_code(

Write Preview
Loading…
Cancel
Save