diff --git a/application/modules/iace/controllers/ReinforcementsController.php b/application/modules/iace/controllers/ReinforcementsController.php index 76c304a4716c6fee8c8ef4ba6ddf1c87d9f1ae14..6be6bf10cac3d6ec7baef4ad0ecd2b5d2cda5054 100644 --- a/application/modules/iace/controllers/ReinforcementsController.php +++ b/application/modules/iace/controllers/ReinforcementsController.php @@ -28,16 +28,32 @@ class Iace_ReinforcementsController extends Creq_Controller_Action $translateChars = array("\n" => ' ', "\r" => ' ', "\t" => ' '); - foreach ($requests as $request) { + foreach ($requests as $request) { + //skip incomplete requests + if(!$request->isComplete()){ + continue; + } $parentCourse = $parentCourses[$request->getId()]; - $proposedCourse = $proposedCourses[$request->getId()]; - $course = $proposedCourse; + $proposedCourse = $proposedCourses[$request->getId()]; + //skip removed courses + if($proposedCourse->getRemoved()){ + continue; + } + $course = $proposedCourse; + $courseLatest = Courses_CourseModel::findByCourseId($proposedCourse->getCourseId()); - $aceReinforcements = $course->getAceReinforcements(); + $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"; diff --git a/application/modules/iace/controllers/SloController.php b/application/modules/iace/controllers/SloController.php index a9b7d45027dd77e596c4ca18d0f9007f0e04e925..eb8cb71d1478fb289f5500ba44c77994eb970f75 100644 --- a/application/modules/iace/controllers/SloController.php +++ b/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" @@ -30,18 +32,42 @@ class Iace_SloController extends Creq_Controller_Action $translateChars = array("\n" => ' ', "\r" => ' ', "\t" => ' '); - foreach ($requests as $request) { + foreach ($requests as $request) { + //skip incomplete requests + if(!$request->isComplete()){ + continue; + } $parentCourse = $parentCourses[$request->getId()]; - $proposedCourse = $proposedCourses[$request->getId()]; - $course = $proposedCourse; - + $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(); + $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"