From d9fb4329ba2d52178efd3934c7ddb76e0ec52f7c Mon Sep 17 00:00:00 2001
From: vikasrohit <vikas.agarwal@appirio.com>
Date: Mon, 26 Oct 2015 18:43:34 -0700
Subject: [PATCH] SUP-2255, Remove "Didn't Finish" from past challenges where
 user was not a submitter

-- Shown "Completed" for non submitter roles.
---
 ...design-challenge-user-place.directive.jade |  2 ++
 .../dev-challenge-user-place.directive.jade   |  2 ++
 app/services/challenge.service.js             | 19 +++++++++++++++++++
 3 files changed, 23 insertions(+)

diff --git a/app/directives/challenge-user-place/design-challenge-user-place.directive.jade b/app/directives/challenge-user-place/design-challenge-user-place.directive.jade
index 91b40956a..c991169f2 100644
--- a/app/directives/challenge-user-place/design-challenge-user-place.directive.jade
+++ b/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")
diff --git a/app/directives/challenge-user-place/dev-challenge-user-place.directive.jade b/app/directives/challenge-user-place/dev-challenge-user-place.directive.jade
index 5e3e921ea..99156ddc9 100644
--- a/app/directives/challenge-user-place/dev-challenge-user-place.directive.jade
+++ b/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")
diff --git a/app/services/challenge.service.js b/app/services/challenge.service.js
index e71ce5293..289709b3a 100644
--- a/app/services/challenge.service.js
+++ b/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";
+          }
         }
       });
     }