kjao/archive
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added coloring for reports/confirmations

Browse Source
This commit is contained in:
Kenneth Jao 2016-09-15 13:37:13 -04:00
parent a2f796ad60
commit 415a621f6c
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hourglass/client/main/main.html
View File

@ -305,7 +305,7 @@
</div> </div>
<div class="cWorkBottom"> <div class="cWorkBottom">
<span class="cWorkDate" style="font-weight:{{cardDate}}">{{dueDate}}</span> <span class="cWorkDate" style="font-weight:{{cardDate}}">{{dueDate}}</span>
<div> <div style="color:{{doneRatio}}">
<i class="fa fa-thumbs-up" aria-hidden="true"></i> <i class="fa fa-thumbs-up" aria-hidden="true"></i>
<span>{{confirmationLength}}</span> <span>{{confirmationLength}}</span>
<i class="fa fa-thumbs-down" aria-hidden="true"></i> <i class="fa fa-thumbs-down" aria-hidden="true"></i>

17
hourglass/client/main/main.js
View File

@ -8,7 +8,6 @@ import './main.html';
var load = true; var load = true;
var calWorkOpen = null; var calWorkOpen = null;
var calWorkDate = null; var calWorkDate = null;
//["class1","class2"] {"2":"class2","1":"class1"}
var openValues = { var openValues = {
"menu": "-270px", "menu": "-270px",
@ -197,7 +196,21 @@ Template.registerHelper('myClasses', () => { // Gets all classes and respective
thisWork[j].reportLength = thisWork[j].reports.length; thisWork[j].reportLength = thisWork[j].reports.length;
thisWork[j].creator = Meteor.users.findOne({_id: thisWork[j].creator}).profile.name; thisWork[j].creator = Meteor.users.findOne({_id: thisWork[j].creator}).profile.name;
var conf = thisWork[j].confirmations.length;
var repo = thisWork[j].reports.length;
var ratio = conf / repo;
var normalColor = themeColors[Session.get("user").preferences.theme]["text"];
if (Math.abs(conf - repo)) {
if ((conf+repo) <= 1) {
thisWork[j].doneRatio = normalColor;
} else {
thisWork[j].doneRatio = "#F9F906";
}
} else if (ratio >= 2) {
thisWork[j].doneRatio = "#33DD33";
} else if (ratio <= .9) {
thisWork[j].doneRatio = "#FF1A1A";
}
} }
array[i].thisClassWork = thisWork; array[i].thisClassWork = thisWork;
} }