Merge branch 'dev' into tom-listings-auth

Author: tladendo

app/account/logout/logout.spec.js

@@ -4,6 +4,11 @@ import angular from 'angular'
 describe('Logout Controller', function() {
   var controller
   var fakeWindow = {
+    // Without the `angular` field our fake window will crush
+    // `angular-mocks@1.6.2` and higher!
+    angular: {
+      callbacks: {}
+    },
     location: {
       href: ''
     }
@@ -15,14 +20,11 @@ describe('Logout Controller', function() {
     angular.mock.module('tc.account', function($provide) {
       $provide.value('$window', fakeWindow)
     })
-
     bard.inject(this, '$controller', 'TcAuthService', '$window', '$q', 'CONSTANTS')
-
     bard.mockService(TcAuthService, {
       logout: $q.when({}),
       _default: $q.when({})
     })
-
     controller = $controller('LogoutController')
   })
 

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

@@ -12,15 +12,17 @@
       .challenge-details
         p.currentPhase {{challenge.userCurrentPhase}}
 
-        .challenge-calendar(ng-show="challenge.userCurrentPhaseEndTime")
-          p.ends-in Ends In
+        .challenge-calendar(ng-show="challenge.userCurrentPhaseEndTime", ng-class="{'challenge-late' : challenge.isLate}")
+          p.ends-in {{challenge.isLate ? 'Late for' : 'Ends In'}}
           p.time-remaining {{challenge.userCurrentPhaseEndTime[0]}}
           p.unit-of-time {{challenge.userCurrentPhaseEndTime[1]}}
 
         .stalled-challenge(ng-hide="challenge.userCurrentPhaseEndTime") This challenge is currently paused.
 
         .phase-action(ng-show="challenge.userAction", ng-switch="challenge.userAction")
           a.tc-btn.tc-btn-s.tc-btn-wide.tc-btn-ghost.submit(ng-switch-when="Submit", ng-href="{{challenge|challengeLinks:'submit'}}") Submit
+          a.tc-btn.tc-btn-s.tc-btn-wide.tc-btn-ghost.submit(ng-switch-when="Appeal", ng-href="{{challenge|challengeLinks:'viewScorecards'}}") View Scorecards
+          a.tc-btn.tc-btn-s.tc-btn-wide.tc-btn-ghost.submit(ng-switch-when="Appeal", ng-href="{{challenge|challengeLinks:'completeAppeals'}}") Complete Appeals
 
           .submitted(ng-switch-when="Submitted") Submitted
 
@@ -88,7 +90,7 @@
       p.roles(ng-hide="challenge.track === 'DATA_SCIENCE'") #[span Role: ] #[span {{challenge.userDetails.roles | listRoles}}]
 
     .challenge-details
-      .challenge-info
+      .challenge-info(ng-class="{'challenge-late' : challenge.isLate}")
         p.currentPhase {{challenge.userCurrentPhase}}
 
         p.ends-in(ng-show="challenge.userCurrentPhaseEndTime") Ends: {{challenge.userCurrentPhaseEndTime[2] | localTime}}
@@ -97,6 +99,8 @@
 
       .phase-action(ng-switch="challenge.userAction")
         a.tc-btn.tc-btn-s.tc-btn-wide.tc-btn-ghost.submit(ng-switch-when="Submit", ng-href="{{challenge|challengeLinks:'submit'}}") Submit
+        a.tc-btn.tc-btn-s.tc-btn-wide.tc-btn-ghost.submit(ng-switch-when="Appeal", ng-href="{{challenge|challengeLinks:'viewScorecards'}}") View Scorecards
+        a.tc-btn.tc-btn-s.tc-btn-wide.tc-btn-ghost.submit(ng-switch-when="Appeal", ng-href="{{challenge|challengeLinks:'completeAppeals'}}") Complete Appeals
 
         .submitted(ng-switch-when="Submitted") Submitted
 

app/filters/challengeLinks.filter.js

@@ -69,6 +69,10 @@ import _ from 'lodash'
           return String.supplant('https://{subdomain}.{domain}/challenge-details/{id}/?type={track}', data)
         case 'detail':
           return String.supplant('https://{subdomain}.{domain}/challenge-details/{id}/?type={track}', data)
+        case 'viewScorecards':
+          return String.supplant('https://software.{domain}/review/actions/ViewProjectDetails?pid={id}', data)
+        case 'completeAppeals':
+          return String.supplant('https://software.{domain}/review/actions/EarlyAppeals?pid={id}', data)
         }
       }
     }

