Skip to content

Commit

Permalink
Merge pull request #225 from Capping-CPCA/27-list-classes
Browse files Browse the repository at this point in the history
Reordered Classes
  • Loading branch information
blackjack26 committed Dec 13, 2017
2 parents dbeefee + 018a02e commit 90e3926
Showing 1 changed file with 6 additions and 3 deletions.
9 changes: 6 additions & 3 deletions views/curricula/curricula_add_class.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,12 @@

$id = $params[1];

$db->prepare("get_curr_classes", "SELECT * FROM classes, curriculumclasses ".
"WHERE curriculumid = $1 AND classes.classid = curriculumclasses.classid ".
"AND classes.df IS FALSE");
$db->prepare("get_curr_classes", "SELECT *
FROM classes, (SELECT *, row_number() over () as rn FROM curriculumclasses) as cc
WHERE cc.curriculumid = $1
AND classes.classid = cc.classid
AND classes.df IS FALSE
ORDER BY cc.rn;");
$db->prepare("get_other_classes",
"SELECT * FROM classes WHERE classid NOT IN (" .
"SELECT classid FROM curriculumclasses WHERE curriculumid = $1" .
Expand Down

0 comments on commit 90e3926

Please sign in to comment.