Feature/non winner state past challenges

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

@@ -75,23 +75,10 @@
         p BLAH
 
     .challenge-details(ng-switch-when="DEVELOP")
-      p.place(ng-class="{ 'first-place': challenge.wonFirst }") {{challenge.highestPlacement}}#[span {{challenge.highestPlacement | ordinal:true}}] Place
-
-      .challenge-score
-        p.score {{challenge.userDetails.submissionReviewScore/100 | percentage}}
-
-        p Review Score
+      dev-challenge-user-place(challenge="challenge", view="view")
 
     .challenge-details(ng-switch-when="DESIGN")
-      p.place(ng-class="{ 'first-place': challenge.wonFirst }") {{challenge.highestPlacement}}#[span {{challenge.highestPlacement | ordinal:true}}] Place
-
-      .thumbnail(ng-click="openLightbox()")
-        img(ng-src="http://studio.{{DOMAIN}}/studio.jpg?module=DownloadSubmission&sbmid={{challenge.thumbnailId}}&sbt=full", fallback-src="/images/ico-picture.svg")
-
-        .thumbnail-gallery(ng-click="challenge.showLightbox()")
-          .gallery-icon
-
-          .num-images 1 image
+      design-challenge-user-place(challenge="challenge", view="view")
 
 .challenge.list-view(ng-show="view=='list'", ng-class="challenge.track")
   .active-challenge(ng-show="challenge.status === 'ACTIVE'")
@@ -163,28 +150,7 @@
           p Total Points
 
     .challenge-details(ng-switch-when="DEVELOP")
-      .place-date
-        p.place(ng-class="{ 'first-place': challenge.wonFirst }") {{challenge.highestPlacement}}#[span {{challenge.highestPlacement | ordinal:true}}] Place
-        p.date-completed {{challenge.submissionEndDate | date : 'MMMM yyyy'}}
-
-      .winner-ribbon(ng-show="challenge.wonFirst")
-
-      .challenge-score
-        p.score {{challenge.userDetails.submissionReviewScore/100 | percentage}}
-
-        p Review Score
+      dev-challenge-user-place(challenge="challenge", view="view")
 
     .challenge-details(ng-switch-when="DESIGN")
-      .place-date
-        p.place(ng-class="{ 'first-place': challenge.wonFirst }") {{challenge.highestPlacement}}#[span {{challenge.highestPlacement | ordinal:true}}] Place
-        p.date-completed {{challenge.submissionEndDate | date : 'MMMM yyyy'}}
-
-      .winner-ribbon(ng-show="challenge.wonFirst")
-
-      .thumbnail(ng-click="openLightbox()")
-        img(ng-src="http://studio.{{DOMAIN}}/studio.jpg?module=DownloadSubmission&sbmid={{challenge.thumbnailId}}&sbt=full", fallback-src="/images/ico-picture.svg")
-
-        .thumbnail-gallery(ng-click="challenge.showLightbox()")
-          .gallery-icon
-
-          .num-images 1 image
+      design-challenge-user-place(challenge="challenge", view="view")

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

@@ -23,15 +23,6 @@
             $scope.challenge.subTrack === 'MARATHON_MATCH') {
             ChallengeService.processPastMarathonMatch($scope.challenge);
           }
