Merge branch 'master' of git.unl.edu:tsteiner2/Curriculum-Request

application/modules/bulletin/views/scripts/queue-manager/request-table.phtml

+<?php
+
+$requestBulletins = Bulletin_SectionModel::findWithRequest($this->requests);
+$isCurrentPeriod = $this->isCurrentPeriod;
+
+$this->headLink()->appendStylesheet($this->baseUrl() . '/css/bulletin/queue-manager/request-table.css', 'all');
+?>
+
+<table class="zentable primary" id="bulletinRequestTable">
+    <tr>
+    	<?php if ($isCurrentPeriod) { ?>
+    	<th>Advance</th>
+    	<?php } ?>
+        <th>Section</th>
+        <th>College</th>
+        <?php foreach ($this->users as $user) { ?>
+        <th><?php echo $user->getFirstName() . ' ' . $user->getLastName(); ?></th>
+        <?php } ?>
+    </tr>
+
+<?php foreach ($this->requests as $request) {
+	$bulletin = $requestBulletins[$request->getId()];
+    $userVotes = $this->requestUserVotes[$request->getId()]; ?>
+    <tr>
+    	<?php if ($isCurrentPeriod) { ?>
+    	<td><?php echo $this->formCheckbox('requests[' . $request->getId() . ']'); ?>
+    	<?php } ?>
+        <td><?php echo $this->escape($bulletin->getMajor() ? $bulletin->getMajor() : $bulletin->getCollegeLong()); ?></td>
+        <td><?php echo $bulletin->getCollege(); ?></td>
+        <?php foreach ($this->users as $user) { 
+            $vote = $userVotes[$user->getId()]; ?>
+        <td><?php echo $vote; ?></td>
+        <?php } ?>
+    </tr>
+    
+<?php } ?>
+</table>

application/modules/fouryearplans/views/scripts/queue-manager/request-table.phtml

+<?php
+
+$proposedFourYearPlans = FourYearPlans_FourYearPlanModel::findLatestOfRequest($this->requests);
+$originalFourYearPlans = FourYearPlans_FourYearPlanModel::findParentOfRequest($this->requests);
+$isCurrentPeriod = $this->isCurrentPeriod;
+
+$requestFourYearPlans = array();
+foreach ($this->requests as $requset) {
+	$requestId = $requset->getId();
+	if ($originalFourYearPlans[$requestId]) {
+		$fourYearPlan = $originalFourYearPlans[$requestId];
+	} else {
+		$fourYearPlan = $proposedFourYearPlans[$requestId];
+	}
+	$requestFourYearPlans[$requestId] = $fourYearPlan;
+}
+
+
+
+
+
+$this->headLink()->appendStylesheet($this->baseUrl() . '/css/fouryearplans/queue-manager/request-table.css', 'all');
+?>
+
+<table class="zentable primary" id="fourYearPlanRequestTable">
+    <tr>
+    	<?php if ($isCurrentPeriod) { ?>
+    	<th>Advance</th>
+    	<?php } ?>
+        <th>Major</th>
+        <th>College</th>
+        <?php foreach ($this->users as $user) { ?>
+        <th><?php echo $user->getFirstName() . ' ' . $user->getLastName(); ?></th>
+        <?php } ?>
+    </tr>
+
+<?php foreach ($this->requests as $request) {
+	$fourYearPlan = $requestFourYearPlans[$request->getId()];
+    $userVotes = $this->requestUserVotes[$request->getId()]; ?>
+    <tr>
+    	<?php if ($isCurrentPeriod) { ?>
+    	<td><?php echo $this->formCheckbox('requests[' . $request->getId() . ']'); ?>
+    	<?php } ?>
+        <td><?php echo $fourYearPlan->getMajor(); ?></td>
+        <td><?php echo $fourYearPlan->getCollege(); ?></td>
+        <?php foreach ($this->users as $user) { 
+            $vote = $userVotes[$user->getId()]; ?>
+        <td><?php echo $vote; ?></td>
+        <?php } ?>
+    </tr>
+    
+<?php } ?>
+</table>

