Fixing view profile and edit profile

Caio Almeida
1 parent 474fe554
Showing 3 changed files with 14 additions and 4 deletions Show diff stats
www/html/_left_sidebar.html
www/html/_profile.html
www/js/controllers.js
 <div id="left-sidebar" class="sidebar" menu-toggle="left">
   <ion-content>
     <h2>
-      <span>{{profile.login}}</span>
+      <span>{{profile.identifier}}</span>
       <button menu-toggle="left" class="button button-icon icon ion-close-circled"></button>
     </h2>
     <ul class="list" ng-show="loggedIn">
@@ -23,7 +23,7 @@
     <h2>Etnia</h2>
     <p>{{profile.etnia | etniaFilter}}</p>
-    <h2><span ng-show="profile.transgenero == 'false'">Não</span> Sou transgênero</h2>
+    <h2><span ng-show="profile.transgenero == 'false'">Não</span> Sou Transgênero</h2>
   </ion-content>
 </div>
@@ -1200,7 +1200,7 @@ angular.module(&#39;confjuvapp.controllers&#39;, [])
     $scope.loadProfile = function() {
       $scope.loading = true;
-      var params = '?private_token=' + ConfJuvAppUtils.getPrivateToken(),
+      var params = '?private_token=' + ConfJuvAppUtils.getPrivateToken() + '&t=' + (new Date().getTime()),
           path = 'people/me/' + params;
       $http.get(ConfJuvAppUtils.pathTo(path))
@@ -1252,13 +1252,23 @@ angular.module(&#39;confjuvapp.controllers&#39;, [])
     $scope.editProfile = function() {
       if ($scope.editProfileModal) {
+        if ($scope.profile.state) {
+          $scope.loadCitiesByState($scope.profile.state.id);
+        }
         $scope.editProfileModal.show();
       }
       else {
         if (!$scope.profile) {
           $scope.loadProfile();
         }
-        if ($scope.states.length == 0) $scope.loadStates();
+        
+        if ($scope.states.length == 0) {
+          $scope.loadStates();
+        }
+        else if ($scope.profile.state) {
+          $scope.loadCitiesByState($scope.profile.state.id);
+        }
+
         if ($scope.signupPersonFields.length == 0) $scope.loadSignupPersonFields();
         $ionicModal.fromTemplateUrl('html/_edit_profile.html', {
           scope: $scope,
1	<div id="left-sidebar" class="sidebar" menu-toggle="left">	1	<div id="left-sidebar" class="sidebar" menu-toggle="left">
2	<ion-content>	2	<ion-content>
3	<h2>	3	<h2>
4	- <span>{{profile.login}}</span>	4	+ <span>{{profile.identifier}}</span>
5	<button menu-toggle="left" class="button button-icon icon ion-close-circled"></button>	5	<button menu-toggle="left" class="button button-icon icon ion-close-circled"></button>
6	</h2>	6	</h2>
7	<ul class="list" ng-show="loggedIn">	7	<ul class="list" ng-show="loggedIn">
	@@ -23,7 +23,7 @@		@@ -23,7 +23,7 @@
23	<h2>Etnia</h2>	23	<h2>Etnia</h2>
24	<p>{{profile.etnia \| etniaFilter}}</p>	24	<p>{{profile.etnia \| etniaFilter}}</p>
25		25
26	- <h2><span ng-show="profile.transgenero == 'false'">Não</span> Sou transgênero</h2>	26	+ <h2><span ng-show="profile.transgenero == 'false'">Não</span> Sou Transgênero</h2>
27		27
28	</ion-content>	28	</ion-content>
29	</div>	29	</div>