refactoring profile load and edit

Caio Almeida
1 parent 4df97dc0
Showing 10 changed files with 122 additions and 125 deletions Show diff stats
www/html/_edit_profile.html
www/html/_login.html
www/html/_profile.html
www/html/_right_sidebar.html
www/html/_select_city.html
www/html/_select_state.html
www/html/_signup_person_fields.html
www/index.html
www/js/controllers.js
www/js/filters.js
 <div id="profile" class="modal">
   <ion-content>
-    <form ng-submit="updateProfile(data)" novalidate>
+    <form ng-submit="updateProfile(profile)" novalidate>
       <h1 class="title">
         <span>Editar Perfil</span>
         <a class="back icon-left ion-reply" ng-click="closeEditProfile()">Voltar</a>
@@ -9,7 +9,7 @@
       <div class="list">
         <div class="list list-inset">
           <label class="item item-input">
-            <input type="text" placeholder="Nome" ng-model="data.name" />
+            <input type="text" placeholder="Nome" ng-model="profile.name" />
           </label>
           <ng-include src="'html/_signup_person_fields.html'"></ng-include>
@@ -31,7 +31,7 @@
     <!-- Login form -->
-    <form ng-submit="Login(data)" ng-show="loginFormDisplayed" id="login-form">
+    <form ng-submit="Login(profile)" ng-show="loginFormDisplayed" id="login-form">
       <h1 class="title">
         <span>Entrar</span>
         <a class="back icon-left ion-reply" ng-click="backToLoginHome()">Voltar</a>
@@ -41,11 +41,11 @@
         <div class="list list-inset">
           <label class="item item-input">
-            <input type="text" placeholder="Usuário" ng-model="data.login">
+            <input type="text" placeholder="Usuário" ng-model="profile.login">
           </label>
           <label class="item item-input">
-            <input type="password" placeholder="Senha" ng-model="data.password">
+            <input type="password" placeholder="Senha" ng-model="profile.password">
           </label>
         </div>
@@ -54,7 +54,7 @@
         </p>
         <div class="login-actions">
-          <a ng-click="forgotPassword(data.login)">Esqueceu a senha?</a>
+          <a ng-click="forgotPassword(profile.login)">Esqueceu a senha?</a>
           <a ng-click="displayRegisterForm('user')">Criar conta</a></p>
         </div>
       </div>
@@ -62,7 +62,7 @@
     <!-- Register form -->
-    <form ng-submit="Register(data)" ng-show="registerFormDisplayed" class="register-form" novalidate id="register-form">
+    <form ng-submit="Register(profile)" ng-show="registerFormDisplayed" class="register-form" novalidate id="register-form">
       <h1 class="title">
         <span>Registrar</span>
         <a class="back icon-left ion-reply" ng-click="backToLoginHome()">Voltar</a>
@@ -72,12 +72,12 @@
         <div class="list list-inset">
           <label class="item item-input">
-            <input type="text" placeholder="E-mail" ng-model="data.email" required ng-blur="setLoginBasedOnEmail()"
+            <input type="text" placeholder="E-mail" ng-model="profile.email" required ng-blur="setLoginBasedOnEmail()"
                    onblur="var $l=document.getElementById('lf'); if ($l.value == '') $l.value=ConfJuvAppUtils.normalizeLogin(this.value);">
           </label>
           <label class="item item-input">
-            <input type="text" id="lf" placeholder="Nome de usuário" required ng-model="data.login"
+            <input type="text" id="lf" placeholder="Nome de usuário" required ng-model="profile.login"
                    onchange="this.value=ConfJuvAppUtils.normalizeLogin(this.value)">
           </label>
           <p><small>Espaços, letras maiúsculas ou acentos <b>não</b> são permitidos</small></p>
@@ -88,8 +88,8 @@
           <p class="disclaimer">Ao se cadastrar, você concorda com os <span onclick="window.open(ConfJuvAppConfig.noosferoApiHost + '/site/terms', '_system')">Termos de Uso do Juventude.gov.br</span> e com o <span onclick="window.open(ConfJuvAppConfig.noosferoApiHost + '/' + ConfJuvAppConfig.noosferoStatutePath, '_system')">Regimento da Conferência</span></p>
-          <label class="item item-input"><input type="password" placeholder="Senha" ng-model="data.password"></label>
-          <label class="item item-input"><input type="password" placeholder="Confirmar senha" ng-model="data.password_confirmation"></label>
+          <label class="item item-input"><input type="password" placeholder="Senha" ng-model="profile.password"></label>
+          <label class="item item-input"><input type="password" placeholder="Confirmar senha" ng-model="profile.password_confirmation"></label>
         </div>
