Skip to content
Snippets Groups Projects
Commit e558f9f5 authored by Tim Steiner's avatar Tim Steiner
Browse files

Handle sorting of requests when multiple requests are for the same course code.

parent 0604a6a3
No related branches found
Tags
No related merge requests found
...@@ -19,7 +19,9 @@ class HomeController extends Nmc_Controller_Action ...@@ -19,7 +19,9 @@ class HomeController extends Nmc_Controller_Action
$myRequests['subject'] = array(); $myRequests['subject'] = array();
$myRequests['courseNumber'] = array(); $myRequests['courseNumber'] = array();
$myRequests['courseLetter'] = array(); $myRequests['courseLetter'] = array();
$myRequests['counter'] = array();
$myRequests['request'] = array(); $myRequests['request'] = array();
$i = 0;
foreach($requests as $index => $request) { foreach($requests as $index => $request) {
$course = $request->getCourseGeneration(); $course = $request->getCourseGeneration();
...@@ -31,6 +33,7 @@ class HomeController extends Nmc_Controller_Action ...@@ -31,6 +33,7 @@ class HomeController extends Nmc_Controller_Action
$myRequests['subject'][] = $originalCourse->subject; $myRequests['subject'][] = $originalCourse->subject;
$myRequests['courseNumber'][] = $originalCourse->courseNumber; $myRequests['courseNumber'][] = $originalCourse->courseNumber;
$myRequests['courseLetter'][] = $originalCourse->courseLetter; $myRequests['courseLetter'][] = $originalCourse->courseLetter;
$myRequests['counter'][] = $i++;
$myRequests['request'][] = $request; $myRequests['request'][] = $request;
} }
...@@ -38,6 +41,7 @@ class HomeController extends Nmc_Controller_Action ...@@ -38,6 +41,7 @@ class HomeController extends Nmc_Controller_Action
array_multisort($myRequests['subject'], array_multisort($myRequests['subject'],
$myRequests['courseNumber'], $myRequests['courseNumber'],
$myRequests['courseLetter'], $myRequests['courseLetter'],
$myRequests['counter'],
$myRequests['request']); $myRequests['request']);
...@@ -48,6 +52,7 @@ class HomeController extends Nmc_Controller_Action ...@@ -48,6 +52,7 @@ class HomeController extends Nmc_Controller_Action
$roleRequests['subject'] = array(); $roleRequests['subject'] = array();
$roleRequests['courseNumber'] = array(); $roleRequests['courseNumber'] = array();
$roleRequests['courseLetter'] = array(); $roleRequests['courseLetter'] = array();
$roleRequests['counter'] = array();
$roleRequests['request'] = array(); $roleRequests['request'] = array();
$requests = $role->getRequests(); $requests = $role->getRequests();
...@@ -62,6 +67,7 @@ class HomeController extends Nmc_Controller_Action ...@@ -62,6 +67,7 @@ class HomeController extends Nmc_Controller_Action
$roleRequests['subject'][] = $originalCourse->subject; $roleRequests['subject'][] = $originalCourse->subject;
$roleRequests['courseNumber'][] = $originalCourse->courseNumber; $roleRequests['courseNumber'][] = $originalCourse->courseNumber;
$roleRequests['courseLetter'][] = $originalCourse->courseLetter; $roleRequests['courseLetter'][] = $originalCourse->courseLetter;
$roleRequests['counter'][] = $i++;
$roleRequests['request'][] = $request; $roleRequests['request'][] = $request;
} }
...@@ -69,6 +75,7 @@ class HomeController extends Nmc_Controller_Action ...@@ -69,6 +75,7 @@ class HomeController extends Nmc_Controller_Action
array_multisort($roleRequests['subject'], array_multisort($roleRequests['subject'],
$roleRequests['courseNumber'], $roleRequests['courseNumber'],
$roleRequests['courseLetter'], $roleRequests['courseLetter'],
$roleRequests['counter'],
$roleRequests['request']); $roleRequests['request']);
$roleData = array(); $roleData = array();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment