Merge branch 'master' into ofaj-20927-2

assets/js/legacy/vendor.js

@@ -19,7 +19,12 @@ global.hljs = hljs;
 var textcomplete = require('textcomplete');
 global.textcomplete = textcomplete;
 
-require('chart.js');
+//global.Chart = require("chart.js/dist/chart").Chart
+
+import { Chart, registerables } from 'chart.js';
+Chart.register(...registerables);
+global.Chart = Chart;
+
 require('./annotation.js');
 require('../editor.js');
 import translateHtml from '../translatehtml.js';

public/main/template/default/tracking/tracking_course_log.html.twig

@@ -1,9 +1,9 @@
 <!-- tracking course log -->
 <script>
-window.onload = function() {
+$(() => {
     var scoreStudent = document.getElementById("chart-score").getContext('2d');
     var lastAccess = document.getElementById("chart-access").getContext('2d');
-    var jsonfile = {{ json_time_student }};
+    var jsonfile = {{ json_time_student|raw }};
     var labels = [];
     var times = [];
 
@@ -32,23 +32,23 @@ window.onload = function() {
                 display: false
             },
             scales: {
-                xAxes:[{
+                x: {
                     position: "bottom",
-                    scaleLabel: {
+                    title: {
                         display: true,
-                        labelString: '{{ "Students"|get_lang|e('js') }}',
+                        text: '{{ "Students"|get_lang|e('js') }}'
                     },
-                    ticks: {
+                    ticks: { display: false },
-                        display: false
+                    min: 0
-                    }
+                },
-                }],
+                y: {
-                yAxes: [{
+                    title: {
-                    position: "left",
-                    scaleLabel: {
                         display: true,
-                        labelString: '{{ "Minutes"|get_lang|e('js') }}',
+                        text: '{{ "Minutes"|get_lang|e('js') }}'
+                    },
+                    position: "left",
+                    min: 0
                 }
-                }]
             }
         }
     });
@@ -59,9 +59,9 @@ window.onload = function() {
             labels: ["0-9%", "10-19%", "20-29%", "30-39%", "40-49%", "50-59%", "60-69%", "70-79%", "80-89%", "90-100%"],
             datasets: [{
                 label: '{{ "NumberOfUsers"|get_lang|e('js') }}',
-                data: {{ score_distribution }},
+                data: {{ score_distribution|raw }},
-                backgroundColor: {{ chart_colors }},
+                backgroundColor: {{ chart_colors|raw }},
-                borderColor: {{ chart_colors }},
+                borderColor: {{ chart_colors|raw }},
                 borderWidth: 1,
                 fill: false
             }]
@@ -71,35 +71,33 @@ window.onload = function() {
               display: false
             },
             scales: {
-                yAxes: [{
+                y: {
                     position: "left",
-                    scaleLabel: {
+                    title: {
-                        display: true,
+                      text: '{{ "NumberOfUsers"|get_lang|e('js') }}',
-                        labelString: '{{ "NumberOfUsers"|get_lang|e('js') }}',
+                      display: true
                     },
                     ticks: {
                         display: true,
                         min: 0,
                         stepSize: 1
-                    }
-                }],
-                xAxes:[{
-                    position: "bottom",
-                    scaleLabel: {
-                        display: true,
-                        labelString: "{{ 'PercentileScoresDistribution'|get_lang|e('js') }}",
                     },
-                    gridLines: {
+                    min: 0
+                },
+                x: {
+                    position: "bottom",
+                    title: {
+                      text: "{{ 'PercentileScoresDistribution'|get_lang|e('js') }}",
                       display: true
                     },
-                    ticks: {
+                    gridLines: { display: true },
-                        display: false,
+                    ticks: { display: true, },
-                    }
+                    min: 0
-                }],
+                },
             }
         }
     });
-};
+})
 </script>
 
 <div class="tracking-course-summary">

public/main/tracking/courseLog.php