@@ -13,5 +13,17 @@
     <h2>Região</h2>
     <p>{{profile.region.full_name}}</p>
+
+    <h2>Orientação Sexual</h2>
+    <p>{{profile.orientacao_sexual | orientacaoSexualFilter }}</p>
+
+    <h2>Identidade de Gênero</h2>
+    <p>{{profile.identidade_genero | generoFilter }}</p>
+
+    <h2>Etnia</h2>
+    <p>{{profile.etnia | etniaFilter}}</p>
+
+    <h2><span ng-show="profile.transgenero == 'false'">Não</span> Sou transgênero</h2>
+
   </ion-content>
 </div>
@@ -4,19 +4,19 @@
       <span>Filtros</span>
       <button menu-toggle="right" class="button button-icon icon ion-close-circled" hide-when="large"></button>
     </h2>
-    <h3 ng-show="user.region">
-      Mostrar apenas propostas de {{user.region.full_name}}
+    <h3 ng-show="profile.region">
+      Mostrar apenas propostas de {{profile.region.full_name}}
       <label class="checkbox my-city-cbox checkbox-balanced">
         <input type="checkbox" ng-click="loadProposalsOfMyCity()" />
       </label>
     </h3>
-    <form ng-submit="updateProfile(data)">
-      <h3 ng-show="!user.region" class="choose-city">
+    <form ng-submit="updateProfile(profile)">
+      <h3 ng-show="!profile.region" class="choose-city">
         <a ng-click="loadStates()">Escolha a sua cidade</a>
         <ng-include ng-show="states.length != 0" src="'html/_select_state.html'"></ng-include>
       </h3>
-      <p class="text-center" style="clear: both;" ng-show="!user.region && (cities.length != 0)">
+      <p class="text-center" style="clear: both;" ng-show="!profile.region && (cities.length != 0)">
         <button class="button" type="submit">Salvar</button>
       </p>
@@ -2,7 +2,7 @@
   <div class="input-label">
     Cidade
   </div>
-  <select ng-model="data.city" ng-value="city.id"  ng-options="city.name for city in cities track by city.id" class="item">
+  <select ng-model="profile.city" ng-value="profile.city.id"  ng-options="city.name for city in cities track by city.id" class="item">
     <option value="">Escolha a cidade...</option>
   </select>
 </label>
@@ -2,7 +2,7 @@
   <div class="input-label">
     Estado
   </div>
-  <select ng-model="data.state" ng-value="state.id" ng-change="loadCitiesByState(data.state.id)" ng-options="state.name for state in states track by state.id" class="item">
+  <select ng-model="profile.state" ng-value="state" ng-change="loadCitiesByState(profile.state.id)" ng-options="state.name for state in states track by state.id" class="item">
     <option value="">Escolha o estado...</option>
   </select>
 </label>
@@ -2,12 +2,12 @@
   <div>
     <label>
       <div class="input-label">
-        Identidade de Gênero
+       Identidade de Gênero
       </div>
-      <select ng-model="data.identidade_genero" required class="item">
+      <select ng-model="profile.identidade_genero" required class="item">
         <option value="">Identidade de Gênero</option>
-        <option value="1">Masculino</option>
-        <option value="2">Feminino</option>
+        <option value="1">{{ 1 | generoFilter }}</option>
+        <option value="2">{{ 2 | generoFilter }}</option>
       </select>
     </label>
   </div>
@@ -16,7 +16,7 @@
     <ul class="list" id="transgender">
       <li class="item item-checkbox">
          <label class="checkbox">
-           <input type="checkbox" ng-model="data.transgenero" class="ckbox">
+           <input type="checkbox" ng-model="profile.transgenero" ng-true-value="'true'" class="ckbox">
          </label>
          Sou transgênero
       </li>
@@ -28,13 +28,13 @@
       <div class="input-label">
         Raça/Etnia
       </div>
-      <select ng-model="data.etnia" required class="item">
+      <select ng-model="profile.etnia" required class="item" >
         <option value="">Raça / Etnia</option>
-        <option value="1">Pardo</option>
-        <option value="2">Preto</option>
-        <option value="3">Branco</option>
-        <option value="4">Indígena</option>
-        <option value="5">Amarelo</option>
+        <option value="1">{{ 1 | etniaFilter}}</option>
+        <option value="2">{{ 2 | etniaFilter}}</option>
+        <option value="3">{{ 3 | etniaFilter}}</option>
+        <option value="4">{{ 4 | etniaFilter}}</option>
+        <option value="5">{{ 5 | etniaFilter}}</option>
       </select>
     </label>
   </div>
@@ -44,12 +44,12 @@
       <div class="input-label">
         Orientação Sexual
       </div>
-      <select ng-model="data.orientacao_sexual" required class="item">
+      <select ng-model="profile.orientacao_sexual" required class="item">
         <option value="">Orientação Sexual</option>
-        <option value="1">Homosexual</option>
-        <option value="2">Heterosexual</option>
-        <option value="3">Bisexual</option>
-        <option value="4">Assexual</option>
+        <option value="1">{{ 1 | orientacaoSexualFilter}}</option>
+        <option value="2">{{ 2 | orientacaoSexualFilter}}</option>
+        <option value="3">{{ 3 | orientacaoSexualFilter}}</option>
+        <option value="4">{{ 4 | orientacaoSexualFilter}}</option>
       </select>
     </label>
   </div>
@@ -48,7 +48,7 @@
       </ion-side-menu-content>
       <ion-side-menu side="right" aside-expose-right="large">
-        <ng-include src="'html/_right_sidebar.html?10'"></ng-include>
+        <ng-include src="'html/_right_sidebar.html?11'"></ng-include>
       </ion-side-menu>
     </ion-side-menus>
