From efaf5b9df5952bddea9a1011aa7f4b43df6a2301 Mon Sep 17 00:00:00 2001 From: Thomas Kranitsas Date: Mon, 6 Feb 2017 17:48:12 +0200 Subject: [PATCH] Fix /my-dashboard ENDS IN time counter issue --- app/directives/challenge-tile/challenge-tile.jade | 6 +++--- app/services/challenge.service.js | 1 + assets/css/directives/challenge-tile.scss | 12 ++++++++++++ 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/app/directives/challenge-tile/challenge-tile.jade b/app/directives/challenge-tile/challenge-tile.jade index 4660e4dfb..092f8e700 100644 --- a/app/directives/challenge-tile/challenge-tile.jade +++ b/app/directives/challenge-tile/challenge-tile.jade @@ -12,8 +12,8 @@ .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]}} @@ -88,7 +88,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}} diff --git a/app/services/challenge.service.js b/app/services/challenge.service.js index c71b4978e..a9ecd0492 100644 --- a/app/services/challenge.service.js +++ b/app/services/challenge.service.js @@ -119,6 +119,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 } }) } diff --git a/assets/css/directives/challenge-tile.scss b/assets/css/directives/challenge-tile.scss index 163886747..ef8b13dc8 100644 --- a/assets/css/directives/challenge-tile.scss +++ b/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 { @@ -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 { pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.

Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy