diff --git a/application/modules/iace/controllers/ReinforcementsController.php b/application/modules/iace/controllers/ReinforcementsController.php index 50f3815b1adf59485d96f1b3186528fe57a618d8..76c304a4716c6fee8c8ef4ba6ddf1c87d9f1ae14 100644 --- a/application/modules/iace/controllers/ReinforcementsController.php +++ b/application/modules/iace/controllers/ReinforcementsController.php @@ -11,9 +11,12 @@ class Iace_ReinforcementsController extends Creq_Controller_Action public function reportAction() { $this->_disableLayoutAndView(); - - $iAceRole = Requests_ApprovalRoleModel::find(114); - $requests = Requests_RequestModel::findByWatchingRole($iAceRole); + + //find all ACE course requests + //NewCourseWithAce (6) + //AddACEToCourse (7) + //AddACEAndChangeCourse (8) + $requests = Requests_RequestModel::findBytype(array(6,7,8)); $proposedCourses = Courses_CourseModel::findLatestOfRequest($requests); $parentCourses = Courses_CourseModel::findParentOfRequest($requests); echo '' diff --git a/application/modules/iace/controllers/SloController.php b/application/modules/iace/controllers/SloController.php index 354a5825fd4d558c2992e00d77567c73130aa8b5..a9b7d45027dd77e596c4ca18d0f9007f0e04e925 100644 --- a/application/modules/iace/controllers/SloController.php +++ b/application/modules/iace/controllers/SloController.php @@ -11,9 +11,12 @@ class Iace_SloController extends Creq_Controller_Action public function reportAction() { $this->_disableLayoutAndView(); - - $iAceRole = Requests_ApprovalRoleModel::find(114); - $requests = Requests_RequestModel::findByWatchingRole($iAceRole); + + //find all ACE course requests + //NewCourseWithAce (6) + //AddACEToCourse (7) + //AddACEAndChangeCourse (8) + $requests = Requests_RequestModel::findBytype(array(6,7,8)); $proposedCourses = Courses_CourseModel::findLatestOfRequest($requests); $parentCourses = Courses_CourseModel::findParentOfRequest($requests); echo '' diff --git a/application/modules/requests/models/RequestModel.php b/application/modules/requests/models/RequestModel.php index e0134126f8bbc809ed9f7957c62addd5a853440f..ffc6076533352af3eb0aa258bc9c6285243867d2 100644 --- a/application/modules/requests/models/RequestModel.php +++ b/application/modules/requests/models/RequestModel.php @@ -108,6 +108,31 @@ class Requests_RequestModel extends Unl_Model } } + static public function findByType($type) + { + $db = Zend_Registry::get('db'); + + $select = new Zend_Db_Select($db); + $select->from(array('r' => 'creqRequests')); + if (Unl_Util::isArray($type)) { + if (count($type) == 0) { + return new Unl_Model_Collection(__CLASS__); + } + $select->where('r.type IN (?)', $type); + } else { + $select->where('r.type = ?', $type); + } + + $records = $select->query()->fetchAll(); + + $requestIds = array(); + foreach ($records as $record) { + $requestIds[] = $record['requestId']; + } + + return self::find($requestIds); + } + static public function findByRole($role, $visibleOnly = true) { $db = Zend_Registry::get('db');