Ticket #132: Check profile completeness

Caio Almeida
1 parent 9145bafa
Showing 3 changed files with 7 additions and 5 deletions Show diff stats
www/html/_edit_profile.html
www/html/_profile.html
www/js/controllers.js
@@ -12,7 +12,7 @@
             <input type="text" placeholder="Nome" ng-model="profile.name" />
           </label>
-          <ng-include src="'html/_signup_person_fields.html?1'"></ng-include>
+          <ng-include src="'html/_signup_person_fields.html?2'"></ng-include>
           <ng-include src="'html/_select_state.html'"></ng-include>
         </div>
@@ -18,7 +18,6 @@
     <h2>Suas Medalhas</h2>
-    <!-- FIXME Need some badges in order to add style to this
     <div id="badges">
       <div ng-repeat="badge in profile.badges" class="badge">
         <span>{{badge.level}}</span>
@@ -26,7 +25,6 @@
         <p>Level {{badge.level}}</p>
       </div>
     </div>
-    -->
     <h2>Nome</h2>
     <p>{{profile.name}}</p>
@@ -1441,7 +1441,7 @@ angular.module(&#39;confjuvapp.controllers&#39;, [])
         }
         if ($scope.signupPersonFields.length == 0) $scope.loadSignupPersonFields();
-        $ionicModal.fromTemplateUrl('html/_edit_profile.html?1', {
+        $ionicModal.fromTemplateUrl('html/_edit_profile.html?2', {
           scope: $scope,
           animation: 'slide-in-up'
         }).then(function(modal) {
@@ -1491,6 +1491,7 @@ angular.module(&#39;confjuvapp.controllers&#39;, [])
         popup.then(function() {
           $scope.loading = false;
           $scope.closeEditProfile();
+          $scope.checkCompleteness(profile);
         });
         $scope.loading = false;
       }, function(err) {
@@ -1502,7 +1503,10 @@ angular.module(&#39;confjuvapp.controllers&#39;, [])
     $scope.profileComplete = true;
     $scope.hideProfileWarning = !!window.localStorage['hide_profile_warning'];
     $scope.checkCompleteness = function(p) {
-      if (!!!p.name || !!!p.orientacao_sexual || !!!p.identidade_genero || !!!p.etnia || !!!p.city || !!!p.membro_conselho) {
+      if (!!p.name && !!p.orientacao_sexual && !!p.identidade_genero && !!p.etnia && !!p.membro_conselho && (!!p.region || !!p.city)) {
+        $scope.profileComplete = true;
+      }
+      else {
         $scope.profileComplete = false;
       }
     };
	@@ -12,7 +12,7 @@		@@ -12,7 +12,7 @@
12	<input type="text" placeholder="Nome" ng-model="profile.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?1'"></ng-include>	15	+ <ng-include src="'html/_signup_person_fields.html?2'"></ng-include>
16		16
17	<ng-include src="'html/_select_state.html'"></ng-include>	17	<ng-include src="'html/_select_state.html'"></ng-include>
18	</div>	18	</div>