Merge branch 'dev' into fixes/vikas-beta-release

* dev:
  new default profile photo
  Added past challenges to design profile
  more fixes
  Fixed add skills bug

Conflicts:
	app/directives/challenge-tile/challenge-tile.directive.jade

Author: vikasrohit

app/directives/challenge-tile/challenge-tile.directive.jade

@@ -59,7 +59,7 @@
 
       div(ng-switch-when="MARATHON_MATCH")
         .marathon-score
-          p.score {{challenge.pointTotal}}
+          p.score {{challenge.pointTotal || 0 }
 
           p Total Points
 

app/directives/profile-widget/profile-widget.jade

@@ -1,6 +1,7 @@
 .profile-widget-directive
   a(ui-sref="profile.about({userHandle: profile.handle})")
-    img.profile-circle(fallback-src="/images/avatarPlaceholder.png", ng-src="{{profile.photoURL}}")
+    img.profile-circle(ng-if="profile.photoURL", ng-src="{{profile.photoURL}}")
+    img.profile-circle(ng-if="!profile.photoURL", src="/images/ico-user-default.svg")
 
   .info
     h1.handle {{profile.handle}}

app/profile/subtrack/data/data.jade

@@ -43,14 +43,14 @@
       .challenges(ng-hide="vm.subTrack === 'SRM'")
         .challenge.tile(ng-repeat="challenge in vm.challenges")
           challenge-tile(challenge="challenge", domain="vm.domain", view="'tile'")
-        .div(ng-show="!vm.challenges || vm.challenges.length == 0")
-          | No past challenges available for this user
+        .no-challenges(ng-show="!vm.challenges || vm.challenges.length == 0")
+          | Sorry, no successful challenges found.
 
       .challenges(ng-show="vm.subTrack == 'SRM'")
         .challenge.tile(ng-repeat="challenge in vm.challenges")
           srm-tile(srm="challenge", domain="vm.domain", view="'tile'")
-        .div(ng-show="!vm.challenges || vm.challenges.length == 0")
-          | No past SRMs available for this user
+        .no-challenges(ng-show="!vm.challenges || vm.challenges.length == 0")
+          | Sorry, no rated SRMs found.
 
     .stats(ng-show="vm.viewing == 'stats' && profileVm.status.stats === 'ready'")
       .graphs()

app/profile/subtrack/design/design.jade

@@ -9,6 +9,17 @@
         .value {{vm.typeStats.wins}}
         .name CHALLENGES
 
+    .tabs
+      a.left(id="stats", ng-click="vm.viewing = 'stats'",
+        ng-class="vm.viewing == 'stats' ? 'selected' : ''"
+      ) Statistics
+
+      a.right(id="challenges", ng-click="vm.viewing = 'challenges'",
+        ng-class="vm.viewing == 'challenges' ? 'selected' : ''"
+      ) Challenges
+
+    hr
+
     tc-section(
       ng-show="vm.viewing == 'challenges'",
       state="vm.status.challenges"
@@ -18,8 +29,8 @@
         .challenge.tile(ng-repeat="challenge in vm.challenges")
           challenge-tile(challenge="challenge", domain="vm.domain", view="'tile'")
 
-        .div(ng-show="!vm.challenges || vm.challenges.length == 0")
-          | No past challenges available for this user
+        .no-challenges(ng-show="!vm.challenges || vm.challenges.length == 0")
+          | Sorry, no successful challenges found.
 
   .bottom(ng-show="vm.viewing == 'stats'")
     h2.detailed Detailed Stats

app/profile/subtrack/develop/develop.jade

@@ -45,8 +45,8 @@
       .challenges
         .challenge.tile(ng-repeat="challenge in vm.challenges")
           challenge-tile(challenge="challenge", domain="vm.domain", view="'tile'")
-        .div(ng-show="!vm.challenges || vm.challenges.length == 0")
-          | no past challenges available for this user
+        .no-challenges(ng-show="!vm.challenges || vm.challenges.length == 0")
+          | Sorry, no successful challenges found.
 
     .stats(ng-show="vm.viewing == 'stats' && profileVm.status.stats === 'ready'")
       .graphs

app/services/challenge.service.js

@@ -31,8 +31,17 @@
       return api.one('members', handle.toLowerCase()).all('challenges').getList(params);
     }
 
-    function getUserMarathonMatches(handle, params) {
-      return api.one('members', handle.toLowerCase()).all('mms').getList(params);
+    function getUserMarathonMatches(handle, params, filterUnRated) {
+      filterUnRated = filterUnRated || true;
+      return api.one('members', handle.toLowerCase()).all('mms').getList(params)
+      .then(function(mms) {
+        if (filterUnRated) {
+          mms = _.filter(mms, function(m) {
+            return _.isArray(m.rounds) && m.rounds.length && !_.isUndefined(m.rounds[0].userMMDetails) && m.rounds[0].userMMDetails.rated;
+          });
+        }
+        return mms;
+      });
     }
 
     function getReviewEndDate(challengeId) {

app/services/srm.service.js

@@ -20,26 +20,20 @@
       return api.all('srms').getList(params);
     }
 
-    function getPastSRMs(userHandle, params) {
-      return api.one('members', userHandle).all('srms').getList(params)
-      .then(function(srms) {
-        // var resultParams =  {
-        //   filter: 'userId=' + userId
-        // };
-        // return getSRMResults(resultParams).then(function(results) {
-        //   var resultsMap = [];
-        //   angular.forEach(results, function(result) {
-        //     resultsMap[result['contestId']] = result;
-        //   });
-        //   angular.forEach(srms, function(srm) {
-        //     if (resultsMap[srm.id]) {
-        //       srm.result = resultsMap[srm.id];
-        //     }
-        //   });
-          return srms;
-        });
+    function getPastSRMs(userHandle, params, filterUnRated) {
+      filterUnRated = filterUnRated || true;
+      return api.one('members', userHandle).all('srms').getList(params).then(function(srms) {
+        // filter un rated SRMs
+        if (filterUnRated) {
+          srms = _.filter(srms, function(s) {
+            return _.isArray(s.rounds) && s.rounds.length && !_.isUndefined(s.rounds[0].userSRMDetails) && s.rounds[0].userSRMDetails.rated;
+          });
+        }
+        return srms;
+      });
     }
 
+    // NOT Used deprecate
     function getSRMResults(params) {
       return api.all('srmResults').getList(params);
     }

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

@@ -65,8 +65,9 @@
       if (skill) {
         var skillTagId = _.get(skill, 'originalObject.id').toString();
         // verify if skill has already been added
-        var idx = _.find(vm.skills, function(s) { return s.tagId === skillTagId});
-        if (idx < 0) {
+        var idx = _.find(vm.skills, function(s) { return s.tagId == skillTagId});
+        // _.find returns undefined when skill isn't found
+        if (!idx) {
           // add the skill
           ProfileService.addUserSkill(vm.userData.handle, skillTagId).then(function(resp) {
             // find the new skill in response object and inject it into our existing list.

assets/css/profile/subtrack.scss

@@ -3,7 +3,7 @@
 .profile-subtrack-container {
   display: flex;
   flex-direction: column;
-  
+
   .nav {
     @include module-full-width;
     background: white;
@@ -291,13 +291,19 @@
         width: 325px;
         padding: 15px;
       }
+      .no-challenges {
+        margin: 30px;
+        @include sofia-pro-regular;
+        font-size: 16px;
+        color: #a3a3ae;
+      }
     }
 
   }
 }
 @media (min-width: 768px) {
 .profile-subtrack-container {
-  
+
   .nav {
     display: flex;
     flex-direction: row;