From 5e9e85ac241f89a22d38357398a48dfdf3a97c3b Mon Sep 17 00:00:00 2001
From: Roger Feese <rfeese@unl.edu>
Date: Wed, 19 Nov 2014 17:04:31 -0600
Subject: [PATCH] Added checks to make sure course is currently ACE and not
removed.
---
.../iace/controllers/ReportsController.php | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/application/modules/iace/controllers/ReportsController.php b/application/modules/iace/controllers/ReportsController.php
index 92dd2982..04b405d7 100644
--- a/application/modules/iace/controllers/ReportsController.php
+++ b/application/modules/iace/controllers/ReportsController.php
@@ -161,6 +161,18 @@ class Iace_ReportsController extends Creq_Controller_Action
$data = new Unl_Model_Collection('Unl_Model_Array');
foreach ($courses as $requestId => $course) {
+ $currentCourse = $currentCourses[$course->getCourseId()];
+
+ //skip course if it has been removed
+ if($currentCourse->getRemoved()){
+ continue;
+ }
+
+ //skip course if it is not ACE
+ if(!$currentCourse->isAce()){
+ continue;
+ }
+
$request = $requests[$requestId];
$finalizeTime = $finalizeTimes[$request->getId()];
$title = $course->getTitle();
@@ -169,7 +181,6 @@ class Iace_ReportsController extends Creq_Controller_Action
$title = strtr($title, array('JDEP' => 'RAIK'));
}
foreach ($course->getAceOutcomes() as $aceOutcome) {
- $currentCourse = $currentCourses[$course->getCourseId()];
$currentSLOs = array();
foreach ($currentCourse->getAceOutcomes() as $currentAceOutcome) {
$currentSLOs[] = $currentAceOutcome['slo'];
@@ -211,4 +222,4 @@ class Iace_ReportsController extends Creq_Controller_Action
$this->view->data = $data;
$this->view->endDate = $endDate->subDay(1);
}
-}
\ No newline at end of file
+}
--
GitLab