Create section method (MDL-80187) WIP 6

Author: james-cnz

classes/courseformat/sectionactions.php

@@ -50,8 +50,11 @@ public function create_from_object(stdClass $fields, bool $skipcheck = false): s
                 'SELECT max(section) from {course_sections} WHERE course = ?',
                 [$this->course->id]
             ) + 1;
-            if (!isset($fields->section) && !isset($fields->previd) && !isset($fields->nextid) && !isset($fields->parentid)) {
-                $fields->nextid = null;
+            if (!isset($fields->section) && !isset($fields->prevupid) && !isset($fields->nextupid) && !isset($fields->parentid)) {
+                $fields->nextupid = null;
+            }
+            if (!isset($fields->level)) {
+                $fields->level = !empty($fields->component) ? 0 : 2;
             }
         }
 
@@ -81,7 +84,7 @@ public function create_from_object(stdClass $fields, bool $skipcheck = false): s
         }
 
         // Now move it to the specified position, if necessary.
-        if (!$skipcheck && !(!empty($fields->component) && property_exists($fields, 'nextid') && $fields->nextid == null)) {
+        if (!$skipcheck && !(!empty($fields->component) && property_exists($fields, 'nextupid') && ($fields->nextupid == null))) {
             try {
                 $movednews = format_multitopic_move_section_to(
                                 $this->course, [$sectionrecord], $fields, !empty($fields->component) ? 2 : 1

locallib.php

@@ -235,6 +235,7 @@ function format_multitopic_reorder_sections(array $sectionsextra, $origins, \std
     $prevextra = null;
     $found = false;
     $appendextraarray = [];
+    $newposition = 0;
     foreach ($sectionsextra as $id => $sectionextra) {
         if ($found) {
             // Target position already found, extract remaining sections.
@@ -257,7 +258,8 @@ function format_multitopic_reorder_sections(array $sectionsextra, $origins, \std
         } else if (isset($parentextra)
                         && ($sectionextra->levelsan < $target->level || $sectionextra->levelsan <= $parentextra->levelsan)
                     || isset($prevextra) && ($sectionextra->levelsan <= $target->level)
-                    || isset($target->nextupid) && $sectionextra->id == $target->nextupid) {
+                    || isset($target->nextupid) && ($sectionextra->id == $target->nextupid)
+                    || isset($target->section) && ($newposition == $target->section)) {
             // Reached the last position in a specified parent in which the moved section would be a (direct) child,
             // or the appropriate position after a specified previous section,
             // or the position before a specified next section.
@@ -269,8 +271,11 @@ function format_multitopic_reorder_sections(array $sectionsextra, $origins, \std
             unset($sectionsextra[$id]);
             $found = true;
         }
+        $newposition++;
     }
-    if (isset($parentextra) || isset($prevextra)) {
+    if (isset($parentextra) || isset($prevextra)
+        || property_exists($target, 'nextupid') && ($target->nextupid == null)
+        || isset($target->section) && ($newposition == $target->section)) {
         // If a specified parent or previous was found, but no position within the section list was appropriate,
         // the appropriate position must be the end of the section list.
         $found = true;