amida-tech · kachok · Feb 3, 2015 · Feb 2, 2015 · Feb 2, 2015 · Feb 2, 2015
diff --git a/client/app/index.html b/client/app/index.html
@@ -53,7 +53,11 @@
                   <img class="img-navbar-avatar" src="images/img-demo.png">
                 </li>
                 <li class="dropdown">
-                  <a class="dropdown-toggle" data-toggle="dropdown"> {{user_first}} {{user_last}} <span class="caret"></span></a>
+                  <a class="button dropdown-toggle" data-toggle="dropdown">
+                    <span username></span>
+                    <span class="caret"></span>
+
+                  </a>
                   <ul class="dropdown-menu" role="menu">
                     <li><a href="#/profile">My Profile</a></li>
                     <li><a href="#/account">My Account</a></li>
@@ -184,6 +188,7 @@ <h6>Made by Amida Technology Solutions | Licensed under Creative Commons</h6>
     <script src="scripts/services/login.js"></script>
     <script src="scripts/services/logout.js"></script>
     <script src="scripts/directives/profile.js"></script>
+    <script src="scripts/directives/username.js"></script>
     <script src="scripts/controllers/files.js"></script>
     <script src="scripts/services/files.js"></script>
     <script src="scripts/directives/breadcrumb.js"></script>

diff --git a/client/app/scripts/controllers/account.js b/client/app/scripts/controllers/account.js
@@ -8,22 +8,12 @@
  * Controller of the phrPrototypeApp
  */
 angular.module('phrPrototypeApp')
