From a42573c111f28be90ad246b5a9c6292dcfffda4a Mon Sep 17 00:00:00 2001
From: Tim Steiner <tsteiner2@unl.edu>
Date: Thu, 4 Feb 2010 00:07:29 +0000
Subject: [PATCH] Sort UCC extended report by course code.
---
.../scripts/reports/extended-request.phtml | 23 ++++++
.../scripts/reports/monthly-extended.phtml | 82 ++++++++-----------
2 files changed, 59 insertions(+), 46 deletions(-)
create mode 100644 application/modules/ucc/views/scripts/reports/extended-request.phtml
diff --git a/application/modules/ucc/views/scripts/reports/extended-request.phtml b/application/modules/ucc/views/scripts/reports/extended-request.phtml
new file mode 100644
index 00000000..9842c658
--- /dev/null
+++ b/application/modules/ucc/views/scripts/reports/extended-request.phtml
@@ -0,0 +1,23 @@
+<div class="request">
+ <h2>Request Type: <?php echo $this->request->getTypeDescription(); ?></h2>
+ <?php echo $this->partial('view/course-info.phtml',
+ 'courses',
+ array('parentCourse' => $this->originalCourses[$this->request->getId()],
+ 'course' => $this->currentCourses[$this->request->getId()],
+ 'request' => $this->request)); ?>
+ <div class="justification">
+ <h3>Justification</h3>
+ <?php echo $this->request->getJustification(); ?>
+ </div>
+ <h3>Vote Tally:</h3>
+ <?php if ($this->requestVoteTally[$this->request->getId()]) { ?>
+ <ul>
+ <?php foreach ($this->requestVoteTally[$this->request->getId()] as $voteLabel => $voteCount) { ?>
+ <li><?php echo $voteLabel . ': ' . $voteCount; ?></li>
+ <?php } ?>
+ </ul>
+ <?php } else { ?>
+ <div>Resolved by Facilitator</div>
+ <?php } ?>
+ <div>Result: <?php echo $this->requestVoteResults[$this->request->getId()]; ?></div>
+</div>
diff --git a/application/modules/ucc/views/scripts/reports/monthly-extended.phtml b/application/modules/ucc/views/scripts/reports/monthly-extended.phtml
index 78417e79..a0960357 100644
--- a/application/modules/ucc/views/scripts/reports/monthly-extended.phtml
+++ b/application/modules/ucc/views/scripts/reports/monthly-extended.phtml
@@ -6,53 +6,43 @@
</div>
<h1>UCC</h1>
-<?php foreach ($this->requests as $request) { ?>
-<div class="request">
- <h2>Request Type: <?php echo $request->getTypeDescription(); ?></h2>
- <?php echo $this->partial('view/course-info.phtml',
- 'courses',
- array('parentCourse' => $this->originalCourses[$request->getId()],
- 'course' => $this->currentCourses[$request->getId()],
- 'request' => $request)); ?>
- <div class="justification">
- <h3>Justification</h3>
- <?php echo $request->getJustification(); ?>
- </div>
- <h3>Vote Tally:</h3>
- <ul>
- <?php foreach ($this->requestVoteTally[$request->getId()] as $voteLabel => $voteCount) { ?>
- <li><?php echo $voteLabel . ': ' . $voteCount; ?></li>
- <?php } ?>
- </ul>
- <div>Result: <?php echo $this->requestVoteResults[$request->getId()]; ?></div>
-</div>
-<?php } ?>
+<?php
+$results = array();
+foreach ($this->requests as $request) {
+ if ($this->originalCourses[$request->getId()]) {
+ $key = $this->originalCourses[$request->getId()]->getCourseCode();
+ } else {
+ $key = $this->currentCourses[$request->getId()]->getCourseCode();
+ }
+ $results[$key] = $this->partial('reports/extended-request.phtml', array('request' => $request,
+ 'originalCourses' => $this->originalCourses,
+ 'currentCourses' => $this->currentCourses,
+ 'requestVoteTally' => $this->requestVoteTally,
+ 'requestVoteResults' => $this->requestVoteResults));
+}
+
+ksort($results);
+echo implode(PHP_EOL, $results);
+?>
<h1>ACE Subcommittee</h1>
-<?php foreach ($this->aceRequests as $request) { ?>
-<div class="request">
- <h2>Request Type: <?php echo $request->getTypeDescription(); ?></h2>
- <?php echo $this->partial('view/course-info.phtml',
- 'courses',
- array('parentCourse' => $this->aceOriginalCourses[$request->getId()],
- 'course' => $this->aceCurrentCourses[$request->getId()],
- 'request' => $request)); ?>
- <div class="justification">
- <h3>Justification</h3>
- <?php echo $request->getJustification(); ?>
- </div>
- <h3>Vote Tally:</h3>
- <?php if ($this->aceRequestVoteTally[$request->getId()]) { ?>
- <ul>
- <?php foreach ($this->aceRequestVoteTally[$request->getId()] as $voteLabel => $voteCount) { ?>
- <li><?php echo $voteLabel . ': ' . $voteCount; ?></li>
- <?php } ?>
- </ul>
- <?php } else { ?>
- <div>Resolved by Facilitator</div>
- <?php } ?>
- <div>Result: <?php echo $this->aceRequestVoteResults[$request->getId()]; ?></div>
-</div>
-<?php } ?>
+<?php
+$results = array();
+foreach ($this->aceRequests as $request) {
+ if ($this->aceOriginalCourses[$request->getId()]) {
+ $key = $this->aceOriginalCourses[$request->getId()]->getCourseCode();
+ } else {
+ $key = $this->aceCurrentCourses[$request->getId()]->getCourseCode();
+ }
+ $results[$key] = $this->partial('reports/extended-request.phtml', array('request' => $request,
+ 'originalCourses' => $this->aceOriginalCourses,
+ 'currentCourses' => $this->aceCurrentCourses,
+ 'requestVoteTally' => $this->aceRequestVoteTally,
+ 'requestVoteResults' => $this->aceRequestVoteResults));
+}
+
+ksort($results);
+echo implode(PHP_EOL, $results);
+?>
--
GitLab