Minor - Flint fixes - refs BT#18671

pull/3859/head
Angel Fernando Quiroz Campos 5 years ago
parent d9e3251712
commit 4ecf77f994
  1. 3
      main/inc/ajax/student_follow_page.ajax.php
  2. 4
      main/inc/lib/events.lib.php
  3. 1
      main/inc/lib/tracking.lib.php
  4. 28
      main/lp/learnpath.class.php
  5. 4
      main/mySpace/student_follow_export.php

@ -72,7 +72,7 @@ function displayForm(int $lpViewId)
'variable' => StudentFollowPage::VARIABLE_ACQUISITION,
'item_id' => $lpViewId,
'comment' => json_encode(['user' => api_get_user_id(), 'datetime' => api_get_utc_datetime()]),
'value' => $values[StudentFollowPage::VARIABLE_ACQUISITION]
'value' => $values[StudentFollowPage::VARIABLE_ACQUISITION],
]
);
@ -133,5 +133,4 @@ function processViewsInvisible(array $lpViewsIds, bool $state)
]
);
}
}

@ -885,7 +885,7 @@ class Event
public static function findUserSubscriptionToCourse(int $userId, int $courseId, int $sessionId = 0)
{
$tblTrackEDefault = Database::get_main_table(TABLE_STATISTIC_TRACK_E_DEFAULT);;
$tblTrackEDefault = Database::get_main_table(TABLE_STATISTIC_TRACK_E_DEFAULT);
return Database::select(
'*',
@ -897,7 +897,7 @@ class Event
'default_value LIKE ? AND ' => '%s:2:\\\\"id\\\\";i:'.$userId.'%',
'c_id = ? AND ' => $courseId,
'session_id = ?' => $sessionId,
]
],
],
'first'
);

@ -5,7 +5,6 @@
use Chamilo\CoreBundle\Entity\Course;
use Chamilo\CoreBundle\Entity\ExtraField as EntityExtraField;
use Chamilo\CoreBundle\Entity\Session as SessionEntity;
use Chamilo\CourseBundle\Entity\CItemProperty;
use Chamilo\UserBundle\Entity\User;
use ChamiloSession as Session;
use CpChart\Cache as pCache;

@ -14183,6 +14183,20 @@ EOD;
}
}
public static function findLastView(int $lpId, int $studentId, int $courseId, int $sessionId = 0)
{
$tblLpView = Database::get_course_table(TABLE_LP_VIEW);
$sessionCondition = api_get_session_condition($sessionId);
$sql = "SELECT iid FROM $tblLpView
WHERE c_id = $courseId AND lp_id = $lpId AND user_id = $studentId $sessionCondition
ORDER BY view_count DESC";
$result = Database::query($sql);
return Database::fetch_assoc($result);
}
/**
* Get the depth level of LP item.
*
@ -14321,18 +14335,4 @@ EOD;
$author->setOptions($options);
}
}
public static function findLastView(int $lpId, int $studentId, int $courseId, int $sessionId = 0)
{
$tblLpView = Database::get_course_table(TABLE_LP_VIEW);
$sessionCondition = api_get_session_condition($sessionId);
$sql = "SELECT iid FROM $tblLpView
WHERE c_id = $courseId AND lp_id = $lpId AND user_id = $studentId $sessionCondition
ORDER BY view_count DESC";
$result = Database::query($sql);
return Database::fetch_assoc($result);
}
}

@ -128,7 +128,7 @@ function generateForm(int $studentId, array $coursesInSessions): FormValidator
function generateHtmlForLearningPaths(User $student, array $courseInfo, int $sessionId): string
{
$html = Display::page_subheader2(get_lang('ToolLearnpath'));;
$html = Display::page_subheader2(get_lang('ToolLearnpath'));
$columnHeaders = [];
$columnHeaders['lp'] = get_lang('LearningPath');
@ -304,7 +304,7 @@ function generateHtmlForLearningPaths(User $student, array $courseInfo, int $ses
function generateHtmlForQuizzes(int $studentId, array $courseInfo, int $sessionId): string
{
$html = Display::page_subheader2(get_lang('ToolQuiz'));;
$html = Display::page_subheader2(get_lang('ToolQuiz'));
$columnHeaders = [];
$columnHeaders[] = get_lang('Exercises');

Loading…
Cancel
Save