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 pull request #778 from AngelFQC/BT9886

Browse Source 
Fix calculate stars and points - refs BT#9886 #TMI
1.10.x
Angel Fernando Quiroz Campos 9 years ago
parent 53095597c7 35abbf62f1
commit 0e6e7e458e
6 changed files with 103 additions and 82 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. 12
      main/gamification/my_progress.php
  2. 16
      main/inc/lib/GamificationUtils.php
  3. 88
      main/newscorm/learnpath.class.php
  4. 32
      main/newscorm/lp_view.php
  5. 8
      main/template/default/gamification/my_progress.tpl
  6. 29
      main/template/default/learnpath/view.tpl

12
main/gamification/my_progress.php
Unescape View File

@ -34,11 +34,15 @@ $sessionList = [];
foreach ($sessionCourseSubscriptions as $subscription) { foreach ($sessionCourseSubscriptions as $subscription) {
$session = $subscription->getSession(); $session = $subscription->getSession();
if (array_key_exists($session->getId(), $sessionList)) {
continue;
}
if ($currentSession && $currentSession->getId() === $session->getId()) { if ($currentSession && $currentSession->getId() === $session->getId()) {
$allowAccess = true; $allowAccess = true;
} }
$sessionList[] = $session; $sessionList[$session->getId()] = $session;
} }
if ($currentSession && !$allowAccess) { if ($currentSession && !$allowAccess) {
@ -53,15 +57,15 @@ $template->assign(
); );
$template->assign( $template->assign(
'gamification_stars', 'gamification_stars',
GamificationUtils::getTotalUserStars($user->getId(), $user->getStatus()) GamificationUtils::getTotalUserStars($user->getId(), $user->getStatus())
); );
$template->assign( $template->assign(
'gamification_points', 'gamification_points',
GamificationUtils::getTotalUserPoints($user->getId(), $user->getStatus()) GamificationUtils::getTotalUserPoints($user->getId(), $user->getStatus())
); );
$template->assign( $template->assign(
'gamification_progress', 'gamification_progress',
GamificationUtils::getTotalUserProgress($user->getId(), $user->getStatus()) GamificationUtils::getTotalUserProgress($user->getId(), $user->getStatus())
); );
$template->assign('sessions', $sessionList); $template->assign('sessions', $sessionList);
$template->assign('current_session', $currentSession); $template->assign('current_session', $currentSession);

16
main/inc/lib/GamificationUtils.php
Unescape View File

@ -13,7 +13,7 @@ class GamificationUtils
* Get the calculated points on session with gamification mode * Get the calculated points on session with gamification mode
* @param int $userId The user ID * @param int $userId The user ID
* @param int $userStatus The user Status * @param int $userStatus The user Status
* @return int * @return float
*/ */
public static function getTotalUserPoints($userId, $userStatus) public static function getTotalUserPoints($userId, $userStatus)
{ {
@ -32,7 +32,7 @@ class GamificationUtils
$points += self::getSessionPoints($session['id'], $userId); $points += self::getSessionPoints($session['id'], $userId);
} }
return $points; return round($points / count($sessions), 2);
} }
/** /**
@ -77,7 +77,7 @@ class GamificationUtils
$totalPoints += $score; $totalPoints += $score;
} }
return $totalPoints / count($courses); return round($totalPoints / count($courses), 2);
} }
/** /**
@ -112,7 +112,7 @@ class GamificationUtils
$progress += $courseProgress; $progress += $courseProgress;
} }
return $progress / count($courses); return round($progress / count($courses), 2);
} }
/** /**
@ -157,7 +157,7 @@ class GamificationUtils
$totalStars += $stars; $totalStars += $stars;
} }
return $totalStars / count($courses); return round($totalStars / count($courses));
} }
/** /**
@ -183,14 +183,14 @@ class GamificationUtils
$stars += self::getSessionStars($session['id'], $userId); $stars += self::getSessionStars($session['id'], $userId);
} }
return $stars; return round($stars / count($sessions));
} }
/** /**
* Get the total progress on sessions with gamification mode * Get the total progress on sessions with gamification mode
* @param int $userId The user ID * @param int $userId The user ID
* @param int $userStatus The user Status * @param int $userStatus The user Status
* @return int * @return float
*/ */
public static function getTotalUserProgress($userId, $userStatus) public static function getTotalUserProgress($userId, $userStatus)
{ {
@ -209,7 +209,7 @@ class GamificationUtils
$progress += self::getSessionProgress($session['id'], $userId); $progress += self::getSessionProgress($session['id'], $userId);
} }
return $progress; return round($progress / count($sessions), 2);
} }
} }