@@ -95,9 +95,12 @@ $csv_content = [];
 $js = "<script>
     // hide column and display the button to unhide it
     function foldup(id) {
-        $('#reporting_table .data_table tr td:nth-child(' + (id + 1) + ')').toggleClass('hide');
+        var show = function () {\$(this).css('outline', '1px solid red')};
-        $('#reporting_table .data_table tr th:nth-child(' + (id + 1) + ')').toggleClass('hide');
+        var hide = function () {\$(this).css('outline', '1px solid gree')};
-        $('div#unhideButtons a:nth-child(' + (id + 1) + ')').toggleClass('hide');
+      
+        $('#reporting_table .data_table tr td:nth-child(' + (id + 1) + ')').toggle();
+        $('#reporting_table .data_table tr th:nth-child(' + (id + 1) + ')').toggle();
+        $('div#unhideButtons a:nth-child(' + (id + 1) + ')').toggle();
     }
 
     // add the red cross on top of each column
@@ -763,20 +766,20 @@ if ($nbStudents > 0) {
     $html .= '<div id="unhideButtons" class="btn-toolbar">';
     $index = 0;
     $getLangDisplayColumn = get_lang('Show column');
-    /*foreach ($headers as $header) {
+    foreach ($headers as $header) {
         $html .= Display::toolbarButton(
             $header,
             '#',
             'arrow-right',
-            'default',
+            'plain-outline',
             [
                 'title' => htmlentities("$getLangDisplayColumn \"$header\"", ENT_QUOTES),
-                'class' => 'hide',
+                'style' => 'display: none;',
                 'onclick' => "foldup($index); return false;",
             ]
         );
         $index++;
-    }*/
+    }
     $html .= '</div>';
 
     $html .= '<div id="reporting_table">';

src/CoreBundle/Controller/CourseController.php

@@ -653,7 +653,7 @@ class CourseController extends ToolBaseController
             }
             $responseData['c_tool'] = [
                 'iid' => $ctool->getIid(),
-                'name' => $ctool->getName()
+                'name' => $ctool->getName(),
             ];
         }
 

src/CoreBundle/Entity/Session.php

@@ -40,7 +40,7 @@ use Symfony\Component\Validator\Constraints as Assert;
         new Put(security: "is_granted('ROLE_ADMIN')"),
         new GetCollection(security: "is_granted('ROLE_ADMIN')"),
         new Post(security: "is_granted('ROLE_ADMIN')"),
-        new Delete(security: "is_granted('DELETE', object)")
+        new Delete(security: "is_granted('DELETE', object)"),
     ],
     normalizationContext: ['groups' => ['session:read']],
     denormalizationContext: ['groups' => ['session:write']],

src/CoreBundle/Entity/SessionRelCourse.php

@@ -68,7 +68,6 @@ class SessionRelCourse
         $this->position = 0;
     }
 
