From 35abbf62f12606cb78e9f3f6dff3b91813c48e4c Mon Sep 17 00:00:00 2001
From: Angel Fernando Quiroz Campos <angelfqc.18@gmail.com>
Date: Wed, 22 Jul 2015 17:10:41 -0500
Subject: [PATCH] Fix show stars and points on lp view - refs BT#9886 #TMI

---
 main/newscorm/lp_view.php                | 32 ++++++++++++++++++++++--
 main/template/default/learnpath/view.tpl | 29 +++++++--------------
 2 files changed, 39 insertions(+), 22 deletions(-)

diff --git a/main/newscorm/lp_view.php b/main/newscorm/lp_view.php
index 74f1fc0d7b..c41042669c 100755
--- a/main/newscorm/lp_view.php
+++ b/main/newscorm/lp_view.php
@@ -32,6 +32,7 @@ $show_learnpath = true;
 api_protect_course_script();
 
 $lp_id = intval($_GET['lp_id']);
+$sessionId = api_get_session_id();
 
 // Check if the learning path is visible for student - (LP requisites)
 
@@ -51,7 +52,7 @@ $visibility = api_get_item_visibility(
     $lp_id,
     $action,
     api_get_user_id(),
-    api_get_session_id()
+    $sessionId
 );
 if (!api_is_allowed_to_edit(false, true, false, false) && intval($visibility) == 0) {
     api_not_allowed(true);
@@ -390,6 +391,12 @@ if (api_get_course_setting('lp_return_link') == 1) {
     $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->assign('glossary_extra_tools', api_get_setting('show_glossary_in_extra_tools'));
 $template->assign(
@@ -409,12 +416,33 @@ $template->assign('button_home_url', $buttonHomeUrl);
 $template->assign('button_home_text', $buttonHomeText);
 $template->assign('navigation_bar', $navigation_bar);
 $template->assign('progress_bar', $progress_bar);
-$template->assign('oLP', $_SESSION['oLP']);
 $template->assign('show_audio_player', $show_audioplayer);
 $template->assign('media_player', $mediaplayer);
 $template->assign('toc_list', $get_toc_list);
 $template->assign('iframe_src', $src);
 $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');
 
diff --git a/main/template/default/learnpath/view.tpl b/main/template/default/learnpath/view.tpl
index 6f262ec201..c2365d61e9 100644
--- a/main/template/default/learnpath/view.tpl
+++ b/main/template/default/learnpath/view.tpl
@@ -13,21 +13,20 @@
                 {% if gamification_mode == 1 %}
                     <div class="row">
                         <div class="col-xs-8">
-                            {% set lp_stars = oLP.getCalculateStars() %}
-                            {% if lp_stars > 0%}
-                                {% for i in 1..lp_stars %}
+                            {% if gamification_stars > 0 %}
+                                {% for i in 1..gamification_stars %}
                                     <i class="fa fa-star fa-2x"></i>
                                 {% endfor %}
                             {% endif %}
 
-                            {% if lp_stars < 4 %}
-                                {% for i in 1..4 - lp_stars %}
+                            {% if gamification_stars < 4 %}
+                                {% for i in 1..4 - gamification_stars %}
                                     <i class="fa fa-star-o fa-2x"></i>
                                 {% endfor %}
                             {% endif %}
                         </div>
                         <div class="col-xs-4 text-right">
-                            {{ "XPoints"|get_lang|format(oLP.getCalculateScore()) }}
+                            {{ "XPoints"|get_lang|format(gamification_points) }}
                         </div>
                     </div>
                 {% else %}
@@ -44,13 +43,7 @@
                                 <i class="fa fa-home"></i> {{ button_home_text }}
                             </a>
 
-                            <div class="image-avatar">
-                                {% 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 class="image-avatar">{{ lp_preview_image }}</div>
 
                             <div id="lp_navigation_elem" class="navegation-bar">
                                 {{ navigation_bar }}
@@ -60,9 +53,7 @@
                                 </div>
                             </div>
 
-                            <div class="description-autor">
-                                {{ oLP.get_author() }}
-                            </div>
+                            <div class="description-autor">{{ lp_author }}</div>
 
                             {% if show_audio_player %}
                                 <div id="lp_media_file">
@@ -75,9 +66,7 @@
 
                 {# TOC layout #}
                 <div id="toc_id" name="toc_name">
-                    <div id="learning_path_toc" class="scorm-list">
-                        {{ oLP.get_html_toc(toc_list) }}
-                    </div>
+                    <div id="learning_path_toc" class="scorm-list">{{ lp_html_toc }}</div>
                 </div>
                 {# end TOC layout #}
 
@@ -88,7 +77,7 @@
 
             {# right zone #}
             <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>
                 {% 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>