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

# By vikasrohit
# Via vikasrohit
* 'dev' of github.com:appirio-tech/topcoder-app:
  SUP-2255, Remove "Didn't Finish" from past challenges where user was not a submitter
  SUP-2250, Grey color for handle should be more darker than current one.
  SUP-2231, New Empty States for Dashboard and Profile
  SUP-2160, Displayed color for Handle/Rating should be yellow SUP-2250, Grey color for handle should be more darker than current one.

Author: Victor George

app/directives/challenge-user-place/design-challenge-user-place.directive.jade

@@ -2,6 +2,7 @@
   p.place(ng-class="{ 'first-place': challenge.wonFirst }", ng-show="challenge.highestPlacement") {{challenge.highestPlacement}}#[span {{challenge.highestPlacement | ordinal:true}}] Place
   p.place(ng-show="challenge.userStatus === 'NOT_FINISHED'") Didn't Finish
   p.place(ng-show="challenge.userStatus === 'PASSED_SCREENING'") Passed Screening
+  p.place(ng-show="challenge.userStatus === 'COMPLETED'") COMPLETED
 
   .thumbnail(ng-click="openLightbox()", ng-class="{hidden: challenge.userStatus !== 'PASSED_REVIEW'}")
     img(ng-src="http://studio.{{DOMAIN}}/studio.jpg?module=DownloadSubmission&sbmid={{challenge.thumbnailId}}&sbt=full", fallback-src="/images/ico-picture.svg")
@@ -16,6 +17,7 @@
     p.place(ng-class="{ 'first-place': challenge.wonFirst }", ng-show="challenge.highestPlacement") {{challenge.highestPlacement}}#[span {{challenge.highestPlacement | ordinal:true}}] Place
     p.place(ng-show="challenge.userStatus === 'NOT_FINISHED'") Didn't Finish
     p.place(ng-show="challenge.userStatus === 'PASSED_SCREENING'") Passed Screening
+    p.place(ng-show="challenge.userStatus === 'COMPLETED'") COMPLETED
     p.date-completed {{challenge.submissionEndDate | date : 'MMMM yyyy'}}
 
   .winner-ribbon(ng-show="challenge.wonFirst")

app/directives/challenge-user-place/dev-challenge-user-place.directive.jade

@@ -2,6 +2,7 @@
   p.place(ng-class="{ 'first-place': challenge.wonFirst }", ng-show="challenge.highestPlacement") {{challenge.highestPlacement}}#[span {{challenge.highestPlacement | ordinal:true}}] Place
     p.place(ng-show="challenge.userStatus === 'NOT_FINISHED'") Didn't Finish
     p.place(ng-show="challenge.userStatus === 'PASSED_SCREENING'") Passed Screening
+    p.place(ng-show="challenge.userStatus === 'COMPLETED'") COMPLETED
 
   .challenge-score(ng-class="{hidden: challenge.userStatus !== 'PASSED_REVIEW'}")
     p.score {{challenge.userDetails.submissionReviewScore/100 | percentage}}
@@ -13,6 +14,7 @@
     p.place(ng-class="{ 'first-place': challenge.wonFirst }", ng-show="challenge.highestPlacement") {{challenge.highestPlacement}}#[span {{challenge.highestPlacement | ordinal:true}}] Place
     p.place(ng-show="challenge.userStatus === 'NOT_FINISHED'") Didn't Finish
     p.place(ng-show="challenge.userStatus === 'PASSED_SCREENING'") Passed Screening
+    p.place(ng-show="challenge.userStatus === 'COMPLETED'") Completed
     p.date-completed {{challenge.submissionEndDate | date : 'MMMM yyyy'}}
 
   .winner-ribbon(ng-show="challenge.wonFirst")

app/filters/rating-color.filter.js

@@ -10,23 +10,16 @@
         if (typeof rating === 'string')
           rating = parseInt(rating.replace(",", ""));
         colors = colors.filter(function(color) {
-          return rating >= color.start && rating <= color.end;
+          return rating !== null && rating >= color.start && rating <= color.end;
         });
         return colors[0] && colors[0].color || 'black';
       }
       var colors = [
-        // level 0 grey
-        {
-          'color': '#F0F0F0',
-          'darkerColor': '#F0F0F0',
-          'start': 0,
-          'end': 0
-        },
         // grey
         {
           'color': '#9D9FA0',
           'darkerColor': '#9D9FA0',
-          'start': 1,
+          'start': 0,
           'end': 899
         },
         // green

app/profile/about/about.controller.js

@@ -13,9 +13,9 @@
     vm.skillIndex = 0;
     vm.displaySection = {};
     vm.sampleSkills = [
-      {"tagName":"VisualForce","hidden":false,"score":0,"sources":[], "tagId": 385},
-      {"tagName":"MongoDB","hidden":false,"score":0,"sources":[], "tagId": 281},
-      {"tagName":"Heroku","hidden":false,"score":0,"sources":[], "tagId": 210}
+      {"tagName":"Photoshop","hidden":false,"score":0,"sources":[], "tagId": 302},
+      {"tagName":"Sketch","hidden":false,"score":0,"sources":[], "tagId": 351},
+      {"tagName":"HTML5","hidden":false,"score":0,"sources":[], "tagId": 213}
     ];
 
     activate();

app/services/challenge.service.js

@@ -196,6 +196,20 @@
             }
           }
 
+          challenge.userHasSubmitterRole = false;
+
+          // determines if user has submitter role or not
+          var roles = challenge.userDetails.roles;
+          if (roles.length > 0) {
+            var submitterRole = _.findIndex(roles, function(role) {
+              var lRole = role.toLowerCase();
+              return lRole === 'submitter';
+            });
+            if (submitterRole >= 0) {
+              challenge.userHasSubmitterRole = true;
+            }
+          }
+
           if (challenge.userDetails.hasUserSubmittedForReview) {
             if (!challenge.highestPlacement) {
               challenge.userStatus = "PASSED_SCREENING";
@@ -205,6 +219,11 @@
           } else {
             challenge.userStatus = "NOT_FINISHED";
           }
+
+          // if user does not has submitter role, just show Completed
+          if (!challenge.userHasSubmitterRole) {
+            challenge.userStatus = "COMPLETED";
+          }
         }
       });
     }

app/services/profile.service.js

@@ -286,7 +286,7 @@
     }
 
     function getUserHandleColor(profile) {
-      var rating = _.get(profile, 'maxRating.rating', 0);
+      var rating = _.get(profile, 'maxRating.rating', null);
       return $filter('ratingColor')(rating);
     }
 

assets/css/profile/about.scss

@@ -154,6 +154,10 @@
 
         .skill {
           width: 130px;
+          opacity: 0.3;
+          a {
+            cursor: default;
+          }
         } 
       }
     }