FIX: hours offset calculation, secondary sort by username

paviliondev · Dec 22, 2019 · 01a24ab · 01a24ab
1 parent 989c42c
commit 01a24ab
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/assets/javascripts/discourse/components/team-display.js.es6 b/assets/javascripts/discourse/components/team-display.js.es6
@@ -49,12 +49,16 @@ export default Ember.Component.extend({
 
     people.forEach (a => {
       let timezone = a.timezone.timezone;
-      a.offset = moment.tz(timezone)._offset;
+      a.offset = Math.round((moment.tz(timezone)._offset)/60);
     });
 
-     people.sort(
-      (a, b) => ((times_score(a.offset,n) < times_score(b.offset,n)) ? 1 : -1)
+    people.sort(
+      (a, b) => ((a.username_lower > b.username_lower) ? 1 : -1)
      );    
+
+    people.sort(
+      (a, b) => ((times_score(a.offset,n) < times_score(b.offset,n)) ? 1 : -1)
+    );    
 
     return people;
   },