diff --git a/application/modules/courses/models/CourseModel.php b/application/modules/courses/models/CourseModel.php index a2faf26aa18cad57d4a4e2d5210100ceac42a1d2..05d2a6c137bf2a5881c3e64bfafa8ed0261ada57 100644 --- a/application/modules/courses/models/CourseModel.php +++ b/application/modules/courses/models/CourseModel.php @@ -140,8 +140,8 @@ class Courses_CourseModel extends Unl_Model //INNER JOIN creq.creqcourseacerecertifyquestions AS q ON a.questionId = q.courseAceRecertifyQuestionId //WHERE a.recertificationId = 785 ORDER BY q.questionSort; $select = new Zend_Db_Select($db); - $select->from(array('a' => 'creqcourseacerecertifyanswers')); - $select->joinInner(array('q' => 'creqcourseacerecertifyquestions'), 'a.questionId = q.courseAceRecertifyQuestionId'); + $select->from(array('a' => 'creqCourseAceRecertifyAnswers')); + $select->joinInner(array('q' => 'creqCourseAceRecertifyQuestions'), 'a.questionId = q.courseAceRecertifyQuestionId'); $select->where('a.recertificationId = ?', $record['courseAceRecertificationId']); $select->order('q.questionSort'); $recordsRecertQA = $select->query()->fetchAll(); @@ -152,8 +152,8 @@ class Courses_CourseModel extends Unl_Model //INNER JOIN creq.creqcourseacerecertifyquestions AS q ON s.courseAceRecertifyQuestionSetId = q.questionSetId //WHERE s.dateRetired IS NULL ORDER BY q.questionSort; $select = new Zend_Db_Select($db); - $select->from(array('s' => 'creqcourseacerecertifyquestionsets')); - $select->joinInner(array('q' => 'creqcourseacerecertifyquestions'), 's.courseAceRecertifyQuestionSetId = q.questionSetId'); + $select->from(array('s' => 'creqCourseAceRecertifyQuestionSets')); + $select->joinInner(array('q' => 'creqCourseAceRecertifyQuestions'), 's.courseAceRecertifyQuestionSetId = q.questionSetId'); $select->where('s.dateRetired IS NULL'); $select->order('q.questionSort'); $recordsRecertQA = $select->query()->fetchAll(); @@ -2968,12 +2968,12 @@ class Courses_CourseModel extends Unl_Model { if (!is_array($this->_data['aceRecertification'])) { // load current empty question set - //SELECT q.* FROM creq.creqcourseacerecertifyquestionsets as s - //INNER JOIN creq.creqcourseacerecertifyquestions AS q ON s.courseAceRecertifyQuestionSetId = q.questionSetId + //SELECT q.* FROM creq.creqCourseAceRecertifyQuestionSets as s + //INNER JOIN creq.creqCourseAceRecertifyQuestions AS q ON s.courseAceRecertifyQuestionSetId = q.questionSetId //WHERE s.dateRetired IS NULL ORDER BY q.questionSort; $select = new Zend_Db_Select($db); - $select->from(array('s' => 'creqcourseacerecertifyquestionsets')); - $select->joinInner(array('q' => 'creqcourseacerecertifyquestions'), 's.courseAceRecertifyQuestionSetId = q.questionSetId'); + $select->from(array('s' => 'creqCourseAceRecertifyQuestionSets')); + $select->joinInner(array('q' => 'creqCourseAceRecertifyQuestions'), 's.courseAceRecertifyQuestionSetId = q.questionSetId'); $select->where('s.dateRetired IS NULL'); $select->order('q.questionSort'); $recordsRecertQA = $select->query()->fetchAll(); @@ -3001,11 +3001,11 @@ class Courses_CourseModel extends Unl_Model } if ($questionIds != "") { - //SELECT q.* FROM creq.creqcourseacerecertifyquestions AS q + //SELECT q.* FROM creq.creqCourseAceRecertifyQuestions AS q //WHERE q.courseAceRecertifyQuestionId IN (1,2,3,4,5) ORDER BY q.questionSort; $db = Zend_Registry::get('db'); $select = new Zend_Db_Select($db); - $select->from(array('q' => 'creqcourseacerecertifyquestions')); + $select->from(array('q' => 'creqCourseAceRecertifyQuestions')); $select->where('q.courseAceRecertifyQuestionId IN (?)', $questionIds); $select->order('q.questionSort'); $result = $select->query()->fetchAll();