Skip to content
Snippets Groups Projects
Commit 784f8c24 authored by Tim Steiner's avatar Tim Steiner
Browse files

Don't show ACE courses that have been removed in the iACE through-date report.

parent 5a346589
No related branches found
No related tags found
No related merge requests found
...@@ -151,6 +151,18 @@ class Iace_ReportsController extends App_Controller_Action ...@@ -151,6 +151,18 @@ class Iace_ReportsController extends App_Controller_Action
$requests = Requests_RequestModel::find($requestIds); $requests = Requests_RequestModel::find($requestIds);
$courses = Courses_CourseModel::findLatestOfRequest($requests); $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(); $courseIds = array();
foreach ($courses as $course) { foreach ($courses as $course) {
$courseIds[] = $course->getCourseId(); $courseIds[] = $course->getCourseId();
...@@ -161,6 +173,9 @@ class Iace_ReportsController extends App_Controller_Action ...@@ -161,6 +173,9 @@ class Iace_ReportsController extends App_Controller_Action
$data = new Unl_Model_Collection('Unl_Model_Array'); $data = new Unl_Model_Collection('Unl_Model_Array');
foreach ($courses as $requestId => $course) { foreach ($courses as $requestId => $course) {
if (in_array($course->getCourseId(), $removeCourseIds)) {
continue;
}
$request = $requests[$requestId]; $request = $requests[$requestId];
$finalizeTime = $finalizeTimes[$request->getId()]; $finalizeTime = $finalizeTimes[$request->getId()];
$title = $course->getTitle(); $title = $course->getTitle();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment