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 - improve foreach performance

Browse Source
pull/2970/head
Julio Montoya 6 years ago
parent 9a6c5f342f
commit cdc4b70567
2 changed files with 47 additions and 71 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. 19
      main/inc/lib/api.lib.php
  2. 99
      main/lp/lp_list.php

19
main/inc/lib/api.lib.php
Unescape View File

@ -2700,18 +2700,19 @@ function api_get_session_visibility(
* This function returns a (star) session icon if the session is not null and * This function returns a (star) session icon if the session is not null and
* the user is not a student. * the user is not a student.
* *
* @param int $session_id * @param int $sessionId
* @param int $status_id User status id - if 5 (student), will return empty * @param int $statusId User status id - if 5 (student), will return empty
* *
* @return string Session icon * @return string Session icon
*/ */
function api_get_session_image($session_id, $status_id) function api_get_session_image($sessionId, $statusId)
{ {
$session_id = (int) $session_id; $sessionId = (int) $sessionId;
$session_img = ''; $image = '';
if ((int) $status_id != 5) { //check whether is not a student if ($statusId != STUDENT) {
if ($session_id > 0) { // Check whether is not a student
$session_img = "  ".Display::return_icon( if ($sessionId > 0) {
$image = '  '.Display::return_icon(
'star.png', 'star.png',
get_lang('SessionSpecificResource'), get_lang('SessionSpecificResource'),
['align' => 'absmiddle'], ['align' => 'absmiddle'],
@ -2720,7 +2721,7 @@ function api_get_session_image($session_id, $status_id)
} }
} }
return $session_img; return $image;
} }
/** /**

99
main/lp/lp_list.php
Unescape View File

@ -48,6 +48,7 @@ if (api_get_setting('search_enabled') === 'true') {
require api_get_path(LIBRARY_PATH).'search/search_widget.php'; require api_get_path(LIBRARY_PATH).'search/search_widget.php';
search_widget_prepare($htmlHeadXtra); search_widget_prepare($htmlHeadXtra);
} }
$courseId = api_get_course_int_id();
$sessionId = api_get_session_id(); $sessionId = api_get_session_id();
$is_allowed_to_edit = api_is_allowed_to_edit(null, true); $is_allowed_to_edit = api_is_allowed_to_edit(null, true);
$courseInfo = api_get_course_info(); $courseInfo = api_get_course_info();
@ -118,7 +119,7 @@ if ($is_allowed_to_edit) {
$token = Security::get_token(); $token = Security::get_token();
$categoriesTempList = learnpath::getCategories(api_get_course_int_id()); $categoriesTempList = learnpath::getCategories($courseId);
$categoryTest = new CLpCategory(); $categoryTest = new CLpCategory();
$categoryTest->setId(0); $categoryTest->setId(0);
$categoryTest->setName(get_lang('WithOutCategory')); $categoryTest->setName(get_lang('WithOutCategory'));
@ -150,10 +151,10 @@ if ($filteredCategoryId) {
$test_mode = api_get_setting('server_type'); $test_mode = api_get_setting('server_type');
$showBlockedPrerequisite = api_get_configuration_value('show_prerequisite_as_blocked'); $showBlockedPrerequisite = api_get_configuration_value('show_prerequisite_as_blocked');
$allowLpChamiloExport = api_get_configuration_value('allow_lp_chamilo_export'); $allowLpChamiloExport = api_get_configuration_value('allow_lp_chamilo_export');
$allowMinTime = Tracking::minimunTimeAvailable(api_get_session_id(), api_get_course_int_id()); $allowMinTime = Tracking::minimunTimeAvailable($sessionId, $courseId);
$accumulateWorkTimeTotal = 0; $accumulateWorkTimeTotal = 0;
if ($allowMinTime) { if ($allowMinTime) {
$accumulateWorkTimeTotal = learnpath::getAccumulateWorkTimeTotal(api_get_course_int_id()); $accumulateWorkTimeTotal = learnpath::getAccumulateWorkTimeTotal($courseId);
} }
$user = api_get_user_entity($userId); $user = api_get_user_entity($userId);
@ -186,6 +187,7 @@ $courseSettingsDisableIcon = Display::return_icon(
); );
$enableAutoLaunch = api_get_course_setting('enable_lp_auto_launch'); $enableAutoLaunch = api_get_course_setting('enable_lp_auto_launch');
$gameMode = api_get_setting('gamification_mode');
$data = []; $data = [];
/** @var CLpCategory $item */ /** @var CLpCategory $item */
@ -201,7 +203,7 @@ foreach ($categories as $item) {
); );
if (!$is_allowed_to_edit) { if (!$is_allowed_to_edit) {
if ((int) $categoryVisibility !== 1 && $categoryVisibility != -1) { if ($categoryVisibility !== 1 && $categoryVisibility != -1) {
continue; continue;
} }
} }
@ -212,9 +214,9 @@ foreach ($categories as $item) {
} }
$list = new LearnpathList( $list = new LearnpathList(
api_get_user_id(), $userId,
api_get_course_id(), api_get_course_id(),
api_get_session_id(), $sessionId,
null, null,
false, false,
$categoryId $categoryId
@ -223,14 +225,14 @@ foreach ($categories as $item) {
$flat_list = $list->get_flat_list(); $flat_list = $list->get_flat_list();
// Hiding categories with out LPs (only for student) // Hiding categories with out LPs (only for student)
if (empty($flat_list) && !api_is_allowed_to_edit()) { if (empty($flat_list) && !$is_allowed_to_edit) {
continue; continue;
} }
$listData = []; $listData = [];
$lpTimeList = []; $lpTimeList = [];
if ($allowMinTime) { if ($allowMinTime) {
$lpTimeList = Tracking::getCalculateTime($userId, api_get_course_int_id(), api_get_session_id()); $lpTimeList = Tracking::getCalculateTime($userId, $courseId, $sessionId);
} }
if (!empty($flat_list)) { if (!empty($flat_list)) {
@ -242,17 +244,13 @@ foreach ($categories as $item) {
$progressList = learnpath::getProgressFromLpList( $progressList = learnpath::getProgressFromLpList(
array_column($flat_list, 'lp_old_id'), array_column($flat_list, 'lp_old_id'),
$userId, $userId,
api_get_course_int_id(), $courseId,
api_get_session_id() $sessionId
); );
$now = time();
foreach ($flat_list as $id => $details) { foreach ($flat_list as $id => $details) {
$id = $details['lp_old_id']; $id = $details['lp_old_id'];
// Validation when belongs to a session.
$session_img = api_get_session_image(
$details['lp_session'],
$userInfo['status']
);
if (!$is_allowed_to_edit && $details['lp_visibility'] == 0) { if (!$is_allowed_to_edit && $details['lp_visibility'] == 0) {
// This is a student and this path is invisible, skip. // This is a student and this path is invisible, skip.
@ -267,7 +265,7 @@ foreach ($categories as $item) {
$userId, $userId,
$details['prerequisite'], $details['prerequisite'],
$courseInfo, $courseInfo,
api_get_session_id() $sessionId
); );
if ($lpVisibility === false && $isBlocked && $showBlockedPrerequisite === false) { if ($lpVisibility === false && $isBlocked && $showBlockedPrerequisite === false) {
continue; continue;
@ -275,12 +273,17 @@ foreach ($categories as $item) {
} }
$start_time = $end_time = ''; $start_time = $end_time = '';
if (!$is_allowed_to_edit) { if ($is_allowed_to_edit) {
if (!empty($details['publicated_on'])) {
$start_time = api_convert_and_format_date($details['publicated_on'], DATE_TIME_FORMAT_LONG_24H);
}
if (!empty($details['expired_on'])) {
$end_time = api_convert_and_format_date($details['expired_on'], DATE_TIME_FORMAT_LONG_24H);
}
} else {
$time_limits = false; $time_limits = false;
// This is an old LP (from a migration 1.8.7) so we do nothing // This is an old LP (from a migration 1.8.7) so we do nothing
if (empty($details['created_on']) && if (empty($details['created_on']) && empty($details['modified_on'])) {
empty($details['modified_on'])
) {
$time_limits = false; $time_limits = false;
} }
@ -291,18 +294,9 @@ foreach ($categories as $item) {
if ($time_limits) { if ($time_limits) {
// Check if start time // Check if start time
if (!empty($details['publicated_on']) && if (!empty($details['publicated_on']) && !empty($details['expired_on'])) {
!empty($details['expired_on']) $start_time = api_strtotime($details['publicated_on'], 'UTC');
) { $end_time = api_strtotime($details['expired_on'], 'UTC');
$start_time = api_strtotime(
$details['publicated_on'],
'UTC'
);
$end_time = api_strtotime(
$details['expired_on'],
'UTC'
);
$now = time();
$is_actived_time = false; $is_actived_time = false;
if ($now > $start_time && $end_time > $now) { if ($now > $start_time && $end_time > $now) {
$is_actived_time = true; $is_actived_time = true;
@ -313,20 +307,6 @@ foreach ($categories as $item) {
} }
} }
} }
$start_time = $end_time = '';
} else {
if (!empty($details['publicated_on'])) {
$start_time = api_convert_and_format_date(
$details['publicated_on'],
DATE_TIME_FORMAT_LONG_24H
);
}
if (!empty($details['expired_on'])) {
$end_time = api_convert_and_format_date(
$details['expired_on'],
DATE_TIME_FORMAT_LONG_24H
);
}
} }
$counter++; $counter++;
@ -348,8 +328,7 @@ foreach ($categories as $item) {
.($lpVisibility .($lpVisibility
? '' ? ''
: ' - ('.get_lang('LPNotVisibleToStudent').')'); : ' - ('.get_lang('LPNotVisibleToStudent').')');
$extra = '<div class ="lp_content_type_label">'.$dsp_desc $extra = '<div class ="lp_content_type_label">'.$dsp_desc.'</div>';
.'</div>';
} }
$my_title = $name; $my_title = $name;
@ -415,7 +394,7 @@ foreach ($categories as $item) {
$linkMinTime = ''; $linkMinTime = '';
if ($allowMinTime) { if ($allowMinTime) {
// Minimum time (in minutes) to pass the learning path // Minimum time (in minutes) to pass the learning path
$accumulateWorkTime = learnpath::getAccumulateWorkTimePrerequisite($id, api_get_course_int_id()); $accumulateWorkTime = learnpath::getAccumulateWorkTimePrerequisite($id, $courseId);
if ($accumulateWorkTime > 0) { if ($accumulateWorkTime > 0) {
$lpTime = isset($lpTimeList[TOOL_LEARNPATH][$id]) ? $lpTimeList[TOOL_LEARNPATH][$id] : 0; $lpTime = isset($lpTimeList[TOOL_LEARNPATH][$id]) ? $lpTimeList[TOOL_LEARNPATH][$id] : 0;
@ -566,8 +545,7 @@ foreach ($categories as $item) {
'lp_publish_na.png', 'lp_publish_na.png',
get_lang('LearnpathPublish') get_lang('LearnpathPublish')
), ),
api_get_self().'?'.$cidReq api_get_self().'?'.$cidReq."&lp_id=$id&action=toggle_publish&new_status=v"
."&lp_id=$id&action=toggle_publish&new_status=v"
); );
} else { } else {
$dsp_publish = Display::url( $dsp_publish = Display::url(
@ -575,8 +553,7 @@ foreach ($categories as $item) {
'lp_publish.png', 'lp_publish.png',
get_lang('LearnpathDoNotPublish') get_lang('LearnpathDoNotPublish')
), ),
api_get_self().'?'.$cidReq api_get_self().'?'.$cidReq."&lp_id=$id&action=toggle_publish&new_status=i"
."&lp_id=$id&action=toggle_publish&new_status=i"
); );
} }
} else { } else {
@ -845,14 +822,7 @@ foreach ($categories as $item) {
); );
} }
if ($is_allowed_to_edit) { if ($gameMode == 1) {
$start_time = $start_time;
$end_time = $end_time;
} else {
$start_time = $end_time = '';
}
if (api_get_setting('gamification_mode') == 1) {
if ($details['seriousgame_mode'] == 0) { if ($details['seriousgame_mode'] == 0) {
$actionSeriousGame = Display::toolbarButton( $actionSeriousGame = Display::toolbarButton(
null, null,
@ -899,11 +869,16 @@ foreach ($categories as $item) {
$export_icon = null; $export_icon = null;
} }
$sessionImage = api_get_session_image(
$details['lp_session'],
$userInfo['status']
);
$listData[] = [ $listData[] = [
'learnpath_icon' => $icon_learnpath, 'learnpath_icon' => $icon_learnpath,
'url_start' => $url_start_lp, 'url_start' => $url_start_lp,
'title' => $my_title, 'title' => $my_title,
'session_image' => $session_img, 'session_image' => $sessionImage,
'extra' => $extra, 'extra' => $extra,
'start_time' => $start_time, 'start_time' => $start_time,
'end_time' => $end_time, 'end_time' => $end_time,

Write Preview
Loading…
Cancel
Save