Ordering/labeling courses: CS1, CS2, GD1, WD1, CS3, etc

app/views/admin/MainAdminView.coffee

@@ -233,10 +233,3 @@ module.exports = class MainAdminView extends RootView
       $('.classroom-progress-csv').prop('disabled', false)
       console.error error
       throw error
-
-  courseLabelsArray: (courses) ->
-    labels = []
-    courseLabelIndexes = CS: 0, GD: 0, WD: 0
-    for course in courses
-      labels.push acronym + ++courseLabelIndexes[acronym]
-    labels

server/middleware/classrooms.coffee

@@ -145,6 +145,7 @@ module.exports =
     query = {}
     query = {adminOnly: {$ne: true}} unless req.user?.isAdmin()
     courses = yield Course.find(query)
+    courses = Course.sortCourses courses
     campaigns = yield Campaign.find({_id: {$in: (course.get('campaignID') for course in courses)}})
     campaignMap = {}
     campaignMap[campaign.id] = campaign for campaign in campaigns

server/middleware/courses.coffee

@@ -57,4 +57,5 @@ module.exports =
     dbq = Model.find(query)
     dbq.select(parse.getProjectFromReq(req))
     results = yield database.viewSearch(dbq, req)
+    results = Course.sortCourses results
     res.send(results)