more small fixes
This commit is contained in:
parent
d0501f76ec
commit
8689a964f5
@ -570,6 +570,23 @@ input {
|
|||||||
text-align: right;
|
text-align: right;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.cWorkBottom .fa-thumbs-up, .cWorkBottom .fa-exclamation-triangle {
|
||||||
|
pointer-events: all;
|
||||||
|
|
||||||
|
-webkit-transition: color 0.4s ease;
|
||||||
|
-moz-transition: color 0.4s ease;
|
||||||
|
-ms-transition: color 0.4s ease;
|
||||||
|
transition: color 0.4s ease;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cWorkBottom .fa-thumbs-up:hover {
|
||||||
|
color: #27A127;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cWorkBottom .fa-exclamation-triangle:hover {
|
||||||
|
color: #FF1A1A;
|
||||||
|
}
|
||||||
|
|
||||||
input.clickModify, textarea.clickModify {
|
input.clickModify, textarea.clickModify {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
font-size: 2.2vh;
|
font-size: 2.2vh;
|
||||||
|
|||||||
@ -293,7 +293,7 @@
|
|||||||
<div id="workInfo1">
|
<div id="workInfo1">
|
||||||
<div>
|
<div>
|
||||||
<span class="workTitle">Due Date:</span><br>
|
<span class="workTitle">Due Date:</span><br>
|
||||||
<input id="wDueDate" class="clickModify" style="color:{{divColor 'textColor'}}" value="{{work 'dueDate'}}" tabindex="11" readonly>
|
<input id="wDueDate" class="clickModify" style="color:{{divColor 'textColor'}}" value="{{work 'dueDate'}}" tabindex="11" readonly="readonly">
|
||||||
</div>
|
</div>
|
||||||
<div>
|
<div>
|
||||||
<span class="workTitle">Description:</span><br>
|
<span class="workTitle">Description:</span><br>
|
||||||
|
|||||||
@ -112,6 +112,7 @@ Template.registerHelper('myClasses', () => { // Gets all classes and respective
|
|||||||
|
|
||||||
Template.registerHelper('pref', (val) => { // Obtains all user preferences.
|
Template.registerHelper('pref', (val) => { // Obtains all user preferences.
|
||||||
try {
|
try {
|
||||||
|
if(val === "school") return Session.get("user").school;
|
||||||
var preferences = Session.get("user").preferences;
|
var preferences = Session.get("user").preferences;
|
||||||
return options[val].filter(function(entry) {
|
return options[val].filter(function(entry) {
|
||||||
return (val === 'theme') ? _.isEqual(preferences[val], themeColors[entry.val]) : preferences[val] === entry.val;
|
return (val === 'theme') ? _.isEqual(preferences[val], themeColors[entry.val]) : preferences[val] === entry.val;
|
||||||
@ -395,6 +396,7 @@ Template.main.events({
|
|||||||
$("#userDropdown").fadeIn(250);
|
$("#userDropdown").fadeIn(250);
|
||||||
},
|
},
|
||||||
'click .workCard' (event) { // Display work information on work card click.
|
'click .workCard' (event) { // Display work information on work card click.
|
||||||
|
if(event.target.className.indexOf("fa") !== -1) return;
|
||||||
var workid = event.target.getAttribute("workid");
|
var workid = event.target.getAttribute("workid");
|
||||||
var thisWork = work.findOne({
|
var thisWork = work.findOne({
|
||||||
_id: workid
|
_id: workid
|
||||||
@ -640,6 +642,14 @@ Template.main.events({
|
|||||||
'click #markReport' () { // Click report button.
|
'click #markReport' () { // Click report button.
|
||||||
serverData = [Session.get("currentWork")._id, "reports"];
|
serverData = [Session.get("currentWork")._id, "reports"];
|
||||||
sendData("toggleWork");
|
sendData("toggleWork");
|
||||||
|
},
|
||||||
|
'click .cWorkBottom .fa-thumbs-up' (event) {
|
||||||
|
serverData = [event.target.parentNode.parentNode.parentNode.parentNode.getAttribute("workid"), "confirmations"]
|
||||||
|
sendData("toggleWork")
|
||||||
|
},
|
||||||
|
'click .cWorkBottom .fa-exclamation-triangle' (event) {
|
||||||
|
serverData = [event.target.parentNode.parentNode.parentNode.parentNode.getAttribute("workid"), "reports"]
|
||||||
|
sendData("toggleWork")
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
@ -1011,7 +1021,11 @@ myClasses = function() {
|
|||||||
var repo = thisWork[j].reports.length;
|
var repo = thisWork[j].reports.length;
|
||||||
var ratio = conf / repo;
|
var ratio = conf / repo;
|
||||||
var normalColor = Session.get("user").preferences.theme.text;
|
var normalColor = Session.get("user").preferences.theme.text;
|
||||||
if (Math.abs(conf - repo)) {
|
|
||||||
|
|
||||||
|
thisWork[j].doneRatio = normalColor;
|
||||||
|
// Ratio color handling
|
||||||
|
/*if (Math.abs(conf - repo)) {
|
||||||
if ((conf + repo) <= 1) {
|
if ((conf + repo) <= 1) {
|
||||||
thisWork[j].doneRatio = normalColor;
|
thisWork[j].doneRatio = normalColor;
|
||||||
} else {
|
} else {
|
||||||
@ -1021,7 +1035,7 @@ myClasses = function() {
|
|||||||
thisWork[j].doneRatio = "#33DD33";
|
thisWork[j].doneRatio = "#33DD33";
|
||||||
} else if (ratio <= 0.9) {
|
} else if (ratio <= 0.9) {
|
||||||
thisWork[j].doneRatio = "#FF1A1A";
|
thisWork[j].doneRatio = "#FF1A1A";
|
||||||
}
|
}*/
|
||||||
}
|
}
|
||||||
array[i].thisClassWork = thisWork.sort(function(a, b) {
|
array[i].thisClassWork = thisWork.sort(function(a, b) {
|
||||||
return Date.parse(a.realDate) - Date.parse(b.realDate);
|
return Date.parse(a.realDate) - Date.parse(b.realDate);
|
||||||
|
|||||||
@ -299,7 +299,7 @@
|
|||||||
<div id="formContainer">
|
<div id="formContainer">
|
||||||
<div class="formDiv">
|
<div class="formDiv">
|
||||||
<p class="profTitle">**School:</p>
|
<p class="profTitle">**School:</p>
|
||||||
{{> inputAutocomplete settings=schoolComplete class="form-control creInput" type="text" form="school" placeholder="**School | Ex: International Academy" }}
|
<input id="school" class="creInput" type="text" form="school" value="{{pref 'school'}}" readonly>
|
||||||
</div>
|
</div>
|
||||||
<div class="formDiv">
|
<div class="formDiv">
|
||||||
<p class="profTitle">Hour:</p>
|
<p class="profTitle">Hour:</p>
|
||||||
|
|||||||
@ -78,7 +78,7 @@
|
|||||||
<div id="formContainer">
|
<div id="formContainer">
|
||||||
<div class="formDiv">
|
<div class="formDiv">
|
||||||
<p class="profTitle">**School:</p>
|
<p class="profTitle">**School:</p>
|
||||||
{{> inputAutocomplete settings=schoolComplete class="form-control creInput" type="text" form="school" placeholder="**School | Ex: International Academy" }}
|
<input id="school" class="creInput" type="text" form="school" value="{{pref 'school'}}" readonly>
|
||||||
</div>
|
</div>
|
||||||
<div class="formDiv">
|
<div class="formDiv">
|
||||||
<p class="profTitle">Hour:</p>
|
<p class="profTitle">Hour:</p>
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user