diff --git a/application/modules/iace/controllers/ReportsController.php b/application/modules/iace/controllers/ReportsController.php index 7f7f0deeca1f436c976c88af047a1941b0f33a10..41c12082b41383614d7dc53ef7a9ad9eec3483ee 100644 --- a/application/modules/iace/controllers/ReportsController.php +++ b/application/modules/iace/controllers/ReportsController.php @@ -151,6 +151,18 @@ class Iace_ReportsController extends App_Controller_Action $requests = Requests_RequestModel::find($requestIds); $courses = Courses_CourseModel::findLatestOfRequest($requests); + $removeRequests = array(); + foreach ($requests as $request) { + if (in_array($request->getType(), array('RemoveACEFromCourse', 'RemoveACEAndChangeCourse'))) { + $removeRequests[] = $request; + } + } + $removeCourses = Courses_CourseModel::findLatestOfRequest($removeRequests); + $removeCourseIds = array(); + foreach ($removeCourses as $removeCourse) { + $removeCourseIds[] = $removeCourse->getCourseId(); + } + $courseIds = array(); foreach ($courses as $course) { $courseIds[] = $course->getCourseId(); @@ -161,6 +173,9 @@ class Iace_ReportsController extends App_Controller_Action $data = new Unl_Model_Collection('Unl_Model_Array'); foreach ($courses as $requestId => $course) { + if (in_array($course->getCourseId(), $removeCourseIds)) { + continue; + } $request = $requests[$requestId]; $finalizeTime = $finalizeTimes[$request->getId()]; $title = $course->getTitle();