MDL-42629 course: moving a course now updates counts and pagination totals

course/ajax/management.php

@@ -54,7 +54,27 @@ switch ($action) {
     case 'movecourseintocategory':
         $courseid = required_param('courseid', PARAM_INT);
         $categoryid = required_param('categoryid', PARAM_INT);
-        $outcome->outcome = \core_course\management\helper::move_courses_into_category($categoryid, $courseid);
+        $course = get_course($courseid);
+        $oldcategory = coursecat::get($course->category);
+        $category = coursecat::get($categoryid);
+        $outcome->outcome = \core_course\management\helper::move_courses_into_category($category, $courseid);
+        $perpage = (int)get_user_preferences('coursecat_management_perpage', $CFG->coursesperpage);
+        $totalcourses = $oldcategory->get_courses_count();
+        $totalpages = ceil($totalcourses / $perpage);
+        if ($totalpages == 0) {
+            $str = get_string('nocoursesyet');
+        } else if ($totalpages == 1) {
+            $str = get_string('showingacourses', 'moodle', $totalcourses);
+        } else {
+            $a = new stdClass;
+            $a->start = ($page * $perpage) + 1;
+            $a->end = min((($page + 1) * $perpage), $totalcourses);
+            $a->total = $totalcourses;
+            $str = get_string('showingxofycourses', 'moodle', $a);
+        }
+        $outcome->newcatcourses = $category->get_courses_count();
+        $outcome->oldcatcourses = $totalcourses;
+        $outcome->paginationtotals = $str;
         break;
     case 'movecourseafter' :
         $courseid = required_param('courseid', PARAM_INT);

course/yui/build/moodle-course-management/moodle-course-management-debug.js

@@ -1246,12 +1246,15 @@ Category.prototype = {
      */
     completeMoveCourse : function(transactionid, response, args) {
         var outcome = this.checkAjaxResponse(transactionid, response, args),
-            course;
+            console = this.get('console'),
+            category,
+            course,
+            totals;
         if (outcome === false) {
             Y.log('AJAX failed to move courses into this category: '+this.get('itemname'), 'warn', 'moodle-course-management');
             return false;
         }
-        course = this.get('console').getCourseById(args.courseid);
+        course = console.getCourseById(args.courseid);
         if (!course) {
             Y.log('Course was moved but the course listing could not be found to reflect this', 'warn', 'moodle-course-management');
             return false;
@@ -1259,6 +1262,28 @@ Category.prototype = {
         Y.log('Moved the course ('+course.getName()+') into this category ('+this.getName()+')', 'info', 'moodle-course-management');
         this.highlight();
         if (course) {
+            if (outcome.paginationtotals) {
+                totals = console.get('courselisting').one('.listing-pagination-totals');
+                if (totals) {
+                    totals.set('innerHTML', outcome.paginationtotals);
+                }
+            }
+            if (outcome.newcatcourses !== 'undefined') {
+                totals = this.get('node').one('.course-count');
+                if (totals) {
+                    totals.set('innerHTML', totals.get('innerHTML').replace(/^\d+/, outcome.newcatcourses));
+                }
+            }
+            if (outcome.oldcatcourses !== 'undefined') {
+                category = console.get('activecategoryid');
+                category = console.getCategoryById(category);
+                if (category) {
+                    totals = category.get('node').one('.course-count');
+                    if (totals) {
+                        totals.set('innerHTML', totals.get('innerHTML').replace(/^\d+/, outcome.oldcatcourses));
+                    }
+                }
+            }
             course.remove();
         }
         return true;

course/yui/build/moodle-course-management/moodle-course-management.js

@@ -1218,16 +1218,41 @@ Category.prototype = {
      */
     completeMoveCourse : function(transactionid, response, args) {
         var outcome = this.checkAjaxResponse(transactionid, response, args),
-            course;
+            console = this.get('console'),
+            category,
+            course,
+            totals;
         if (outcome === false) {
             return false;
         }
-        course = this.get('console').getCourseById(args.courseid);
+        course = console.getCourseById(args.courseid);
         if (!course) {
             return false;
         }
         this.highlight();
         if (course) {
+            if (outcome.paginationtotals) {
+                totals = console.get('courselisting').one('.listing-pagination-totals');
+                if (totals) {
+                    totals.set('innerHTML', outcome.paginationtotals);
+                }
+            }
+            if (outcome.newcatcourses !== 'undefined') {
+                totals = this.get('node').one('.course-count');
+                if (totals) {
+                    totals.set('innerHTML', totals.get('innerHTML').replace(/^\d+/, outcome.newcatcourses));
+                }
+            }
+            if (outcome.oldcatcourses !== 'undefined') {
+                category = console.get('activecategoryid');
+                category = console.getCategoryById(category);
+                if (category) {
+                    totals = category.get('node').one('.course-count');
+                    if (totals) {
+                        totals.set('innerHTML', totals.get('innerHTML').replace(/^\d+/, outcome.oldcatcourses));
+                    }
+                }
+            }
             course.remove();
         }
         return true;

course/yui/src/management/js/category.js

@@ -242,12 +242,15 @@ Category.prototype = {
      */
     completeMoveCourse : function(transactionid, response, args) {
         var outcome = this.checkAjaxResponse(transactionid, response, args),
-            course;
+            console = this.get('console'),
+            category,
+            course,
+            totals;
         if (outcome === false) {
             Y.log('AJAX failed to move courses into this category: '+this.get('itemname'), 'warn', 'moodle-course-management');
             return false;
         }
-        course = this.get('console').getCourseById(args.courseid);
+        course = console.getCourseById(args.courseid);
         if (!course) {
             Y.log('Course was moved but the course listing could not be found to reflect this', 'warn', 'moodle-course-management');
             return false;
@@ -255,6 +258,28 @@ Category.prototype = {
         Y.log('Moved the course ('+course.getName()+') into this category ('+this.getName()+')', 'info', 'moodle-course-management');
         this.highlight();
         if (course) {
+            if (outcome.paginationtotals) {
+                totals = console.get('courselisting').one('.listing-pagination-totals');
+                if (totals) {
+                    totals.set('innerHTML', outcome.paginationtotals);
+                }
+            }
+            if (outcome.newcatcourses !== 'undefined') {
+                totals = this.get('node').one('.course-count');
+                if (totals) {
+                    totals.set('innerHTML', totals.get('innerHTML').replace(/^\d+/, outcome.newcatcourses));
+                }
+            }
+            if (outcome.oldcatcourses !== 'undefined') {
+                category = console.get('activecategoryid');
+                category = console.getCategoryById(category);
+                if (category) {
+                    totals = category.get('node').one('.course-count');
+                    if (totals) {
+                        totals.set('innerHTML', totals.get('innerHTML').replace(/^\d+/, outcome.oldcatcourses));
+                    }
+                }
+            }
             course.remove();
         }
         return true;