From c7dc81a679f944f868c0243b8bb66a545cd6d783 Mon Sep 17 00:00:00 2001
From: jmontoyaa <gugli100@gmail.com>
Date: Mon, 23 May 2016 15:58:17 +0200
Subject: [PATCH 1/5] Fix option 
 RESULT_DISABLE_SHOW_SCORE_ATTEMPT_SHOW_ANSWERS_LAST_ATTEMPT BT#11202

---
 main/inc/lib/exercise.lib.php | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/main/inc/lib/exercise.lib.php b/main/inc/lib/exercise.lib.php
index aa7e5ff120..7e0b2eae3c 100644
--- a/main/inc/lib/exercise.lib.php
+++ b/main/inc/lib/exercise.lib.php
@@ -3461,8 +3461,7 @@ HOTSPOT;
         $objExercise,
         $exe_id,
         $save_user_result = false
-    )
-    {
+    ) {
         global $origin;
 
         // Getting attempt info
@@ -3532,16 +3531,19 @@ HOTSPOT;
 
                 if ($attempts) {
                     $numberAttempts = count($attempts);
-                    if ($save_user_result) {
-                        $numberAttempts++;
-                    }
-                    if ($numberAttempts >= $objExercise->attempts) {
-                        $show_results = true;
-                        $show_only_score = false;
-                        $show_total_score_and_user_choices = false;
-                    } else {
-                        $show_total_score_and_user_choices = true;
-                    }
+                } else {
+                    $numberAttempts = 0;
+                }
+
+                if ($save_user_result) {
+                    $numberAttempts++;
+                }
+                if ($numberAttempts >= $objExercise->attempts) {
+                    $show_results = true;
+                    $show_only_score = false;
+                    $show_total_score_and_user_choices = false;
+                } else {
+                    $show_total_score_and_user_choices = true;
                 }
             }
         }

From 1297b8c79a75440f50f5b6c21f47236bb64e3f54 Mon Sep 17 00:00:00 2001
From: Yannick Warnier <ywarnier@beeznest.org>
Date: Mon, 23 May 2016 23:35:44 -0500
Subject: [PATCH 2/5] Update changelog for 1.10.6

---
 documentation/changelog.html | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/documentation/changelog.html b/documentation/changelog.html
index 45b852f32e..1b97173ccb 100755
--- a/documentation/changelog.html
+++ b/documentation/changelog.html
@@ -49,7 +49,7 @@
 
     <a name="1.10.6"></a>
 
-    <h1>Chamilo 1.10.6 - Zacatecas, 23rd of May 2016</h1>
+    <h1>Chamilo 1.10.6 - Zacatecas, 24th of May 2016</h1>
     <h3>Release notes - summary</h3>
     <p>Chamilo 1.10.6 is a minor, bugfix release of the 1.10.x branch, with a few new features and bugfixes on top of 1.10.4.</p>
     <h3>Release name</h3>
@@ -86,6 +86,20 @@
     </ul>
     <h3>Improvements (minor features) and debug</h3>
     <ul>
