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 1.10.x

Browse Source
ofaj
jmontoyaa 10 years ago
parent 060612ac18 1418a604be
commit 5986d03ed4
10 changed files with 46 additions and 23 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. 18
      documentation/changelog.html
  2. 2
      main/gradebook/gradebook_display_summary.php
  3. 2
      main/gradebook/index.php
  4. 2
      main/gradebook/lib/GradebookUtils.php
  5. 26
      main/inc/lib/exercise.lib.php
  6. 3
      main/lang/english/trad4all.inc.php
  7. 3
      main/lang/french/trad4all.inc.php
  8. 1
      main/lang/spanish/trad4all.inc.php
  9. 10
      main/newscorm/learnpath.class.php
  10. 2
      main/newscorm/lp_final_item.php

18
documentation/changelog.html
Unescape View File

@ -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>
@ -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,21 @@
</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>
<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>

2
main/gradebook/gradebook_display_summary.php
Unescape View File

@ -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' => '',

2
main/gradebook/index.php
Unescape View File

@ -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' => '',

2
main/gradebook/lib/GradebookUtils.php
Unescape View File

@ -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' => '',

26
main/inc/lib/exercise.lib.php
Unescape View File

@ -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;
}
}
}

3
main/lang/english/trad4all.inc.php
Unescape View File

@ -7664,4 +7664,5 @@ $RecordAudio = "Record audio";
$StartRecordingAudio = "Start recording";
$StopRecordingAudio = "Stop recording";
$SaveRecordedAudio = "Save recorded audio";
?>
$GradeFromX = "Grade for course: %s";
?>

3
main/lang/french/trad4all.inc.php
Unescape View File

@ -7651,4 +7651,5 @@ $RecordAudio = "Enregistrement audio";
$StartRecordingAudio = "Lancer l'enregistrement";
$StopRecordingAudio = "Arrêter l'enregistrement";
$SaveRecordedAudio = "Sauvegarder l'audio enregistré";
?>
$GradeFromX = "Bulletin pour le cours: %s";
?>

1
main/lang/spanish/trad4all.inc.php
Unescape View File

@ -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";
?>

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

@ -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) &&

2
main/newscorm/lp_final_item.php
Unescape View File

@ -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();

Write Preview
Loading…
Cancel
Save