From 784f8c24da566ecd715960dabdc558c872cda051 Mon Sep 17 00:00:00 2001
From: Tim Steiner <tsteiner2@unl.edu>
Date: Mon, 15 Feb 2010 18:55:36 +0000
Subject: [PATCH] Don't show ACE courses that have been removed in the iACE
through-date report.
---
.../iace/controllers/ReportsController.php | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/application/modules/iace/controllers/ReportsController.php b/application/modules/iace/controllers/ReportsController.php
index 7f7f0dee..41c12082 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();
--
GitLab