Delete gradebook categories when deleting course - refs BT#14687

Author: AngelFQC

main/admin/course_list.php

@@ -338,8 +338,6 @@ function get_course_visibility_icon($visibility)
             if (count($course_codes) > 0) {
                 foreach ($course_codes as $course_code) {
                     CourseManager::delete_course($course_code);
-                    $obj_cat = new Category();
-                    $obj_cat->update_category_delete($course_code);
                 }
             }
 
@@ -409,8 +407,6 @@ function get_course_visibility_icon($visibility)
     $tool_name = get_lang('CourseList');
     if (isset($_GET['delete_course'])) {
         CourseManager::delete_course($_GET['delete_course']);
-        $obj_cat = new Category();
-        $obj_cat->update_category_delete($_GET['delete_course']);
         Display::addFlash(Display::return_message(get_lang('Deleted')));
     }
     // Create a search-box

main/course_info/delete_course.php

@@ -28,8 +28,6 @@
 
 if (isset($_GET['delete']) && $_GET['delete'] === 'yes') {
     CourseManager::delete_course($_course['sysCode']);
-    $obj_cat = new Category();
-    $obj_cat->update_category_delete($_course['sysCode']);
 
     // DELETE CONFIRMATION MESSAGE
     Session::erase('_cid');

main/gradebook/lib/be/category.class.php

@@ -746,6 +746,8 @@ public function delete()
 
     /**
      * Not delete this category from the database,when visible=3 is category eliminated.
+     *
+     * @deprecated To delete categories form course when deleting course use Category::deleteFromCourse
      */
     public function update_category_delete($course_id)
     {
@@ -756,6 +758,41 @@ public function update_category_delete($course_id)
         Database::query($sql);
     }
 
+    /**
+     * Delete the gradebook categories from a course, including course sessions
+     *
+     * @param string $courseCode
+     */
+    public static function deleteFromCourse($courseCode)
+    {
+        $em = Database::getManager();
+        $categories = $em
+            ->createQuery(
+                'SELECT DISTINCT gc.sessionId
+                FROM ChamiloCoreBundle:GradebookCategory gc WHERE gc.courseCode = :code'
+            )
+            ->setParameter('code', $courseCode)
+            ->getResult();
+
+        foreach ($categories as $category) {
+            $cats = self::load(
+                null,
+                null,
+                $courseCode,
+                null,
+                null,
+                (int) $category['sessionId']
+            );
+
+            if (!empty($cats)) {
+                /** @var self $cat */
+                foreach ($cats as $cat) {
+                    $cat->delete_all();
+                }
+            }
+        }
+    }
+
     /**
      * Show message resource delete.
      */

main/inc/lib/course.lib.php

@@ -2278,6 +2278,8 @@ public static function delete_course($code)
                 rename($course_dir, $archive_dir);
             }
 
+            Category::deleteFromCourse($course['code']);
+
             // Unsubscribe all users from the course
             $sql = "DELETE FROM $table_course_user WHERE c_id = $courseId";
             Database::query($sql);