-    
     public function getId(): ?int
     {
         return $this->id;

src/CoreBundle/Entity/TrackEAttemptRecording.php

@@ -8,7 +8,6 @@ namespace Chamilo\CoreBundle\Entity;
 
 use ApiPlatform\Metadata\ApiResource;
 use ApiPlatform\Metadata\Get;
-use ApiPlatform\Metadata\GetCollection;
 use DateTime;
 use Doctrine\ORM\Mapping as ORM;
 use Gedmo\Mapping\Annotation as Gedmo;
@@ -31,10 +30,6 @@ class TrackEAttemptRecording
     #[ORM\GeneratedValue]
     protected ?int $id = null;
 
-    #[ORM\ManyToOne(inversedBy: 'revisedAttempts')]
-    #[ORM\JoinColumn(name: 'exe_id', referencedColumnName: 'exe_id', nullable: false)]
-    private ?TrackEExercise $trackExercise = null;
-
     #[ORM\Column(name: 'question_id', type: 'integer', nullable: false)]
     protected int $questionId;
 
@@ -57,6 +52,10 @@ class TrackEAttemptRecording
     #[ORM\Column(name: 'answer', type: 'text', nullable: true)]
     protected ?string $answer;
 
+    #[ORM\ManyToOne(inversedBy: 'revisedAttempts')]
+    #[ORM\JoinColumn(name: 'exe_id', referencedColumnName: 'exe_id', nullable: false)]
+    private ?TrackEExercise $trackExercise = null;
+
     public function __construct()
     {
         $this->teacherComment = '';

src/CoreBundle/Entity/User.php

@@ -2361,7 +2361,8 @@ class User implements UserInterface, EquatableInterface, ResourceInterface, Reso
     {
         return $this
             ->getFriendsWithMeByRelationType($relationType)
-            ->exists(fn (int $index, UserRelUser $userRelUser) => $userRelUser->getUser() === $friend);
+            ->exists(fn (int $index, UserRelUser $userRelUser) => $userRelUser->getUser() === $friend)
+        ;
     }
 
     /**

src/CoreBundle/Migrations/Schema/V200/Version20231004220000.php

@@ -6,11 +6,7 @@ declare(strict_types=1);
 
 namespace Chamilo\CoreBundle\Migrations\Schema\V200;
 
-use Chamilo\CoreBundle\Entity\User;
 use Chamilo\CoreBundle\Migrations\AbstractMigrationChamilo;
-use Chamilo\CourseBundle\Entity\CCalendarEvent;
-use DateTime;
-use DateTimeZone;
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\ORM\Exception\ORMException;
 use Exception;

src/CoreBundle/Migrations/Schema/V200/Version20231022124700.php

@@ -416,11 +416,9 @@ final class Version20231022124700 extends AbstractMigrationChamilo
                     }
                 }
             }
-
         }
     }
 
-
     private function replaceURLParametersInContent($htmlContent, $connection)
     {
         $pattern = '/((https?:\/\/[^\/\s]*|)\/[^?\s]+?)\?cidReq=([a-zA-Z0-9_]+)(&(?:amp;)?id_session=([0-9]+))(&(?:amp;)?gidReq=([0-9]+))([^"\s]*)/i';
@@ -432,7 +430,7 @@ final class Version20231022124700 extends AbstractMigrationChamilo
                 $code = $matches[3]; // The 'code' is extracted from the captured URL.
 
                 $courseId = null;
-                $sql = "SELECT id FROM course WHERE code = :code ORDER BY id DESC LIMIT 1";
+                $sql = 'SELECT id FROM course WHERE code = :code ORDER BY id DESC LIMIT 1';
                 $stmt = $connection->executeQuery($sql, ['code' => $code]);
                 $course = $stmt->fetch();
 
@@ -440,7 +438,7 @@ final class Version20231022124700 extends AbstractMigrationChamilo
                     $courseId = $course['id'];
                 }
 
-                if ($courseId === null) {
+                if (null === $courseId) {
                     return $matches[0]; // Complete original URL.
                 }
 
@@ -448,24 +446,22 @@ final class Version20231022124700 extends AbstractMigrationChamilo
                 $remainingParams = '';
                 if (!empty($matches[8])) {
                     $remainingParams = $matches[8];
-                    if ($remainingParams[0] !== '&') {
+                    if ('&' !== $remainingParams[0]) {
                         $remainingParams = '&'.$remainingParams;
                     }
                 }
 
                 // Reconstructing the URL with the new courseId and adjusted parameters.
-                $newUrl = $matches[1] . '?cid=' . $courseId . '&sid=' . $matches[5] . '&gid=' . $matches[7] . $remainingParams;
+                return $matches[1].'?cid='.$courseId.'&sid='.$matches[5].'&gid='.$matches[7].$remainingParams;
-
+                  // Return the new URL.
-                return $newUrl; // Return the new URL.
             },
             $htmlContent
         );
 
-        if (preg_last_error() !== PREG_NO_ERROR) {
+        if (PREG_NO_ERROR !== preg_last_error()) {
             error_log('Error encountered in preg_replace_callback: '.preg_last_error());
         }
 
         return $newContent;
     }
-
 }

src/CoreBundle/Security/Authorization/Voter/CourseVoter.php

@@ -6,12 +6,11 @@ declare(strict_types=1);
 
 namespace Chamilo\CoreBundle\Security\Authorization\Voter;
 
-use Doctrine\ORM\EntityManagerInterface;
-use Chamilo\CoreBundle\Entity\Session;
 use Chamilo\CoreBundle\Entity\Course;
+use Chamilo\CoreBundle\Entity\Session;
 use Chamilo\CoreBundle\Entity\User;
+use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\HttpFoundation\RequestStack;
-use Symfony\Component\HttpFoundation\Session\SessionInterface;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 use Symfony\Component\Security\Core\Authorization\Voter\Voter;
 use Symfony\Component\Security\Core\Security;
@@ -151,8 +150,8 @@ class CourseVoter extends Voter
 
                         return true;
                     }
-
                 }
+
                 break;
             case self::EDIT:
             case self::DELETE:

src/CoreBundle/State/CategorizedExerciseResultStateProvider.php

@@ -11,6 +11,7 @@ use ApiPlatform\State\ProviderInterface;
 use Chamilo\CoreBundle\ApiResource\CategorizedExerciseResult;
 use Chamilo\CoreBundle\Entity\TrackEExercise;
 use Chamilo\CoreBundle\Security\Authorization\Voter\TrackEExerciseVoter;
+use function count;
 use Doctrine\ORM\EntityManagerInterface;
 use Event;
 use Exception;
@@ -22,9 +23,6 @@ use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
 use TestCategory;
 
-use function count;
-use function in_array;
-
 class CategorizedExerciseResultStateProvider implements ProviderInterface
 {
     public function __construct(
@@ -98,7 +96,7 @@ class CategorizedExerciseResultStateProvider implements ProviderInterface
         $show_results = false;
         $show_only_score = false;
 
-        if (in_array(
+        if (\in_array(
             $objExercise->results_disabled,
             [
                 RESULT_DISABLE_SHOW_ONLY_IN_CORRECT_ANSWER,
@@ -110,7 +108,7 @@ class CategorizedExerciseResultStateProvider implements ProviderInterface
             $show_results = true;
         }
 
-        if (in_array(
+        if (\in_array(
             $objExercise->results_disabled,
             [
                 RESULT_DISABLE_SHOW_SCORE_ONLY,
@@ -133,7 +131,7 @@ class CategorizedExerciseResultStateProvider implements ProviderInterface
         $showTotalScoreAndUserChoicesInLastAttempt = true;
         $showTotalScore = true;
 
-        if (in_array(
+        if (\in_array(
             $objExercise->results_disabled,
             [
                 RESULT_DISABLE_SHOW_SCORE_ATTEMPT_SHOW_ANSWERS_LAST_ATTEMPT,
@@ -158,7 +156,7 @@ class CategorizedExerciseResultStateProvider implements ProviderInterface
                 );
 
                 if ($attempts) {
-                    $numberAttempts = count($attempts);
+                    $numberAttempts = \count($attempts);
                 }
 
                 $showTotalScore = false;

src/CoreBundle/Traits/UserExtraFieldFilterTrait.php

@@ -11,7 +11,7 @@ use Chamilo\CoreBundle\Filter\UserExtraFieldFilter;
 
 /**
  * Properties to use as filters. To search by a user extra field.
- * The API Resource must have a relation with User
+ * The API Resource must have a relation with User.
  */
 trait UserExtraFieldFilterTrait
 {

src/CourseBundle/Entity/CQuizAnswer.php

@@ -110,7 +110,6 @@ class CQuizAnswer
         return $this;
     }
 
-    
     public function getPonderation(): float
     {
         return $this->ponderation;