add progress bars
This commit is contained in:
@@ -29,7 +29,7 @@ module.exports = {
|
|||||||
var challengeList = resources.getChallengeMapForDisplay();
|
var challengeList = resources.getChallengeMapForDisplay();
|
||||||
Object.keys(challengeList).forEach(function(key) {
|
Object.keys(challengeList).forEach(function(key) {
|
||||||
challengeList[key].completed = challengeList[key].challenges.filter(function(elem) {
|
challengeList[key].completed = challengeList[key].challenges.filter(function(elem) {
|
||||||
return completedChallengeList.indexOf(elem._id) > 0;
|
return completedChallengeList.indexOf(elem._id) > -1;
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -41,6 +41,7 @@ module.exports = {
|
|||||||
var date2 = new Date();
|
var date2 = new Date();
|
||||||
var timeDiff = Math.abs(date2.getTime() - date1.getTime());
|
var timeDiff = Math.abs(date2.getTime() - date1.getTime());
|
||||||
var daysRunning = Math.ceil(timeDiff / (1000 * 3600 * 24));
|
var daysRunning = Math.ceil(timeDiff / (1000 * 3600 * 24));
|
||||||
|
challengeList[0].completed[0] +=
|
||||||
|
|
||||||
User.count({}, function (err, camperCount) {
|
User.count({}, function (err, camperCount) {
|
||||||
if (err) {
|
if (err) {
|
||||||
|
@@ -332,6 +332,15 @@ ul {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.thin-progress-bar {
|
||||||
|
height: 8px;
|
||||||
|
margin-top:3px;
|
||||||
|
margin-bottom:0px;
|
||||||
|
width: 60%;
|
||||||
|
margin-right: auto;
|
||||||
|
margin-left: auto;
|
||||||
|
}
|
||||||
|
|
||||||
.panel-body {
|
.panel-body {
|
||||||
margin-bottom: -6px;
|
margin-bottom: -6px;
|
||||||
}
|
}
|
||||||
|
@@ -2,7 +2,7 @@ extends ../layout
|
|||||||
block content
|
block content
|
||||||
script.
|
script.
|
||||||
var completedChallenges = !{JSON.stringify(completedChallengeList)};
|
var completedChallenges = !{JSON.stringify(completedChallengeList)};
|
||||||
var challengeList = !{JSON.stringify(challengeList)}
|
var challengeList = !{JSON.stringify(challengeList)};
|
||||||
.panel.panel-info
|
.panel.panel-info
|
||||||
.panel-heading.text-center
|
.panel-heading.text-center
|
||||||
h1 Challenge Map
|
h1 Challenge Map
|
||||||
@@ -26,8 +26,16 @@ block content
|
|||||||
ol
|
ol
|
||||||
for challengeBlock in challengeList
|
for challengeBlock in challengeList
|
||||||
.row
|
.row
|
||||||
.hidden-xs.col-sm-3.col-md-2
|
if (user)
|
||||||
span.negative-10
|
if (challengeBlock.completed.length === challengeBlock.challenges.length)
|
||||||
|
.hidden-xs.col-sm-3.col-md-2.text-primary.ion-checkmark-circled.padded-ionic-icon.text-center.large-p.negative-10
|
||||||
|
else
|
||||||
|
.hidden-xs.col-sm-3.col-md-2
|
||||||
|
.progress.progress-bar-padding.text-center.thin-progress-bar
|
||||||
|
.progress-bar(role='progressbar', aria-valuenow=((challengeBlock.completed.length / challengeBlock.challenges.length) * 100), aria-valuemin='0', aria-valuemax='100', style='width: ' + ((challengeBlock.completed.length / challengeBlock.challenges.length) * 100) + '%;')
|
||||||
|
else
|
||||||
|
.hidden-xs.col-sm-3
|
||||||
|
span.negative-10
|
||||||
.col-xs-12.col-sm-9.col-md-10
|
.col-xs-12.col-sm-9.col-md-10
|
||||||
li.large-p.negative-10
|
li.large-p.negative-10
|
||||||
a(href='#' + challengeBlock.dashedName)= challengeBlock.name
|
a(href='#' + challengeBlock.dashedName)= challengeBlock.name
|
||||||
|
Reference in New Issue
Block a user