88
main/newscorm/learnpath.class.php
Unescape View File

@ -10202,69 +10202,67 @@ EOD;
// Calculate stars chapters evaluation // Calculate stars chapters evaluation
$exercisesItems = $this->getExercisesItems(); $exercisesItems = $this->getExercisesItems();
if ($exercisesItems === false) { if (!empty($exercisesItems)) {
return $stars; $totalResult = 0;
}
$totalResult = 0;
foreach ($exercisesItems as $exerciseItem) { foreach ($exercisesItems as $exerciseItem) {
$exerciseResultInfo = Event::getExerciseResultsByUser( $exerciseResultInfo = Event::getExerciseResultsByUser(
$this->user_id, $this->user_id,
$exerciseItem->ref, $exerciseItem->path,
$this->course_int_id, $this->course_int_id,
$sessionId, $sessionId,
$this->lp_id, $this->lp_id,
$exerciseItem->db_id $exerciseItem->db_id
); );
$exerciseResult = 0; $exerciseResult = 0;
foreach ($exerciseResultInfo as $result) { foreach ($exerciseResultInfo as $result) {
$exerciseResult += $result['exe_result'] * 100 / $result['exe_weighting']; $exerciseResult += $result['exe_result'] * 100 / $result['exe_weighting'];
} }
$exerciseAverage = $exerciseResult / (count($exerciseResultInfo) > 0 ? count($exerciseResultInfo) : 1); $exerciseAverage = $exerciseResult / (count($exerciseResultInfo) > 0 ? count($exerciseResultInfo) : 1);
$totalResult += $exerciseAverage; $totalResult += $exerciseAverage;
} }
$totalExerciseAverage = $totalResult / (count($exercisesItems) > 0 ? count($exercisesItems) : 1); $totalExerciseAverage = $totalResult / (count($exercisesItems) > 0 ? count($exercisesItems) : 1);
if ($totalExerciseAverage >= 50) { if ($totalExerciseAverage >= 50) {
$stars++; $stars++;
} }
if ($totalExerciseAverage >= 80) { if ($totalExerciseAverage >= 80) {
$stars++; $stars++;
}
} }
// Calculate star for final evaluation // Calculate star for final evaluation
$finalEvaluationItem = $this->getFinalEvaluationItem(); $finalEvaluationItem = $this->getFinalEvaluationItem();
if (empty($finalEvaluationItem)) { if (!empty($finalEvaluationItem)) {
return $stars; $evaluationResultInfo = Event::getExerciseResultsByUser(
} $this->user_id,
$finalEvaluationItem->path,
$this->course_int_id,
$sessionId,
$this->lp_id,
$finalEvaluationItem->db_id
);
$evaluationResultInfo = Event::getExerciseResultsByUser( $evaluationResult = 0;
$this->user_id,
$finalEvaluationItem->ref,
$this->course_int_id,
$sessionId,
$this->lp_id,
$finalEvaluationItem->db_id
);
$evaluationResult = 0; foreach ($evaluationResultInfo as $result) {
$evaluationResult += $result['exe_result'] * 100 / $result['exe_weighting'];
}
foreach ($evaluationResultInfo as $result) { $averageDivisor = count($evaluationResultInfo) > 0 ? count($evaluationResultInfo) : 1;
$evaluationResult += $result['exe_result'] * 100 / $result['exe_weighting'];
}
$evaluationAverage = $evaluationResult / (count($evaluationResultInfo) > 0 ? count($evaluationResultInfo) : 1); $evaluationAverage = $evaluationResult / $averageDivisor;
if ($evaluationAverage >= 80) { if ($evaluationAverage >= 80) {
$stars++; $stars++;
}
} }
return $stars; return $stars;

