X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=roster.js;h=14f1cb46160b04f73e897ba2fa93b137f87d9783;hb=4d2991a8d05b23222912fb904b436af5f4d740c2;hp=02ff92e6317428ee9de4c750c63cb29ce2f3b6ba;hpb=f229762296dd4504ced5af1025b2413b52b2c1e6;p=ultimatescore

diff --git a/roster.js b/roster.js
index 02ff92e..14f1cb4 100644
--- a/roster.js
+++ b/roster.js
@@ -16,7 +16,8 @@ function load_roster(sheet, cb)
 		let roster = [];
 		let i;
 		for (i = 0; i < response.values.length; ++i) {
-			if (response.values[i][0] === 'Number') {
+			if (response.values[i][0] === 'Number' ||
+			    response.values[i][0] === 'Fake #') {
 				++i;
 				break;
 			}
@@ -30,9 +31,19 @@ function load_roster(sheet, cb)
 				"name": name
 			});
 		}
+		roster.sort(function(a, b) {
+			let an = a['number'];
+			let bn = b['number'];
+			if (!(parseInt(an) > 0)) an = 1000;
+			if (!(parseInt(bn) > 0)) bn = 1000;
+			if (an !== bn) {
+				return an - bn;
+			}
+			return a['name'].localeCompare(b['name']);
+		});
 		cb(team_name, roster);
 	};
-	req.open('GET', 'https://sheets.googleapis.com/v4/spreadsheets/1RciMlauWxqM9LYKdsY6lPjJbIAcHJpCXTqyZSEHxH3U/values/\'' + sheet + '\'!A1:J50?key=AIzaSyAuP9yQn8g0bSay6r_RpGtpFeIbwprH1TU');
+	req.open('GET', 'https://sheets.googleapis.com/v4/spreadsheets/' + ultimateconfig['roster_sheet_id'] + '/values/\'' + sheet + '\'!A1:J50?key=' + ultimateconfig['api_key']);
 	req.send();
 };