@@ -34,7 +34,7 @@ angular.module(&#39;confjuvapp.controllers&#39;, [])
     // Function to open the modal
     $scope.openModal = function() {
       if (ConfJuvAppUtils.getPrivateToken()) {
-        $scope.loadMe();
+        $scope.loadProfile();
       } else if ($scope.modal) {
         $scope.modal.show();
       } else {
@@ -88,6 +88,7 @@ angular.module(&#39;confjuvapp.controllers&#39;, [])
     // Function to logout
     $scope.logout = function() {
       ConfJuvAppUtils.setPrivateToken(null);
+      $scope.profile = null;
       $scope.openModal();
     };
@@ -120,7 +121,7 @@ angular.module(&#39;confjuvapp.controllers&#39;, [])
       .then(function(resp) {
         $scope.closeModal();
         var popup = $ionicPopup.alert({ title: 'Login', template: 'Login efetuado com sucesso!' });
-        $scope.user = resp.data.person;
+        $scope.profile = resp.data.person;
         popup.then(function() {
           $scope.loginCallback(resp.data.private_token);
         });
@@ -219,7 +220,6 @@ angular.module(&#39;confjuvapp.controllers&#39;, [])
         },
         timeout: 10000
       }
-
       var params = {
         'email': data.email,
         'login': data.login,
@@ -273,56 +273,6 @@ angular.module(&#39;confjuvapp.controllers&#39;, [])
       });
     };
-    // Load Me
-    $scope.loadMe = function() {
-      $scope.loading = true;
-
-      var params = '?private_token=' + ConfJuvAppUtils.getPrivateToken(),
-          path = 'people/me/' + params;
-
-      $http.get(ConfJuvAppUtils.pathTo(path))
-      .then(function(resp) {
-        $scope.user = resp.data.person;
-        $scope.loginCallback(ConfJuvAppUtils.getPrivateToken());
-        $scope.loading = false;
-      }, function(err) {
-        $scope.token = ConfJuvAppUtils.setPrivateToken(null);
-        $scope.loggedIn = false;
-        var popup = $ionicPopup.alert({ title: 'Usuário', template: 'Sessão expirada. Por favor faça login novamente.' });
-        popup.then(function() {
-          $scope.openModal();
-        });
-        $scope.loading = false;
-      });
-    };
-
-    // Submit the profile
-    $scope.updateProfile = function(data) {
-        $scope.loading = true;
-        var config = {
-          headers: {
-            'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8',
-          },
-          timeout: 10000
-        };
-        var params = {
-          'private_token': $scope.token,
-          'person[region_id]': data.city.id
-        };
-
-        $http.post(ConfJuvAppUtils.pathTo('people/' + $scope.user.id), jQuery.param(params), config)
-        .then(function(resp) {
-          $scope.user = resp.data.person;
-          var popup = $ionicPopup.alert({ title: 'Atualizar Usuário', template: 'Usuário atualizado com sucesso!' });
-          popup.then(function() {
-            $scope.loading = false;
-          });
-        }, function(err) {
-          var popup = $ionicPopup.alert({ title: 'Atualizar Usuário', template: 'Erro ao atualizar usuário!' });
-          $scope.loading = false;
-        });
-    };
-
     $scope.backToLoginHome = function() {
       $scope.registerFormDisplayed = false;
       $scope.loginFormDisplayed = false;
@@ -346,6 +296,9 @@ angular.module(&#39;confjuvapp.controllers&#39;, [])
       $http.get(ConfJuvAppUtils.pathTo(path))
       .then(function(resp) {
         $scope.states = resp.data;
+        if($scope.profile && $scope.profile.state){
+          $scope.loadCitiesByState($scope.profile.state.id) 
+        }
         $scope.loading = false;
       }, function(err) {
         $ionicPopup.alert({ title: 'Estados', template: 'Não foi possível carregar os estados' });
@@ -356,7 +309,6 @@ angular.module(&#39;confjuvapp.controllers&#39;, [])
     // Load Cities
     $scope.loadCitiesByState = function(state_id) {
       $scope.loading = true;
-
       var path = 'states/' + state_id + '/cities';
       $http.get(ConfJuvAppUtils.pathTo(path))
@@ -430,7 +382,7 @@ angular.module(&#39;confjuvapp.controllers&#39;, [])
     $scope.loadProposalsOfMyCity = function() {
       $scope.loading = true;
       if($scope.proposalsFilter == ''){
-        $scope.proposalsFilter = '&categories_ids=' + $scope.user.region.id;
+        $scope.proposalsFilter = '&categories_ids=' + $scope.profile.region.id;
       }else{
         $scope.proposalsFilter = '';
       }
@@ -647,7 +599,7 @@ angular.module(&#39;confjuvapp.controllers&#39;, [])
               body: data.description,
               topic: topic,
               categories: [data.city, data.state],
-              author: { name: $scope.user.name, id: $scope.user.id }
+              author: { name: $scope.profile.name, id: $scope.profile.id }
             };
             $scope.cards.push(proposal);
             $scope.myProposals.push(proposal);
@@ -741,7 +693,7 @@ angular.module(&#39;confjuvapp.controllers&#39;, [])
           if (!$scope.proposal.comments) {
             $scope.proposal.comments = [];
           }
-          $scope.proposal.comments.unshift({ body: params.body, author: { name: $scope.user.name }});
+          $scope.proposal.comments.unshift({ body: params.body, author: { name: $scope.profile.name }});
           $scope.commentStatus = '';
           popup.then(function() {
             $scope.loading = false;
@@ -1199,19 +1151,25 @@ angular.module(&#39;confjuvapp.controllers&#39;, [])
     $scope.profile = null;
+    // Load Profile
     $scope.loadProfile = function() {
       $scope.loading = true;
-      var path = 'people/me?private_token=' + ConfJuvAppUtils.getPrivateToken();
+      var params = '?private_token=' + ConfJuvAppUtils.getPrivateToken(),
+          path = 'people/me/' + params;
       $http.get(ConfJuvAppUtils.pathTo(path))
       .then(function(resp) {
         $scope.profile = resp.data.person;
-        if ($scope.data == null) $scope.data = {};
-        $scope.data.name = $scope.profile.name;
+        $scope.loginCallback(ConfJuvAppUtils.getPrivateToken());
         $scope.loading = false;
       }, function(err) {
-        $ionicPopup.alert({ title: 'Perfil', template: 'Não foi possível carregar o perfil' });
+        $scope.token = ConfJuvAppUtils.setPrivateToken(null);
+        $scope.loggedIn = false;
+        var popup = $ionicPopup.alert({ title: 'Usuário', template: 'Sessão expirada. Por favor faça login novamente.' });
+        popup.then(function() {
+          $scope.openModal();
+        });
         $scope.loading = false;
       });
     };
@@ -1274,7 +1232,7 @@ angular.module(&#39;confjuvapp.controllers&#39;, [])
       $scope.editProfileModal.remove();
     });
-    $scope.updateProfile = function(data) {
+    $scope.updateProfile = function(profile) {
       $scope.loading = true;
       var config = {
@@ -1282,22 +1240,25 @@ angular.module(&#39;confjuvapp.controllers&#39;, [])
           'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8',
         },
         timeout: 10000
-      }
+      };
       var params = {
         'private_token': $scope.token,
-        'person[name]': data.name,
-        'person[orientacao_sexual]': data.orientacao_sexual,
-        'person[identidade_genero]': data.identidade_genero,
-        'person[transgenero]': data.transgenero,
-        'person[etnia]': data.etnia,
-        'person[city]': data.city.id
+        'person[name]': profile.name,
+        'person[orientacao_sexual]': profile.orientacao_sexual,
+        'person[identidade_genero]': profile.identidade_genero,
+        'person[transgenero]': profile.transgenero,
+        'person[etnia]': profile.etnia,
+        'person[city]': profile.city.id
       };
-      $http.post(ConfJuvAppUtils.pathTo('people'), jQuery.param(params), config)
+      $http.post(ConfJuvAppUtils.pathTo('people/' + $scope.profile.id), jQuery.param(params), config)
       .then(function(resp) {
-        $scope.profile = { name: data.name };
-        $ionicPopup.alert({ title: 'Perfil', template: 'Perfil atualizado com sucesso' });
+        $scope.profile = resp.data.person;
+        var popup = $ionicPopup.alert({ title: 'Perfil', template: 'Perfil atualizado com sucesso' });
+        popup.then(function() {
+          $scope.loading = false;
+        });
         $scope.loading = false;
       }, function(err) {
         $ionicPopup.alert({ title: 'Perfil', template: 'Erro ao atualizar perfil' });
@@ -1322,26 +1283,21 @@ angular.module(&#39;confjuvapp.controllers&#39;, [])
           timeout: 10000
         };
-        var path = 'articles?private_token=' + $scope.token + '&fields=title,image,body,abstract,id,tag_list,categories,created_by&content_type=ProposalsDiscussionPlugin::Proposal&_=' + (new Date().getTime()) + '&parent_id=';
+        var path = 'articles?private_token=' + $scope.token + '&fields=title,image,body,abstract,id,tag_list,categories,created_by&content_type=ProposalsDiscussionPlugin::Proposal&_=' + (new Date().getTime()) + '&author_id=' + $scope.profile.id + '&parent_id[]=';
         for (var i = 0; i < $scope.topics.length; i++) {
-          $scope.loading = true;
-          
-          $http.get(ConfJuvAppUtils.pathTo(path + $scope.topics[i].id), config)
-          .then(function(resp) {
-            var articles = resp.data.articles;
-            for (var j = 0; j < articles.length; j++) {
-              var article = articles[j];
-              if (article.author.id === $scope.user.id) {
-                $scope.myProposals.push(article);
-                $scope.cards = $scope.myProposals.slice();
-              }
-            }
-            $scope.loading = false;
-          }, function(err) {
-            $scope.loading = false;
-          });
-        }
+          path += '&parent_id[]=' +  $scope.topics[i].id;
+        } 
+        $scope.loading = true;
+        
+        $http.get(ConfJuvAppUtils.pathTo(path), config)
+        .then(function(resp) {
+          $scope.myProposals = resp.data.articles;
+          $scope.cards = $scope.myProposals.slice();
+          $scope.loading = false;
+        }, function(err) {
+          $scope.loading = false;
+        });
       }
       else {
         $scope.cards = $scope.myProposals.slice();
@@ -17,4 +17,33 @@ filter(&#39;tagFilter&#39;, function() {
   return function(text) {
     return String(text).replace(/#/gm, '');
   };
+}).
+filter('etniaFilter', function() {
+  return function(type) {
+    var etnia = {};
+    etnia[1] = 'Pardo';
+    etnia[2] = 'Preto';
+    etnia[3] = 'Branco';
+    etnia[4] = 'Indígena';
+    etnia[5] = 'Amarelo';
+    return etnia[type];
+  };
+}).
+filter('orientacaoSexualFilter', function() {
+  return function(type) {
+    var orientacao = {};
+    orientacao[1] = 'Homosexual';
+    orientacao[2] = 'Heterosexual';
+    orientacao[3] = 'Bisexual';
+    orientacao[4] = 'Assexual';
+    return orientacao[type];
+  };
+}).
+filter('generoFilter', function() {
+  return function(type) {
+    var genero = {};
+    genero[1] = 'Masculino';
+    genero[2] = 'Feminino';
+    return genero[type];
+  };
 });
1	<div id="profile" class="modal">	1	<div id="profile" class="modal">
2	<ion-content>	2	<ion-content>
3	- <form ng-submit="updateProfile(data)" novalidate>	3	+ <form ng-submit="updateProfile(profile)" novalidate>
4	<h1 class="title">	4	<h1 class="title">
5	<span>Editar Perfil</span>	5	<span>Editar Perfil</span>
6	<a class="back icon-left ion-reply" ng-click="closeEditProfile()">Voltar</a>	6	<a class="back icon-left ion-reply" ng-click="closeEditProfile()">Voltar</a>
	@@ -9,7 +9,7 @@		@@ -9,7 +9,7 @@
9	<div class="list">	9	<div class="list">
10	<div class="list list-inset">	10	<div class="list list-inset">
11	<label class="item item-input">	11	<label class="item item-input">
12	- <input type="text" placeholder="Nome" ng-model="data.name" />	12	+ <input type="text" placeholder="Nome" ng-model="profile.name" />
13	</label>	13	</label>
14		14
15	<ng-include src="'html/_signup_person_fields.html'"></ng-include>	15	<ng-include src="'html/_signup_person_fields.html'"></ng-include>
	@@ -13,5 +13,17 @@		@@ -13,5 +13,17 @@
13		13
14	<h2>Região</h2>	14	<h2>Região</h2>
15	<p>{{profile.region.full_name}}</p>	15	<p>{{profile.region.full_name}}</p>
		16	+
		17	+ <h2>Orientação Sexual</h2>
		18	+ <p>{{profile.orientacao_sexual \| orientacaoSexualFilter }}</p>
		19	+
		20	+ <h2>Identidade de Gênero</h2>
		21	+ <p>{{profile.identidade_genero \| generoFilter }}</p>
		22	+
		23	+ <h2>Etnia</h2>
		24	+ <p>{{profile.etnia \| etniaFilter}}</p>
		25	+
		26	+ <h2><span ng-show="profile.transgenero == 'false'">Não</span> Sou transgênero</h2>
		27	+
16	</ion-content>	28	</ion-content>
17	</div>	29	</div>
	@@ -2,7 +2,7 @@		@@ -2,7 +2,7 @@
2	<div class="input-label">	2	<div class="input-label">
3	Cidade	3	Cidade
4	</div>	4	</div>
5	- <select ng-model="data.city" ng-value="city.id" ng-options="city.name for city in cities track by city.id" class="item">	5	+ <select ng-model="profile.city" ng-value="profile.city.id" ng-options="city.name for city in cities track by city.id" class="item">
6	<option value="">Escolha a cidade...</option>	6	<option value="">Escolha a cidade...</option>
7	</select>	7	</select>
8	</label>	8	</label>
	@@ -48,7 +48,7 @@		@@ -48,7 +48,7 @@
48	</ion-side-menu-content>	48	</ion-side-menu-content>
49		49
50	<ion-side-menu side="right" aside-expose-right="large">	50	<ion-side-menu side="right" aside-expose-right="large">
51	- <ng-include src="'html/_right_sidebar.html?10'"></ng-include>	51	+ <ng-include src="'html/_right_sidebar.html?11'"></ng-include>
52	</ion-side-menu>	52	</ion-side-menu>
53	</ion-side-menus>	53	</ion-side-menus>
54		54
	@@ -17,4 +17,33 @@ filter('tagFilter', function() {		@@ -17,4 +17,33 @@ filter('tagFilter', function() {
17	return function(text) {	17	return function(text) {
18	return String(text).replace(/#/gm, '');	18	return String(text).replace(/#/gm, '');
19	};	19	};
		20	+}).
		21	+filter('etniaFilter', function() {
		22	+ return function(type) {
		23	+ var etnia = {};
		24	+ etnia[1] = 'Pardo';
		25	+ etnia[2] = 'Preto';
		26	+ etnia[3] = 'Branco';
		27	+ etnia[4] = 'Indígena';
		28	+ etnia[5] = 'Amarelo';
		29	+ return etnia[type];
		30	+ };
		31	+}).
		32	+filter('orientacaoSexualFilter', function() {
		33	+ return function(type) {
		34	+ var orientacao = {};
		35	+ orientacao[1] = 'Homosexual';
		36	+ orientacao[2] = 'Heterosexual';
		37	+ orientacao[3] = 'Bisexual';
		38	+ orientacao[4] = 'Assexual';
		39	+ return orientacao[type];
		40	+ };
		41	+}).
		42	+filter('generoFilter', function() {
		43	+ return function(type) {
		44	+ var genero = {};
		45	+ genero[1] = 'Masculino';
		46	+ genero[2] = 'Feminino';
		47	+ return genero[type];
		48	+ };
20	});	49	});