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 branch '1.11.x' of github.com:chamilo/chamilo-lms into 1.11.x

Browse Source
pull/3420/head
Angel Fernando Quiroz Campos 5 years ago
parent 73348d506c b68e8b5465
commit c648937400
9 changed files with 86 additions and 26 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. 41
      documentation/changelog.html
  2. 11
      main/course_progress/index.php
  3. 12
      main/exercise/exercise.class.php
  4. 3
      main/exercise/exercise_show.php
  5. 4
      main/exercise/stats.php
  6. 18
      main/exercise/upload_exercise.php
  7. 9
      main/inc/introductionSection.inc.php
  8. 2
      main/inc/lib/agenda.lib.php
  9. 12
      main/template/default/learnpath/view.tpl

41
documentation/changelog.html
Unescape View File

@ -17,7 +17,7 @@
$('.version').each(function() {
var version = $(this).attr('aria-label');
var title = $(this).find('h1').text();
var titleParts = title.split('-');
var titleParts = title.split(' - ');
title = titleParts[0];
var cityParts = titleParts[1].split(',');
@ -108,7 +108,7 @@
<div class="version" aria-label="1.11.12">
<a id="1.11.12"></a>
A <h1>Chamilo 1.11.12 - Le Breuil-sous-Argenton, ??/0?/2020</h1>
<h1>Chamilo 1.11.12 - Le Breuil-sous-Argenton, ??/08/2020</h1>
<h3>Release notes - summary</h3>
<p>Chamilo 1.11.12 is a minor bugfix release on top of 1.11.10.</p>
<p>Starting from this release, changes are registered by reversed date of addition (the latest changes first), which dramatically improves the changelog edition time. Because yes, it is reviewed manually.</p>
@ -144,6 +144,7 @@ A <h1>Chamilo 1.11.12 - Le Breuil-sous-Argenton, ??/0?/2020</h1>
<h3>Notable new Features</h3>
<h4>For end-users, teachers and Chamilo admins</h4>
<ul aria-live="off">
<li>[2020-07-30] (<a href="https://github.com/chamilo/chamilo-lms/commit/ed713e1dbf775418b582e26ea2262b33bb3b0389">ed713e1d</a> - <a href="https://support.chamilo.org/issues/17589">CT#17589</a>) UserPortal: Add new link "Latest visited course" to redirect the user to the latest visited course/course-session</li>
<li>[2020-07-24] (<a href="https://github.com/chamilo/chamilo-lms/commit/7d102e29cd282988943c8fc864a2a81ae069e45a">7d102e29</a> - <a href="https://task.beeznest.com/issues/17576">BT#17576</a>) Session: Allow session admins to see session reports</li>
<li>[2020-07-16] (<a href="https://github.com/chamilo/chamilo-lms/commit/d7a05c034b406d719e84a4a44e86277eeecc6f02">d7a05c03</a> - <a href="https://github.com/chamilo/chamilo-lms/issues/3093">GH#3093</a>) Tracking: New attndances page for parents/HRM</li>
<li>[2020-07-20] (<a href="https://github.com/chamilo/chamilo-lms/commit/910ad1e99605da8f1b27e624f84eb9986d0a65e0">910ad1e9</a>) Plugin: H5P: Let teachers create H5P games inside learning paths (global shared storage)</li>
@ -311,6 +312,28 @@ A <h1>Chamilo 1.11.12 - Le Breuil-sous-Argenton, ??/0?/2020</h1>
</ul>
<h3>Improvements (minor features) and debug</h3>
<ul aria-live="off">
<li>[2020-07-30] (<a href="https://github.com/chamilo/chamilo-lms/commit/c623b960becf9b415faf034ebe900c4099c94a8d">c623b960</a> - <a href="https://github.com/chamilo/chamilo-lms/issues/2968">GH#2968</a>) Force generation for path of platform logo in PDF</li>
<li>[2020-07-30] (<a href="https://github.com/chamilo/chamilo-lms/commit/7c426d8b93c4b1071a9aa72b243ca64ee5a7764e">7c426d8b</a>) Quiz: Remove Display::display_footer in result.php</li>
<li>[2020-07-30] (<a href="https://github.com/chamilo/chamilo-lms/commit/9004408e16004e902b44a019611d1138998bcd79">9004408e</a>) Scripts: Update undefined language variables detector script to ignore variables called as get_lang() method of a plugin</li>
<li>[2020-07-29] (<a href="https://github.com/chamilo/chamilo-lms/commit/2c1b64539fa4c07491196a20aec722489573517e">2c1b6453</a> - <a href="https://github.com/chamilo/chamilo-lms/issues/3409">GH#3409</a>) Learning path: Show item view when selecting an item in ToC</li>
<li>[2020-07-29] (<a href="https://github.com/chamilo/chamilo-lms/commit/a8f8788b8cd2761e317bbb557603ecef52422ae4">a8f8788b</a> - <a href="https://github.com/chamilo/chamilo-lms/issues/3008">GH#3008</a>) Course Progress: Incorrect time in Thematic Advance Change .ready for function</li>
<li>[2020-07-29] (<a href="https://github.com/chamilo/chamilo-lms/commit/1bbcbb44991d1dbfbd600b3cf63c13d5a6046995">1bbcbb44</a>) Documentation: Remove support for PHP 7.4 from documentation: Due to library dependencies, 7.4 is supported *but* generates a lot of NOTICE and WARNING messages, which can spook users or overload server logs.</li>
<li>[2020-07-29] (<a href="https://github.com/chamilo/chamilo-lms/commit/ccde072d7edac61e65994b4dc35febb2d1246cf5">ccde072d</a>) WCAG: Add label text to search form in documents list</li>
<li>[2020-07-29] (<a href="https://github.com/chamilo/chamilo-lms/commit/a50c07ad22953fd83aae6a95a3e7ece24ea59b48">a50c07ad</a> - <a href="https://github.com/chamilo/chamilo-lms/issues/3406">GH#3406</a>) Gradebook: Grade model: Increase max elements to 20</li>
<li>[2020-07-28] (<a href="https://github.com/chamilo/chamilo-lms/commit/e936e64c882d1764f58126b0fef08a2bfd58096e">e936e64c</a> - <a href="https://task.beeznest.com/issues/17585">BT#17585</a>) Exercises: Fix missing NoFeedback option</li>
<li>[2020-07-28] (<a href="https://github.com/chamilo/chamilo-lms/commit/e1db8e0858c62b9fa5a9e1246f6acedb4958c747">e1db8e08</a>) Plugin: Zoom fix entity definition</li>
<li>[2020-07-27] (<a href="https://github.com/chamilo/chamilo-lms/commit/dd03905c07e087b955f2e6ff960394ea64200e76">dd03905c</a> - <a href="https://task.beeznest.com/issues/17415">BT#17415</a>) Plugin: Whispeak: Change enrollment title</li>
<li>[2020-07-27] (<a href="https://github.com/chamilo/chamilo-lms/commit/6b402e1cf794f908dea60d7e8767e2055416e0c8">6b402e1c</a> - <a href="https://task.beeznest.com/issues/17415">BT#17415</a>) Plugin: Whispeak: Remove unused lang variables</li>
<li>[2020-07-27] (<a href="https://github.com/chamilo/chamilo-lms/commit/b234316dff1291c307eb239665140d7890b89d1a">b234316d</a>) WCAG: Avoid using empty <i></i> for comments in documents list: replace by &lt;em&gt; and remove if no comment is set</li>
<li>[2020-07-27] (<a href="https://github.com/chamilo/chamilo-lms/commit/ef6ac7c3c4048af05f9eb936ed0536feb728ad56">ef6ac7c3</a>) WCAG: Convert &lt;i&gt; tags to &lt;em&gt; for better accessibility (WCAG AA)</li>
<li>[2020-07-27] (<a href="https://github.com/chamilo/chamilo-lms/commit/8cf4fc017ee1388acd38a0985745bdd2c76c7f7b">8cf4fc01</a> - <a href="https://task.beeznest.com/issues/16386">BT#16386</a>) Notification: Add check on user being logged in before showing user menu (fix previous typo)</li>
<li>[2020-07-27] (<a href="https://github.com/chamilo/chamilo-lms/commit/e239616ea78d20233210fbfeb96d4f78db12183e">e239616e</a> - <a href="https://task.beeznest.com/issues/16386">BT#16386</a>) Notification: Add check on user being logged in before showing user menu</li>
<li>[2020-07-27] (<a href="https://github.com/chamilo/chamilo-lms/commit/608c0e418798bb20613d7cd51dd95aee0a9c4e5c">608c0e41</a> - <a href="https://task.beeznest.com/issues/17288">BT#17288</a>) Plugins: fix lang vars, fix UI</li>
<li>[2020-07-27] (<a href="https://github.com/chamilo/chamilo-lms/commit/237c9aadff01534adb217c241bbaf568c0c50b84">237c9aad</a> - <a href="https://task.beeznest.com/issues/17288">BT#17288</a>) Plugin: Zoom add new setting globalConferencePerUserAllowRoles - fix lang vars</li>
<li>[2020-07-27] (<a href="https://github.com/chamilo/chamilo-lms/commit/93603fccfc3c5b69d978dc579ee35ac5e59f2d50">93603fcc</a>) Plugin: Zoom: fix translations, replace location with api_location</li>
<li>[2020-07-27] (<a href="https://github.com/chamilo/chamilo-lms/commit/aaa19118c4383516dbfb335380c207b41019b243">aaa19118</a>) Performance: Replace user.user_id with user.id in sessionmanager and subscribe_user.php</li>
<li>[2020-07-24] (<a href="https://github.com/chamilo/chamilo-lms/commit/1a39ffbb83081140c99fadb075d3002f6f6e3de4">1a39ffbb</a> - <a href="https://task.beeznest.com/issues/17415">BT#17415</a>) Plugin: Whispeak: Improve message above record audio block</li>
<li>[2020-07-24] (<a href="https://github.com/chamilo/chamilo-lms/commit/e6fbb35dcef7a5c88afeffd88b54328fae229905">e6fbb35d</a> - <a href="https://task.beeznest.com/issues/17415">BT#17415</a>) Plugin: Whispeak: Set accept-language in request header</li>
<li>[2020-07-24] (<a href="https://github.com/chamilo/chamilo-lms/commit/14462c1d4e57bb4205cf8662a930ab62671a8f8a">14462c1d</a> - <a href="https://task.beeznest.com/issues/17576">BT#17576</a>) Tracking: Check session list of session admins and let them see their report, in teachers_time_by_session_report.php and works_in_session_report.php</li>
<li>[2020-07-24] (<a href="https://github.com/chamilo/chamilo-lms/commit/a761c90ce92e1c55ef3b1891bef0fd530fa9cf7c">a761c90c</a> - <a href="https://github.com/chamilo/chamilo-lms/issues/2667">GH#2667</a>) Plugin: H5P: Add installer checks and translations</li>
<li>[2020-07-23] (<a href="https://github.com/chamilo/chamilo-lms/commit/0121c51c1ad47249abcad0a70f9f45dfadca8c5b">0121c51c</a> - <a href="https://task.beeznest.com/issues/16298">BT#16298</a>) Plugin: Pause training: check course and login access</li>
@ -10129,16 +10152,16 @@ All security issues are published and patches are attached on <a href="https://s
</div>
<div class="version" aria-label="1.9.8.2">
<a id="1.9.8.2"></a>
<h1>Chamilo 1.9.8.2 - ,21st of June, 2014</h1>
<h3>Release notes - summary</h3>
<p>Chamilo 1.9.8.2 is a very little patch version with one bugfix regarding the learning paths tool. Considering the fact that 1.9.8 is planned for the long term, we'd hate to have such a minor patch left on the side for a year or so. This will be packaged and promoted as 1.9.8, but the folder inside the 1.9.8 will be called 1.9.8.2, with a change to this changelog file and a one-line change to main/newscorm/learnpathItem.class.php (as such, you can update just this file to upgrade from 1.9.8.1 to 1.9.8.2. See <a href="https://github.com/chamilo/chamilo-lms/commit/642a80e9e838f98f25135fbb64795e4f3df86260">the code change</a> for detais.</p>
<a id="1.9.8.2"></a>
<h1>Chamilo 1.9.8.2 - Quipán, 21st of June, 2014</h1>
<h3>Release notes - summary</h3>
<p>Chamilo 1.9.8.2 is a very little patch version with one bugfix regarding the learning paths tool. Considering the fact that 1.9.8 is planned for the long term, we'd hate to have such a minor patch left on the side for a year or so. This will be packaged and promoted as 1.9.8, but the folder inside the 1.9.8 will be called 1.9.8.2, with a change to this changelog file and a one-line change to main/newscorm/learnpathItem.class.php (as such, you can update just this file to upgrade from 1.9.8.1 to 1.9.8.2. See <a href="https://github.com/chamilo/chamilo-lms/commit/642a80e9e838f98f25135fbb64795e4f3df86260">the code change</a> for details.</p>
</div>
<div class="version" aria-label="1.9.8.1">
<h1>Chamilo 1.9.8.1 - ,18th of June 2014</h1>
<h3>Release notes - summary</h3>
<p>Chamilo 1.9.8.1 is a patch version with one security patch on top of 1.9.8 (in the included library for FCKeditor). Please check <a href="https://support.chamilo.org/projects/chamilo-18/wiki/Security_issues">our security issues page</a> for more information.</p>
<h1>Chamilo 1.9.8.1 - Gangai, 18th of June, 2014</h1>
<h3>Release notes - summary</h3>
<p>Chamilo 1.9.8.1 is a patch version with one security patch on top of 1.9.8 (in the included library for FCKeditor). Please check <a href="https://support.chamilo.org/projects/chamilo-18/wiki/Security_issues">our security issues page</a> for more information.</p>
</div>
<div class="version" aria-label="1.9.8.0">

11
main/course_progress/index.php
Unescape View File

@ -114,6 +114,11 @@ $(function() {
</script>';
$htmlHeadXtra[] = '<script>
$(function() {
if ($("#div_result").html() !== undefined && $("#div_result").html().length == 0) {
$("#div_result").html("0");
}
})
function datetime_by_attendance(attendance_id, thematic_advance_id) {
$.ajax({
contentType: "application/x-www-form-urlencoded",
@ -248,13 +253,13 @@ if ($action == 'thematic_plan_list') {
$(function () {
$('.btn-delete').on('click', function (e) {
e.preventDefault();
var id = $(this).data('id') || 0;
if (!id) {
return;
}
//$('[name=\"title[' + id + ']\"]').val('');
CKEDITOR.instances['description[' + id + ']'].setData('');
});

12
main/exercise/exercise.class.php
Unescape View File

@ -8304,10 +8304,14 @@ class Exercise
}
/**
* @param int $start
* @param int $length
*
* @return array
* Get the question IDs from quiz_rel_question for the current quiz,
* using the parameters as the arguments to the SQL's LIMIT clause.
* Because the exercise_id is known, it also comes with a filter on
* the session, so sessions are not specified here.
* @param int $start At which question do we want to start the list
* @param int $length Up to how many results we want
*
* @return array A list of question IDs
*/
public function getQuestionForTeacher($start = 0, $length = 10)
{

3
main/exercise/exercise_show.php
Unescape View File

@ -939,8 +939,7 @@ if ($show_results) {
if ('export' === $action) {
$content = ob_get_clean();
// needed in order to mpdf to work
ob_clean();
if (ob_get_contents()) ob_clean();
$params = [
'filename' => api_replace_dangerous_char(
$objExercise->name.' '.

4
main/exercise/stats.php
Unescape View File

@ -44,7 +44,9 @@ if (empty($sessionId)) {
);
}
$count_students = count($students);
$question_list = $objExercise->get_validated_question_list();
//$question_list = $objExercise->get_validated_question_list();
$totalQuestions = $objExercise->getQuestionCount(); //Get total of questions
$question_list = $objExercise->getQuestionForTeacher(0, $totalQuestions); // get questions from 0 to total
$data = [];
// Question title # of students who tool it Lowest score Average Highest score Maximum score

18
main/exercise/upload_exercise.php
Unescape View File

@ -23,9 +23,13 @@ if (!$is_allowed_to_edit) {
$this_section = SECTION_COURSES;
$htmlHeadXtra[] = "<script>
$(function(){
$('#user_custom_score').click(function() {
$('#options').toggle();
$(function () {
$('#user_custom_score').on('change', function () {
if ($('#user_custom_score[type=\"checkbox\"]').prop('checked')) {
$('#options').removeClass('hidden')
} else {
$('#options').addClass('hidden')
}
});
});
</script>";
@ -110,7 +114,7 @@ function lp_upload_quiz_main()
get_lang('UseCustomScoreForAllQuestions'),
['id' => 'user_custom_score']
);
$form->addElement('html', '<div id="options" style="display:none">');
$form->addElement('html', '<div id="options" class="hidden">');
$form->addElement('text', 'correct_score', get_lang('CorrectScore'));
$form->addElement('text', 'incorrect_score', get_lang('IncorrectScore'));
$form->addElement('html', '</div>');
@ -427,8 +431,10 @@ function lp_upload_quiz_action_handling()
$score,
$id
);
$total += (float) $score;
if ($correct) {
//only add the item marked as correct ( x )
$total += (float)$score;
}
$id++;
}

9
main/inc/introductionSection.inc.php
Unescape View File

@ -210,11 +210,20 @@ if ($tool == TOOL_COURSE_HOMEPAGE && !isset($_GET['intro_cmdEdit'])) {
$thematic_advance = get_lang('CourseThematicAdvance');
$thematicScore = $thematic->get_total_average_of_thematic_advances().'%';
$thematicUrl = api_get_path(WEB_CODE_PATH).'course_progress/index.php?action=thematic_details&'.api_get_cidreq();
$thematic_advance_info['thematic_id'] = isset($thematic_advance_info['thematic_id']) ? $thematic_advance_info['thematic_id'] : 0;
$thematic_advance_info['start_date'] = isset($thematic_advance_info['start_date']) ? $thematic_advance_info['start_date'] : null;
$thematic_advance_info['content'] = isset($thematic_advance_info['content']) ? $thematic_advance_info['content'] : '';
$thematic_advance_info['duration'] = isset($thematic_advance_info['duration']) ? $thematic_advance_info['duration'] : 0;
$thematic_info = $thematic->get_thematic_list($thematic_advance_info['thematic_id']);
$thematic_info['title'] = isset($thematic_info['title']) ? $thematic_info['title'] : '';
/*
$thematic_advance_info['start_date'] = api_get_local_time(
$thematic_advance_info['start_date']
);
*/
$thematic_advance_info['start_date'] = api_format_date(
$thematic_advance_info['start_date'],
DATE_TIME_FORMAT_LONG

2
main/inc/lib/agenda.lib.php
Unescape View File

@ -246,7 +246,7 @@ class Agenda
) {
$start = api_get_utc_datetime($start);
$end = api_get_utc_datetime($end);
$allDay = isset($allDay) && $allDay === 'true' ? 1 : 0;
$allDay = isset($allDay) && ($allDay === 'true' || $allDay == 1) ? 1 : 0;
$id = null;
switch ($this->type) {

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

@ -139,6 +139,8 @@
</div>
{# TOC layout #}
<div id="toc_id" class="scorm-body" name="toc_name">
{# div#flab-mobile is to know when the user is on mobile view. Don't delete. #}
<div id="flag-mobile" class="visible-xs-block" aria-hidden="true"></div>
{% include 'learnpath/scorm_list.tpl'|get_template %}
</div>
{# end TOC layout #}
@ -299,6 +301,16 @@
$('.lp-view-tabs').animate({opacity: 1}, 500);
});
{% if lp_mode == 'embedded' %}
$('.scorm_item_normal a, #scorm-previous, #scorm-next').on('click', function () {
$('.lp-view-tabs').animate({opacity: 0}, 500);
if ($('#flag-mobile').is(':visible') && !$('#learning_path_main').is('.lp-view-collapsed')) {
$('#lp-view-expand-toggle').trigger('click');
}
});
{% endif %}
loadForumThread({{ lp_id }}, {{ lp_current_item_id }});
checkCurrentItemPosition({{ lp_current_item_id }});

Write Preview
Loading…
Cancel
Save