Merge branch '1.11.x' of github.com:chamilo/chamilo-lms into 1.11.x

main/exercise/exercise.class.php

@@ -10562,7 +10562,6 @@ class Exercise
                             if (!isset($tempResult[$exerciseId][$category_id])) {
                                 $tempResult[$exerciseId][$category_id] = 0;
                             }
-                            //var_dump($exerciseId,  $category_id, $category_item['score'] / $category_item['total']);
                             $tempResult[$exerciseId][$category_id] += $category_item['score'] / $category_item['total'] * 10;
                         }
                     }
@@ -10571,8 +10570,6 @@ class Exercise
         }
 
         $totalUsers = count($userList);
-        //var_dump($tempResult, $totalUsers);
-        //exit;
 
         foreach ($exercises as $exercise) {
             $exerciseId = $exercise->iId;
@@ -10584,7 +10581,6 @@ class Exercise
                     $data[] = 0;
                 }
             }
-            //var_dump($data);
             $dataSet[] = $data;
         }
 

plugin/positioning/img/positioning-line.svg

@@ -14,7 +14,10 @@
    version="1.1"
    id="svg8"
    inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"
-   sodipodi:docname="positioning-line.svg">
+   sodipodi:docname="positioning-line.svg"
+   inkscape:export-filename="/var/www/chamilo111x/plugin/positioning/img/positioning-line.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96">
   <defs
      id="defs2">
     <clipPath

plugin/positioning/lang/english.php

@@ -17,3 +17,4 @@ $strings['InitialTest'] = 'Initial test';
 $strings['YouMustCompleteAThresholdToTakeFinalTest'] = 'You must complete at least %s%% percent of progress on average for all learning paths to unlock the final test.';
 $strings['FinalTest'] = 'Final test';
 $strings['Positioning'] = 'Positioning';
+$strings['ChartShowsAverageForAllStudentsUsingZeroForIncompleteTests'] = 'Note: This chart shows average scores for all students, using zero for incomplete tests.';

plugin/positioning/lang/french.php

@@ -17,3 +17,4 @@ $strings['InitialTest'] = 'Test initial';
 $strings['YouMustCompleteAThresholdToTakeFinalTest'] = 'Vous devez compléter au moins %s%% de progrès moyen dans les parcours pour débloquer le test final.';
 $strings['FinalTest'] = 'Test final';
 $strings['Positioning'] = 'Positionnement';
+$strings['ChartShowsAverageForAllStudentsUsingZeroForIncompleteTests'] = 'Note: Ce graphique montre les scores moyens, utilisant zéro pour les tests non passés.';

plugin/positioning/lang/spanish.php

@@ -17,3 +17,4 @@ $strings['InitialTest'] = 'Prueba initial';
 $strings['YouMustCompleteAThresholdToTakeFinalTest'] = 'Completa mínimo %s%% de progreso promedio en las lecciones para desbloquear la prueba final.';
 $strings['FinalTest'] = 'Prueba final';
 $strings['Positioning'] = 'Posicionamiento';
+$strings['ChartShowsAverageForAllStudentsUsingZeroForIncompleteTests'] = 'Nota: Este gráfico muestra las notas promedias para todos los estudiantes, considerando un valor de cero para las pruebas no tomadas.';

plugin/positioning/start.php

@@ -125,8 +125,6 @@ if (!empty($users) && $initialData && $initialData['exercise_id']) {
     $exerciseId = $initialData['exercise_id'];
     $initialExercise = new Exercise();
     $initialExercise->read($exerciseId);
-    $results[] = $initialExercise;
-    $labels[] = $plugin->get_lang('InitialTest');
 
     $finalData = $plugin->getFinalExercise($courseId, $sessionId);
     if ($finalData && $finalData['exercise_id']) {
@@ -135,8 +133,9 @@ if (!empty($users) && $initialData && $initialData['exercise_id']) {
         $results[] = $finalExercise;
         $labels[] = $plugin->get_lang('FinalTest');
     }
+    $results[] = $initialExercise;
+    $labels[] = $plugin->get_lang('InitialTest');
 
-    //$radars = $initialExercise->getRadarsFromUsers($users, $results, $labels, $courseId, $sessionId);
     $radars = $initialExercise->getAverageRadarsFromUsers($users, $results, $labels, $courseId, $sessionId);
     $initialExerciseTitle = $initialExercise->get_formated_title();
 }

plugin/positioning/view/start.tpl

@@ -4,6 +4,7 @@
 {{ table }}
 
 {% if radars %}
-    <h4>{{ "InitialTest"| get_plugin_lang('Positioning') }}: {{ initial_exercise }}</h4>
     {{ radars }}
+    <br>
+    {{ "ChartShowsAverageForAllStudentsUsingZeroForIncompleteTests"| get_plugin_lang('Positioning') }}
 {% endif %}