+        <li>(<a href="https://github.com/chamilo/chamilo-lms/commit/c7dc81a679f944f868c0243b8bb66a545cd6d783">c7dc81a6</a> - <a href="https://task.beeznest.com/issues/11202">BT#11202</a>) Fix option  RESULT_DISABLE_SHOW_SCORE_ATTEMPT_SHOW_ANSWERS_LAST_ATTEMPT BT#11202</li>
+        <li>(<a href="https://github.com/chamilo/chamilo-lms/commit/397c9dcfd1bccc648b78ba423b132ccacc5aae2a">397c9dcf</a>) Update version to 1.10.6 in main/install/version.php</li>
+        <li>(<a href="https://github.com/chamilo/chamilo-lms/commit/0ad4eaee3cfa47acbc8bbab2bf70f55d92ed49bc">0ad4eaee</a> - <a href="https://support.chamilo.org/issues/1170">#1170</a>) Scrutinizer Auto-Fixes (#1170)</li>
+        <li>(<a href="https://github.com/chamilo/chamilo-lms/commit/8f76ee8d0cf33a8c52313b19067c2d7566e823e6">8f76ee8d</a> - <a href="https://support.chamilo.org/issues/8237">#8237</a>) Save calculated answer without correct answer</li>
+        <li>(<a href="https://github.com/chamilo/chamilo-lms/commit/6b3e77efabf6750a7aeec266eb7ad1fa8b3fbed0">6b3e77ef</a> - <a href="https://support.chamilo.org/issues/8237">#8237</a>) Fix read question of calculated answer type</li>
+        <li>(<a href="https://github.com/chamilo/chamilo-lms/commit/aafde67b9c4e1dca98e2064bd3d4774979e045ca">aafde67b</a> - <a href="https://support.chamilo.org/issues/8237">#8237</a>) Order code + showw CALCULATED_ANSWER questions</li>
+        <li>(<a href="https://github.com/chamilo/chamilo-lms/commit/dfaa4f873da912c58dbc9b8a588b56e3c83d159d">dfaa4f87</a> - <a href="https://task.beeznest.com/issues/11202">BT#11202</a>) Fix hotspot question result by a new parameter</li>
+        <li>(<a href="https://github.com/chamilo/chamilo-lms/commit/73a570bfd0163e84361856f78dec57a2d9ea953e">73a570bf</a>) Update gitlog to better ignore language terms messages</li>
+        <li>(<a href="https://github.com/chamilo/chamilo-lms/commit/a82e76b76648e86490c2f6481e1febd0ed7ea6b8">a82e76b7</a> - <a href="https://support.chamilo.org/issues/8237">#8237</a>) Revert "Fix CALCULATED_ANSWER</li>
+        <li>(<a href="https://github.com/chamilo/chamilo-lms/commit/d3a5c1e8db761f738dcfe98181a473a87084759e">d3a5c1e8</a> - <a href="https://support.chamilo.org/issues/8237">#8237</a>) Revert "Fix questions list with calculated questions</li>
+        <li>(<a href="https://github.com/chamilo/chamilo-lms/commit/ee763e840555125e82549213e040178961934525">ee763e84</a> - <a href="https://support.chamilo.org/issues/8237">#8237</a>) Revert "Fix showing resuls for calculated answers</li>
+        <li>(<a href="https://github.com/chamilo/chamilo-lms/commit/ee874accf2a186902a8815a5e45244bf381f2b98">ee874acc</a> - <a href="https://support.chamilo.org/issues/8237">#8237</a>) Revert "Fix questions list for calculated answers</li>
+        <li>(<a href="https://github.com/chamilo/chamilo-lms/commit/9cb2a9214cba10f5a3b40465211bc084d7e4bf69">9cb2a921</a> - <a href="https://support.chamilo.org/issues/8237">#8237</a>) Revert "Fix conflict</li>
+        <li>(<a href="https://github.com/chamilo/chamilo-lms/commit/6096b797f6c210fa8444d34ff7a3d95487fd4d63">6096b797</a> - <a href="https://support.chamilo.org/issues/8237">#8237</a>) Revert "Save the calculated answer without whished anser</li>
         <li>(<a href="https://github.com/chamilo/chamilo-lms/commit/6b51fae1a37d3c7b3f7c656e3631cb2eb50d028e">6b51fae1</a> - <a href="https://task.beeznest.com/issues/10052">BT#10052</a>) Add function needed for exercises categories</li>
         <li>(<a href="https://github.com/chamilo/chamilo-lms/commit/1eac339bacb87237413064b9f20f6047d4093dad">1eac339b</a>) Fix the update of API keys when no key exists previously (update_api_key())</li>
         <li>(<a href="https://github.com/chamilo/chamilo-lms/commit/f40efabc34cbffb840a47f44495e0fa59fc476e9">f40efabc</a>) Fix - Enable/disable tickets plugin from menu, display blank screen</li>

From 773bbbd30b8b29868fd21aae3c26e81697423c1a Mon Sep 17 00:00:00 2001
From: Yannick Warnier <ywarnier@beeznest.org>
Date: Mon, 23 May 2016 23:51:57 -0500
Subject: [PATCH 3/5] Fix "GradeFromX" lang var used as report title for
 gradebook export to PDF

---
 main/gradebook/gradebook_display_summary.php | 2 +-
 main/gradebook/index.php                     | 2 +-
 main/gradebook/lib/GradebookUtils.php        | 2 +-
 main/lang/english/trad4all.inc.php           | 3 ++-
 main/lang/french/trad4all.inc.php            | 3 ++-
 main/lang/spanish/trad4all.inc.php           | 3 ++-
 6 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/main/gradebook/gradebook_display_summary.php b/main/gradebook/gradebook_display_summary.php
index 9ad2f63543..6f42ff5a05 100644
--- a/main/gradebook/gradebook_display_summary.php
+++ b/main/gradebook/gradebook_display_summary.php
@@ -57,7 +57,7 @@ switch ($action) {
 
         $courseInfo = api_get_course_info();
         $params = array(
-            'pdf_title' => sprintf(get_lang('GradeFromX'), $courseInfo['department_name']),
+            'pdf_title' => sprintf(get_lang('GradeFromX'), $courseInfo['name']),
             'session_info' => '',
             'course_info' => '',
             'pdf_date' => '',
diff --git a/main/gradebook/index.php b/main/gradebook/index.php
index 5ae8051e2a..40a0d6938d 100755
--- a/main/gradebook/index.php
+++ b/main/gradebook/index.php
@@ -949,7 +949,7 @@ if (isset($first_time) && $first_time==1 && api_is_allowed_to_edit(null,true)) {
                     $sessionName = api_get_session_name(api_get_session_id());
                     $sessionName = !empty($sessionName) ? " - $sessionName" : '';
                     $params = array(
-                        'pdf_title' => sprintf(get_lang('GradeFromX'), $courseInfo['department_name']),
+                        'pdf_title' => sprintf(get_lang('GradeFromX'), $courseInfo['name']),
                         'course_code' => api_get_course_id(),
                         'session_info' => '',
                         'course_info' => '',
diff --git a/main/gradebook/lib/GradebookUtils.php b/main/gradebook/lib/GradebookUtils.php
index 3b7c4e8360..5dc9fddf16 100644
--- a/main/gradebook/lib/GradebookUtils.php
+++ b/main/gradebook/lib/GradebookUtils.php
@@ -1387,7 +1387,7 @@ class GradebookUtils
         $sessionName = !empty($sessionName) ? " - $sessionName" : '';
 
         $params = array(
-            'pdf_title' => sprintf(get_lang('GradeFromX'), $courseInfo['department_name']),
+            'pdf_title' => sprintf(get_lang('GradeFromX'), $courseInfo['name']),
             'session_info' => '',
             'course_info' => '',
             'pdf_date' => '',
diff --git a/main/lang/english/trad4all.inc.php b/main/lang/english/trad4all.inc.php
index ff0d3f65e0..502197bc54 100644
--- a/main/lang/english/trad4all.inc.php
+++ b/main/lang/english/trad4all.inc.php
@@ -7664,4 +7664,5 @@ $RecordAudio = "Record audio";
 $StartRecordingAudio = "Start recording";
 $StopRecordingAudio = "Stop recording";
 $SaveRecordedAudio = "Save recorded audio";
-?>
\ No newline at end of file
+$GradeFromX = "Grade for course: %s";
+?>
diff --git a/main/lang/french/trad4all.inc.php b/main/lang/french/trad4all.inc.php
index 8094dd641f..29de7a99f9 100644
--- a/main/lang/french/trad4all.inc.php
+++ b/main/lang/french/trad4all.inc.php
@@ -7651,4 +7651,5 @@ $RecordAudio = "Enregistrement audio";
 $StartRecordingAudio = "Lancer l'enregistrement";
 $StopRecordingAudio = "Arrêter l'enregistrement";
 $SaveRecordedAudio = "Sauvegarder l'audio enregistré";
-?>
\ No newline at end of file
+$GradeFromX = "Bulletin pour le cours: %s";
+?>
diff --git a/main/lang/spanish/trad4all.inc.php b/main/lang/spanish/trad4all.inc.php
index 5c42cfccd5..cddd011477 100644
--- a/main/lang/spanish/trad4all.inc.php
+++ b/main/lang/spanish/trad4all.inc.php
@@ -7683,4 +7683,5 @@ $RecordAudio = "Grabar audio";
 $StartRecordingAudio = "Lanzar la grabación";
 $StopRecordingAudio = "Finalizar la grabación";
 $SaveRecordedAudio = "Guardar el audio grabado";
-?>
\ No newline at end of file
+$GradeFromX = "Notas para el curso: %s";
+?>

From 1a69e4b4c7f21d54d1f3ca4639e4c2ce5da9a118 Mon Sep 17 00:00:00 2001
From: Yannick Warnier <ywarnier@beeznest.org>
Date: Tue, 24 May 2016 00:30:03 -0500
Subject: [PATCH 4/5] Last update to changelog for 1.10.6 (post release)

---
 documentation/changelog.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/documentation/changelog.html b/documentation/changelog.html
index 1b97173ccb..3438b6985d 100755
--- a/documentation/changelog.html
+++ b/documentation/changelog.html
@@ -61,7 +61,6 @@
     <h3>Notable new Features</h3>
     <h4>For end-users, teachers and Chamilo admins</h4>
     <ul>
-        <li>(<a href="https://github.com/chamilo/chamilo-lms/commit/700d3516f86c441460f30d5feb64916465d1d545">700d3516</a> - <a href="https://task.beeznest.com/issues/11186">BT#11186</a>) Fix random questions</li>
         <li>(<a href="https://github.com/chamilo/chamilo-lms/commit/dd051695d71cb7e69969d6b3644a5b1ee79bedfb">dd051695</a>) Add option to show right answers only during the last exercise attempt (RESULT_DISABLE_SHOW_SCORE_ATTEMPT_SHOW_ANSWERS_LAST_ATTEMPT)</li>
         <li>(<a href="https://github.com/chamilo/chamilo-lms/commit/1c76446ff2967542afc9f1ec963f6444593b3c5e">1c76446f</a>) Add course setting "bbb_enable_conference_in_groups" to allow for conferences through course groups (requires the BigBlueButton plugin)</li>
         <li>(<a href="https://github.com/chamilo/chamilo-lms/commit/88842fd706130a593d2a5e95cd37784a4d0de389">88842fd7</a> - <a href="https://task.beeznest.com/issues/11141">BT#11141</a>) Allow platform admins to manage all sessions</li>
@@ -86,6 +85,7 @@
     </ul>
     <h3>Improvements (minor features) and debug</h3>
     <ul>
+        <li>(<a href="https://github.com/chamilo/chamilo-lms/commit/700d3516f86c441460f30d5feb64916465d1d545">700d3516</a> - <a href="https://task.beeznest.com/issues/11186">BT#11186</a>) Fix random questions</li>
         <li>(<a href="https://github.com/chamilo/chamilo-lms/commit/c7dc81a679f944f868c0243b8bb66a545cd6d783">c7dc81a6</a> - <a href="https://task.beeznest.com/issues/11202">BT#11202</a>) Fix option  RESULT_DISABLE_SHOW_SCORE_ATTEMPT_SHOW_ANSWERS_LAST_ATTEMPT BT#11202</li>
         <li>(<a href="https://github.com/chamilo/chamilo-lms/commit/397c9dcfd1bccc648b78ba423b132ccacc5aae2a">397c9dcf</a>) Update version to 1.10.6 in main/install/version.php</li>
         <li>(<a href="https://github.com/chamilo/chamilo-lms/commit/0ad4eaee3cfa47acbc8bbab2bf70f55d92ed49bc">0ad4eaee</a> - <a href="https://support.chamilo.org/issues/1170">#1170</a>) Scrutinizer Auto-Fixes (#1170)</li>

From 1db35954ccbd0d7db791f84560d2a2a4b7848c0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Loguercio?= <jloguercio.work@gmail.com>
Date: Tue, 24 May 2016 19:03:50 -0500
Subject: [PATCH 5/5] Fix LP Final Item when it showing the certificate and
 badges if you fail an exercise

---
 main/newscorm/learnpath.class.php | 10 +++++++---
 main/newscorm/lp_final_item.php   |  2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/main/newscorm/learnpath.class.php b/main/newscorm/learnpath.class.php
index 309ae04f8b..65ecd9c740 100755
--- a/main/newscorm/learnpath.class.php
+++ b/main/newscorm/learnpath.class.php
@@ -1686,9 +1686,10 @@ class learnpath
 
     /**
      * Gets the number of items currently completed
+     * @param bool $failedStatusException flag to determine the failed status is not considered progressed
      * @return integer The number of items currently completed
      */
-    public function get_complete_items_count()
+    public function get_complete_items_count($failedStatusException = false)
     {
         if ($this->debug > 0) {
             error_log('New LP - In learnpath::get_complete_items_count()', 0);
@@ -1698,10 +1699,13 @@ class learnpath
             'completed',
             'passed',
             'succeeded',
-            'browsed',
-            'failed'
+            'browsed'
         );
 
+        if (!$failedStatusException) {
+            $completedStatusList[] = 'failed';
+        }
+
         foreach ($this->items as $id => $dummy) {
             // Trying failed and browsed considered "progressed" as well.
             if ($this->items[$id]->status_is($completedStatusList) &&
diff --git a/main/newscorm/lp_final_item.php b/main/newscorm/lp_final_item.php
index 99d989bd3f..b5af284411 100644
--- a/main/newscorm/lp_final_item.php
+++ b/main/newscorm/lp_final_item.php
@@ -35,7 +35,7 @@ $finalItemTemplate = '';
 // Check prerequisites and total completion of the learning path
 $lp = new Learnpath($courseCode, $lpId, $userId);
 $count = $lp->get_total_items_count_without_chapters();
-$completed = $lp->get_complete_items_count();
+$completed = $lp->get_complete_items_count(true);
 $currentItemId = $lp->get_current_item_id();
 $currentItem = $lp->items[$currentItemId];
 $currentItemStatus = $currentItem->get_status();