application/modules/learningoutcomes/views/scripts/queue-manager/request-table.phtml

+<?php
+
+$proposedLearningOutcomes = LearningOutcomes_LearningOutcomeModel::findLatestOfRequest($this->requests);
+$originalLearningOutcomes = LearningOutcomes_LearningOutcomeModel::findParentOfRequest($this->requests);
+$isCurrentPeriod = $this->isCurrentPeriod;
+
+$requestLearningOutcomes = array();
+foreach ($this->requests as $requset) {
+	$requestId = $requset->getId();
+	if ($originalLearningOutcomes[$requestId]) {
+		$learningOutcome = $originalLearningOutcomes[$requestId];
+	} else {
+		$learningOutcome = $proposedLearningOutcomes[$requestId];
+	}
+	$requestLearningOutcomes[$requestId] = $learningOutcome;
+}
+
+
+
+
+
+$this->headLink()->appendStylesheet($this->baseUrl() . '/css/learningoutcomes/queue-manager/request-table.css', 'all');
+?>
+
+<table class="zentable primary" id="learningOutcomeRequestTable">
+    <tr>
+    	<?php if ($isCurrentPeriod) { ?>
+    	<th>Advance</th>
+    	<?php } ?>
+        <th>Major</th>
+        <th>College</th>
+        <?php foreach ($this->users as $user) { ?>
+        <th><?php echo $user->getFirstName() . ' ' . $user->getLastName(); ?></th>
+        <?php } ?>
+    </tr>
+
+<?php foreach ($this->requests as $request) {
+	$learningOutcome = $requestLearningOutcomes[$request->getId()];
+    $userVotes = $this->requestUserVotes[$request->getId()]; ?>
+    <tr>
+    	<?php if ($isCurrentPeriod) { ?>
+    	<td><?php echo $this->formCheckbox('requests[' . $request->getId() . ']'); ?>
+    	<?php } ?>
+        <td><?php echo $learningOutcome->getMajor(); ?></td>
+        <td><?php echo $learningOutcome->getCollege(); ?></td>
+        <?php foreach ($this->users as $user) { 
+            $vote = $userVotes[$user->getId()]; ?>
+        <td><?php echo $vote; ?></td>
+        <?php } ?>
+    </tr>
+    
+<?php } ?>
+</table>

application/modules/requests/views/scripts/queue-manager/view.phtml

@@ -19,7 +19,6 @@ WDN.initializePlugin('notice');
 <?php } ?>
 
 Select period that ended on <?php echo $this->formSelect('period', $this->currentPeriod, NULL, $this->periods); ?>
-<h3>Requests:</h3>
 <?php
 $isCurrentPeriod = (!$this->currentPeriod || $this->currentPeriod < 0);
 foreach ($this->moduleRequests as $module => $requests) { 
@@ -27,6 +26,7 @@ foreach ($this->moduleRequests as $module => $requests) {
 
 <?php if ($isCurrentPeriod) { ?>
 <form method="post" action="<?php echo $this->baseUrl() . '/requests/queue-manager/advance-post/id/' . $this->queue->getId(); ?>">
+<h3><?php echo $module ?> Requests:</h3>
 <?php echo $this->formHidden('queueId', $this->queue->getId()); ?>
 <?php } ?>
 

document_root/css/bulletin/queue-manager/request-table.css

+@CHARSET "UTF-8";
+
+#bulletinRequestTable {overflow: scroll;}
+#bulletinRequestTable td {text-align: center; white-space:nowrap;}

document_root/css/fouryearplans/queue-manager/request-table.css

+@CHARSET "UTF-8";
+
+#fourYearPlanRequestTable {overflow: scroll;}
+#fourYearPlanRequestTable td {text-align: center; white-space:nowrap;}

document_root/css/learningoutcomes/queue-manager/request-table.css

+@CHARSET "UTF-8";
+
+#learningOutcomesRequestTable {overflow: scroll;}
+#learningOutcomesRequestTable td {text-align: center; white-space:nowrap;}