Skip to content
Snippets Groups Projects
Commit 6f3487e9 authored by Nick Barry's avatar Nick Barry
Browse files

Merge branch 'projects-task-31' into 'master'

Projects Task 31

Modifications to fix the ACE course feed so that it doesn't display deleted and non-ACE courses.
parents 519ed258 5e9e85ac
No related branches found
No related tags found
No related merge requests found
......@@ -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'];
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment