Download as
Browse Code »

Commit 3685c864edca4660200d0a1a6ae2ac0c85c422f7

Authored by Caio Almeida
2 parents b7e21a20 7f385422
Exists in master and in 2 other branches production, staging

fixing merge conflict

Showing 6 changed files with 27 additions and 5 deletions   Show diff stats
ConfJuvApp/builds/confjuv-dev.apk
View file @3685c86
No preview for this file type
ConfJuvApp/builds/confjuvapp-live.apk
View file @3685c86
No preview for this file type
ConfJuvApp/builds/confjuvapp-web.zip
View file @3685c86
No preview for this file type
ConfJuvApp/config.xml
  Diff comments   View file @3685c86
1 1 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
2   -<widget id="com.ionicframework.confjuvapp748431" version="0.0.26" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
  2 +<widget id="com.ionicframework.confjuvapp748431" version="0.0.27" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
3 3 <name>#3ConfJuv</name>
4 4 <description>Aplicativo móvel para 3ª Conferência Nacional de Juventude</description>
5 5 <author email="confjuvapp@gmail.com" href="http://www.juventude.gov.br/"></author>
... ... @@ -13,6 +13,7 @@
13 13 <preference name="BackupWebStorage" value="none"/>
14 14 <preference name="SplashScreen" value="screen"/>
15 15 <preference name="SplashScreenDelay" value="3000"/>
  16 + <preference name="orientation" value="portrait" />
16 17 <feature name="StatusBar">
17 18 <param name="ios-package" value="CDVStatusBar" onload="true"/>
18 19 </feature>
... ...
ConfJuvApp/www/js/controllers.js
  Diff comments   View file @3685c86
... ... @@ -116,6 +116,7 @@ angular.module(&#39;confjuvapp.controllers&#39;, [])
116 116 var popup = $ionicPopup.alert({ title: 'Login', template: 'Erro ao efetuar login. Verifique usuário e senha e conexão com a internet.' });
117 117 $scope.loggedIn = false;
118 118 $scope.loading = false;
  119 + $scope.data.password = '';
119 120 popup.then(function() {
120 121 $scope.openModal();
121 122 });
... ... @@ -334,13 +335,14 @@ angular.module(&#39;confjuvapp.controllers&#39;, [])
334 335 $scope.emptyTopicsCount = 0;
335 336 //FIXME refatoring this variable to make the proposals filters more generic
336 337 $scope.proposalsFilter = '';
337   - $scope.topicFilter = { value: 'all' };
  338 + $scope.topicFilter = { value: ConfJuvAppUtils.getTopicFilter() };
  339 + $scope.emptyTopicsCount = $scope.topicFilter.value == 'all' ? 0 : 10;
338 340  
339 341 $scope.reloadTopics = function() {
340 342 $scope.emptyTopicsCount = 0;
341 343  
342 344 if ($scope.topicFilter.value != 'all') {
343   - $scope.emptyTopicsCount = $scope.topics.length - 1;
  345 + $scope.emptyTopicsCount = 10;
344 346 }
345 347  
346 348 $scope.topics = [];
... ... @@ -348,6 +350,7 @@ angular.module(&#39;confjuvapp.controllers&#39;, [])
348 350 };
349 351  
350 352 $scope.reloadProposals = function() {
  353 + ConfJuvAppUtils.setTopicFilter($scope.topicFilter.value);
351 354 $scope.cards = [];
352 355 $scope.reloadTopics();
353 356 };
... ...
ConfJuvApp/www/js/utils.js
  Diff comments   View file @3685c86
... ... @@ -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 };
... ...