-          if ($scope.challenge.track == 'DESIGN' && $scope.challenge.userDetails.submissions && $scope.challenge.userDetails.submissions.length > 0) {
-            $scope.challenge.thumbnailId = $scope.challenge.userDetails.submissions[0].id;
-
-            $scope.challenge.highestPlacement = _.max($scope.challenge.userDetails.submissions, 'placement').placement;
-
-            if ($scope.challenge.highestPlacement == 1) {
-              $scope.challenge.wonFirst = true;
-            }
-          }
         }
 
         function openLightbox() {

app/directives/challenge-user-place/challenge-user-place.directive.js

@@ -0,0 +1,56 @@
+(function() {
+  'use strict';
+
+  angular.module('tcUIComponents')
+    .directive('devChallengeUserPlace', devChallengeUserPlace)
+    .directive('designChallengeUserPlace', designChallengeUserPlace);
+
+  function devChallengeUserPlace() {
+    return {
+      restrict: 'E',
+      templateUrl: 'directives/challenge-user-place/dev-challenge-user-place.directive.html',
+      scope: {
+        challenge: '=',
+        view: '='
+      },
+      controller: ['$scope', 'CONSTANTS', '$attrs', 'ChallengeService',
+       function($scope, CONSTANTS, $attrs, ChallengeService) {
+        $scope.DOMAIN = CONSTANTS.domain;
+
+        activate();
+
+        function activate() {
+        }
+      }]
+    };
+  }
+
+  function designChallengeUserPlace() {
+    return {
+      restrict: 'E',
+      templateUrl: 'directives/challenge-user-place/design-challenge-user-place.directive.html',
+      scope: {
+        challenge: '=',
+        view: '='
+      },
+      controller: ['$scope', 'CONSTANTS', '$attrs', 'ChallengeService',
+       function($scope, CONSTANTS, $attrs, ChallengeService) {
+        $scope.DOMAIN = CONSTANTS.domain;
+
+        activate();
+
+        function activate() {
+          if ($scope.challenge.userDetails.submissions && $scope.challenge.userDetails.submissions.length > 0) {
+            $scope.challenge.thumbnailId = $scope.challenge.userDetails.submissions[0].id;
+
+            $scope.challenge.highestPlacement = _.max($scope.challenge.userDetails.submissions, 'placement').placement;
+
+            if ($scope.challenge.highestPlacement == 1) {
+              $scope.challenge.wonFirst = true;
+            }
+          }
+        }
+      }]
+    };
+  }
+})();

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

@@ -0,0 +1,29 @@
+.tile-view(ng-show="view === 'tile'")
+  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
+
+  .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")
+
+    .thumbnail-gallery(ng-click="challenge.showLightbox()")
+      .gallery-icon
+
+      .num-images 1 image
+
+.list-view(ng-show="view === 'list'")
+  .place-date
+    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.date-completed {{challenge.submissionEndDate | date : 'MMMM yyyy'}}
+
+  .winner-ribbon(ng-show="challenge.wonFirst")
+
+  .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")
+
+    .thumbnail-gallery(ng-click="challenge.showLightbox()")
+      .gallery-icon
+
+      .num-images 1 image

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

@@ -0,0 +1,23 @@
+.tile-view(ng-show="view === 'tile'")
+  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
+
+  .challenge-score(ng-class="{hidden: challenge.userStatus !== 'PASSED_REVIEW'}")
+    p.score {{challenge.userDetails.submissionReviewScore/100 | percentage}}
+
+    p Review Score
+
+.list-view(ng-show="view === 'list'")
+  .place-date
+    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.date-completed {{challenge.submissionEndDate | date : 'MMMM yyyy'}}
+
+  .winner-ribbon(ng-show="challenge.wonFirst")
+
+  .challenge-score(ng-class="{hidden: challenge.userStatus !== 'PASSED_REVIEW'}")
+    p.score {{challenge.userDetails.submissionReviewScore/100 | percentage}}
+
+    p Review Score

app/index.jade

@@ -69,7 +69,9 @@ html
     link(rel="stylesheet", href="assets/css/directives/external-link-data.css")
     link(rel="stylesheet", href="assets/css/directives/external-account.css")
     link(rel="stylesheet", href="assets/css/directives/distribution-graph.css")
+    link(rel="stylesheet", href="assets/css/directives/dev-challenge-user-place.css")
     link(rel="stylesheet", href="assets/css/directives/design-lightbox.css")
+    link(rel="stylesheet", href="assets/css/directives/design-challenge-user-place.css")
     link(rel="stylesheet", href="assets/css/directives/challenge-tile.css")
     link(rel="stylesheet", href="assets/css/directives/badge-tooltip.css")
     link(rel="stylesheet", href="assets/css/account/reset-password.css")
@@ -155,6 +157,7 @@ html
     script(src="directives/badges/badge-tooltip.directive.js")
     script(src="directives/busy-button/busy-button.directive.js")
     script(src="directives/challenge-tile/challenge-tile.directive.js")
+    script(src="directives/challenge-user-place/challenge-user-place.directive.js")
     script(src="directives/distribution-graph/distribution-graph.directive.js")
     script(src="directives/external-account/external-account.directive.js")
     script(src="directives/focus-on.directive.js")

app/my-challenges/my-challenges.controller.js

@@ -81,7 +81,11 @@
 
       return ChallengeService.getUserChallenges(handle, params)
       .then(function(challenges){
-        ChallengeService.processActiveDevDesignChallenges(challenges);
+        if (vm.statusFilter == 'active') {
+          ChallengeService.processActiveDevDesignChallenges(challenges);
+        } else {
+          ChallengeService.processPastChallenges(challenges);
+        }
         if (challenges.length > 0) {
           vm.myChallenges = challenges;
           vm.userHasChallenges = true;

app/services/challenge.service.js

@@ -171,9 +171,36 @@
 
     function processPastChallenges(challenges) {
       angular.forEach(challenges, function(challenge) {
-        if (challenge.userDetails && Array.isArray(challenge.userDetails.winningPlacements)) {
-          challenge.highestPlacement = _.max(challenge.userDetails.winningPlacements);
-          challenge.wonFirst = challenge.highestPlacement == 1;
+        if (challenge.userDetails) {
+          // TODO placement logic for challenges can be moved to their corresponding user place directive
+          // process placement for challenges having winningPlacements array in response
+          if (Array.isArray(challenge.userDetails.winningPlacements)) {
+            challenge.highestPlacement = _.max(challenge.userDetails.winningPlacements);
+            challenge.wonFirst = challenge.highestPlacement == 1;
+            if (challenge.highestPlacement === 0) {
+              challenge.highestPlacement = null;
+            }
+          }
+          // process placement for design challenges
+          if (challenge.track == 'DESIGN' && challenge.userDetails.submissions && challenge.userDetails.submissions.length > 0) {
+            challenge.thumbnailId = challenge.userDetails.submissions[0].id;
+
+            challenge.highestPlacement = _.max(challenge.userDetails.submissions, 'placement').placement;
+
+            if (challenge.highestPlacement == 1) {
+              challenge.wonFirst = true;
+            }
+          }
+
+          if (challenge.userDetails.hasUserSubmittedForReview) {
+            if (!challenge.highestPlacement) {
+              challenge.userStatus = "PASSED_SCREENING";
+            } else {
+              challenge.userStatus = "PASSED_REVIEW";
+            }
+          } else {
+            challenge.userStatus = "NOT_FINISHED";
+          }
         }
       });
     }