X-Git-Url: https://git.sesse.net/?p=ultimatescore;a=blobdiff_plain;f=roster.js;h=14f1cb46160b04f73e897ba2fa93b137f87d9783;hp=c8cd2e3a5f823275176f6d76762deea46465a579;hb=HEAD;hpb=fe24af7266193f4908d73c49403387af8c819acc

diff --git a/roster.js b/roster.js
index c8cd2e3..14f1cb4 100644
--- a/roster.js
+++ b/roster.js
@@ -31,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/1Mp6sWSxxvRl3YCCx4-RPlnCyuzkgNbJW1iCHnsH-9Ks/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();
 };