mirror of
https://github.com/codeninjasllc/codecombat.git
synced 2025-03-14 07:00:01 -04:00
🐛Fix admin student licenses range coloring
This commit is contained in:
parent
6b1adb9b31
commit
f44821bfe1
3 changed files with 8 additions and 4 deletions
|
@ -17,5 +17,6 @@
|
|||
.range-dates
|
||||
position: absolute
|
||||
height: 100%
|
||||
width: 100%
|
||||
left: 0px
|
||||
top: 0px
|
||||
|
|
|
@ -24,7 +24,7 @@ block content
|
|||
each rangeKey in view.rangeKeys
|
||||
span.range-background(style="left:#{rangeKey.startScale}%;width:#{rangeKey.width}%;background-color:#{rangeKey.color}")
|
||||
span.range-dates(style="left:#{rangeKey.startScale}%;width:#{rangeKey.width}%;") #{rangeKey.name}
|
||||
td(colspan=2)
|
||||
td(colspan=3)
|
||||
each school in view.schools
|
||||
each prepaid in school.prepaids
|
||||
tr
|
||||
|
|
|
@ -59,9 +59,12 @@ module.exports = class SchoolLicensesView extends RootView
|
|||
collapsedPrepaids.push({startDate, endDate, max, used})
|
||||
|
||||
for collapsedPrepaid in collapsedPrepaids
|
||||
collapsedPrepaid.startScale = Math.round((new Date(collapsedPrepaid.startDate).getTime() - @startDateRange.getTime()) / rangeMilliseconds * 100)
|
||||
collapsedPrepaid.startScale = 0 if collapsedPrepaid.startScale < 0
|
||||
collapsedPrepaid.rangeScale = Math.round((new Date(collapsedPrepaid.endDate).getTime() - new Date(collapsedPrepaid.startDate).getTime()) / rangeMilliseconds * 100)
|
||||
collapsedPrepaid.startScale = (new Date(collapsedPrepaid.startDate).getTime() - @startDateRange.getTime()) / rangeMilliseconds * 100
|
||||
if collapsedPrepaid.startScale < 0
|
||||
collapsedPrepaid.startScale = 0
|
||||
collapsedPrepaid.rangeScale = (new Date(collapsedPrepaid.endDate).getTime() - @startDateRange.getTime()) / rangeMilliseconds * 100
|
||||
else
|
||||
collapsedPrepaid.rangeScale = (new Date(collapsedPrepaid.endDate).getTime() - new Date(collapsedPrepaid.startDate).getTime()) / rangeMilliseconds * 100
|
||||
collapsedPrepaid.rangeScale = 100 - collapsedPrepaid.startScale if collapsedPrepaid.rangeScale + collapsedPrepaid.startScale > 100
|
||||
@schools.push {name: school, activity, max: schoolMax, used: schoolUsed, prepaids: collapsedPrepaids, startDate: collapsedPrepaids[0].startDate, endDate: collapsedPrepaids[0].endDate}
|
||||
|
||||
|
|
Loading…
Reference in a new issue