krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-17 14:47:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Andded together filters and created tests for challenge filtering

Browse Source
This commit is contained in:
TheHollidayInn
2015-04-23 00:33:31 -05:00
parent 71cc5f76fe
commit f3f1bd4d8e
2 changed files with 187 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
website/public/js/controllers/challengesCtrl.js
View File

@@ -259,18 +259,20 @@ habitrpg.controller("ChallengesCtrl", ['$rootScope','$scope', 'Shared', 'User',
if (!$scope.search) return true;
//Filter challenges that are owned by the user
if ($scope.search._isOwner == true) {
return (chal.leader._id == User.user.id);
} else if ($scope.search._isOwner == false) {
return (chal.leader._id != User.user.id);
} else {
return ($scope.search.group[chal.group._id] &&
(typeof $scope.search._isMember == 'undefined' || $scope.search._isMember == chal._isMember));
}
//Currently, all filters are andded together
//First we must filter by selected groups
var showChallenge = $scope.search.group[chal.group._id];
//Membership filters: Show if user has selected either or has selcted Owned and is owner
var userIsOwner = chal.leader._id == User.user.id;
showChallenge = showChallenge && (typeof $scope.search._isOwner === 'undefined' || userIsOwner === $scope.search._isOwner );
console.log($scope.search._isMember, chal._isMember)
//Membership filters: Show if user has selected either or has selcted Participating and is a member
showChallenge = showChallenge && (typeof $scope.search._isMember === 'undefined' || $scope.search._isMember === chal._isMember);
return showChallenge;
//By default we should return true to show all challenges
return true;
}
$scope.$watch('newChallenge.group', function(gid){