diff --git a/application/modules/bulletin/views/scripts/queue-manager/request-table.phtml b/application/modules/bulletin/views/scripts/queue-manager/request-table.phtml new file mode 100644 index 0000000000000000000000000000000000000000..49e4ce80c984a9e906b504350213a4bf6734587a --- /dev/null +++ b/application/modules/bulletin/views/scripts/queue-manager/request-table.phtml @@ -0,0 +1,37 @@ +<?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> diff --git a/application/modules/fouryearplans/views/scripts/queue-manager/request-table.phtml b/application/modules/fouryearplans/views/scripts/queue-manager/request-table.phtml new file mode 100644 index 0000000000000000000000000000000000000000..e869341ef8533b5f1e41da0b7204dbc8be7838da --- /dev/null +++ b/application/modules/fouryearplans/views/scripts/queue-manager/request-table.phtml @@ -0,0 +1,53 @@ +<?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> diff --git a/application/modules/learningoutcomes/views/scripts/queue-manager/request-table.phtml b/application/modules/learningoutcomes/views/scripts/queue-manager/request-table.phtml new file mode 100644 index 0000000000000000000000000000000000000000..42a5a29edf8a4c5f785f3f3313e26f8e766cbb31 --- /dev/null +++ b/application/modules/learningoutcomes/views/scripts/queue-manager/request-table.phtml @@ -0,0 +1,53 @@ +<?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> diff --git a/application/modules/requests/views/scripts/queue-manager/view.phtml b/application/modules/requests/views/scripts/queue-manager/view.phtml index 5733d04fe3b5da8f224883b453708e25889d54df..09cde2f131c60725009439d18737bad2bf1f8ee7 100644 --- a/application/modules/requests/views/scripts/queue-manager/view.phtml +++ b/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 } ?> diff --git a/document_root/css/bulletin/queue-manager/request-table.css b/document_root/css/bulletin/queue-manager/request-table.css new file mode 100644 index 0000000000000000000000000000000000000000..649a103f0ccad4c61d18e34b4fc6663c4cff809c --- /dev/null +++ b/document_root/css/bulletin/queue-manager/request-table.css @@ -0,0 +1,4 @@ +@CHARSET "UTF-8"; + +#bulletinRequestTable {overflow: scroll;} +#bulletinRequestTable td {text-align: center; white-space:nowrap;} diff --git a/document_root/css/fouryearplans/queue-manager/request-table.css b/document_root/css/fouryearplans/queue-manager/request-table.css new file mode 100644 index 0000000000000000000000000000000000000000..401d1476da45853d9cbded3c644fc7fda1cee71b --- /dev/null +++ b/document_root/css/fouryearplans/queue-manager/request-table.css @@ -0,0 +1,4 @@ +@CHARSET "UTF-8"; + +#fourYearPlanRequestTable {overflow: scroll;} +#fourYearPlanRequestTable td {text-align: center; white-space:nowrap;} diff --git a/document_root/css/learningoutcomes/queue-manager/request-table.css b/document_root/css/learningoutcomes/queue-manager/request-table.css new file mode 100644 index 0000000000000000000000000000000000000000..4ede35d1a0feb83d49c4e4077ab2ee59421bf3d8 --- /dev/null +++ b/document_root/css/learningoutcomes/queue-manager/request-table.css @@ -0,0 +1,4 @@ +@CHARSET "UTF-8"; + +#learningOutcomesRequestTable {overflow: scroll;} +#learningOutcomesRequestTable td {text-align: center; white-space:nowrap;}