diff --git a/documentation/changelog.html b/documentation/changelog.html
index 45b852f32e..3438b6985d 100755
--- a/documentation/changelog.html
+++ b/documentation/changelog.html
@@ -49,7 +49,7 @@
- Chamilo 1.10.6 - Zacatecas, 23rd of May 2016
+ Chamilo 1.10.6 - Zacatecas, 24th of May 2016
Release notes - summary
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.
Release name
@@ -61,7 +61,6 @@
Notable new Features
For end-users, teachers and Chamilo admins
- - (700d3516 - BT#11186) Fix random questions
- (dd051695) Add option to show right answers only during the last exercise attempt (RESULT_DISABLE_SHOW_SCORE_ATTEMPT_SHOW_ANSWERS_LAST_ATTEMPT)
- (1c76446f) Add course setting "bbb_enable_conference_in_groups" to allow for conferences through course groups (requires the BigBlueButton plugin)
- (88842fd7 - BT#11141) Allow platform admins to manage all sessions
@@ -86,6 +85,21 @@
Improvements (minor features) and debug
+ - (700d3516 - BT#11186) Fix random questions
+ - (c7dc81a6 - BT#11202) Fix option RESULT_DISABLE_SHOW_SCORE_ATTEMPT_SHOW_ANSWERS_LAST_ATTEMPT BT#11202
+ - (397c9dcf) Update version to 1.10.6 in main/install/version.php
+ - (0ad4eaee - #1170) Scrutinizer Auto-Fixes (#1170)
+ - (8f76ee8d - #8237) Save calculated answer without correct answer
+ - (6b3e77ef - #8237) Fix read question of calculated answer type
+ - (aafde67b - #8237) Order code + showw CALCULATED_ANSWER questions
+ - (dfaa4f87 - BT#11202) Fix hotspot question result by a new parameter
+ - (73a570bf) Update gitlog to better ignore language terms messages
+ - (a82e76b7 - #8237) Revert "Fix CALCULATED_ANSWER
+ - (d3a5c1e8 - #8237) Revert "Fix questions list with calculated questions
+ - (ee763e84 - #8237) Revert "Fix showing resuls for calculated answers
+ - (ee874acc - #8237) Revert "Fix questions list for calculated answers
+ - (9cb2a921 - #8237) Revert "Fix conflict
+ - (6096b797 - #8237) Revert "Save the calculated answer without whished anser
- (6b51fae1 - BT#10052) Add function needed for exercises categories
- (1eac339b) Fix the update of API keys when no key exists previously (update_api_key())
- (f40efabc) Fix - Enable/disable tickets plugin from menu, display blank screen
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 76cae85a10..a2b95a25a6 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 474f20fb5c..b3a25a13f8 100644
--- a/main/gradebook/lib/GradebookUtils.php
+++ b/main/gradebook/lib/GradebookUtils.php
@@ -1395,7 +1395,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/inc/lib/exercise.lib.php b/main/inc/lib/exercise.lib.php
index 34a6f886bd..6822b2d967 100644
--- a/main/inc/lib/exercise.lib.php
+++ b/main/inc/lib/exercise.lib.php
@@ -3466,8 +3466,7 @@ HOTSPOT;
$objExercise,
$exe_id,
$save_user_result = false
- )
- {
+ ) {
global $origin;
// Getting attempt info
@@ -3537,16 +3536,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;
}
}
}
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 e48bdeebe2..f60f0f14cf 100644
--- a/main/lang/spanish/trad4all.inc.php
+++ b/main/lang/spanish/trad4all.inc.php
@@ -7681,4 +7681,5 @@ $RecordAudio = "Grabar audio";
$StartRecordingAudio = "Lanzar la grabación";
$StopRecordingAudio = "Finalizar la grabación";
$SaveRecordedAudio = "Guardar el audio grabado";
+$GradeFromX = "Notas para el curso: %s";
?>
diff --git a/main/newscorm/learnpath.class.php b/main/newscorm/learnpath.class.php
index e3d9718738..d49e742140 100755
--- a/main/newscorm/learnpath.class.php
+++ b/main/newscorm/learnpath.class.php
@@ -1676,9 +1676,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);
@@ -1688,10 +1689,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();