Merge pull request #4451 from crookedneighbor/vIiRuS-groupSorting

Group Sorting

public/js/controllers/groupsCtrl.js

@@ -303,11 +303,18 @@ habitrpg.controller("GroupsCtrl", ['$scope', '$rootScope', 'Shared', 'Groups', '
       'level': window.env.t('sortLevel'),
       'random': window.env.t('sortRandom'),
       'pets': window.env.t('sortPets'),
+      'habitrpg_date_joined' : window.env.t('sortHabitrpgJoined'),
       'party_date_joined': window.env.t('sortJoined'),
+      'habitrpg_last_logged_in': window.env.t('sortHabitrpgLastLoggedIn'),
       'name': window.env.t('sortName'),
       'backgrounds': window.env.t('sortBackgrounds'),
     };
 
+    $scope.partyOrderAscendingChoices = {
+      'ascending': window.env.t('ascendingSort'),
+      'descending': window.env.t('descendingSort')
+    }
+
   }])
 
   .controller("GuildsCtrl", ['$scope', 'Groups', 'User', 'Challenges', '$rootScope', '$state', '$location', '$compile',

public/js/controllers/headerCtrl.js

@@ -28,12 +28,21 @@ habitrpg.controller("HeaderCtrl", ['$scope', 'Groups', 'User',
               case 'backgrounds':
                 return member.preferences.background;
                 break;
+              case 'habitrpg_date_joined':
+                return member.auth.timestamps.created;
+                break
+              case 'habitrpg_last_logged_in':
+                return member.auth.timestamps.loggedin;
+                break
               default:
                 // party date joined
                 return true;
           }
         }
-      ).reverse()
+      )
+      if (User.user.party.orderAscending == "descending") {
+      	$scope.partyMinusSelf = $scope.partyMinusSelf.reverse()
+      }
     });
   }
 ]);

src/models/user.js

@@ -250,6 +250,7 @@ var UserSchema = new Schema({
   party: {
     // id // FIXME can we use a populated doc instead of fetching party separate from user?
     order: {type:String, 'default':'level'},
+    orderAscending: {type:String, 'default':'ascending'},
     quest: {
       key: String,
       progress: {

views/options/social/group.jade

@@ -58,13 +58,20 @@ a.pull-right.gem-wallet(ng-if='group.type!="party"', popover-trigger='mouseenter
             button.pull-right.btn.btn-primary(ng-click="openModal('invite-friends', {controller:'GroupsCtrl'})", ng-if='::group.type=="party"') Invite Friends
         .panel-body.modal-fixed-height
           div.form-group(ng-if='::group.type=="party"')
-            =env.t('partyList')
+            p=env.t('partyList')
             select.form-control#partyOrder(
               ng-model='user.party.order',
               ng-controller='ChatCtrl',
               ng-options='k as v for (k , v) in partyOrderChoices',
               ng-change='set({"party.order": user.party.order})'
               )
+            | 
+            select.form-control#partyOrderAscending(
+              ng-model='user.party.orderAscending',
+              ng-controller='ChatCtrl',
+              ng-options='k as v for (k , v) in partyOrderAscendingChoices',
+              ng-change='set({"party.orderAscending": user.party.orderAscending})'
+              )
           table.table.table-striped(bindonce='group')
             tr(ng-repeat='member in group.members track by member._id')
               td.media