Commit 20ef1074197b257fd0a7cfeac9089f5ee234f046
1 parent
82273771
Exists in
master
and in
2 other branches
Ticket #15: Remember filters
Showing
2 changed files
with
24 additions
and
5 deletions
Show diff stats
ConfJuvApp/www/js/controllers.js
... | ... | @@ -331,14 +331,14 @@ angular.module('confjuvapp.controllers', []) |
331 | 331 | |
332 | 332 | $scope.topics = []; |
333 | 333 | $scope.cards = []; |
334 | - $scope.emptyTopicsCount = 0; | |
335 | - $scope.topicFilter = { value: 'all' }; | |
334 | + $scope.topicFilter = { value: ConfJuvAppUtils.getTopicFilter() }; | |
335 | + $scope.emptyTopicsCount = $scope.topicFilter.value == 'all' ? 0 : 10; | |
336 | 336 | |
337 | 337 | $scope.reloadTopics = function() { |
338 | 338 | $scope.emptyTopicsCount = 0; |
339 | 339 | |
340 | 340 | if ($scope.topicFilter.value != 'all') { |
341 | - $scope.emptyTopicsCount = $scope.topics.length - 1; | |
341 | + $scope.emptyTopicsCount = 10; | |
342 | 342 | } |
343 | 343 | |
344 | 344 | $scope.topics = []; |
... | ... | @@ -346,6 +346,7 @@ angular.module('confjuvapp.controllers', []) |
346 | 346 | }; |
347 | 347 | |
348 | 348 | $scope.reloadProposals = function() { |
349 | + ConfJuvAppUtils.setTopicFilter($scope.topicFilter.value); | |
349 | 350 | $scope.cards = []; |
350 | 351 | $scope.reloadTopics(); |
351 | 352 | }; | ... | ... |
ConfJuvApp/www/js/utils.js
... | ... | @@ -12,9 +12,10 @@ var ConfJuvAppUtils = { |
12 | 12 | }, |
13 | 13 | |
14 | 14 | setPrivateToken: function(value) { |
15 | - if(value == undefined || value == '' || value == null){ | |
15 | + if (value == undefined || value == '' || value == null) { | |
16 | 16 | window.localStorage.removeItem('private_token'); |
17 | - }else{ | |
17 | + } | |
18 | + else { | |
18 | 19 | window.localStorage['private_token'] = value; |
19 | 20 | } |
20 | 21 | }, |
... | ... | @@ -63,5 +64,22 @@ var ConfJuvAppUtils = { |
63 | 64 | } |
64 | 65 | |
65 | 66 | return msg; |
67 | + }, | |
68 | + | |
69 | + setTopicFilter: function(value) { | |
70 | + if (value == undefined || value == '' || value == null) { | |
71 | + window.localStorage.removeItem('topic_filter'); | |
72 | + } | |
73 | + else { | |
74 | + window.localStorage['topic_filter'] = value; | |
75 | + } | |
76 | + }, | |
77 | + | |
78 | + getTopicFilter: function() { | |
79 | + var value = window.localStorage['topic_filter']; | |
80 | + if (value == null) { | |
81 | + value = 'all'; | |
82 | + } | |
83 | + return value; | |
66 | 84 | } |
67 | 85 | }; | ... | ... |