X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=public%2Fjavascripts%2Fcourse.js;h=e0f2e3755c87ad9097ef54a13360fa93cb5ab68e;hb=b3540dbb5c169db3c7cf49a04e253ab3a6940916;hp=94e1b846655086988285359c953c7d228764b15c;hpb=e99c53fb3be56eb4c685dd061eef0e5b5bf22b73;p=qomet.git

diff --git a/public/javascripts/course.js b/public/javascripts/course.js
index 94e1b84..e0f2e37 100644
--- a/public/javascripts/course.js
+++ b/public/javascripts/course.js
@@ -57,12 +57,7 @@ window.onload = function() {
 				return this.course.students
 					.filter( s => { return group==0 || s.group == group; })
 					.map( s => { return Object.assign({}, s); }) //not altering initial array
-					.sort( (a,b) => {
-						let res = a.name.localeCompare(b.name);
-						if (res == 0)
-							res += a.forename.localeCompare(b.forename);
-						return res;
-					});
+					.sort( (a,b) => { return a.name.localeCompare(b.name); })
 			},
 			// STUDENTS:
 			uploadTrigger: function() {
@@ -311,7 +306,7 @@ window.onload = function() {
 							s["final"] = finalGrade; //TODO: forbid "final" as assessment name
 						});
 					}
-					data.push(s); //number,forename,name,group,assessName1...assessNameN,final
+					data.push(s); //number,name,group,assessName1...assessNameN,final
 				});
 				let csv = Papa.unparse(data, {
 					quotes: true,
@@ -340,8 +335,8 @@ window.onload = function() {
 					return ""; //no grade yet
 				return this.grades[assessmentIndex][studentNumber];
 			},
-			groupId: function(group, hash) {
-				return (!!hash?"#":"") + "group" + group;
+			groupId: function(group, prefix) {
+				return (prefix || "") + "group" + group;
 			},
 			togglePresence: function(number, index) {
 				// UNIMPLEMENTED