diff --git a/application/models/rows/CourseGeneration.php b/application/models/rows/CourseGeneration.php index 740ad469118fa334ee0b40c37219037242209218..c0ef6f4a022e6207f0734c2f145da3a363edddd8 100644 --- a/application/models/rows/CourseGeneration.php +++ b/application/models/rows/CourseGeneration.php @@ -180,11 +180,7 @@ class CourseGeneration extends Asset $this->courseNumber, $this->courseLetter); if (is_null($courseCode)) { - if (is_null($college)) { - return array(array()); - } else { - return array(); - } + return CourseEsDesignations::getInstance()->getEmptyEssentialStudiesArray($college); } return CourseEsDesignations::getInstance()->getEssentialStudiesAreas($courseCode, $college); diff --git a/application/models/tables/CourseEsDesignations.php b/application/models/tables/CourseEsDesignations.php index c50bbf4fd18e468740e54333cfc281b2cff68157..a7724945560d05aacd973a0ebfca8b495dd6e521 100644 --- a/application/models/tables/CourseEsDesignations.php +++ b/application/models/tables/CourseEsDesignations.php @@ -63,22 +63,7 @@ class CourseEsDesignations extends Nmc_Db_Table $where = implode(' AND ', $where); $results = $this->fetchAll($where); - $areaCodes = array('A', 'B', 'C', 'D', 'E', 'F', 'G', 'H'); - $colleges = Colleges::getInstance()->fetchAll(); - - $areas = array(); - if ($college) { - foreach ($areaCodes as $areaCode) { - $areas[$areaCode] = false; - } - } else { - foreach ($colleges as $collegeRow) { - $areas[$collegeRow->name] = array(); - foreach ($areaCodes as $areaCode) { - $areas[$collegeRow->name][$areaCode] = false; - } - } - } + $areas = $this->getEmptyEssentialStudiesArray($college); foreach ($results as $row) { if ($college) { @@ -113,4 +98,26 @@ class CourseEsDesignations extends Nmc_Db_Table } } } + + public function getEmptyEssentialStudiesArray(College $college = null) + { + $areaCodes = array('A', 'B', 'C', 'D', 'E', 'F', 'G', 'H'); + $colleges = Colleges::getInstance()->fetchAll(); + + $areas = array(); + if ($college) { + foreach ($areaCodes as $areaCode) { + $areas[$areaCode] = false; + } + } else { + foreach ($colleges as $collegeRow) { + $areas[$collegeRow->name] = array(); + foreach ($areaCodes as $areaCode) { + $areas[$collegeRow->name][$areaCode] = false; + } + } + } + + return $areas; + } } \ No newline at end of file