diff --git a/application/modules/courses/controllers/ViewController.php b/application/modules/courses/controllers/ViewController.php index 1821c92622b9cf9d6737c68bdebb783a63789786..3caa59135df5f8e53f6bfab861ed6de74f5df241 100644 --- a/application/modules/courses/controllers/ViewController.php +++ b/application/modules/courses/controllers/ViewController.php @@ -82,6 +82,24 @@ class Courses_ViewController extends App_Controller_Action $session->tabName = $tabName; exit; } + + public function printAction() + { + $requestId = $this->getRequest()->getParam('id'); + $request = Requests_RequestModel::find($requestId); + $course = Courses_CourseModel::findLatestOfRequest($request); + + $parentCourse = null; + if (in_array($request->getType(), array('ChangeCourse', 'AddACEAndChangeCourse'))) { + $parentCourse = Courses_CourseModel::findParentOfRequest($request); + } + + $this->view->request = $request; + $this->view->course = $course; + $this->view->parentCourse = $parentCourse; + + $this->_helper->layout->setLayout('naked-layout'); + } protected function _getFutureTerms() { diff --git a/application/modules/courses/views/scripts/view/course-info.phtml b/application/modules/courses/views/scripts/view/course-info.phtml new file mode 100644 index 0000000000000000000000000000000000000000..fcc420ac7be76787e99a2457c4b5ef59bd109eb9 --- /dev/null +++ b/application/modules/courses/views/scripts/view/course-info.phtml @@ -0,0 +1,109 @@ +<div class="courseInfo"> +<?php + $course = $this->course; + if (in_array($this->request->getType(), array('ChangeCourse', 'AddISToCourse', 'AddACEAndChangeCourse', 'RemoveACEAndChangeCourse'))) { + $parentCourse = $this->parentCourse; +/****************************CHANGE COURSE*************************************/ +?> + +<div class="current"> + <h2>Current</h2> + <div class="bulletinEntry"> + <?php echo $this->bulletinEntryDiff($parentCourse, $course, $this->request, 'current'); ?> + </div> +</div> +<div class="proposed"> + <h2>Proposed</h2> + <div class="bulletinEntry"> + <?php echo $this->bulletinEntryDiff($parentCourse, $course, $this->request, 'proposed'); ?> + </div> +</div> +<div class="clear"></div> + + +<?php + } else if ($this->request->getType() == 'RemoveCourse') { +/*****************************REMOVE COURSE************************************/ +?> + <div class="removed"> + <?php echo $this->bulletinEntry($course, $this->request); ?> + </div> + +<?php } else { +/*****************************NEW COURSE***************************************/ + echo $this->bulletinEntry($course, $this->request); + } + + +/*****************************ACE COURSE***************************************/ + if (in_array($this->request->getType(), array('NewCourseWithACE', 'AddACEToCourse', 'AddACEAndChangeCourse', 'RemoveACEFromCourse', 'RemoveACEAndChangeCourse'))) { +?> +<div> + <h2 id="aceHeading">Ace Course Proposal</h2> + + <h3>Outcome(s)</h3> + <?php foreach ($course->getAceOutcomes() as $aceOutcome) { ?> + <div class="sloHeading"> + <?php echo $aceOutcome['slo']; ?>: + <?php echo $aceOutcome['description']; ?> + </div> + <ol> + <li> + <div class="question"> + Describe opportunities students should have to learn the outcome.<br /> + How is the learning objective embedded in the course? + </div> + <div class="answer"> + <?php echo $aceOutcome['justification']; ?> + </div> + </li> + <li> + <div class="question"> + Describe student work that will be used to assess student achievement + of the outcome and explain how the students demonstrate the knowledge + and skills specified by the outcome. + </div> + <div class="answer"> + <?php echo $aceOutcome['studentWork']; ?> + </div> + </li> + <li> + <div class="question"> + As part of the ACE certification process, the department/unit agrees to + collect and assess a reasonable sample of students' work and provide + reflections on students' achievement of the Learning Outcomes for its + respective ACE-certified courses.<br /> + Please comment on your plans to develop a process to collect and evaluate + student work over time for the purpose of assessing student success for + this ACE outcome. + </div> + <div class="answer"> + <?php echo $aceOutcome['assesmentPlan']; ?> + </div> + </li> + </ol> + <?php } ?> + + <h3>Reinforcements</h3> + <div id="reinforcementDescription"> + According to the ACE document approved by faculty (Structural Criteria, + item 9), "Every ACE course will reinforce at least one of the following + skills listed below as appropriate for the discipline and as identified + by the department offering the course..." Indicate skills that will be reinforced + by the course by clicking on as many as apply and describe briefly how those + skills will be reinforced.<br /><br /> + + <b>These areas are those <em>OTHER THAN</em> the one or two outcomes for + which you seek ACE certification. Students will not receive ACE credit for + the reinforced skills, and the reinforced skills do not need to be assessed + for ACE purposes.</b> + </div> + <dl> + <?php foreach ($course->getAceReinforcements() as $aceReinforcement) { ?> + <dt><?php echo $aceReinforcement['longName']; ?></dt> + <dd><?php echo $aceReinforcement['description']; ?></dd> + <?php } ?> + </dl> +</div> +<?php } ?> +</div> \ No newline at end of file diff --git a/application/modules/courses/views/scripts/view/index.phtml b/application/modules/courses/views/scripts/view/index.phtml index dcfd144123a7abf3e2377b705d77fc971fb89f9a..58e439507d478c55a0eb246dafe831c65f3d0fa4 100644 --- a/application/modules/courses/views/scripts/view/index.phtml +++ b/application/modules/courses/views/scripts/view/index.phtml @@ -8,77 +8,8 @@ if ($this->preview) { } $this->layout()->tagline = $tagline . ': ' . $this->course->getCourseCode() . ' (' . $this->request->getType() . ')'; ?> - <div id="viewRequest"> - <?php - $course = $this->course; - if (in_array($this->request->getType(), array('ChangeCourse', 'AddISToCourse', 'AddACEAndChangeCourse', 'RemoveACEAndChangeCourse'))) { - $parentCourse = $this->parentCourse; -/****************************CHANGE COURSE*************************************/ - ?> - - <div class="current"> - <h2>Current</h2> - <div class="bulletinEntry"> - <?php echo $this->bulletinEntryDiff($parentCourse, $course, $this->request, 'current'); ?> - </div> - </div> - <div class="proposed"> - <h2>Proposed</h2> - <div class="bulletinEntry"> - <?php echo $this->bulletinEntryDiff($parentCourse, $course, $this->request, 'proposed'); ?> - </div> - </div> - <div class="clear"></div> - - - <?php - } else if ($this->request->getType() == 'RemoveCourse') { -/*****************************REMOVE COURSE************************************/ -?> - <div class="removed"> - <?php echo $this->bulletinEntry($course, $this->request); ?> - </div> - -<?php } else { -/*****************************NEW COURSE***************************************/ - echo $this->bulletinEntry($course, $this->request); - } - - -/*****************************ACE COURSE***************************************/ - if (in_array($this->request->getType(), array('NewCourseWithACE', 'AddACEToCourse', 'AddACEAndChangeCourse', 'RemoveACEFromCourse', 'RemoveACEAndChangeCourse'))) { -?> - <div> - <h2 id="aceHeading">Ace Course Proposal</h2> - - <h3>Outcome(s)</h3> - <?php foreach ($course->getAceOutcomes() as $aceOutcome) { ?> - <div> - <?php echo $aceOutcome['slo']; ?>: - <?php echo $aceOutcome['description']; ?> - </div> - <ol> - <li><?php echo $aceOutcome['justification']; ?></li> - <li><?php echo $aceOutcome['studentWork']; ?></li> - <li><?php echo $aceOutcome['assesmentPlan']; ?></li> - </ol> - <?php } ?> - - <h3>Reinforcements</h3> - <dl> - <?php foreach ($course->getAceReinforcements() as $aceReinforcement) { ?> - <dt><?php echo $aceReinforcement['longName']; ?></dt> - <dd><?php echo $aceReinforcement['description']; ?></dd> - <?php } ?> - </dl> - - - </div> -<?php - } -/*****************************COMMON STUFF*************************************/ - ?> + <?php echo $this->partial('view/course-info.phtml', $this); ?> <?php if (!in_array($this->request->getType(), array('AddACEToCourse', 'RemoveACEFromCourse'))) { ?> <div id="justification"> diff --git a/application/modules/courses/views/scripts/view/print.phtml b/application/modules/courses/views/scripts/view/print.phtml new file mode 100644 index 0000000000000000000000000000000000000000..59c11d22ccde76c0ec4b9ef63215158c29b6c5f3 --- /dev/null +++ b/application/modules/courses/views/scripts/view/print.phtml @@ -0,0 +1,7 @@ +<?php $this->headLink()->appendStylesheet($this->baseUrl() . '/css/courses/view/print.css', 'all'); ?> + +<img id="aceLogo" src="<?php echo $this->baseUrl(); ?>/images/courses/ace_logo.jpg" alt="University of Nebraska Lincoln" /> +<img id="unlLogo" src="<?php echo $this->baseUrl(); ?>/images/courses/unl_logo_gray.png" alt="University of Nebraska Lincoln" /> + +<div class="courseCode"><?php echo $this->course->getCourseCode(); ?></div> +<?php echo $this->partial('view/course-info.phtml', $this); ?> \ No newline at end of file diff --git a/application/modules/iace/controllers/ReportsController.php b/application/modules/iace/controllers/ReportsController.php index c1c5dcdd8b199590a68a6dcdee16a74752ad2e07..e11984b5dfdb55baecfeae2ee718e722e885073e 100644 --- a/application/modules/iace/controllers/ReportsController.php +++ b/application/modules/iace/controllers/ReportsController.php @@ -66,7 +66,8 @@ class Iace_ReportsController extends App_Controller_Action 'courseCode' => $course->getCourseCode(), 'college' => $course->getCollege(), 'title' => $course->getTitle(), - 'finalizeTime' => $finalizeTime + 'finalizeTime' => $finalizeTime, + 'requestId' => $request->getId() )); } } @@ -88,7 +89,6 @@ class Iace_ReportsController extends App_Controller_Action $data->orderBy('get' . $sortKey); } - //$this->_helper->layout->disableLayout(); $this->_helper->layout->setLayout('naked-layout'); $this->view->data = $data; $this->view->endDate = $endDate->subDay(1); diff --git a/application/modules/iace/views/scripts/reports/weekly.phtml b/application/modules/iace/views/scripts/reports/weekly.phtml index 7c27d7ec1c55dbcf9281d19d6f00bd60df4cc943..92d14b0fce851c4fa605586dc6af3c86a75288f0 100644 --- a/application/modules/iace/views/scripts/reports/weekly.phtml +++ b/application/modules/iace/views/scripts/reports/weekly.phtml @@ -18,11 +18,30 @@ </tr> <?php foreach ($this->data as $record) { ?> <tr <?php if ($rowCount++ % 2) { ?>class="even"<?php } ?>> - <td><?php echo $record->getSlo(); ?></td> - <td><?php echo $record->getCourseCode(); ?></td> - <td><?php echo $record->getCollege(); ?></td> - <td><?php echo $record->getTitle(); ?></td> - <td><?php echo date('n/j/Y', $record->getFinalizeTime()); ?></td> + <td> + <a href="<?php echo $this->baseUrl(); ?>/courses/view/print/id/<?php echo $record->getRequestId(); ?>"> + <?php echo $record->getSlo(); ?></td> + </a> + <td> + <a href="<?php echo $this->baseUrl(); ?>/courses/view/print/id/<?php echo $record->getRequestId(); ?>"> + <?php echo $record->getCourseCode(); ?> + </a> + </td> + <td> + <a href="<?php echo $this->baseUrl(); ?>/courses/view/print/id/<?php echo $record->getRequestId(); ?>"> + <?php echo $record->getCollege(); ?> + </a> + </td> + <td> + <a href="<?php echo $this->baseUrl(); ?>/courses/view/print/id/<?php echo $record->getRequestId(); ?>"> + <?php echo $record->getTitle(); ?> + </a> + </td> + <td> + <a href="<?php echo $this->baseUrl(); ?>/courses/view/print/id/<?php echo $record->getRequestId(); ?>"> + <?php echo date('n/j/Y', $record->getFinalizeTime()); ?> + </a> + </td> </tr> <? } ?> </table> \ No newline at end of file diff --git a/document_root/css/courses/view.css b/document_root/css/courses/view.css index 029e39a2ed83d6f67a9cce5bf8fbb1e3e5058b58..e331f5a84b0da5890a4ddf436015b690dec87f02 100644 --- a/document_root/css/courses/view.css +++ b/document_root/css/courses/view.css @@ -73,6 +73,10 @@ #aceHeading { font-style: italic; } +.question, #reinforcementDescription { + display: none; +} + div#comments .tabBar a { -moz-border-radius-bottomleft:0px; diff --git a/document_root/css/courses/view/print.css b/document_root/css/courses/view/print.css new file mode 100644 index 0000000000000000000000000000000000000000..d83f2cdeb81a76b3eb5384c13033f1bd1151a10b --- /dev/null +++ b/document_root/css/courses/view/print.css @@ -0,0 +1,57 @@ +@CHARSET "UTF-8"; + +#aceLogo { + float: right; + height: 75px; +} + +#unlLogo { + margin-bottom: 2em; +} + + +div.courseInfo { + font-size: 14px; + font-family: sans-serif; +} + +div.courseCode { + font-size: 18px; + font-weight: bold; + float: left; + width: 150px; +} + +div.bulletinEntry { + overflow: hidden; +} + +div.bulletinEntry, .sloHeading, #reinforcementDescription { + border: 1px solid #999; + padding: 0.25em; +} + +#aceHeading { + font-style: italic; +} + +ol { + padding-left: 20px; +} + +.question, .answer { + margin-bottom: 1em; +} + +.answer { + margin-left: 2em; +} + +#reinforcementDescription { + margin-left: 2em; +} + +#reinforcementDescription b { + font-weight: normal; +} + diff --git a/document_root/css/iace/reports/weekly.css b/document_root/css/iace/reports/weekly.css index 64030627a730fabde308dd87ca6d852d223a8af9..f455c9d328602ab686481bb3caed455ffca2a819 100644 --- a/document_root/css/iace/reports/weekly.css +++ b/document_root/css/iace/reports/weekly.css @@ -1,5 +1,15 @@ @CHARSET "UTF-8"; +body { + font-size: 12px; + font-family: sans-serif; +} + +a { + color: inherit; + text-decoration: inherit; +} + h2 { text-align: center; font-size: 14px; @@ -10,14 +20,14 @@ table { } table th { - background-color: #ccd; + background-color: #bcd; text-align: left; - padding: 0.2em 0.5em; + padding: 0.3em 0.5em; } table tr.even { background-color: #eee; } table td { - padding: 0.2em 0.5em; + padding: 0.5em 0.5em; } \ No newline at end of file diff --git a/document_root/images/courses/ace_logo.jpg b/document_root/images/courses/ace_logo.jpg new file mode 100644 index 0000000000000000000000000000000000000000..98074dae2e4469688d7faceba737482151cf1d6f Binary files /dev/null and b/document_root/images/courses/ace_logo.jpg differ diff --git a/document_root/images/courses/unl_logo_gray.png b/document_root/images/courses/unl_logo_gray.png new file mode 100644 index 0000000000000000000000000000000000000000..d5af69a243e380eb4cb2dc78a8b930d3fd78259c Binary files /dev/null and b/document_root/images/courses/unl_logo_gray.png differ