app/layout/footer/footer.jade

@@ -1,7 +1,6 @@
 footer.bottom-footer
   // Footer links
   nav.menu-item
-    .menu-item-header.show-small OTHERS
 
     ul.submenu
       li.submenu-item #[a.menu-link(ng-href="https://www.{{domain}}/sitemap") SITE MAP]

app/profile/badges/badges.controller.js

@@ -661,6 +661,12 @@ import moment from 'moment-timezone'
         name: 'Predix Community',
         groupClass: 'Predix-Community',
         active: false
+      },
+      {
+        id: 1009,
+        name: 'iOS Community',
+        groupClass: 'iOS-Community',
+        active: false
       }
     ]
   }

app/services/challenge.service.js

@@ -105,6 +105,9 @@ import moment from 'moment'
             }
           })
         }
+        if (challenge.userCurrentPhase === 'Appeals') {
+          challenge.userAction = 'Appeal'
+        }
 
         if (challenge.userCurrentPhaseEndTime) {
           var fullTime = challenge.userCurrentPhaseEndTime
@@ -119,6 +122,7 @@ import moment from 'moment'
           // Add actual time ['2', 'months', actual date]
           timeAndUnit.push(fullTime)
           challenge.userCurrentPhaseEndTime = timeAndUnit
+          challenge.isLate = moment().diff(fullTime) > 0 // If > 0 then the challenge has 'Late Deliverables' or
         }
       })
     }

app/services/helpers.service.spec.js

@@ -5,6 +5,11 @@ const mockData = require('../../tests/test-helpers/mock-data')
 describe('Helper Service', function() {
 
   var fakeWindow = {
+    // Without the `angular` field our fake window will crush
+    // `angular-mocks@1.6.2` and higher!
+    angular: {
+      callbacks: {}
+    },
     location: {
       href: '/'
     },

app/services/jwtInterceptor.service.spec.js

@@ -33,6 +33,11 @@ describe('JWT Interceptor Service', function() {
       })
     },
     fakeWindow = {
+      // Without the `angular` field our fake window will crush
+      // `angular-mocks@1.6.2` and higher!
+      angular: {
+        callbacks: {}
+      },
       location: ''
     }
 

assets/css/directives/badge-tooltip.scss

@@ -440,6 +440,9 @@
 .Predix-Community {
   background-position: -50px -672px;
 }
+.iOS-Community {
+  background-position: -95px -672px;
+}
 .Wireframe {
     width: 31px;
     background-position: 0px -1009px !important;

assets/css/directives/challenge-tile.scss

@@ -222,6 +222,12 @@ challenge-tile .challenge.tile-view {
           text-transform: lowercase;
           color: #7F7F7F;
         }
+
+        &.challenge-late {
+          .ends-in, .time-remaining, .unit-of-time {
+            color: #ee6666;
+          }
+        }
       }
 
       .stalled-challenge {
@@ -239,8 +245,8 @@ challenge-tile .challenge.tile-view {
         min-height: 55px;
 
         .submit {
-          margin-bottom: 25px;
-          display: inline-block;
+          margin: 12px;
+          display: block;
         }
 
         .submitted {
@@ -462,6 +468,12 @@ challenge-tile .challenge.list-view {
         font-size: 14px;
         color: #A3A3AE;
       }
+
+      &.challenge-late {
+        .ends-in, .time-remaining, .unit-of-time {
+          color: #ee6666;
+        }
+      }
     }
 
     .marathon-score {
@@ -486,7 +498,8 @@ challenge-tile .challenge.list-view {
 
     .phase-action {
       .submit {
-        display: inline-block;
+        display: block;
+        margin: 6px 0;
       }
 
       .submitted {