-  .controller('AccountCtrl', function ($scope, $location, profile) {
+  .controller('AccountCtrl', function ($scope, $location) {
 
     $scope.resetPassword = function () {
     	$location.path('/home');
 
     };
 
-    function showUserInfo() {
-        profile.getProfile(function(err, profileInfo) {
-            $scope.user_first = profileInfo.name.first;
-            $scope.user_last = profileInfo.name.last;
-            $scope.user_email = profileInfo.email[0].email;
-            $scope.user_dob = profileInfo.dob;
-        });
-    }
-
-    showUserInfo();
 
   });
diff --git a/client/app/scripts/controllers/billing.js b/client/app/scripts/controllers/billing.js
@@ -6,7 +6,7 @@
  * # BillingClaimsCtrl
  * Controller of the phrPrototypeApp
  */
-angular.module('phrPrototypeApp').controller('BillingCtrl', function($scope, $location, $anchorScroll, claims, insurance, format, profile, billing) {
+angular.module('phrPrototypeApp').controller('BillingCtrl', function($scope, $location, $anchorScroll, claims, insurance, format, billing) {
     $scope.entryType = 'all';
     $scope.masterEntries = [];
     $scope.entries = [];
@@ -15,16 +15,6 @@ angular.module('phrPrototypeApp').controller('BillingCtrl', function($scope, $lo
         'starred': false
     };
 
-    function showUserInfo() {
-        profile.getProfile(function(err, profileInfo) {
-            $scope.user_first = profileInfo.name.first;
-            $scope.user_last = profileInfo.name.last;
-            $scope.user_email = profileInfo.email[0].email;
-            $scope.user_dob = profileInfo.dob;
-        });
-    }
-    showUserInfo();
-
     function getUpdateDate() {
         //Should grab from files/update history.  Stubbed for now.
         $scope.updateDate = '12/1/2014';

diff --git a/client/app/scripts/controllers/files.js b/client/app/scripts/controllers/files.js
@@ -8,7 +8,7 @@
  * Controller of the phrPrototypeApp
  */
 angular.module('phrPrototypeApp')
-  .controller('FilesCtrl', function ($scope, files, profile) {
+  .controller('FilesCtrl', function ($scope, files) {
 
 
 
@@ -59,15 +59,5 @@ angular.module('phrPrototypeApp')
       }
     };
 
-    function showUserInfo() {
-      profile.getProfile(function(err, profileInfo) {
-          $scope.user_first = profileInfo.name.first;
-          $scope.user_last = profileInfo.name.last;
-          $scope.user_email = profileInfo.email[0].email;
-          $scope.user_dob = profileInfo.dob;
-      });
-    }
-
-    showUserInfo();
 
   });
diff --git a/client/app/scripts/controllers/home.js b/client/app/scripts/controllers/home.js
@@ -8,24 +8,13 @@
  * Controller of the phrPrototypeApp
  */
 angular.module('phrPrototypeApp')
-    .controller('HomeCtrl', function($scope, history, record, profile) {
+    .controller('HomeCtrl', function($scope, history, record) {
 
-        function showUserInfo() {
-            profile.getProfile(function(err, profileInfo) {
-                $scope.user_first = profileInfo.name.first;
-                $scope.user_last = profileInfo.name.last;
-                //$scope.user_email = profileInfo.email[0].email;
-                $scope.user_dob = profileInfo.dob;
-            });
-        }
-
-        showUserInfo();
 
         $scope.accountHistory = {
             "lastLogin": "01/01/2980"
         };
         $scope.noteCount = 0;
-        $scope.user_first = '';
 
         function countNotes() {
             //notes.noteCount(function(err, results) {
@@ -42,14 +31,6 @@ angular.module('phrPrototypeApp')
         countNotes();
         //countUpdates();
 
-        function showUser() {
-            profile.getProfile(function(err, profileInfo) {
-                $scope.user_first = profileInfo.name.first;
-            });
-        }
-
-        showUser();
-
 
         function getHistory() {
             history.getHistory(function(err, history) {

diff --git a/client/app/scripts/controllers/navbar.js b/client/app/scripts/controllers/navbar.js
@@ -8,7 +8,7 @@
  * Controller of the phrPrototypeApp
  */
 angular.module('phrPrototypeApp')
-    .controller('NavbarCtrl', function($rootScope, $scope, $location, authentication, logout, profile) {
+    .controller('NavbarCtrl', function($rootScope, $scope, $location, authentication, logout) {
 
         $scope.loginStatus = false;
 
@@ -33,24 +33,14 @@ angular.module('phrPrototypeApp')
             checkAuthStatus();
         });
 
-        function showUserInfo() {
-            profile.getProfile(function(err, profileInfo) {
-                $scope.user_first = profileInfo.name.first;
-                $scope.user_last = profileInfo.name.last;
-                //$scope.email = profileInfo.email[0].email;
-            });
-        }
-
-        showUserInfo();
-
-
         //TODO: isValid is not used??
         $scope.logout = function(isValid) {
             console.log("navbar controller, logout()", isValid);
             logout.logout(function(err) {
                 if (err) {
                     $scope.error = err;
                 } else {
+                    // $scope.loginStatus = false;
                     $location.path('/');
                 }
             });

diff --git a/client/app/scripts/controllers/notes.js b/client/app/scripts/controllers/notes.js
@@ -6,7 +6,7 @@
  * # NotesCtrl
  * Controller of the phrPrototypeApp
  */
-angular.module('phrPrototypeApp').controller('NotesCtrl', function($scope, notes, profile) {
+angular.module('phrPrototypeApp').controller('NotesCtrl', function($scope, notes) {
 
     $scope.notes = [];
 
@@ -94,16 +94,5 @@ angular.module('phrPrototypeApp').controller('NotesCtrl', function($scope, notes
         }
     };
 
-    function showUserInfo() {
-        profile.getProfile(function(err, profileInfo) {
-            $scope.user_first = profileInfo.name.first;
-            $scope.user_last = profileInfo.name.last;
-            $scope.user_email = profileInfo.email[0].email;
-            $scope.user_dob = profileInfo.dob;
-        });
-    }
-
-    showUserInfo();
-
     getNotes();
 });
diff --git a/client/app/scripts/controllers/pagetitle.js b/client/app/scripts/controllers/pagetitle.js
@@ -8,11 +8,14 @@
  * Controller of the phrPrototypeApp
  */
 angular.module('phrPrototypeApp')
-  .controller('titleController', function ($rootScope, $scope, $location) {
-
-    $scope.user_first="Kevin";
-    $scope.user_last="Bacon";
+  .controller('titleController', function ($rootScope, $scope, $location, profile) {
 
+    // profile.getProfile(function(err, profileInfo) {
+    //     if (profileInfo.name.first) {
+    //     $scope.user_first = profileInfo.name.first;
+    //     $scope.user_last = profileInfo.name.last;
+    //     }
+    // });
 
   	$scope.pageTitle = 'My PHR';
   	var routeMap = {

diff --git a/client/app/scripts/controllers/profile.js b/client/app/scripts/controllers/profile.js
@@ -36,12 +36,7 @@ angular.module('phrPrototypeApp')
         if (profileInfo.dob.date) {
           var tmpDOB = moment(profileInfo.dob.date).format('YYYY-MM-DD');
           $scope.profile.dob = tmpDOB;
-        } else {
-        $scope.user_first = profileInfo.name.first;
-        $scope.user_last = profileInfo.name.last;
-        $scope.user_email = profileInfo.email[0].email;
-        $scope.user_dob = profileInfo.dob;
-      }
+        } 
       });
     }
 

diff --git a/client/app/scripts/controllers/record.js b/client/app/scripts/controllers/record.js
@@ -6,19 +6,8 @@
  * # RecordCtrl
  * Controller of the phrPrototypeApp
  */
-angular.module('phrPrototypeApp').controller('RecordCtrl', function($scope, $window, record, format, profile) {
+angular.module('phrPrototypeApp').controller('RecordCtrl', function($scope, $window, record, format) {
 
-    function showUserInfo() {
-        profile.getProfile(function(err, profileInfo) {
-            $scope.user_first = profileInfo.name.first;
-            $scope.user_last = profileInfo.name.last;
-            $scope.user_email = profileInfo.email[0].email;
-            $scope.user_dob = profileInfo.dob;
-        });
-    }
-
-    showUserInfo();
-
     function pageRender(data) {
         $scope.dashMetrics = {};
         $scope.tabs = [{

diff --git a/client/app/scripts/controllers/register.js b/client/app/scripts/controllers/register.js
@@ -8,7 +8,7 @@
  * Controller of the phrPrototypeApp
  */
 angular.module('phrPrototypeApp')
-    .controller('RegisterCtrl', function($scope, $location, registration, login, profile, username) {
+    .controller('RegisterCtrl', function($scope, $location, registration, login, username) {
 
         $scope.step = 0;
 

diff --git a/client/app/scripts/directives/profile.js b/client/app/scripts/directives/profile.js
@@ -17,10 +17,14 @@ angular.module('phrPrototypeApp')
                 //$scope.user_first="blah";
 
                 profile.getProfile(function(err, profileInfo) {
-                    scope.user_first = profileInfo.name.first;
-                    scope.user_last = profileInfo.name.last;
-                    //scope.user_email = profileInfo.email[0].email;
-                    scope.user_dob = profileInfo.dob;
+                    if (profileInfo) {
+                        if (!angular.isUndefined(profileInfo.email)) {
+                            scope.user_email = profileInfo.email[0].email;
+                        }
+                        if (profileInfo.dob) {
+                            scope.user_dob = profileInfo.dob;
+                        }
+                    }                
                 });
 
             }

diff --git a/client/app/scripts/directives/username.js b/client/app/scripts/directives/username.js
@@ -0,0 +1,28 @@
+'use strict';
+
+/**
+ * @ngdoc directive
+ * @name phrPrototypeApp.directive:username
+ * @description
+ * # username
+ */
+angular.module('phrPrototypeApp')
+    .directive('username', function(profile) {
+
+
+        return {
+            template: '{{user_first}} {{user_last}}',
+            restrict: 'EA',
+            link: function postLink(scope, element, attrs) {
+                //$scope.user_first="blah";
+
+                profile.getProfile(function(err, profileInfo) {
+                    if (profileInfo&&!angular.isUndefined(profileInfo.name)) {
+                        scope.user_first = profileInfo.name.first;
+                        scope.user_last = profileInfo.name.last;
+                    }
+                });
+
+            }
+        };
+    });
diff --git a/client/app/scripts/services/authentication.js b/client/app/scripts/services/authentication.js
@@ -40,6 +40,7 @@ angular.module('phrPrototypeApp')
                 .success(function(data) {
                     if (data && data.authenticated){
                         callback(null, true);
+                        // console.log(data, data.authenticated);
                     }
                     else
                     {

diff --git a/client/app/scripts/services/logout.js b/client/app/scripts/services/logout.js
@@ -19,7 +19,7 @@ angular.module('phrPrototypeApp')
 
             $http.post('api/v1/logout')
                 .success(function() {
-                	console.log("logout successfull");
+                	console.log("logout successful");
                     //$rootScope.isAuthenticated = false;
                     //$location.path('/home');
                     callback(null);

diff --git a/client/app/views/templates/profile.html b/client/app/views/templates/profile.html
@@ -1,11 +1,12 @@
 <div class="profile">
     <div class="profile-body">
         <div class="profile-image">
-        <img class="img-responsive center-block" src="images/img-demo.png"></div>
+            <img class="img-responsive center-block" src="images/img-demo.png">
+        </div>
         <div class="profile-content">
-            <h4>{{user_first}} {{user_last}}</h4>
-            <p>{{user_email}}</p>
-            <p>Born: {{user_dob}}</p>
+            <h4 username></h4>
+            <p ng-show="user_email">{{user_email}}</p>
+            <p ng-show="user_dob">Born: {{user_dob}}</p>
         </div>
     </div>
-</div>
+</div>