Adjust reports to only include completed requests and use latest course information if available.

application/modules/iace/controllers/ReinforcementsController.php

@@ -29,15 +29,31 @@ class Iace_ReinforcementsController extends Creq_Controller_Action
 		$translateChars = array("\n" => ' ', "\r" => ' ', "\t" => ' ');
 
         foreach ($requests as $request) {
+            //skip incomplete requests
+            if(!$request->isComplete()){
+                continue;
+            }
 	    	$parentCourse = $parentCourses[$request->getId()];
             $proposedCourse = $proposedCourses[$request->getId()];
+            //skip removed courses
+            if($proposedCourse->getRemoved()){
+                continue;
+            }
             $course = $proposedCourse;
+            $courseLatest = Courses_CourseModel::findByCourseId($proposedCourse->getCourseId());
 
+            $courseCode = $course->getCourseCode();
+			$crosslistings = $course->getCrosslistingsText();
             $aceReinforcements = $course->getAceReinforcements();
+            if($courseLatest){
+                $courseCode = $courseLatest->getCourseCode();
+                $crosslistings = $courseLatest->getCrosslistingsText();
+                $aceReinforcements = $courseLatest->getAceReinforcements();
+            }
 	    	foreach ($aceReinforcements as $aceReinforcement) {
 			echo ''
-			. $course->getCourseCode() . "\t"
-			. $course->getCrosslistingsText() . "\t"
+			. $courseCode . "\t"
+			. $crosslistings . "\t"
 			. strtr($aceReinforcement['longName'], $translateChars) . "\t"
 			. strip_tags(str_replace('&', '&', strtr($aceReinforcement['description'], $translateChars))) . "\t"
 			. "\n";

application/modules/iace/controllers/SloController.php

@@ -19,6 +19,8 @@ class Iace_SloController extends Creq_Controller_Action
 		$requests = Requests_RequestModel::findBytype(array(6,7,8));
 		$proposedCourses = Courses_CourseModel::findLatestOfRequest($requests);
 		$parentCourses = Courses_CourseModel::findParentOfRequest($requests);
+
+        //header
 		echo ''
            . 'Course Code' . "\t"
            . 'Crosslistings' . "\t"
@@ -31,17 +33,41 @@ class Iace_SloController extends Creq_Controller_Action
 		$translateChars = array("\n" => ' ', "\r" => ' ', "\t" => ' ');
 
         foreach ($requests as $request) {
+            //skip incomplete requests
+            if(!$request->isComplete()){
+                continue;
+            }
 	    	$parentCourse = $parentCourses[$request->getId()];
             $proposedCourse = $proposedCourses[$request->getId()];
+            //skip removed courses
+            if($proposedCourse->getRemoved()){
+                continue;
+            }
             $course = $proposedCourse;
+            $courseLatest = Courses_CourseModel::findByCourseId($proposedCourse->getCourseId());
 
+            /*
+            if($courseLatest->getRemoved()){
+                continue;
+            }
+             */
+
+            $courseCode = $course->getCourseCode();
+			$crosslistings = $course->getCrosslistingsText();
 	    	$gradTieIn = $course->getGradTieIn();
             $aceOutcomes = $course->getAceOutcomes();
+            if($courseLatest){
+                $courseCode = $courseLatest->getCourseCode();
+                $crosslistings = $courseLatest->getCrosslistingsText();
+                $gradTieIn = $courseLatest->getGradTieIn();
+                $aceOutcomes = $courseLatest->getAceOutcomes();
+            }
+
 	    	$aceOutcomeText = '';
 	    	foreach ($aceOutcomes as $aceOutcome) {
 			echo ''
-			. $course->getCourseCode() . "\t"
-			. $course->getCrosslistingsText() . "\t"
+			. $courseCode . "\t"
+			. $crosslistings . "\t"
 			. strtr($aceOutcome['slo'], $translateChars) . "\t"
 			. strip_tags(str_replace('&', '&', strtr($aceOutcome['justification'], $translateChars))) . "\t"
 			. strip_tags(str_replace('&', '&', strtr($aceOutcome['studentWork'], $translateChars))) . "\t"