Skip to content
This repository was archived by the owner on Mar 4, 2025. It is now read-only.

Commit efaf5b9

Browse files
Fix /my-dashboard ENDS IN time counter issue
1 parent 8c13292 commit efaf5b9

File tree

3 files changed

+16
-3
lines changed

3 files changed

+16
-3
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
.challenge-details
1313
p.currentPhase {{challenge.userCurrentPhase}}
1414

15-
.challenge-calendar(ng-show="challenge.userCurrentPhaseEndTime")
16-
p.ends-in Ends In
15+
.challenge-calendar(ng-show="challenge.userCurrentPhaseEndTime", ng-class="{'challenge-late' : challenge.isLate}")
16+
p.ends-in {{challenge.isLate ? 'Late for' : 'Ends In'}}
1717
p.time-remaining {{challenge.userCurrentPhaseEndTime[0]}}
1818
p.unit-of-time {{challenge.userCurrentPhaseEndTime[1]}}
1919

@@ -88,7 +88,7 @@
8888
p.roles(ng-hide="challenge.track === 'DATA_SCIENCE'") #[span Role: ] #[span {{challenge.userDetails.roles | listRoles}}]
8989

9090
.challenge-details
91-
.challenge-info
91+
.challenge-info(ng-class="{'challenge-late' : challenge.isLate}")
9292
p.currentPhase {{challenge.userCurrentPhase}}
9393

9494
p.ends-in(ng-show="challenge.userCurrentPhaseEndTime") Ends: {{challenge.userCurrentPhaseEndTime[2] | localTime}}

app/services/challenge.service.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,7 @@ import moment from 'moment'
119119
// Add actual time ['2', 'months', actual date]
120120
timeAndUnit.push(fullTime)
121121
challenge.userCurrentPhaseEndTime = timeAndUnit
122+
challenge.isLate = moment().diff(fullTime) > 0 // If > 0 then the challenge has 'Late Deliverables' or
122123
}
123124
})
124125
}

assets/css/directives/challenge-tile.scss

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -222,6 +222,12 @@ challenge-tile .challenge.tile-view {
222222
text-transform: lowercase;
223223
color: #7F7F7F;
224224
}
225+
226+
&.challenge-late {
227+
.ends-in, .time-remaining, .unit-of-time {
228+
color: #ee6666;
229+
}
230+
}
225231
}
226232

227233
.stalled-challenge {
@@ -462,6 +468,12 @@ challenge-tile .challenge.list-view {
462468
font-size: 14px;
463469
color: #A3A3AE;
464470
}
471+
472+
&.challenge-late {
473+
.ends-in, .time-remaining, .unit-of-time {
474+
color: #ee6666;
475+
}
476+
}
465477
}
466478

467479
.marathon-score {

0 commit comments

Comments
 (0)