Merge pull request #7446 from christianbeeznest/GH-7443

Course: Fix session-specific course introduction display - refs #7443

Author: christianbeeznest

src/CoreBundle/Controller/CourseController.php

@@ -839,50 +839,90 @@ private function findIntroOfCourse(Course $course): ?CTool
     #[Route('/{id}/getToolIntro', name: 'chamilo_core_course_gettoolintro')]
     public function getToolIntro(Request $request, Course $course, EntityManagerInterface $em): Response
     {
-        $sessionId = (int) $request->get('sid');
+        $sessionId = (int) $request->query->get('sid', 0);
+
+        $session = null;
+        if ($sessionId > 0) {
+            $session = $em->getRepository(Session::class)->find($sessionId);
+        }
 
-        $responseData = [];
         $ctoolRepo = $em->getRepository(CTool::class);
-        $sessionRepo = $em->getRepository(Session::class);
-        $createInSession = false;
+        $ctoolintroRepo = $em->getRepository(CToolIntro::class);
 
-        $session = null;
+        // Base tool + base intro (course context, no session).
+        $baseTool = $this->findIntroOfCourse($course);
+        if (!$baseTool) {
+            // ensure the base tool exists (should rarely happen).
+            $baseTool = $this->ensureCourseHomepageTool($course, null, $em);
+        }
 
-        if (!empty($sessionId)) {
-            $session = $sessionRepo->find($sessionId);
+        $baseIntro = null;
+        if ($baseTool) {
+            $baseIntro = $ctoolintroRepo->findOneBy(
+                ['courseTool' => $baseTool],
+                ['iid' => 'DESC']
+            );
         }
 
-        $ctool = $this->findIntroOfCourse($course);
+        $activeTool = $baseTool;
+        $activeIntro = $baseIntro;
+        $createInSession = false;
 
         if ($session) {
-            $ctoolSession = $ctoolRepo->findOneBy(['title' => 'course_homepage', 'course' => $course, 'session' => $session]);
+            // Ensure the session tool exists so the frontend can create the intro in the right context.
+            $sessionTool = $ctoolRepo->findOneBy([
+                'title' => 'course_homepage',
+                'course' => $course,
+                'session' => $session,
+            ]);
+
+            if (!$sessionTool) {
+                $sessionTool = $this->ensureCourseHomepageTool($course, $session, $em);
+            }
 
-            if (!$ctoolSession) {
-                $createInSession = true;
+            // Use session tool for editing/creation in session context.
+            if ($sessionTool) {
+                $activeTool = $sessionTool;
+
+                $sessionIntro = $ctoolintroRepo->findOneBy(
+                    ['courseTool' => $sessionTool],
+                    ['iid' => 'DESC']
+                );
+
+                if ($sessionIntro) {
+                    // Session-specific intro exists: show it.
+                    $activeIntro = $sessionIntro;
+                    $createInSession = false;
+                } else {
+                    // No session-specific intro yet: show base intro (if any), but allow creating in session.
+                    $activeIntro = $baseIntro;
+                    $createInSession = true;
+                }
             } else {
-                $ctool = $ctoolSession;
+                // If session tool cannot be created, fallback to base (display only).
+                $activeTool = $baseTool;
+                $activeIntro = $baseIntro;
+                $createInSession = false;
             }
         }
 
-        if ($ctool) {
-            $ctoolintroRepo = $em->getRepository(CToolIntro::class);
-
-            /** @var CToolIntro $ctoolintro */
-            $ctoolintro = $ctoolintroRepo->findOneBy(['courseTool' => $ctool]);
-            if ($ctoolintro) {
-                $responseData = [
-                    'iid' => $ctoolintro->getIid(),
-                    'introText' => $ctoolintro->getIntroText(),
-                    'createInSession' => $createInSession,
-                    'cToolId' => $ctool->getIid(),
-                ];
-            }
+        $responseData = [
+            'createInSession' => $createInSession,
+        ];
+
+        if ($activeTool) {
+            $responseData['cToolId'] = $activeTool->getIid();
             $responseData['c_tool'] = [
-                'iid' => $ctool->getIid(),
-                'title' => $ctool->getTitle(),
+                'iid' => $activeTool->getIid(),
+                'title' => $activeTool->getTitle(),
             ];
         }
 
+        if ($activeIntro) {
+            $responseData['iid'] = $activeIntro->getIid();
+            $responseData['introText'] = $activeIntro->getIntroText();
+        }
+
         return new JsonResponse($responseData);
     }
 
@@ -936,6 +976,7 @@ public function addToolIntro(Request $request, Course $course, EntityManagerInte
             return new JsonResponse([
                 'status' => 'created',
                 'cToolId' => $ctoolSession->getIid(),
+                'iid' => $ctoolIntro->getIid(),
                 'introIid' => $ctoolIntro->getIid(),
                 'introText' => $ctoolIntro->getIntroText(),
             ]);
@@ -949,6 +990,7 @@ public function addToolIntro(Request $request, Course $course, EntityManagerInte
             return new JsonResponse([
                 'status' => 'updated',
                 'cToolId' => $ctoolSession->getIid(),
+                'iid' => $ctoolIntro->getIid(),
                 'introIid' => $ctoolIntro->getIid(),
                 'introText' => $ctoolIntro->getIntroText(),
             ]);
@@ -1303,6 +1345,46 @@ private function autoLaunch(): void
         }
     }
 
+    /**
+     * Ensure a "course_homepage" CTool exists for the given course + session context.
+     * - If $session is null, it creates/returns the base tool.
+     * - If $session is not null, it creates/returns the session tool.
+     */
+    private function ensureCourseHomepageTool(Course $course, ?Session $session, EntityManagerInterface $em): ?CTool
+    {
+        $ctoolRepo = $em->getRepository(CTool::class);
+
+        $existing = $ctoolRepo->findOneBy([
+            'title' => 'course_homepage',
+            'course' => $course,
+            'session' => $session,
+        ]);
+
+        if ($existing) {
+            return $existing;
+        }
+
+        $toolEntity = $em->getRepository(Tool::class)->findOneBy(['title' => 'course_homepage']);
+        if (!$toolEntity) {
+            return null;
+        }
+
+        $ctool = (new CTool())
+            ->setTool($toolEntity)
+            ->setTitle('course_homepage')
+            ->setCourse($course)
+            ->setPosition(1)
+            ->setParent($course)
+            ->setCreator($course->getCreator())
+            ->setSession($session)
+            ->addCourseLink($course);
+
+        $em->persist($ctool);
+        $em->flush();
+
+        return $ctool;
+    }
+
     // Implement the real logic to check course enrollment
     private function isUserEnrolledInAnyCourse(User $user, EntityManagerInterface $em): bool
     {