fixing merge conflict

Caio Almeida
2 parents b7e21a20 7f385422
Showing 6 changed files with 27 additions and 5 deletions Show diff stats
ConfJuvApp/builds/confjuv-dev.apk
ConfJuvApp/builds/confjuvapp-live.apk
ConfJuvApp/builds/confjuvapp-web.zip
ConfJuvApp/config.xml
ConfJuvApp/www/js/controllers.js
ConfJuvApp/www/js/utils.js
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<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">
+<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">
   <name>#3ConfJuv</name>
   <description>Aplicativo móvel para 3ª Conferência Nacional de Juventude</description>
   <author email="confjuvapp@gmail.com" href="http://www.juventude.gov.br/"></author>
@@ -13,6 +13,7 @@
   <preference name="BackupWebStorage" value="none"/>
   <preference name="SplashScreen" value="screen"/>
   <preference name="SplashScreenDelay" value="3000"/>
+  <preference name="orientation" value="portrait" />
   <feature name="StatusBar">
     <param name="ios-package" value="CDVStatusBar" onload="true"/>
   </feature>
@@ -116,6 +116,7 @@ angular.module(&#39;confjuvapp.controllers&#39;, [])
         var popup = $ionicPopup.alert({ title: 'Login', template: 'Erro ao efetuar login. Verifique usuário e senha e conexão com a internet.' });
         $scope.loggedIn = false;
         $scope.loading = false;
+        $scope.data.password = '';
         popup.then(function() {
           $scope.openModal();
         });
@@ -334,13 +335,14 @@ angular.module(&#39;confjuvapp.controllers&#39;, [])
     $scope.emptyTopicsCount = 0;
     //FIXME refatoring this variable to make the proposals filters more generic
     $scope.proposalsFilter = '';
-    $scope.topicFilter = { value: 'all' };
+    $scope.topicFilter = { value: ConfJuvAppUtils.getTopicFilter() };
+    $scope.emptyTopicsCount = $scope.topicFilter.value == 'all' ? 0 : 10;
     $scope.reloadTopics = function() {
       $scope.emptyTopicsCount = 0;
       if ($scope.topicFilter.value != 'all') {
-        $scope.emptyTopicsCount = $scope.topics.length - 1;
+        $scope.emptyTopicsCount = 10;
       }
       $scope.topics = [];
@@ -348,6 +350,7 @@ angular.module(&#39;confjuvapp.controllers&#39;, [])
     };
     $scope.reloadProposals = function() {
+      ConfJuvAppUtils.setTopicFilter($scope.topicFilter.value);
       $scope.cards = [];
       $scope.reloadTopics();
     };
@@ -12,9 +12,10 @@ var ConfJuvAppUtils = {
   },
   setPrivateToken: function(value) {
-    if(value == undefined || value == '' || value == null){
+    if (value == undefined || value == '' || value == null) {
       window.localStorage.removeItem('private_token');
-    }else{
+    }
+    else {
       window.localStorage['private_token'] = value;
     }
   },
@@ -63,5 +64,22 @@ var ConfJuvAppUtils = {
     }
     return msg;
+  },
+
+  setTopicFilter: function(value) {
+    if (value == undefined || value == '' || value == null) {
+      window.localStorage.removeItem('topic_filter');
+    }
+    else {
+      window.localStorage['topic_filter'] = value;
+    }
+  },
+
+  getTopicFilter: function() {
+    var value = window.localStorage['topic_filter'];
+    if (value == null) {
+      value = 'all';
+    }
+    return value;
   }
 };
	@@ -12,9 +12,10 @@ var ConfJuvAppUtils = {		@@ -12,9 +12,10 @@ var ConfJuvAppUtils = {
12	},	12	},
13		13
14	setPrivateToken: function(value) {	14	setPrivateToken: function(value) {
15	- if(value == undefined \|\| value == '' \|\| value == null){	15	+ if (value == undefined \|\| value == '' \|\| value == null) {
16	window.localStorage.removeItem('private_token');	16	window.localStorage.removeItem('private_token');
17	- }else{	17	+ }
		18	+ else {
18	window.localStorage['private_token'] = value;	19	window.localStorage['private_token'] = value;
19	}	20	}
20	},	21	},
	@@ -63,5 +64,22 @@ var ConfJuvAppUtils = {		@@ -63,5 +64,22 @@ var ConfJuvAppUtils = {
63	}	64	}
64		65
65	return msg;	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	};