diff --git a/application/modules/courses/models/CourseModel.php b/application/modules/courses/models/CourseModel.php index 139732c07fca0d2b08a6dd3d9a60338fe5f6fcc1..ff50211c86af0cb579dd8390e0c8e45014f12cde 100644 --- a/application/modules/courses/models/CourseModel.php +++ b/application/modules/courses/models/CourseModel.php @@ -1893,6 +1893,17 @@ class Courses_CourseModel extends Unl_Model return false; } } + + public function getEssentialStudiesAreas($collegeId = null) + { + $areas = array(); + foreach ((array) $this->_data['esDesignations'] as $esDesignation) { + if (!$collegeId || $collegeId == $esDesignation['college']) { + $areas[$esDesignation['area']] = $esDesignation['area']; + } + } + return $areas; + } public function getDeliveryMethods() { diff --git a/application/modules/ucc/controllers/ReportsController.php b/application/modules/ucc/controllers/ReportsController.php index df9714df6a1c75eb83804cd8744e366e0604a4c3..5671b3c22642080b20f81b1aec1af74c5faad7d6 100644 --- a/application/modules/ucc/controllers/ReportsController.php +++ b/application/modules/ucc/controllers/ReportsController.php @@ -82,6 +82,7 @@ class Ucc_ReportsController extends App_Controller_Action $difference = $currentCourse->getDifferenceSummary($originalCourse, $request); + $es = $originalCourse->getEssentialStudiesAreas(); $data[] = new Unl_Model_Array(array( 'time' => $time->getTimestamp(), 'college' => $originalCourse->getCollege(), @@ -89,6 +90,7 @@ class Ucc_ReportsController extends App_Controller_Action 'title' => $originalCourse->getTitle(), 'difference' => $difference, 'IS' => $originalCourse->isIntegratedStudies(), + 'esAreas' => $originalCourse->getEssentialStudiesAreas(), 'crosslist' => $originalCourse->getCrosslistingsText(), 'course' => $originalCourse->getCourseId() )); diff --git a/application/modules/ucc/views/scripts/reports/monthly-summary.phtml b/application/modules/ucc/views/scripts/reports/monthly-summary.phtml index 9bb370f9c3aedc9ecc322e1d8c7b0f23955f14af..e7a6fbf61538802c42efa9a42bcb1622799dd14b 100644 --- a/application/modules/ucc/views/scripts/reports/monthly-summary.phtml +++ b/application/modules/ucc/views/scripts/reports/monthly-summary.phtml @@ -1,5 +1,6 @@ <?php $this->headLink()->appendStylesheet($this->baseUrl() . '/css/iace/reports/weekly.css', 'all'); ?> -<table> +<?php $this->headLink()->appendStylesheet($this->baseUrl() . '/css/ucc/reports/monthly-summary.css')?> +<table id=""> <tr> <th><a href="<?php echo $this->url(array('sort' => 'time')); ?>">Date Approved</a></th> <th><a href="<?php echo $this->url(array('sort' => 'college')); ?>">College</a></th> @@ -7,7 +8,7 @@ <th><a href="<?php echo $this->url(array('sort' => 'title')); ?>">title</a></th> <th><a href="<?php echo $this->url(array('sort' => 'difference')); ?>">Action Requested</a></th> <th><a href="<?php echo $this->url(array('sort' => 'is')); ?>">IS</a></th> - <th><a href="<?php echo $this->url(array('sort' => 'es')); ?>">ES Section</a></th> + <th><a href="<?php echo $this->url(array('sort' => 'esAreas')); ?>">ES Section</a></th> <th><a href="<?php echo $this->url(array('sort' => 'SF')); ?>">SF</a></th> <th><a href="<?php echo $this->url(array('sort' => 'crosslist')); ?>">X-list</a></th> </tr> @@ -23,7 +24,7 @@ <td><?php echo $row->getTitle(); ?></td> <td><?php echo $row->getDifference(); ?></td> <td><?php if($row->getIS()) echo 'Yes'; ?></td> - <td>?</td> + <td><?php echo implode(',', $row->getEsAreas()); ?></td> <td>?</td> <td><?php echo $row->getCrosslist(); ?></td> </tr> diff --git a/document_root/css/ucc/reports/monthly-summary.css b/document_root/css/ucc/reports/monthly-summary.css new file mode 100644 index 0000000000000000000000000000000000000000..e35749cf740df9708b038cdd928d8eee04251163 --- /dev/null +++ b/document_root/css/ucc/reports/monthly-summary.css @@ -0,0 +1,5 @@ +@CHARSET "UTF-8"; + +#creqMain table {border: 1px solid #000; border-collapse: collapse; margin: 1px;} +#creqMain table td, +#creqMain table th {border: 1px solid #000; padding: 0.5em;} \ No newline at end of file