Merge branch 'dev' of github.com:appirio-tech/topcoder-app into dev

Author: Parth Shah

app/settings/account-info/account-info.controller.js

@@ -15,12 +15,13 @@
       accountInfoForm: false,
       newPasswordForm: false
     };
+    var originalUserData = userData;
 
     activate();
 
     function activate() {
-      processData();
-      vm.userData = userData;
+      vm.userData = userData.clone();
+      processData(vm.userData);
       UserService.getUserProfile({fields: 'credential'})
       .then(function(res) {
         vm.isSocialRegistrant = !res.credential.hasPassword;
@@ -31,7 +32,7 @@
       });
 
       vm.countries = ISO3166.getAllCountryObjects();
-      vm.countryObj = ISO3166.getCountryObjFromAlpha3(userData.homeCountryCode);
+      vm.countryObj = ISO3166.getCountryObjFromAlpha3(vm.userData.homeCountryCode);
 
       // Timeout needed since newPasswordForm.currentPassword doesn't exist until later
       $timeout(function(){
@@ -53,7 +54,7 @@
       var isValidCountry = _.isUndefined(countryCode) ? false : true;
       vm.accountInfoForm.country.$setValidity('required', isValidCountry);
       if (isValidCountry) {
-        userData.homeCountryCode = countryCode;
+        vm.userData.homeCountryCode = countryCode;
       }
     }
 
@@ -69,19 +70,20 @@
 
     function saveAccountInfo() {
       vm.formProcessing.accountInfoForm = true;
-      userData.addresses = getAddr();
-      ProfileService.updateUserProfile(userData)
+      vm.userData.addresses = getAddr();
+      ProfileService.updateUserProfile(vm.userData)
       .then(function(data) {
         vm.formProcessing.accountInfoForm = false;
         toaster.pop('success', "Success!", "Your account information was updated.");
+        for (var k in vm.userData) userData[k] = vm.userData[k];
       })
       .catch(function() {
         vm.formProcessing.accountInfoForm = false;
         toaster.pop('error', "Whoops!", "Something went wrong. Please try again later.");
       })
     }
 
-    function processData() {
+    function processData(userData) {
       vm.homeAddress = _.find(userData.addresses, {type: 'HOME'}) || {};
     }
 

app/settings/account-info/account-info.jade

@@ -95,9 +95,13 @@
             placeholder="123 Topcoder Ave.",
             value="{{vm.homeAddress.streetAddr1}}",
             ng-model="vm.homeAddress.streetAddr1",
-            ng-class="{'form-field-focused': hasFocus==true}"
+            ng-class="{'form-field-focused': hasFocus==true}",
+            ng-required="vm.addressDirty = vm.accountInfoForm.address.$dirty || vm.accountInfoForm.city.$dirty || vm.accountInfoForm.state.$dirty || vm.accountInfoForm.zipcode.$dirty || vm.accountInfoForm.country.$dirty"
           )
 
+          .account-info-error(ng-show="vm.addressDirty && vm.accountInfoForm.address.$invalid")
+            p(ng-show="vm.accountInfoForm.address.$error.required") Please enter an address
+
           .form-label Address 2
             span(style="text-transform: none;")  (opt., suite, etc.)
           input.form-field(
@@ -115,27 +119,39 @@
             value="{{vm.homeAddress.city}}",
             placeholder="Best City in the World",
             ng-model="vm.homeAddress.city",
-            ng-class="{'form-field-focused': hasFocus==true}"
+            ng-class="{'form-field-focused': hasFocus==true}",
+            ng-required="vm.addressDirty"
           )
 
+          .account-info-error(ng-show="vm.addressDirty && vm.accountInfoForm.city.$invalid")
+            p(ng-show="vm.accountInfoForm.city.$error.required") Please enter a city
+
           .form-label State/Province
           input.form-field(
             name="state", type="text",
             value="{{vm.homeAddress.stateCode}}",
             placeholder="California",
             ng-model="vm.homeAddress.stateCode",
-            ng-class="{'form-field-focused': hasFocus==true}"
+            ng-class="{'form-field-focused': hasFocus==true}",
+            ng-required="vm.addressDirty"
           )
 
+          .account-info-error(ng-show="vm.addressDirty && vm.accountInfoForm.state.$invalid")
+            p(ng-show="vm.accountInfoForm.state.$error.required") Please enter a state or province
+
           .form-label Zip
           input.form-field(
             name="zipcode", type="text",
             placeholder="Zip"
             value="{{vm.homeAddress.zip}}",
             ng-model="vm.homeAddress.zip",
-            ng-class="{'form-field-focused': hasFocus==true}"
+            ng-class="{'form-field-focused': hasFocus==true}",
+            ng-required="vm.addressDirty"
           )
 
+          .account-info-error(ng-show="vm.addressDirty && vm.accountInfoForm.zipcode.$invalid")
+            p(ng-show="vm.accountInfoForm.zipcode.$error.required") Please enter a zip
+
           .form-label Country
           angucomplete-alt(
             input-name="country",
@@ -148,9 +164,10 @@
             title-field="name",
             match-class="angucomplete-highlight",
             minlength="1",
-            ng-class="{'form-field-focused': hasFocus==true}"
+            ng-class="{'form-field-focused': hasFocus==true}",
+            field-required="vm.addressDirty"
           )
-          .account-info-error(ng-show="vm.accountInfoForm.country.$invalid")
+          .account-info-error(ng-show="vm.addressDirty && vm.accountInfoForm.country.$error.required")
             p(ng-show="vm.accountInfoForm.country.$error.required") Please choose a country from the list.
 
 

app/settings/edit-profile/edit-profile.controller.js

@@ -18,6 +18,7 @@
     activate();
 
     function activate() {
+      vm.userData = userData.clone();
       vm.linkedExternalAccounts = [];
       vm.linkedExternalAccountsData = {};
       vm.skills = false;
@@ -26,12 +27,11 @@
       vm.tracks = {};
 
       vm.countries = ISO3166.getAllCountryObjects();
-      vm.countryObj = ISO3166.getCountryObjFromAlpha3(userData.competitionCountryCode);
+      vm.countryObj = ISO3166.getCountryObjFromAlpha3(vm.userData.competitionCountryCode);
 
-      processData(userData);
-      vm.userData = userData;
+      processData(vm.userData);
 
-      ExternalAccountService.getLinkedExternalAccounts(userData.userId).then(function(data) {
+      ExternalAccountService.getLinkedExternalAccounts(vm.userData.userId).then(function(data) {
         vm.linkedExternalAccounts = data;
       });
 
@@ -114,6 +114,7 @@
         vm.profileFormProcessing = false;
         $log.info('Saved successfully');
         toaster.pop('success', "Success!", "Your account information was updated.");
+        for (var k in vm.userData) userData[k] = vm.userData[k];
       })
       .catch(function(err) {
         vm.profileFormProcessing = false;
@@ -128,9 +129,9 @@
 
     function processData(userInfo) {
       vm.tracks = {
-        DESIGN: _.contains(userData.tracks, 'DESIGN'),
-        DEVELOP: _.contains(userData.tracks, 'DEVELOP'),
-        DATA_SCIENCE: _.contains(userData.tracks, 'DATA_SCIENCE'),
+        DESIGN: _.contains(userInfo.tracks, 'DESIGN'),
+        DEVELOP: _.contains(userInfo.tracks, 'DEVELOP'),
+        DATA_SCIENCE: _.contains(userInfo.tracks, 'DATA_SCIENCE'),
       };
     }
   }

assets/css/settings/account-info.scss

@@ -4,6 +4,10 @@
 .account-info-container {
   padding-bottom: 75px;
 
+  .account-info-error {
+    color: #ef3a3a;
+  }
+
   .section-fields {
     margin-top: 20px;
   }

assets/css/settings/settings.scss

@@ -215,7 +215,6 @@
   .skills {
     .section-fields {
       margin-top: 20px;
-      width: 100%;
       display: flex;
       flex-direction: column;