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

minor fixes

Browse Source
This commit is contained in:
Kenneth Jao 2017-04-25 03:07:56 -04:00
parent b5edb2bb25
commit 16aad247f8
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -394,7 +394,7 @@ Template.main.helpers({
date.startOf("day"); date.startOf("day");
realDate = realDate._d; realDate = realDate._d;
Session.set("newWork", true); Session.set("newWork", true);
Session.set("currentWork", {dueDate: realDate}); Session.set("currentWork", {dueDate: realDate, type: "normal"});
if(!Session.equals("sidebarMode", "create")) toggleToSidebar("create"); if(!Session.equals("sidebarMode", "create")) toggleToSidebar("create");
} }
}; };
@ -1071,7 +1071,7 @@ updateWork = function(id, fields, type) {
return work._id !== id; return work._id !== id;
}); });
myWork.push(workObj); myWork.push(workObj);
if(!Session.equals("currentWork", null) && Session.get("currentWork")._id === id) { /*if(!Session.equals("currentWork", null) && Session.get("currentWork")._id === id) { Notification beta, probably rework.
Session.set("currentWork", workObj); Session.set("currentWork", workObj);
if($(".overlay").css("display") !== "none") { // If currently viewing work. if($(".overlay").css("display") !== "none") { // If currently viewing work.
var message = Object.keys(fields)[0].replace("dueDate", "due date"); var message = Object.keys(fields)[0].replace("dueDate", "due date");
@ -1082,7 +1082,7 @@ updateWork = function(id, fields, type) {
}); });
workChanger = false; workChanger = false;
} }
} }*/
} }
Session.set("myWork", myWork); Session.set("myWork", myWork);
@ -1102,7 +1102,8 @@ filterWork = function() {
var notInTypeFilter = typeFilter.length !== 0 && !_.contains(typeFilter, workObj.type); var notInTypeFilter = typeFilter.length !== 0 && !_.contains(typeFilter, workObj.type);
var pastHideDate = hideTime !== 0 && (moment().subtract(hideTime, 'days'))._d > (moment(workObj.dueDate))._d; var pastHideDate = hideTime !== 0 && (moment().subtract(hideTime, 'days'))._d > (moment(workObj.dueDate))._d;
var markedDone = Session.get("user").preferences.done && !(Meteor.Device.isPhone() || Meteor.Device.isTablet()) && _.contains(workObj.done, Meteor.userId()); var markedDone = Session.get("user").preferences.done && !(Meteor.Device.isPhone() || Meteor.Device.isTablet()) && _.contains(workObj.done, Meteor.userId());
var reported = (workObj.reportLength / (workObj.reportLength + workObj.confirmationLength)) > 0.7; // Over 70% are reports var reported = false; // Temp, working on reporting.
//var reported = (workObj.reportLength / (workObj.reportLength + workObj.confirmationLength)) > 0.7; // Over 70% are reports
if(notInClassFilter || notInTypeFilter || pastHideDate || markedDone || reported) { if(notInClassFilter || notInTypeFilter || pastHideDate || markedDone || reported) {
hideWork.push(workObj); hideWork.push(workObj);

8
hourglass/client/mobile/mobile.js
View File

@ -431,7 +431,7 @@ Template.mobile.helpers({
}) : }) :
Session.get("myWork").filter(function(work) { Session.get("myWork").filter(function(work) {
return !_.contains(work.done, Meteor.userId()); return !_.contains(work.done, Meteor.userId());
}) });
}, },
showMode(mode) { showMode(mode) {
return Session.equals("mobileMode", mode); return Session.equals("mobileMode", mode);
@ -481,6 +481,12 @@ Template.mobile.helpers({
} }
}); });
Template.mobileClass.helpers({
isDone() {
return Session.equals("mobileMode", "done");
},
})
Template.mAddWork.rendered = function() { Template.mAddWork.rendered = function() {
addMobileButton($('#dueDate'), 0.2, "brightness", function() { addMobileButton($('#dueDate'), 0.2, "brightness", function() {
$('#dueDate').datepicker({ $('#dueDate').datepicker({