Remove call of "__toString", improve query using "order by treePos"

main/admin/course_add.php

@@ -116,7 +116,7 @@ if ($countCategories >= 100) {
 
     /** @var CourseCategory $category */
     foreach ($categories as $category) {
-        $categoriesOptions[$category->getCode()] = $category->__toString();
+        $categoriesOptions[$category->getCode()] = $category;
     }
 
     $form->addSelect(

main/admin/course_edit.php

@@ -143,7 +143,12 @@ $form->addText(
 
 $form->applyFilter('visual_code', 'strtoupper');
 $form->applyFilter('visual_code', 'html_filter');
-$form->addElement('advmultiselect', 'course_teachers', get_lang('CourseTeachers'), $allTeachers);
+$form->addElement(
+    'advmultiselect',
+    'course_teachers',
+    get_lang('CourseTeachers'),
+    $allTeachers
+);
 $courseInfo['course_teachers'] = $course_teachers;
 if (array_key_exists('add_teachers_to_sessions_courses', $courseInfo)) {
     $form->addElement(
@@ -158,7 +163,10 @@ $coursesInSession = SessionManager::get_session_by_course($courseInfo['real_id']
 if (!empty($coursesInSession)) {
     foreach ($coursesInSession as $session) {
         $sessionId = $session['id'];
-        $coaches = SessionManager::getCoachesByCourseSession($sessionId, $courseInfo['real_id']);
+        $coaches = SessionManager::getCoachesByCourseSession(
+            $sessionId,
+            $courseInfo['real_id']
+        );
         $teachers = $allTeachers;
 
         $sessionTeachers = array();
@@ -216,7 +224,7 @@ if ($countCategories >= 100) {
 
     /** @var CourseCategory $category */
     foreach ($categories as $category) {
-        $categoriesOptions[$category->getCode()] = $category->__toString();
+        $categoriesOptions[$category->getCode()] = $category;
     }
 
     $form->addSelect(

src/Chamilo/CoreBundle/Entity/CourseCategory.php

@@ -22,6 +22,15 @@ use Doctrine\ORM\Mapping as ORM;
  */
 class CourseCategory
 {
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="id", type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue(strategy="IDENTITY")
+     */
+    private $id;
+
     /**
      * @var string
      *
@@ -71,17 +80,6 @@ class CourseCategory
      */
     private $authCatChild;
 
-    /**
-     * @var integer
-     *
-     * @ORM\Column(name="id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="IDENTITY")
-     */
-    private $id;
-
-
-
     /**
      * Set name
      *
@@ -260,6 +258,6 @@ class CourseCategory
     {
         $name = strip_tags($this->name);
 
-        return "({$this->code}) $name";
+        return "$name ({$this->code})";
     }
 }

src/Chamilo/CoreBundle/Entity/Repository/CourseCategoryRepository.php

@@ -29,7 +29,7 @@ class CourseCategoryRepository extends EntityRepository
             )
             ->where(
                 $qb->expr()->eq('a.accessUrlId', $accessUrl)
-            )
+            )->orderBy('c.treePos', 'ASC')
             ->getQuery();
 
         return $query->getResult();
@@ -59,4 +59,4 @@ class CourseCategoryRepository extends EntityRepository
 
         return (int) $count;
     }
-}
+}