From 5f21db457d74ef364e2c0f43fb88be1ef73110af Mon Sep 17 00:00:00 2001
From: Berkeley Martinez <Berkeley@robotie.com>
Date: Mon, 10 Aug 2015 23:29:32 -0700
Subject: [PATCH] fix challenge ordering Now challenges are ordered on map
 first by top order value of json file second by index of array

---
 common/models/challenge.json | 3 +++
 seed/index.js                | 3 ++-
 server/boot/challenge.js     | 5 ++++-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/common/models/challenge.json b/common/models/challenge.json
index 743332107d..08fa48779b 100644
--- a/common/models/challenge.json
+++ b/common/models/challenge.json
@@ -22,6 +22,9 @@
     "order": {
       "type": "number"
     },
+    "suborder": {
+      "type": "number"
+    },
     "dashedName": {
       "type": "string"
     },
diff --git a/seed/index.js b/seed/index.js
index 38305428a2..334a11d3dc 100644
--- a/seed/index.js
+++ b/seed/index.js
@@ -63,7 +63,8 @@ Challenge.destroyAll(function(err, info) {
           .toLowerCase()
           .replace(/\:/g, '')
           .replace(/\s/g, '-');
-        challenge.order = +('' + order + (index + 1));
+        challenge.order = order;
+        challenge.suborder = index + 1;
         challenge.block = block;
 
         return challenge;
diff --git a/server/boot/challenge.js b/server/boot/challenge.js
index 1fc4342def..feea89818a 100644
--- a/server/boot/challenge.js
+++ b/server/boot/challenge.js
@@ -458,7 +458,10 @@ module.exports = function(app) {
       .map(camperCount => numberWithCommas(camperCount));
 
     const query = {
-      order: 'order ASC'
+      order: [
+        'order ASC',
+        'suborder ASC'
+      ]
     };
 
     // create a stream of all the challenges