Course progress: Ensure new sections are active; fix breadcrumb - refs #7052

Author: christianbeeznest

public/main/course_progress/index.php

@@ -206,7 +206,11 @@ function update_done_thematic_advance(selected_value) {
 // get default thematic plan title
 $default_thematic_plan_title = $thematicManager->get_default_thematic_plan_title();
 
-$tpl = new Template(get_lang('Thematic control'));
+$tpl = new Template('');
+$interbreadcrumb[] = [
+    'url' => 'index.php?'.api_get_cidreq().'&action=thematic_details',
+    'name' => get_lang('Thematic control')
+];
 
 // Dispatch actions to controller
 switch ($action) {
@@ -225,8 +229,8 @@ function update_done_thematic_advance(selected_value) {
         if ('POST' === $requestMethod && '' !== trim($_POST['title']) &&
             api_is_allowed_to_edit(null, true)
         ) {
-            $title = trim($_POST['title']);
-            $content = trim($_POST['content']);
+            $title = trim($_POST['title'] ?? '');
+            $content = trim($_POST['content'] ?? '');
             $thematicManager->thematicSave($thematicId, $title, $content, $course, $session);
             Display::addFlash(Display::return_message(get_lang('Update successful')));
 
@@ -673,7 +677,6 @@ class="btn btn--default"
         $content = $tpl->fetch($thematicLayout);
         break;
     case 'thematic_list':
-        $interbreadcrumb[] = ['url' => '#', 'name' => get_lang('Thematic control')];
         if (!$readOnly) {
             $actionLeft = '<a href="index.php?'.api_get_cidreq().'&action=thematic_add'.$url_token.'">'.
                 Display::getMdiIcon('progress-star', 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('New thematic section')).'</a>';
@@ -821,8 +824,8 @@ class="btn btn--default"
     case 'thematic_plan_list':
         if (!empty($thematicEntity)) {
             $interbreadcrumb[] = [
-                'url' => '#',
-                'name' => get_lang('Thematic plan').' ('.$cleanThematicTitle.') ',
+                'url'  => '#',
+                'name' => get_lang('Thematic plan').' ('.$cleanThematicTitle.')',
             ];
         }
 
@@ -1210,8 +1213,10 @@ class="btn btn--default"
         }
         break;
     case 'thematic_advance_list':
-
-        $interbreadcrumb[] = ['url' => '#', 'name' => get_lang('Thematic advance').' ('.$cleanThematicTitle.')'];
+        $interbreadcrumb[] = [
+            'url'  => '#',
+            'name' => get_lang('Thematic advance').' ('.$cleanThematicTitle.')',
+        ];
 
         // thematic advance list toolbar (local)
         $actions = '<a href="'.api_get_self().'?'.api_get_cidreq().'&action=thematic_details">'.

public/main/inc/lib/thematic.lib.php

@@ -159,6 +159,7 @@ public function thematicSave($id, $title, $content, Course $course, Session $ses
                 ->setContent($content)
                 ->setParent($course)
                 ->addCourseLink($course, $session)
+                ->setActive(true)
             ;
 
             $repo->create($thematic);
@@ -198,55 +199,66 @@ public function delete(int|array $thematicId): void
     }
 
     /**
-     * @param int $thematicId
+     * Duplicate a thematic (title, content, plans and advances) into the same Course/Session.
      */
-    public function copy($thematicId)
+    public function copy(int $thematicId, ?Course $course = null, ?Session $session = null): ?CThematic
     {
         $repo = Container::getThematicRepository();
-        /** @var CThematic $thematic */
-        $thematic = $repo->find($thematicId);
-        if (null === $thematic) {
-            return false;
+        /** @var CThematic|null $source */
+        $source = $repo->find($thematicId);
+        if (!$source) {
+            return null;
         }
 
-        $thematicManager = new Thematic();
+        // Resolve context if not provided
+        $course  = $course   ?: api_get_course_entity();
+        $session = $session  ?: api_get_session_entity();
 
-        $newThematic = $thematicManager->thematicSave(
+        // Create the new thematic using the existing helper (keeps linking logic consistent)
+        $new = $this->thematicSave(
             null,
-            $thematic->getTitle().' - '.get_lang('Copy'),
-            $thematic->getContent(),
-            api_get_course_entity(),
-            api_get_session_entity()
+            (string) $source->getTitle(),
+            (string) $source->getContent(),
+            $course,
+            $session
         );
 
-        if (!empty($newThematic->getIid())) {
-            $thematic_advanced = $thematic->getAdvances();
-            if (!empty($thematic_advanced)) {
-                foreach ($thematic_advanced as $item) {
-                    $thematic = new Thematic();
-                    $thematic->thematicAdvanceSave(
-                        $newThematic,
-                        $item->getAttendance(),
-                        null,
-                        $item->getContent(),
-                        $item->getStartDate()->format('Y-m-d H:i:s'),
-                        $item->getDuration()
-                    );
-                }
-            }
+        if (!$new) {
+            return null;
+        }
 
-            $thematic_plan = $thematic->getPlans();
-            if (!empty($thematic_plan)) {
-                foreach ($thematic_plan as $item) {
-                    $thematic->thematicPlanSave(
-                        $newThematic,
-                        $item->getTitle(),
-                        $item->getDescription(),
-                        $item->getDescriptionType()
-                    );
-                }
+        // Copy advances
+        foreach ($source->getAdvances() as $adv) {
+            // Normalize start date to string Y-m-d H:i:s for thematicAdvanceSave
+            $startDate = $adv->getStartDate();
+            if ($startDate instanceof \DateTimeInterface) {
+                $startDate = $startDate->format('Y-m-d H:i:s');
+            } else {
+                $startDate = (string) $startDate;
             }
+
+            // Keep the same attendance relation if any (same course/session context)
+            $this->thematicAdvanceSave(
+                $new,
+                $adv->getAttendance(),
+                null,
+                (string) $adv->getContent(),
+                $startDate,
+                (float) $adv->getDuration()
+            );
+        }
+
+        // Copy plans
+        foreach ($source->getPlans() as $plan) {
+            $this->thematicPlanSave(
+                $new,
+                (string) $plan->getTitle(),
+                (string) $plan->getDescription(),
+                (int) $plan->getDescriptionType()
+            );
         }
+
+        return $new;
     }
 
     /**