32
main/newscorm/lp_view.php
Unescape View File

@ -32,6 +32,7 @@ $show_learnpath = true;
api_protect_course_script(); api_protect_course_script();
$lp_id = intval($_GET['lp_id']); $lp_id = intval($_GET['lp_id']);
$sessionId = api_get_session_id();
// Check if the learning path is visible for student - (LP requisites) // Check if the learning path is visible for student - (LP requisites)
@ -51,7 +52,7 @@ $visibility = api_get_item_visibility(
$lp_id, $lp_id,
$action, $action,
api_get_user_id(), api_get_user_id(),
api_get_session_id() $sessionId
); );
if (!api_is_allowed_to_edit(false, true, false, false) && intval($visibility) == 0) { if (!api_is_allowed_to_edit(false, true, false, false) && intval($visibility) == 0) {
api_not_allowed(true); api_not_allowed(true);
@ -390,6 +391,12 @@ if (api_get_course_setting('lp_return_link') == 1) {
$buttonHomeText = get_lang('LearningPathList'); $buttonHomeText = get_lang('LearningPathList');
} }
$lpPreviewImagePath = 'unknown_250_100.jpg';
if ($_SESSION['oLP']->get_preview_image()) {
$lpPreviewImagePath = $_SESSION['oLP']->get_preview_image_path();
}
$template = new Template('title', false, false, true, true, false); $template = new Template('title', false, false, true, true, false);
$template->assign('glossary_extra_tools', api_get_setting('show_glossary_in_extra_tools')); $template->assign('glossary_extra_tools', api_get_setting('show_glossary_in_extra_tools'));
$template->assign( $template->assign(
@ -409,12 +416,33 @@ $template->assign('button_home_url', $buttonHomeUrl);
$template->assign('button_home_text', $buttonHomeText); $template->assign('button_home_text', $buttonHomeText);
$template->assign('navigation_bar', $navigation_bar); $template->assign('navigation_bar', $navigation_bar);
$template->assign('progress_bar', $progress_bar); $template->assign('progress_bar', $progress_bar);
$template->assign('oLP', $_SESSION['oLP']);
$template->assign('show_audio_player', $show_audioplayer); $template->assign('show_audio_player', $show_audioplayer);
$template->assign('media_player', $mediaplayer); $template->assign('media_player', $mediaplayer);
$template->assign('toc_list', $get_toc_list); $template->assign('toc_list', $get_toc_list);
$template->assign('iframe_src', $src); $template->assign('iframe_src', $src);
$template->assign('navigation_bar_bottom', $navigation_bar_bottom); $template->assign('navigation_bar_bottom', $navigation_bar_bottom);
$template->assign(
'gamification_stars',
$_SESSION['oLP']->getCalculateStars($sessionId)
);
$template->assign(
'gamification_points',
$_SESSION['oLP']->getCalculateScore($sessionId)
);
$template->assign(
'lp_preview_image',
Display::return_icon(
$lpPreviewImagePath,
null,
['height' => 96, 'width' => 104]
)
);
$template->assign('lp_author', $_SESSION['oLP']->get_author());
$template->assign('lp_mode', $_SESSION['oLP']->mode);
$template->assign(
'lp_html_toc',
$_SESSION['oLP']->get_html_toc($get_toc_list)
);
$content = $template->fetch('default/learnpath/view.tpl'); $content = $template->fetch('default/learnpath/view.tpl');

8
main/template/default/gamification/my_progress.tpl
Unescape View File

@ -14,9 +14,11 @@
{% endfor %} {% endfor %}
{% endif %} {% endif %}
{% for i in 1..(5 - gamification_stars) %} {% if 4 - gamification_stars > 0 %}
<i class="fa fa-star in"></i> {% for i in 1..(4 - gamification_stars) %}
{% endfor %} <i class="fa fa-star in"></i>
{% endfor %}
{% endif %}
</div> </div>
<div class="progress"> <div class="progress">

29
main/template/default/learnpath/view.tpl
Unescape View File

@ -13,21 +13,20 @@
{% if gamification_mode == 1 %} {% if gamification_mode == 1 %}
<div class="row"> <div class="row">
<div class="col-xs-8"> <div class="col-xs-8">
{% set lp_stars = oLP.getCalculateStars() %} {% if gamification_stars > 0 %}
{% if lp_stars > 0%} {% for i in 1..gamification_stars %}
{% for i in 1..lp_stars %}
<i class="fa fa-star fa-2x"></i> <i class="fa fa-star fa-2x"></i>
{% endfor %} {% endfor %}
{% endif %} {% endif %}
{% if lp_stars < 4 %} {% if gamification_stars < 4 %}
{% for i in 1..4 - lp_stars %} {% for i in 1..4 - gamification_stars %}
<i class="fa fa-star-o fa-2x"></i> <i class="fa fa-star-o fa-2x"></i>
{% endfor %} {% endfor %}
{% endif %} {% endif %}
</div> </div>
<div class="col-xs-4 text-right"> <div class="col-xs-4 text-right">
{{ "XPoints"|get_lang|format(oLP.getCalculateScore()) }} {{ "XPoints"|get_lang|format(gamification_points) }}
</div> </div>
</div> </div>
{% else %} {% else %}
@ -44,13 +43,7 @@
<i class="fa fa-home"></i> {{ button_home_text }} <i class="fa fa-home"></i> {{ button_home_text }}
</a> </a>
<div class="image-avatar"> <div class="image-avatar">{{ lp_preview_image }}</div>
{% if oLP.get_preview_image() %}
<img src="{{ oLP.get_preview_image_path() }}" width="104" height="96">
{% else %}
<img src="{{ "unknown_250_100.jpg"|icon }}" width="104" height="96">
{% endif %}
</div>
<div id="lp_navigation_elem" class="navegation-bar"> <div id="lp_navigation_elem" class="navegation-bar">
{{ navigation_bar }} {{ navigation_bar }}
@ -60,9 +53,7 @@
</div> </div>
</div> </div>
<div class="description-autor"> <div class="description-autor">{{ lp_author }}</div>
{{ oLP.get_author() }}
</div>
{% if show_audio_player %} {% if show_audio_player %}
<div id="lp_media_file"> <div id="lp_media_file">
@ -75,9 +66,7 @@
{# TOC layout #} {# TOC layout #}
<div id="toc_id" name="toc_name"> <div id="toc_id" name="toc_name">
<div id="learning_path_toc" class="scorm-list"> <div id="learning_path_toc" class="scorm-list">{{ lp_html_toc }}</div>
{{ oLP.get_html_toc(toc_list) }}
</div>
</div> </div>
{# end TOC layout #} {# end TOC layout #}
@ -88,7 +77,7 @@
{# right zone #} {# right zone #}
<div id="learning_path_right_zone" style="height:100%" class="content-scorm"> <div id="learning_path_right_zone" style="height:100%" class="content-scorm">
{% if oLP.mode == 'fullscreen' %} {% if lp_mode == 'fullscreen' %}
<iframe id="content_id_blank" name="content_name_blank" src="blank.php" border="0" frameborder="0" style="width: 100%; height: 100%" allowfullscreen="true" webkitallowfullscreen="true" mozallowfullscreen="true"></iframe> <iframe id="content_id_blank" name="content_name_blank" src="blank.php" border="0" frameborder="0" style="width: 100%; height: 100%" allowfullscreen="true" webkitallowfullscreen="true" mozallowfullscreen="true"></iframe>
{% else %} {% else %}
<iframe id="content_id" name="content_name" src="{{ iframe_src }}" border="0" frameborder="0" style="display: block; width: 100%; height: 100%" allowfullscreen="true" webkitallowfullscreen="true" mozallowfullscreen="true"></iframe> <iframe id="content_id" name="content_name" src="{{ iframe_src }}" border="0" frameborder="0" style="display: block; width: 100%; height: 100%" allowfullscreen="true" webkitallowfullscreen="true" mozallowfullscreen="true"></iframe>

Write Preview
Loading…
Cancel
Save